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-zh-rHK/strings.xml | 80 ++--------------------
 1 file changed, 7 insertions(+), 73 deletions(-)

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

diff --git a/java/com/android/incallui/res/values-zh-rHK/strings.xml b/java/com/android/incallui/res/values-zh-rHK/strings.xml
index 5eb8892e9..6b9972d55 100644
--- a/java/com/android/incallui/res/values-zh-rHK/strings.xml
+++ b/java/com/android/incallui/res/values-zh-rHK/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">"電話"</string>
-    <string name="inCallLabel" msgid="8627766543550519912">"InCallUI"</string>
-    <string name="confCall" msgid="36560628097626181">"視訊會議"</string>
-    <string name="call_lost" msgid="2082971531689406145">"已中斷通話"</string>
     <string name="wait_prompt_str" msgid="3509685348904329594">"傳送下列鈴聲？ \n"</string>
-    <string name="pause_prompt_str" msgid="5712344742516488080">"正在傳送訊號音\n"</string>
-    <string name="send_button" msgid="6976782353456252579">"傳送"</string>
     <string name="pause_prompt_yes" msgid="4642047011233552973">"是"</string>
     <string name="pause_prompt_no" msgid="4691320111774935838">"否"</string>
-    <string name="wild_prompt_str" msgid="1399377741491574104">"將萬用字元改成"</string>
-    <string name="caller_manage_header" msgid="7358710345135355578">"電話會議 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="voicemail_settings_number_label" msgid="8935904934161608885">"留言信箱號碼"</string>
     <string name="notification_dialing" msgid="9072177265772083826">"正在撥號"</string>
-    <string name="notification_missedCallTicker" msgid="238492086972857643">"來自 <xliff:g id="MISSED_CALL_FROM">%s</xliff:g> 的未接來電"</string>
     <string name="notification_ongoing_call" msgid="8712641937577776125">"通話中"</string>
     <string name="notification_ongoing_work_call" msgid="3189581218078981547">"正在進行工作通話"</string>
-    <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"正在進行 Wi-Fi 通話"</string>
-    <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"正在進行 Wi-Fi 工作通話"</string>
+    <string name="notification_ongoing_call_wifi_template" msgid="387925749965565373">"正在進行 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_incoming_call_wifi_template" msgid="6678951047381412864">"有其他人打來的 <xliff:g id="BRAND_NAME">%1$s</xliff:g>"</string>
+    <string name="notification_call_wifi_brand" msgid="7480874079128972085">"Wi-Fi 通話"</string>
+    <string name="notification_call_wifi_work_brand" msgid="8540257660638915570">"Wi‑Fi 工作通話"</string>
     <string name="notification_on_hold" msgid="7141827443379205682">"保留通話"</string>
     <string name="notification_incoming_call" msgid="7520580807513849283">"來電"</string>
     <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"附有相片的來電"</string>
@@ -55,87 +48,28 @@
     <string name="important_notification_incoming_call_with_photo_message_location" msgid="513692941317253479">"附有相片、訊息和位置的重要來電"</string>
     <string name="important_notification_incoming_call_attachments" msgid="4594375776340303751">"附有附件的重要來電"</string>
     <string name="notification_incoming_work_call" msgid="5291275092734261918">"工作來電"</string>
-    <string name="notification_incoming_call_wifi" msgid="1039173395425774684">"Wi-Fi 來電"</string>
-    <string name="notification_incoming_work_call_wifi" msgid="322580182203435905">"Wi-Fi 工作來電"</string>
     <string name="notification_incoming_spam_call" msgid="7591506944666791937">"疑似收到垃圾來電"</string>
     <string name="notification_requesting_video_call" msgid="1807679328811515758">"收到視像要求"</string>
-    <string name="notification_network_selection_title" msgid="8639159088474275747">"沒有服務"</string>
-    <string name="notification_network_selection_text" msgid="7190860774239009625">"您所選取的網絡 (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) 無法使用"</string>
     <string name="notification_action_answer" msgid="8748275902211192568">"接聽"</string>
     <string name="notification_action_end_call" msgid="7467258454170007765">"掛斷"</string>
     <string name="notification_action_answer_video" msgid="8488108892919917287">"影片"</string>
-    <string name="notification_action_answer_voice" msgid="6237890905749760509">"語音"</string>
     <string name="notification_action_accept" msgid="1272761514200507143">"接受"</string>
     <string name="notification_action_dismiss" msgid="3128241581632616226">"拒絕"</string>
     <string name="notification_external_call" msgid="2504334597315343920">"其他裝置上有正在進行的通話"</string>
     <string name="notification_external_video_call" msgid="7709394856028436683">"其他裝置上有正在進行的視像通話"</string>
     <string name="notification_take_call" msgid="5631659438864492229">"接受通話"</string>
     <string name="notification_take_video_call" msgid="4473387503712341390">"接受視像通話"</string>
-    <string name="incall_error_power_off" msgid="3244691852792529453">"請先關閉飛行模式後再撥打電話。"</string>
-    <string name="incall_error_emergency_only" msgid="8313690034696753566">"未在網絡上完成註冊。"</string>
-    <string name="incall_error_out_of_service" msgid="539611768312332950">"無法連線至流動網絡。"</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="293343960362630925">"要撥打電話，請輸入有效的號碼。"</string>
-    <string name="incall_error_call_failed" msgid="5560521345862514733">"無法通話。"</string>
-    <string name="incall_status_dialed_mmi" msgid="3341365334358686873">"開始 MMI 序列..."</string>
     <string name="incall_error_supp_service_unknown" msgid="3062751096566282959">"不支援的服務。"</string>
-    <string name="incall_error_supp_service_switch" msgid="759346040980722884">"無法切換通話。"</string>
-    <string name="incall_error_supp_service_separate" msgid="5250304200901095519">"無法分開通話。"</string>
-    <string name="incall_error_supp_service_transfer" msgid="556522021433482116">"無法轉移。"</string>
-    <string name="incall_error_supp_service_conference" msgid="9211560861266632111">"無法進行會議。"</string>
-    <string name="incall_error_supp_service_reject" msgid="2724981515194352120">"無法拒絕來電。"</string>
-    <string name="incall_error_supp_service_hangup" msgid="4659922482839313098">"無法釋放通話。"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="5964415982020440543">"緊急電話"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="6927454354381787268">"正在開啟無線電..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="8760220613410560290">"沒有服務。請再試一次…"</string>
-    <string name="dial_emergency_error" msgid="6953255422990366011">"無法通話。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急電話號碼。"</string>
-    <string name="dial_emergency_empty_error" msgid="6668006522178181198">"無法通話。撥打緊急號碼。"</string>
-    <string name="dialerKeyboardHintText" msgid="6275105254377292585">"使用鍵盤撥號"</string>
-    <string name="player_started" msgid="9177182657338033086">"開始播放"</string>
-    <string name="player_stopped" msgid="5040965200339765956">"停止播放"</string>
-    <string name="camera_not_ready" msgid="3629017450703828964">"相機未準備好"</string>
-    <string name="camera_ready" msgid="4312684554501216898">"已可使用相機"</string>
-    <string name="unknown_call_session_event" msgid="797786212356595358">"未知的視像通訊"</string>
-    <string name="other_settings" msgid="2537377721890761197">"其他通話設定"</string>
     <string name="goPrivate" msgid="5269514638004595378">"私人通話"</string>
-    <string name="selectContact" msgid="1703433172800564849">"選取聯絡人"</string>
-    <string name="preference_category_ringtone" msgid="8566115267004890115">"鈴聲和震動"</string>
     <string name="manageConferenceLabel" msgid="3589379023518128318">"管理會議通話"</string>
     <string name="emergency_call_dialog_number_for_display" msgid="461645337084699104">"緊急電話號碼"</string>
     <string name="child_number" msgid="3398257437107259682">"透過 <xliff:g id="CHILD_NUMBER">%s</xliff:g>"</string>
-    <string name="person_contact_context_title" msgid="9186980175313563725">"最新訊息"</string>
-    <string name="business_contact_context_title" msgid="4796616668776688978">"公司資料"</string>
-    <string name="distance_imperial_away" msgid="66546464027126106">"<xliff:g id="DISTANCE">%.1f</xliff:g> 英里外"</string>
-    <string name="distance_metric_away" msgid="4535553190850854545">"<xliff:g id="DISTANCE">%.1f</xliff:g> 公里外"</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">"將於明天<xliff:g id="OPEN_TIME">%s</xliff:g> 開放"</string>
-    <string name="opens_today_at" msgid="4701005560156621184">"將於今天<xliff:g id="OPEN_TIME">%s</xliff:g> 開放"</string>
-    <string name="closes_today_at" msgid="2668928851103904896">"將於<xliff:g id="CLOSE_TIME">%s</xliff:g> 關門"</string>
-    <string name="closed_today_at" msgid="4203311397205549440">"已於今天<xliff:g id="CLOSE_TIME">%s</xliff:g> 關門"</string>
-    <string name="open_now" msgid="5897306702060039512">"營業中"</string>
-    <string name="closed_now" msgid="3962291301467974921">"休息"</string>
-    <string name="non_spam_notification_title" msgid="3290544768406546372">"<xliff:g id="NUMBER">%1$s</xliff:g> 是已知號碼？"</string>
-    <string name="spam_notification_title" msgid="2439276063775520534">"<xliff:g id="NUMBER">%1$s</xliff:g> 是垃圾號碼？"</string>
-    <string name="spam_notification_block_report_toast_text" msgid="6844067640633690292">"已將 <xliff:g id="NUMBER">%1$s</xliff:g> 封鎖並舉報為垃圾號碼。"</string>
-    <string name="spam_notification_not_spam_toast_text" msgid="8321993839027073785">"<xliff:g id="NUMBER">%1$s</xliff:g> 的來電已舉報為非垃圾來電。"</string>
-    <string name="spam_notification_non_spam_call_collapsed_text" msgid="6482092382445364016">"輕按以新增至通訊錄，或封鎖垃圾號碼。"</string>
-    <string name="spam_notification_non_spam_call_expanded_text" msgid="3598209932872915536">"這是此號碼的第一次來電，如果是垃圾來電，您可以封鎖並舉報此號碼。"</string>
-    <string name="spam_notification_spam_call_collapsed_text" msgid="3865687645128037638">"輕按以舉報為非垃圾來電，或加以封鎖。"</string>
-    <string name="spam_notification_spam_call_expanded_text" msgid="1062029525759401658">"我們懷疑此為垃圾來電。如果不是，請輕按 [非垃圾來電] 舉報我們的錯誤。"</string>
-    <string name="spam_notification_report_spam_action_text" msgid="4829510418690824538">"封鎖並舉報"</string>
-    <string name="spam_notification_add_contact_action_text" msgid="307315138401483232">"新增聯絡人"</string>
-    <string name="spam_notification_not_spam_action_text" msgid="2576048366011852090">"非垃圾來電"</string>
-    <string name="spam_notification_block_spam_action_text" msgid="80045727259264724">"封鎖號碼"</string>
-    <string name="spam_notification_dialog_add_contact_action_text" msgid="5619696845681999506">"新增至通訊錄"</string>
-    <string name="spam_notification_dialog_block_report_spam_action_text" msgid="1821506089128547428">"封鎖並舉報垃圾來電"</string>
-    <string name="spam_notification_dialog_was_not_spam_action_text" msgid="4953789750391355251">"非垃圾來電"</string>
     <string name="callFailed_simError" msgid="4587775795711340072">"沒有 SIM 卡，或是 SIM 卡錯誤"</string>
     <string name="conference_caller_disconnect_content_description" msgid="2821988368803183644">"結束通話"</string>
     <string name="conference_call_name" msgid="8189987124611337174">"會議通話"</string>
     <string name="generic_conference_call_name" msgid="1546941472424243894">"正在通話"</string>
-    <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"使用流動數據繼續通話…"</string>
-    <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"無法切換為 Wi-Fi 網絡"</string>
-    <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"視像通話仍會使用流動網絡 (可能需要支付標準數據用量費用)。"</string>
+    <string name="video_call_wifi_to_lte_handover_toast" msgid="2108633957233856099">"使用流動數據繼續通話…"</string>
+    <string name="video_call_lte_to_wifi_failed_title" msgid="1343446383310594456">"無法切換為 Wi-Fi 網絡"</string>
+    <string name="video_call_lte_to_wifi_failed_message" msgid="3703332569739939335">"視像通話仍會使用流動網絡 (可能需要支付標準數據用量費用)。"</string>
     <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"不要再顯示此訊息"</string>
 </resources>
-- 
cgit v1.2.3