From a76a2a1ccd1a6ae25f68afbdb26e966f33499ae7 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Sun, 31 Aug 2014 12:08:25 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I0f2976b2d94ccc2dc4d9d0335ce213af5151235c
Auto-generated-cl: translation import
---
 InCallUI/res/values-af/strings.xml     | 4 ++--
 InCallUI/res/values-bg/strings.xml     | 3 +--
 InCallUI/res/values-fr/strings.xml     | 3 +--
 InCallUI/res/values-ms-rMY/strings.xml | 4 ++--
 InCallUI/res/values-pt-rPT/strings.xml | 2 +-
 InCallUI/res/values-ro/strings.xml     | 2 +-
 InCallUI/res/values-tr/strings.xml     | 3 +--
 InCallUI/res/values-zh-rCN/strings.xml | 3 +--
 InCallUI/res/values-zh-rTW/strings.xml | 2 +-
 InCallUI/res/values-zu/strings.xml     | 2 +-
 10 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/InCallUI/res/values-af/strings.xml b/InCallUI/res/values-af/strings.xml
index 4cd59d0cf..dc47462b5 100644
--- a/InCallUI/res/values-af/strings.xml
+++ b/InCallUI/res/values-af/strings.xml
@@ -167,8 +167,8 @@
     <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Bluetooth-kopstuk gekies"</string>
     <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 uitgestel."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Oproep uit uitstel verwyder."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Oproep is laat wag."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Oproep is van wag afgehaal."</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-bg/strings.xml b/InCallUI/res/values-bg/strings.xml
index 428fca445..71ac4293c 100644
--- a/InCallUI/res/values-bg/strings.xml
+++ b/InCallUI/res/values-bg/strings.xml
@@ -128,8 +128,7 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Обединяване на обаждания"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Размяна"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управление на обажданията"</string>
-    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
-    <skip />
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Упр. на конф. обаждане"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Аудио"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Видеообаждане"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Преминаване към гласово обаждане"</string>
diff --git a/InCallUI/res/values-fr/strings.xml b/InCallUI/res/values-fr/strings.xml
index 14686f62e..3ef54e66c 100644
--- a/InCallUI/res/values-fr/strings.xml
+++ b/InCallUI/res/values-fr/strings.xml
@@ -128,8 +128,7 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Fusionner les appels"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Permuter"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gérer les appels"</string>
-    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
-    <skip />
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gérer conférence tél."</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Appel vidéo"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Passer à un appel vocal"</string>
diff --git a/InCallUI/res/values-ms-rMY/strings.xml b/InCallUI/res/values-ms-rMY/strings.xml
index 99152b71d..325249144 100644
--- a/InCallUI/res/values-ms-rMY/strings.xml
+++ b/InCallUI/res/values-ms-rMY/strings.xml
@@ -167,8 +167,8 @@
     <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"Set kepala Bluetooth dipilih"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Panggilan diredam."</string>
     <string name="accessibility_call_unmuted" msgid="7496527089753980871">"Panggilan dinyahredam."</string>
-    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Panggilan dibuat menunggu."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Panggilan dikeluarkan daripada menunggu."</string>
+    <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Panggilan sedang menunggu."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Panggilan tidak lagi menunggu."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Jawapan"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Hantar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Tolak"</string>
diff --git a/InCallUI/res/values-pt-rPT/strings.xml b/InCallUI/res/values-pt-rPT/strings.xml
index 0cb824e1d..502ab5289 100644
--- a/InCallUI/res/values-pt-rPT/strings.xml
+++ b/InCallUI/res/values-pt-rPT/strings.xml
@@ -128,7 +128,7 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Intercalar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Trocar"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gerir chamadas"</string>
-    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gerir cham. em confer."</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Gerir chamada de conferência"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Áudio"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videochamada"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Mudar para chamada de voz"</string>
diff --git a/InCallUI/res/values-ro/strings.xml b/InCallUI/res/values-ro/strings.xml
index ff6c06f47..cfc9273a1 100644
--- a/InCallUI/res/values-ro/strings.xml
+++ b/InCallUI/res/values-ro/strings.xml
@@ -173,7 +173,7 @@
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Apel cu sunet dezactivat."</string>
     <string name="accessibility_call_unmuted" msgid="7496527089753980871">"S-a activat sunetul pentru apel."</string>
     <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"Apelul a fost pus în așteptare."</string>
-    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Apel a fost scos din așteptare."</string>
+    <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"Apelul a fost scos din așteptare."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Răspundeţi"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Trimiteţi SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuzaţi"</string>
diff --git a/InCallUI/res/values-tr/strings.xml b/InCallUI/res/values-tr/strings.xml
index 73178fc12..58f7ef390 100644
--- a/InCallUI/res/values-tr/strings.xml
+++ b/InCallUI/res/values-tr/strings.xml
@@ -128,8 +128,7 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Çağrıları birleştir"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Değiştir"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Aramaları yönet"</string>
-    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
-    <skip />
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Konferans çağrısını yönet"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Ses"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video görüşmesi"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Sesli çağrıya geç"</string>
diff --git a/InCallUI/res/values-zh-rCN/strings.xml b/InCallUI/res/values-zh-rCN/strings.xml
index d495a7b23..63dbc0c6d 100644
--- a/InCallUI/res/values-zh-rCN/strings.xml
+++ b/InCallUI/res/values-zh-rCN/strings.xml
@@ -128,8 +128,7 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"合并通话"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"交换"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"管理通话"</string>
-    <!-- no translation found for onscreenManageConferenceText (6801708317570467407) -->
-    <skip />
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"管理电话会议"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"音频"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"视频通话"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"改为语音通话"</string>
diff --git a/InCallUI/res/values-zh-rTW/strings.xml b/InCallUI/res/values-zh-rTW/strings.xml
index 32c10dfcd..3b2fe92d7 100644
--- a/InCallUI/res/values-zh-rTW/strings.xml
+++ b/InCallUI/res/values-zh-rTW/strings.xml
@@ -166,7 +166,7 @@
     <string name="accessibility_wired_headset_selected" msgid="2984920743124263932">"已選取有線耳機"</string>
     <string name="accessibility_bluetooth_headset_selected" msgid="2785473629292181736">"已選取藍牙耳機"</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"通話已靜音。"</string>
-    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"通話已取消靜音。"</string>
+    <string name="accessibility_call_unmuted" msgid="7496527089753980871">"通話靜音已取消。"</string>
     <string name="accessibility_call_put_on_hold" msgid="4226100429657528833">"通話保留中。"</string>
     <string name="accessibility_call_removed_from_hold" msgid="2269352120695851563">"已移除保留的通話。"</string>
     <string name="description_target_answer" msgid="7205604197797472471">"解答"</string>
diff --git a/InCallUI/res/values-zu/strings.xml b/InCallUI/res/values-zu/strings.xml
index a78318adc..71bf2f449 100644
--- a/InCallUI/res/values-zu/strings.xml
+++ b/InCallUI/res/values-zu/strings.xml
@@ -128,7 +128,7 @@
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hlanganisa amakholi"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Shintsha"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Phatha amakholi"</string>
-    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Phatha ucingo lwengqungquthela"</string>
+    <string name="onscreenManageConferenceText" msgid="6801708317570467407">"Phatha ikholi yenkomfa"</string>
     <string name="onscreenAudioText" msgid="1710087112800041743">"Umsindo"</string>
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Ikholi yevidiyo ye-Hangout"</string>
     <string name="onscreenChangeToVoiceText" msgid="5311407863653867937">"Shintshela kukholi yezwi"</string>
-- 
cgit v1.2.3