diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-22 18:04:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-22 18:04:40 +0000 |
commit | 6ffaa6d5c0284c73f49b82ba7b4422f5c375e890 (patch) | |
tree | 2d642036d7c3e46a73c91f3f7d9f036d37d2c79c /java/com/android/incallui/res/values-fr-rCA/strings.xml | |
parent | da6e1f120189c89059b06afc989e5178a6b8622f (diff) | |
parent | 7b28abc0f919395a971f48d8add255e1a0303ec2 (diff) |
Merge changes I146a5d87,I65e53add,I5163be69,I65376894,I416d7e2d, ...
* changes:
Don't show bubble when InCallActivity is visible in multi screen mode.
Fixed bug where dialer would sometimes show blank screen.
Update ViLTE strings to reflect "carrier" video calling
Adding some contacts permission guards.
Better handling country iso when getting geo location of phone number.
Dialer integration of contacts suggestions promo
Updated ongoing call notification to reflect video call state.
Added dismiss button to location permission request.
Refactor CallList to call onUpdateCall and notifyGenericListeners directly.
Added location permission request inline the search fragment.
Update package assets and strings.
Diffstat (limited to 'java/com/android/incallui/res/values-fr-rCA/strings.xml')
-rw-r--r-- | java/com/android/incallui/res/values-fr-rCA/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/com/android/incallui/res/values-fr-rCA/strings.xml b/java/com/android/incallui/res/values-fr-rCA/strings.xml index ad7951a71..46143cc2a 100644 --- a/java/com/android/incallui/res/values-fr-rCA/strings.xml +++ b/java/com/android/incallui/res/values-fr-rCA/strings.xml @@ -23,6 +23,8 @@ <string name="pause_prompt_no" msgid="4691320111774935838">"Non"</string> <string name="notification_dialing" msgid="9072177265772083826">"Composition..."</string> <string name="notification_ongoing_call" msgid="8712641937577776125">"Appel en cours"</string> + <string name="notification_ongoing_video_call" msgid="6331318021321487769">"Appel vidéo en cours"</string> + <string name="notification_ongoing_paused_video_call" msgid="709950253594606371">"Appel vidéo en cours – vidéo en pause"</string> <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Appel en cours - travail"</string> <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> en cours"</string> <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"<xliff:g id="BRAND_NAME">%1$s</xliff:g> entrant"</string> @@ -55,6 +57,8 @@ <string name="notification_action_answer_video" msgid="8488108892919917287">"Vidéo"</string> <string name="notification_action_accept" msgid="1272761514200507143">"Accepter"</string> <string name="notification_action_dismiss" msgid="3128241581632616226">"Refuser"</string> + <string name="notification_action_speaker_on" msgid="1882659234405596540">"Activer le haut-parleur"</string> + <string name="notification_action_speaker_off" msgid="6340085043115533948">"Désactiver le haut-parleur"</string> <string name="notification_external_call" msgid="2504334597315343920">"Appel en cours sur un autre appareil"</string> <string name="notification_external_video_call" msgid="7709394856028436683">"Appel vidéo en cours sur un autre appareil"</string> <string name="notification_take_call" msgid="5631659438864492229">"Répondre à l\'appel"</string> |