summaryrefslogtreecommitdiff
path: root/InCallUI/res
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2016-08-07 19:43:45 -0700
committerBill Yi <byi@google.com>2016-08-07 19:43:45 -0700
commit904ef33648bba909398b991af1c786691cdbc1d1 (patch)
tree3565e9d17a70f535f8a13c45e0afe3a8842ca6c0 /InCallUI/res
parenta0e57cde68fa5f14a877d497d81acf4d24ecaded (diff)
Import translations. DO NOT MERGE
Change-Id: I95dfdcc069f801e64c6414f51b7c5bc75682eeea Auto-generated-cl: translation import
Diffstat (limited to 'InCallUI/res')
-rw-r--r--InCallUI/res/values-mr-rIN/strings.xml4
-rw-r--r--InCallUI/res/values-pt-rBR/strings.xml2
-rw-r--r--InCallUI/res/values-pt/strings.xml2
3 files changed, 4 insertions, 4 deletions
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>