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/voicemail/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/voicemail/impl/res/values-nb')
-rw-r--r-- | java/com/android/voicemail/impl/res/values-nb/strings.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/com/android/voicemail/impl/res/values-nb/strings.xml b/java/com/android/voicemail/impl/res/values-nb/strings.xml index 890c0a98b..93e9e2a2c 100644 --- a/java/com/android/voicemail/impl/res/values-nb/strings.xml +++ b/java/com/android/voicemail/impl/res/values-nb/strings.xml @@ -25,8 +25,10 @@ <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Visuell talepostkasse"</string> <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Ekstra sikkerhetskopi og lagring"</string> <string name="voicemail_visual_voicemail_auto_archive_temporary_disclaimer" msgid="401509437213449235">" "<b><i>"Denne funksjonen er fortsatt under utforskning"</i></b>", og det kan føre til at noen av talepostmelingene dine slettes. Vi kan dessverre ikke love at denne funksjonen støttes i fremtiden, men vi vil gjerne høre om hva du mener om den."</string> - <string name="voicemail_set_pin_dialog_title" msgid="8853126653745637812">"Angi PIN-kode"</string> - <string name="voicemail_change_pin_dialog_title" msgid="6929300804279262966">"Endre PIN-koden"</string> + <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Angi PIN-kode"</string> + <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Endre PIN-koden"</string> + <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"Du må slå på visuell talepost for å endre PIN-koden"</string> + <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"Visuell talepost er ikke slått på ennå – prøv igjen senere"</string> <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Gammel PIN-kode"</string> <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Ny PIN-kode"</string> <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Vent litt."</string> |