diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
| commit | d8046e520a866b9948ee9ba47cf642b441ca8e23 (patch) | |
| tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/incallui/answer/impl/res/values-nb | |
| parent | cdb1edf966a892abebcba425a85b7d4e47758302 (diff) | |
Update AOSP Dialer source from internal google3 repository at
cl/152373142.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217
Diffstat (limited to 'java/com/android/incallui/answer/impl/res/values-nb')
| -rw-r--r-- | java/com/android/incallui/answer/impl/res/values-nb/strings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml index b9cae7da9..fb3538f04 100644 --- a/java/com/android/incallui/answer/impl/res/values-nb/strings.xml +++ b/java/com/android/incallui/answer/impl/res/values-nb/strings.xml @@ -5,7 +5,7 @@ <string name="call_incoming_swipe_to_answer_video_as_audio" msgid="2656902519734774070">"Sveip fra ikonet for å svare med en lydsamtale"</string> <string name="call_incoming_default_label_answer_and_release_second" msgid="4543429977872844314">"Sveip oppover for å svare og sette samtalen som er i gang på vent"</string> <string name="call_incoming_default_label_answer_and_release_third" msgid="1738895612225349741">"Sveip oppover for å svare og avslutte samtalen som står på vent"</string> - <string name="call_incoming_swipe_to_answer_and_release" msgid="5695449250270204669">"Sveip fra ikonet for å svare på det innkommende anropet og avslutte samtalen som er i gang"</string> + <string name="call_incoming_swipe_to_answer_and_release" msgid="662432029870261061">"Sveip fra ikonet for å svare – og avslutte samtalen som er i gang"</string> <string name="call_incoming_message_custom" msgid="5819492800418293238">"Skriv noe selv …"</string> <string name="call_incoming_audio_handset" msgid="2299009191401671619">"Telefon"</string> <string name="call_incoming_audio_speakerphone" msgid="5632622369522427991">"Høyttaler"</string> @@ -14,10 +14,10 @@ <string name="call_incoming_custom_message_send" msgid="3826716354040318205">"Send"</string> <string name="a11y_incoming_call_reject_with_sms" msgid="6101839791429796754">"Avvis anropet med en melding"</string> <string name="a11y_incoming_call_answer_video_as_audio" msgid="3890612269318682756">"Svar med en lydsamtale"</string> - <string name="a11y_incoming_call_answer_and_release" msgid="6771962954510757804">"Svar på det innkommende anropet og avslutt samtalen som er i gang"</string> + <string name="a11y_incoming_call_answer_and_release" msgid="4896746774725239464">"Svar, og avslutt samtalen som er i gang"</string> <string name="a11y_description_incoming_call_reject_with_sms" msgid="4705064921696291310">"Avvis med en melding"</string> <string name="a11y_description_incoming_call_answer_video_as_audio" msgid="1562530317428907884">"Svar med en lydsamtale"</string> - <string name="a11y_description_incoming_call_answer_and_release" msgid="1162931642679631008">"Svar på det innkommende anropet og avslutt samtalen som er i gang"</string> + <string name="a11y_description_incoming_call_answer_and_release" msgid="8511087499748888476">"Svar, og avslutt samtalen som er i gang"</string> <string name="call_incoming_video_is_off" msgid="3216603035158629403">"Video er av"</string> <string name="a11y_incoming_call_swipe_gesture_prompt" msgid="8682480557168484972">"Sveip oppover med to fingre for å svare. Sveip nedover med to fingre for å avvise."</string> <string name="call_incoming_important" msgid="6477906345540334049">"Viktig samtale"</string> |