diff options
author | Eric Erfanian <erfanian@google.com> | 2017-08-04 14:54:19 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-08-07 15:21:54 +0000 |
commit | 10ae593a59aa50963e1d3159747da2d65ca79bed (patch) | |
tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 /java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml | |
parent | e1a73952372a7ceee493863520e5046e6d979dc0 (diff) | |
download | android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.gz android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.bz2 android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.zip |
This change brings Dialer oc-mr1-dev up to date with v11.1 RC06.
This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2
Test: make
master is already up to date and
Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9
Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
Diffstat (limited to 'java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml')
-rw-r--r-- | java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml index 0451dcfc1..be06baaf1 100644 --- a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml @@ -33,8 +33,6 @@ <string name="description_call_composer_camera" msgid="388088245837924914">"Prendre une photo"</string> <string name="description_call_composer_photo" msgid="6449208314952246454">"Choisir une photo"</string> <string name="description_call_composer_message" msgid="9132362446000908550">"Envoyer un message"</string> - <!-- no translation found for image_sent_messages (6520870555040566229) --> - <skip /> - <!-- no translation found for message_sent_messages (6286576951151541098) --> - <skip /> + <string name="image_sent_messages" msgid="6520870555040566229">"Photo envoyée au moyen de l\'application Messages"</string> + <string name="message_sent_messages" msgid="6286576951151541098">"Message envoyé au moyen de l\'application Messages"</string> </resources> |