From 049e9def67f04edb096d63c3975e4adc47c5bb0f Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Tue, 9 Aug 2016 13:59:10 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I85eb6a46665b8c76e04dc9c93a89d485f874006f
Auto-generated-cl: translation import
---
 InCallUI/res/values-ca/strings.xml     | 2 +-
 InCallUI/res/values-hy-rAM/strings.xml | 6 +++---
 InCallUI/res/values-mr-rIN/strings.xml | 4 ++--
 InCallUI/res/values-pt-rBR/strings.xml | 2 +-
 InCallUI/res/values-pt/strings.xml     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'InCallUI/res')

diff --git a/InCallUI/res/values-ca/strings.xml b/InCallUI/res/values-ca/strings.xml
index 5426b12c9..6fda05c29 100644
--- a/InCallUI/res/values-ca/strings.xml
+++ b/InCallUI/res/values-ca/strings.xml
@@ -195,7 +195,7 @@
     <string name="opens_today_at" msgid="6281212768937222891">"Obre avui a les <xliff:g id="OPEN_TIME">%s</xliff:g>"</string>
     <string name="closes_today_at" msgid="4822369201263491509">"Tanca a les <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
     <string name="closed_today_at" msgid="4060072663433467233">"Avui ha tancat a les <xliff:g id="CLOSE_TIME">%s</xliff:g>"</string>
-    <string name="open_now" msgid="4615706338669555999">"Ara és obert"</string>
+    <string name="open_now" msgid="4615706338669555999">"Obert ara"</string>
     <string name="closed_now" msgid="2635314668145282080">"Ara és tancat"</string>
     <string name="label_spam_caller" msgid="8270472297763063585">"Possible trucada brossa"</string>
     <string name="spam_notification_title" msgid="8681565585547329999">"La trucada amb el número %1$s ha finalitzat"</string>
diff --git a/InCallUI/res/values-hy-rAM/strings.xml b/InCallUI/res/values-hy-rAM/strings.xml
index 59ca6bc2b..63d6eb574 100644
--- a/InCallUI/res/values-hy-rAM/strings.xml
+++ b/InCallUI/res/values-hy-rAM/strings.xml
@@ -81,7 +81,7 @@
     <string name="notification_action_answer_video" msgid="2400233093494856655">"Տեսազանգ"</string>
     <string name="notification_action_answer_voice" msgid="3206168292649273866">"Ձայնային"</string>
     <string name="notification_action_accept" msgid="8595047032790476122">"Ընդունել"</string>
-    <string name="notification_action_dismiss" msgid="1998811618480434300">"Փակել"</string>
+    <string name="notification_action_dismiss" msgid="1998811618480434300">"Մերժել"</string>
     <string name="notification_missedCall_call_back" msgid="7855043480614703539">"Հետ զանգել"</string>
     <string name="notification_missedCall_message" msgid="2407410183079324393">"Հաղորդագրություն"</string>
     <string name="notification_external_call" msgid="5611236780302924816">"Ընթացիկ զանգ այլ սարքում"</string>
@@ -100,7 +100,7 @@
     <string name="incall_error_supp_service_reject" msgid="4543915892409365831">"Հնարավոր չէ մերժել զանգը:"</string>
     <string name="incall_error_supp_service_hangup" msgid="101167589969625637">"Հնարավոր չէ անջատել զանգ(եր)ը:"</string>
     <string name="incall_call_type_label_sip" msgid="1327822795765282192">"SIP զանգ"</string>
-    <string name="emergency_enable_radio_dialog_title" msgid="7882321703828314787">"Արտակարգ իրավիճակի զանգ"</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="7882321703828314787">"Շտապ կանչ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="4382752053654184327">"Ռադիոն միացվում է…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="1672288458940152814">"Ծառայությունը մատչելի չէ: Փորձը կրկնվում է…"</string>
     <string name="dial_emergency_error" msgid="582305854626092376">"Հնարավոր չէ զանգել: <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> համարը արտակարգ իրավիճակի համար չէ:"</string>
@@ -123,7 +123,7 @@
     <string name="onscreenAudioText" msgid="8963459818052898299">"Ձայնային"</string>
     <string name="onscreenVideoCallText" msgid="1578940167445068369">"Տեսազանգ"</string>
     <string name="onscreenChangeToVoiceText" msgid="6249580619992009182">"Փոխարկել ձայնային կանչի"</string>
-    <string name="onscreenSwitchCameraText" msgid="7141261218152736690">"Փոխել տեսախցիկը"</string>
+    <string name="onscreenSwitchCameraText" msgid="7141261218152736690">"Փոխարկել խցիկը"</string>
     <string name="onscreenTurnOnCameraText" msgid="915019986687927588">"Միացնել տեսախցիկը"</string>
     <string name="onscreenTurnOffCameraText" msgid="6225377831394679126">"Անջատել տեսախցիկը"</string>
     <string name="onscreenOverflowText" msgid="7932741239724473887">"Այլ ընտրանքներ"</string>
diff --git a/InCallUI/res/values-mr-rIN/strings.xml b/InCallUI/res/values-mr-rIN/strings.xml
index 2e9a0b3d6..5a3244f55 100644
--- a/InCallUI/res/values-mr-rIN/strings.xml
+++ b/InCallUI/res/values-mr-rIN/strings.xml
@@ -129,8 +129,8 @@
     <string name="onscreenOverflowText" msgid="7932741239724473887">"अधिक पर्याय"</string>
     <string name="player_started" msgid="3478865572468310331">"प्लेअर सुरु झाले"</string>
     <string name="player_stopped" msgid="1278611664986561535">"प्लेअर थांबले"</string>
-    <string name="camera_not_ready" msgid="6614469280264241251">"कॅमेरा सज्ज नाही"</string>
-    <string name="camera_ready" msgid="2614541247814590887">"कॅमेरा सज्ज"</string>
+    <string name="camera_not_ready" msgid="6614469280264241251">"कॅमेरा तयार नाही"</string>
+    <string name="camera_ready" msgid="2614541247814590887">"कॅमेरा तयार"</string>
     <string name="unknown_call_session_event" msgid="2947023743819984299">"अज्ञात कॉल सत्र इव्हेंट"</string>
     <string name="voicemail_provider" msgid="2878119321474918370">"सेवा"</string>
     <string name="voicemail_settings" msgid="7548868784816068975">"सेटअप"</string>
diff --git a/InCallUI/res/values-pt-rBR/strings.xml b/InCallUI/res/values-pt-rBR/strings.xml
index 723e8b02a..ffb7733ac 100644
--- a/InCallUI/res/values-pt-rBR/strings.xml
+++ b/InCallUI/res/values-pt-rBR/strings.xml
@@ -114,7 +114,7 @@
     <string name="onscreenMuteText_unselected" msgid="4130269060091842798">"Desativar som"</string>
     <string name="onscreenMuteText_selected" msgid="7074763815284369548">"Ativar som"</string>
     <string name="onscreenAddCallText" msgid="5577548650466595598">"Adicionar chamada"</string>
-    <string name="onscreenMergeCallsText" msgid="4946687067221459357">"Mesclar chamadas"</string>
+    <string name="onscreenMergeCallsText" msgid="4946687067221459357">"Juntar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="8272036175646846198">"Trocar"</string>
     <string name="onscreenManageCallsText" msgid="5491297234697209677">"Gerenciar chamadas"</string>
     <string name="onscreenManageConferenceText" msgid="7043499154946980355">"Gerenciar teleconferência"</string>
diff --git a/InCallUI/res/values-pt/strings.xml b/InCallUI/res/values-pt/strings.xml
index 723e8b02a..ffb7733ac 100644
--- a/InCallUI/res/values-pt/strings.xml
+++ b/InCallUI/res/values-pt/strings.xml
@@ -114,7 +114,7 @@
     <string name="onscreenMuteText_unselected" msgid="4130269060091842798">"Desativar som"</string>
     <string name="onscreenMuteText_selected" msgid="7074763815284369548">"Ativar som"</string>
     <string name="onscreenAddCallText" msgid="5577548650466595598">"Adicionar chamada"</string>
-    <string name="onscreenMergeCallsText" msgid="4946687067221459357">"Mesclar chamadas"</string>
+    <string name="onscreenMergeCallsText" msgid="4946687067221459357">"Juntar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="8272036175646846198">"Trocar"</string>
     <string name="onscreenManageCallsText" msgid="5491297234697209677">"Gerenciar chamadas"</string>
     <string name="onscreenManageConferenceText" msgid="7043499154946980355">"Gerenciar teleconferência"</string>
-- 
cgit v1.2.3