summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-03-25 18:52:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-25 18:52:44 +0000
commit83c01c22d3302e48deb5169f8876f20b208da66b (patch)
treefba86ed96a817e479f6b7c8ff34e39b467be5925
parentd0559623c5fcc9957d0cdfa1f1405b98a2f730f8 (diff)
parent8a23c702458ba1afcfc16af37769933a497f3aec (diff)
Merge "Import translations. DO NOT MERGE"
-rw-r--r--InCallUI/res/values-da/strings.xml6
-rw-r--r--InCallUI/res/values-zh-rCN/strings.xml4
2 files changed, 5 insertions, 5 deletions
diff --git a/InCallUI/res/values-da/strings.xml b/InCallUI/res/values-da/strings.xml
index cb9e06f55..03fa9cf98 100644
--- a/InCallUI/res/values-da/strings.xml
+++ b/InCallUI/res/values-da/strings.xml
@@ -35,7 +35,7 @@
<string name="callFailed_powerOff" msgid="2766035859391549713">"Slå radio fra"</string>
<string name="callFailed_simError" msgid="4476360200030635828">"Der er intet SIM-kort, eller der er SIM-kortfejl"</string>
<string name="callFailed_outOfService" msgid="4825791466557236225">"Området er uden for netværksdækning"</string>
- <string name="callFailed_fdn_only" msgid="2850204579765430641">"Udgående opkald er begrænset af faste opkaldsnumre."</string>
+ <string name="callFailed_fdn_only" msgid="2850204579765430641">"Udgående opkald er begrænset til angivne opkaldsnumre."</string>
<string name="callFailed_cb_enabled" msgid="3686963693629739680">"Du kan ikke foretage udgående opkald, mens opkaldsspærring er slået til."</string>
<string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle opkald er begrænset af adgangskontrol."</string>
<string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Nødopkald er begrænset af adgangskontrol."</string>
@@ -55,7 +55,7 @@
<string name="pause_prompt_no" msgid="6686238803236884877">"Nej"</string>
<string name="wild_prompt_str" msgid="5543521676355533577">"Erstat jokertegnet med"</string>
<string name="caller_manage_header" msgid="3231519674734638786">"Telefonmøde <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
- <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemailnummer"</string>
+ <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Telefonsvarernummer"</string>
<string name="card_title_dialing" msgid="5769417478498348054">"Ringer op"</string>
<string name="card_title_redialing" msgid="4831412164303596395">"Prøver igen"</string>
<string name="card_title_conf_call" msgid="1162980346189744501">"Telefonmøde"</string>
@@ -76,7 +76,7 @@
<string name="notification_voicemail_title" msgid="8933468752045550523">"Ny telefonsvarerbesked"</string>
<string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nye telefonsvarerbeskeder (<xliff:g id="COUNT">%d</xliff:g>)"</string>
<string name="notification_voicemail_text_format" msgid="4447323569453981685">"Ring til <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
- <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemailnummeret er ukendt"</string>
+ <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Telefonsvarernummeret er ukendt"</string>
<string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen dækning"</string>
<string name="notification_network_selection_text" msgid="2607085729661923269">"Det valgte netværk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgængeligt"</string>
<string name="notification_action_end_call" msgid="6069460915123531620">"Læg på"</string>
diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml
index 3e46acb7c..661c05c1b 100644
--- a/InCallUI/res/values-zh-rCN/strings.xml
+++ b/InCallUI/res/values-zh-rCN/strings.xml
@@ -85,8 +85,8 @@
<string name="incall_error_power_off" msgid="6550191216405193368">"要进行呼叫,请先关闭飞行模式。"</string>
<string name="incall_error_emergency_only" msgid="4678640422710818317">"尚未注册网络。"</string>
<string name="incall_error_out_of_service" msgid="8587993036435080418">"无法连接到移动网络"</string>
- <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"拨号未送出,因为输入的号码无效。"</string>
- <string name="incall_error_call_failed" msgid="4313552620858880999">"拨号未送出。"</string>
+ <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"拨号失败,因为输入的号码无效。"</string>
+ <string name="incall_error_call_failed" msgid="4313552620858880999">"拨号失败。"</string>
<string name="incall_status_dialed_mmi" msgid="3672498861336189563">"正在启动 MMI 序列..."</string>
<string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"不支持此服务。"</string>
<string name="incall_error_supp_service_switch" msgid="3503552565745872241">"无法切换通话。"</string>