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-fr-rCA/strings.xml | |
parent | cdb1edf966a892abebcba425a85b7d4e47758302 (diff) | |
download | android_packages_apps_Dialer-d8046e520a866b9948ee9ba47cf642b441ca8e23.tar.gz android_packages_apps_Dialer-d8046e520a866b9948ee9ba47cf642b441ca8e23.tar.bz2 android_packages_apps_Dialer-d8046e520a866b9948ee9ba47cf642b441ca8e23.zip |
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-fr-rCA/strings.xml')
-rw-r--r-- | java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml index b4efb14d9..2c9a11a93 100644 --- a/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml +++ b/java/com/android/voicemail/impl/res/values-fr-rCA/strings.xml @@ -25,8 +25,10 @@ <string name="voicemail_visual_voicemail_switch_title" msgid="3158454817165714998">"Messagerie vocale visuelle"</string> <string name="voicemail_visual_voicemail_auto_archive_switch_title" msgid="7120443850486401455">"Espace suppl. de sauvegarde et stockage"</string> <string name="voicemail_visual_voicemail_auto_archive_temporary_disclaimer" msgid="401509437213449235">" "<b><i>"Fonction expérimentale"</i></b>" en cours de test."</string> - <string name="voicemail_set_pin_dialog_title" msgid="8853126653745637812">"Définir un NIP"</string> - <string name="voicemail_change_pin_dialog_title" msgid="6929300804279262966">"Modifier le NIP"</string> + <string name="voicemail_set_pin_preference_title" msgid="1034691230818233684">"Définir un NIP"</string> + <string name="voicemail_change_pin_preference_title" msgid="8944570865151211693">"Modifier le NIP"</string> + <string name="voicemail_change_pin_preference_summary_disable" msgid="2787334822298063691">"La messagerie vocale visuelle doit être activée pour que vous puissiez modifier votre NIP"</string> + <string name="voicemail_change_pin_preference_summary_not_activated" msgid="8794039647258533633">"La messagerie vocale visuelle n\'a pas encore été activée. Veuillez réessayer plus tard"</string> <string name="vm_change_pin_old_pin" msgid="3732582036597386047">"Ancien NIP"</string> <string name="vm_change_pin_new_pin" msgid="5167496290646066333">"Nouveau NIP"</string> <string name="vm_change_pin_progress_message" msgid="4143209637626661679">"Veuillez patienter."</string> |