summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-01 17:04:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-01 17:04:09 +0000
commit61ccf49b6a9cd3b15c81af266f8ef166397dce6c (patch)
tree152c96704eed2391cc4847a5c19d29b1e8da7242
parent58a658e73efced50b0204df1237f7f93c19b099a (diff)
parent9d9f26b2b286aab9a6fc3e5607291bbfef8b67e8 (diff)
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
-rw-r--r--InCallUI/res/values-af/strings.xml10
-rw-r--r--InCallUI/res/values-hy-rAM/strings.xml6
-rw-r--r--InCallUI/res/values-in/strings.xml6
-rw-r--r--InCallUI/res/values-ms-rMY/strings.xml2
-rw-r--r--InCallUI/res/values-ta-rIN/strings.xml2
-rw-r--r--InCallUI/res/values-zh-rTW/strings.xml6
6 files changed, 16 insertions, 16 deletions
diff --git a/InCallUI/res/values-af/strings.xml b/InCallUI/res/values-af/strings.xml
index 291dadc56..3050c2f19 100644
--- a/InCallUI/res/values-af/strings.xml
+++ b/InCallUI/res/values-af/strings.xml
@@ -21,9 +21,9 @@
<string name="onHold" msgid="9035493194749959955">"Hou aan"</string>
<string name="unknown" msgid="6878797917991465859">"Onbekend"</string>
<string name="private_num" msgid="6713286113000232309">"Privaat nommer"</string>
- <string name="payphone" msgid="4793877574636445118">"Betaalfoon"</string>
+ <string name="payphone" msgid="4793877574636445118">"Telefoonhokkie"</string>
<string name="confCall" msgid="1904840547188336828">"Konferensie-oproep"</string>
- <string name="call_lost" msgid="6183862117003999578">"Oproep laat val"</string>
+ <string name="call_lost" msgid="6183862117003999578">"Oproep is ontkoppel"</string>
<string name="audio_mode_speaker" msgid="27649582100085266">"Luidspreker"</string>
<string name="audio_mode_earpiece" msgid="4156527186373869107">"Selfoonoorstuk"</string>
<string name="audio_mode_wired_headset" msgid="1465350758489175975">"Bedraade kopfoon"</string>
@@ -87,11 +87,11 @@
<string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Kan nie deurskakel nie."</string>
<string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Kan nie konferensieoproep maak nie."</string>
<string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Kan nie oproep verwerp nie."</string>
- <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan nie oproep(e) laat los nie."</string>
+ <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Kan nie oproep(e) vrystel nie."</string>
<string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP-oproep"</string>
<string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Noodoproep"</string>
<string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Skakel tans radio aan…"</string>
- <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Geen diens nie. Probeer tans weer …"</string>
+ <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Geen sein nie. Probeer tans weer …"</string>
<string name="dial_emergency_error" msgid="1509085166367420355">"Kan nie bel nie. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is nie \'n noodnommer nie."</string>
<string name="dial_emergency_empty_error" msgid="9130194953830414638">"Kan nie bel nie. Skakel \'n noodnommer."</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gebruik sleutelbord om te bel"</string>
@@ -134,7 +134,7 @@
<string name="accessibility_call_muted" msgid="2776111226185342220">"Oproep stilgemaak."</string>
<string name="accessibility_call_unmuted" msgid="7496527089753980871">"Oproep ontdemp."</string>
<string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Oproep is laat wag."</string>
- <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Oproep word nie meer gehou nie."</string>
+ <string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Oproep word nie meer laat wag nie"</string>
<string name="description_target_answer" msgid="7205604197797472471">"Antwoord"</string>
<string name="description_target_send_sms" msgid="2098326025587950144">"Stuur SMS"</string>
<string name="description_target_decline" msgid="4789834364389731957">"Wys af"</string>
diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml
index 33141325e..f420ddbb7 100644
--- a/InCallUI/res/values-hy-rAM/strings.xml
+++ b/InCallUI/res/values-hy-rAM/strings.xml
@@ -23,7 +23,7 @@
<string name="private_num" msgid="6713286113000232309">"Գաղտնի համար"</string>
<string name="payphone" msgid="4793877574636445118">"Բջջային տերմինալ"</string>
<string name="confCall" msgid="1904840547188336828">"Կոնֆերանս զանգ"</string>
- <string name="call_lost" msgid="6183862117003999578">"Զանգն ավարտվեց"</string>
+ <string name="call_lost" msgid="6183862117003999578">"Զանգը դադարեցվեց"</string>
<string name="audio_mode_speaker" msgid="27649582100085266">"Բարձրախոս"</string>
<string name="audio_mode_earpiece" msgid="4156527186373869107">"Հեռախոսի ականջակալ"</string>
<string name="audio_mode_wired_headset" msgid="1465350758489175975">"Լարային ականջակալ"</string>
@@ -85,7 +85,7 @@
<string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Հնարավոր չէ փոխանջատել զանգը:"</string>
<string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Հնարավոր չէ առանձնացնել զանգը:"</string>
<string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Հնարավոր չէ փոխանցել:"</string>
- <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Հնարավոր չէ համամիասնական զանգ կատարել:"</string>
+ <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Հնարավոր չէ խմբային զանգ կատարել:"</string>
<string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Հնարավոր չէ մերժել զանգը:"</string>
<string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Հնարավոր չէ անջատել զանգ(եր)ը:"</string>
<string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP զանգ"</string>
@@ -93,7 +93,7 @@
<string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ռադիոն միացվում է..."</string>
<string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Ծառայությունը մատչելի չէ: Նորից փորձեք…"</string>
<string name="dial_emergency_error" msgid="1509085166367420355">"Հնարավոր չէ զանգել: <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> համարը արտակարգ իրավիճակի համար չէ:"</string>
- <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Հնարավոր չէ զանգել: Հավաքեք արտակարգ իրավիճակի համարը:"</string>
+ <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Հնարավոր չէ զանգել: Հավաքեք արտակարգ իրավիճակի որևէ համար:"</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"Օգտագործեք ստեղնաշարը՝ համարհավաքման համար"</string>
<string name="overflowHoldMenuItemText" msgid="7382457697092158039">"Պահել զանգը"</string>
<string name="overflowResumeMenuItemText" msgid="8826360006222366843">"Վերսկսել զանգը"</string>
diff --git a/InCallUI/res/values-in/strings.xml b/InCallUI/res/values-in/strings.xml
index 1d5541667..c34c62eb1 100644
--- a/InCallUI/res/values-in/strings.xml
+++ b/InCallUI/res/values-in/strings.xml
@@ -135,11 +135,11 @@
<string name="accessibility_call_unmuted" msgid="7496527089753980871">"Panggilan disuarakan lagi."</string>
<string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Panggilan ditahan."</string>
<string name="accessibility_call_removed_from_hold" msgid="5107480079544990575">"Panggilan tidak lagi ditunda."</string>
- <string name="description_target_answer" msgid="7205604197797472471">"Menjawab"</string>
+ <string name="description_target_answer" msgid="7205604197797472471">"Jawab"</string>
<string name="description_target_send_sms" msgid="2098326025587950144">"Mengirim SMS"</string>
<string name="description_target_decline" msgid="4789834364389731957">"Menolak"</string>
- <string name="description_target_answer_video_call" msgid="3495965588512395026">"Menjawab sebagai video call"</string>
- <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Menjawab sebagai panggilan audio"</string>
+ <string name="description_target_answer_video_call" msgid="3495965588512395026">"Jawab sebagai video call"</string>
+ <string name="description_target_answer_audio_call" msgid="8396296303320994450">"Jawab sebagai panggilan audio"</string>
<string name="description_target_accept_upgrade_to_video_request" msgid="2894072808324604062">"Terima permintaan video"</string>
<string name="description_target_decline_upgrade_to_video_request" msgid="4093888612888538776">"Tolak permintaan video"</string>
<string name="description_direction_up" msgid="4441409581444516690">"Geser ke atas untuk <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
diff --git a/InCallUI/res/values-ms-rMY/strings.xml b/InCallUI/res/values-ms-rMY/strings.xml
index 9540e6251..0310409de 100644
--- a/InCallUI/res/values-ms-rMY/strings.xml
+++ b/InCallUI/res/values-ms-rMY/strings.xml
@@ -84,7 +84,7 @@
<string name="incall_error_supp_service_unknown" msgid="323435289607131929">"Perkhidmatan tidak disokong."</string>
<string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Tidak dapat menukar panggilan."</string>
<string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Tidak dapat mengasingkan panggilan."</string>
- <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Tidak dapat memindahkan."</string>
+ <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Tidak dapat memindahkan panggilan."</string>
<string name="incall_error_supp_service_conference" msgid="7010354362202271726">"Tidak dapat membuat panggilan persidangan."</string>
<string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Tidak dapat menolak panggilan."</string>
<string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Tidak dapat melepaskan panggilan."</string>
diff --git a/InCallUI/res/values-ta-rIN/strings.xml b/InCallUI/res/values-ta-rIN/strings.xml
index e7db946ab..f5ef486c7 100644
--- a/InCallUI/res/values-ta-rIN/strings.xml
+++ b/InCallUI/res/values-ta-rIN/strings.xml
@@ -87,7 +87,7 @@
<string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"மாற்ற முடியாது."</string>
<string name="incall_error_supp_service_conference" msgid="7010354362202271726">"குழு அழைப்பு செய்ய முடியாது."</string>
<string name="incall_error_supp_service_reject" msgid="8998568661508655638">"அழைப்பை நிராகரிக்க முடியாது."</string>
- <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"அழைப்பை(களை) விடுவிக்க முடியாது."</string>
+ <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"அழைப்பை(அழைப்புகளை) விடுவிக்க முடியாது."</string>
<string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP அழைப்பு"</string>
<string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"அவசரகால அழைப்பு"</string>
<string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ரேடியோவை இயக்குகிறது…"</string>
diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml
index 42a0178a8..f986157b7 100644
--- a/InCallUI/res/values-zh-rTW/strings.xml
+++ b/InCallUI/res/values-zh-rTW/strings.xml
@@ -83,15 +83,15 @@
<string name="incall_status_dialed_mmi" msgid="3672498861336189563">"開始 MMI 序列…"</string>
<string name="incall_error_supp_service_unknown" msgid="323435289607131929">"不支援的服務。"</string>
<string name="incall_error_supp_service_switch" msgid="5237002176899962862">"無法切換通話。"</string>
- <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"無法區分通話。"</string>
+ <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"無法分割通話。"</string>
<string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"無法轉接。"</string>
- <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"無法加入會議。"</string>
+ <string name="incall_error_supp_service_conference" msgid="7010354362202271726">"無法進行電話會議。"</string>
<string name="incall_error_supp_service_reject" msgid="8998568661508655638">"無法拒接來電。"</string>
<string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"無法掛斷電話。"</string>
<string name="incall_call_type_label_sip" msgid="4931428719494190371">"SIP 通話"</string>
<string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"緊急電話"</string>
<string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"開啟無線通訊中…"</string>
- <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"沒有服務,正在重試…"</string>
+ <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"找不到服務訊號,正在重試…"</string>
<string name="dial_emergency_error" msgid="1509085166367420355">"無法通話。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急號碼。"</string>
<string name="dial_emergency_empty_error" msgid="9130194953830414638">"無法通話。只能撥打緊急號碼。"</string>
<string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用鍵盤撥號"</string>