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
---
 .../com/android/incallui/res/values-ca/strings.xml | 80 ++--------------------
 1 file changed, 7 insertions(+), 73 deletions(-)

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

diff --git a/java/com/android/incallui/res/values-ca/strings.xml b/java/com/android/incallui/res/values-ca/strings.xml
index 5148db540..a2d99b159 100644
--- a/java/com/android/incallui/res/values-ca/strings.xml
+++ b/java/com/android/incallui/res/values-ca/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">"Telèfon"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"Trucada de conferència"</string>
-    <string name="call_lost" msgid="2082971531689406145">"La trucada s\'ha interromput."</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"Voleu enviar els codis següents?\n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"S\'estan enviant els tons\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"Envia"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"Sí"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"No"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"Substitueix el caràcter comodí per"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"Trucada de conferència <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"Número de la bústia de veu"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"S\'està marcant"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"Trucada perduda de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"Trucada en procés"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"Trucada de feina en curs"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Trucada Wi-Fi en curs"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Trucada de feina per Wi-Fi en curs"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"En curs: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"Entrant: <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Trucada per Wi-Fi"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Trucada de feina per Wi-Fi"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"En espera"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"Trucada entrant"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Trucada entrant amb foto"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"Trucada entrant important amb foto, missatge i ubicació"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"Trucada entrant important amb fitxers adjunts"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"Trucada de feina entrant"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Trucada Wi-Fi entrant"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Trucada de feina per Wi-Fi entrant"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"Presumpta trucada brossa entrant"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"Sol·licitud de vídeo entrant"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"Sense servei"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"La xarxa seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no està disponible"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"Respon"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"Penja"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"Vídeo"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"Veu"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"Accepta"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"Rebutja"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"Trucada en curs en un altre dispositiu"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"Videotrucada en curs en un altre dispositiu"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"Accepta la trucada"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"Accepta la videotrucada"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"Per fer una trucada, primer apagueu el mode d\'avió."</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"No registrat a la xarxa."</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"La xarxa mòbil no està disponible."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"Per realitzar una trucada, introdueix un número vàlid."</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"No es pot trucar."</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"S\'està iniciant la seqüència MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"El servei no és compatible."</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"No es pot canviar de trucada."</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"No es pot separar la trucada."</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"No es poden realitzar transferències."</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"No es pot establir la conferència."</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"No es pot rebutjar la trucada."</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"No es poden alliberar trucades."</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"Trucada d\'emergència"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"S\'està activant el senyal mòbil..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"No hi ha servei. S\'està tornant a provar..."</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"No es pot trucar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no és un número d\'emergència."</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"No es pot trucar. Marca un número d\'emergència."</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"Utilitzeu el teclat per marcar"</string>
-    <string name="player_started" msgid="9177182657338033086">"S\'ha iniciat el reproductor"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"S\'ha aturat el reproductor"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"La càmera no està preparada"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"La càmera està preparada"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"Esdeveniment de sessió de trucada desconeguda"</string>
-    <string name="other_settings" msgid="2537377721890761197">"Altres opcions de trucades"</string>
     <string name="goPrivate" msgid="5269514638004595378">"passa a privat"</string>
-    <string name="selectContact" msgid="1703433172800564849">"selecciona el contacte"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"So i vibració"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"Gestiona la conferència"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"Número d\'emergència"</string>
     <string name="child_number" msgid="3398257437107259682">"mitjançant <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"Missatges recents"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"Informació de l\'empresa"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"A <xliff:g id="DISTANCE">%.1f</xliff:g> mi de distància"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"A <xliff:g id="DISTANCE">%.1f</xliff:g> km de distància"</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">"Obre demà a les <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"Obre avui a les <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"Tanca a les <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"Avui ha tancat a les <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="5897306702060039512">"Obert ara"</string>
-    <string name="closed_now" msgid="3962291301467974921">"Ara tancat"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"Coneixes el <xliff:g id="NUMBER">%1$s</xliff:g>?"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"El <xliff:g id="NUMBER">%1$s</xliff:g> és un número brossa?"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"El <xliff:g id="NUMBER">%1$s</xliff:g> s\'ha bloquejat i la trucada es marcarà com a brossa."</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"S\'ha indicat que la trucada del <xliff:g id="NUMBER">%1$s</xliff:g> no és brossa."</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"Toca per afegir el número als contactes o bé per marcar-lo com a brossa i bloquejar-lo."</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"És la primera vegada que aquest número t\'ha trucat. Si era una trucada brossa, pots bloquejar aquest número i informar-ne."</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"Toca per informar que NO ÉS BROSSA o per bloquejar-lo."</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"Segons les nostres sospites, l\'autor de la trucada és un emissor de contingut brossa. Si ens equivoquem, toca NO ÉS BROSSA per informar-nos-en."</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"Bloqueja i marca"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"Afegeix un contacte"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"No és contingut brossa"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"Bloqueja el número"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"Afegeix als contactes"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"Bloqueja i marca com a brossa"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"No és una trucada brossa"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"Cap SIM o error de la SIM"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"Finalitza la trucada"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"Conferència"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"En una trucada"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"S\'està continuant la trucada mitjançant dades mòbils…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"No s\'ha pogut canviar a la xarxa Wi-Fi"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videotrucada es mantindrà a la xarxa mòbil. És possible que s\'apliquin càrrecs de dades estàndard."</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"S\'està continuant la trucada mitjançant dades mòbils…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"No s\'ha pogut canviar a la xarxa Wi-Fi"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"La videotrucada continuarà a la xarxa mòbil. És possible que s\'hi apliquin càrrecs de dades estàndard."</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No ho tornis a mostrar"</string>
 </resources>
-- 
cgit v1.2.3