From 2ca4318cc1ee57dda907ba2069bd61d162b1baef Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 31 Aug 2017 06:57:16 -0700
Subject: Update Dialer source to latest internal Google revision.

Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.

The Dialer team is now switching to a public development model similar
to the telephony team.

This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.

Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
---
 .../android/incallui/res/values-fr-rCA/strings.xml | 80 ++--------------------
 1 file changed, 7 insertions(+), 73 deletions(-)

(limited to 'java/com/android/incallui/res/values-fr-rCA')

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 6f4d8daa4..ad7951a71 100644
--- a/java/com/android/incallui/res/values-fr-rCA/strings.xml
+++ b/java/com/android/incallui/res/values-fr-rCA/strings.xml
@@ -18,23 +18,16 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="default" msgid="4266606423746318128">"Téléphone"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"Interface d\'appel"</string>
-    <string name="confCall" msgid="36560628097626181">"Conférence téléphonique"</string>
-    <string name="call_lost" msgid="2082971531689406145">"L\'appel a été interrompu"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Envoyer les tonalités suivantes?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"Envoi des tonalités\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Envoyer"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Oui"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"Non"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Remplacer le caractère générique par"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Conférence téléphonique <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"N° messagerie vocale"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"Composition..."</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Appel manqué de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Appel en cours"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Appel en cours - travail"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Appel Wi-Fi en cours"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Appel Wi-Fi 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>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Appel Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Appel professionnel Wi‑Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En attente"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Appel entrant"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Appel entrant avec photo"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Appel important avec photo, message et position"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Appel entrant important avec pièces jointes"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Appel entrant - travail"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Appel Wi-Fi entrant"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Appel Wi-Fi entrant - travail"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"L\'appel entrant est suspect"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Demande de vidéo reçue"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Aucun service"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"Réseau sélectionné (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponible"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Répondre"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Raccrocher"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vidéo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Vocal"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accepter"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Refuser"</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>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Répondre à l\'appel vidéo"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Veuillez désactiver le mode Avion avant de passer un appel."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"Non enregistré sur le réseau"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"Réseau cellulaire non disponible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Pour faire un appel, entrez un numéro valide."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"Impossible d\'appeler."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"Lancement de la séquence IHM..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"Service non pris en charge."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"Impossible de faire des appels."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"Impossible de séparer les appels."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"Impossible de transférer."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"Impossible de créer la conférence."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"Impossible de refuser l\'appel."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"Impossible de libérer l\'appel ou les appels."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Appel d\'urgence"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"Activation du signal radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"Aucun service. Nouvel essai en cours..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"Appel impossible. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'est pas un numéro d\'urgence."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"Appel impossible. Composez un numéro d\'urgence."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utilisez le clavier pour composer un numéro."</string>
-    <string name="player_started" msgid="9177182657338033086">"Le lecteur a démarré"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"Le lecteur a arrêté"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"L\'appareil photo n\'est pas prêt"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"L\'appareil photo est prêt"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Événement inconnu de séance d\'appel"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Autres paramètres d\'appel"</string>
     <string name="goPrivate" msgid="5269514638004595378">"mode privé"</string>
-    <string name="selectContact" msgid="1703433172800564849">"sélectionner un contact"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"Sonnerie et vibration"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gérer la conférence"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Numéro d\'urgence"</string>
     <string name="child_number" msgid="3398257437107259682">"au moyen du <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Messages récents"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Renseignements sur l\'entreprise"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"À <xliff:g id="DISTANCE">%.1f</xliff:g> mi"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"À <xliff:g id="DISTANCE">%.1f</xliff:g> km"</string>
-    <string name="display_address" msgid="2909385132133621873">"<xliff:g id="STREET_ADDRESS">%1$s</xliff:g>, <xliff:g id="LOCALITY">%2$s</xliff:g>"</string>
-    <string name="open_time_span" msgid="3333746415188434992">"<xliff:g id="OPEN_TIME">%1$s</xliff:g> à <xliff:g id="CLOSE_TIME">%2$s</xliff:g>"</string>
-    <string name="opening_hours" msgid="2908934145495754020">"<xliff:g id="EARLIER_TIMES">%1$s</xliff:g>, <xliff:g id="LATER_TIME">%2$s</xliff:g>"</string>
-    <string name="opens_tomorrow_at" msgid="2896787795283597856">"Ouvre demain à <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Ouvre aujourd\'hui à <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Ferme à <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"A fermé aujourd\'hui à <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Ouvert"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Fermé"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Connaissez-vous le numéro <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"L\'appel provenant du numéro <xliff:g id="NUMBER">%1$s</xliff:g> est-il un pourriel?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"Le numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été bloqué, et l\'appel a été signalé comme pourriel."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"L\'appel provenant du numéro <xliff:g id="NUMBER">%1$s</xliff:g> a été signalé comme n\'étant pas un pourriel."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Appuyez pour ajouter aux contacts, ou bloquez le numéro source de pourriel."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"C\'est la première fois que ce numéro vous appelle. Si cet appel était un pourriel, vous pouvez le signaler et bloquer le numéro."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Appuyez pour signaler que l\'appel N\'EST PAS UN POURRIEL, ou bloquez le numéro."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Cet appel nous semblait suspect. Le cas échéant, appuyez sur N\'EST PAS UN POURRIEL pour signaler notre erreur."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloquer et signaler"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Ajouter un contact"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"N\'est pas indésirable"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloquer le numéro"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Ajouter aux contacts"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloquer le numéro et signaler le pourriel"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"N\'est pas un pourriel"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Aucune carte SIM ou erreur de carte SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Mettre fin à l\'appel"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conférence téléphonique"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"Appel en cours"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"Poursuite de l\'appel à l\'aide de données cellulaires en cours…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"Impossible de passer à un réseau Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"L\'appel vidéo restera sur le réseau cellulaire. Des frais de données standards peuvent s\'appliquer."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"Poursuite de l\'appel utilisant des données mobiles en cours…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"Impossible de passer à un réseau Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"L\'appel vidéo restera sur le réseau cellulaire. Des frais de données standards peuvent s\'appliquer."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"Ne plus afficher"</string>
 </resources>
-- 
cgit v1.2.3