summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-05-21 09:58:39 -0700
committerGeoff Mendal <mendal@google.com>2015-05-21 09:58:39 -0700
commite35760ef40638c409daf7447346c3fa97d29f994 (patch)
tree09077a9671ae093394918d895fa12a8cd6fd48ea /res
parentc64b6269796087236a7aa50674b022d864a3d275 (diff)
downloadandroid_packages_apps_UnifiedEmail-e35760ef40638c409daf7447346c3fa97d29f994.tar.gz
android_packages_apps_UnifiedEmail-e35760ef40638c409daf7447346c3fa97d29f994.tar.bz2
android_packages_apps_UnifiedEmail-e35760ef40638c409daf7447346c3fa97d29f994.zip
Import translations. DO NOT MERGE
Change-Id: Iae84a0b5c2dafc9bb4b89c2abed2c9cbd2292772 Auto-generated-cl: translation import
Diffstat (limited to 'res')
-rw-r--r--res/values-ja/strings.xml2
-rw-r--r--res/values-sr/strings.xml8
2 files changed, 5 insertions, 5 deletions
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c290672fe..e4df534d6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -434,7 +434,7 @@
<string name="eml_loader_error_toast" msgid="6577383216635400167">"このファイルを開けません"</string>
<string name="help_and_info" msgid="3708286489943154681">"ヘルプ"</string>
<string name="help_and_feedback" msgid="7211458338163287670">"ヘルプとフィードバック"</string>
- <string name="feedback" msgid="204247008751740034">"ご意見、ご感想"</string>
+ <string name="feedback" msgid="204247008751740034">"フィードバック"</string>
<string name="copyright" msgid="3121335168340432582">"©<xliff:g id="YEAR">%1$d</xliff:g> Google Inc."</string>
<string name="version" msgid="1161745345056656547">"<xliff:g id="APP_NAME">%1$s</xliff:g>、バージョン<xliff:g id="VERSION">%2$s</xliff:g>"</string>
<string name="view_app_page" msgid="3241990517052398927"></string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 527df8b5d..76b326b55 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -412,8 +412,8 @@
<item quantity="other" msgid="5422167728480739361">"<xliff:g id="COUNT">%1$d</xliff:g> прилога"</item>
</plurals>
<string name="no_subject" msgid="5622708348540036959">"(без наслова)"</string>
- <string name="vacation_responder" msgid="5570132559074523806">"Одговор на одмору"</string>
- <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"Одговор на одмору"</string>
+ <string name="vacation_responder" msgid="5570132559074523806">"Аутоматски одговор"</string>
+ <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"Аутоматски одговор"</string>
<string name="vacation_responder_body_hint_text" msgid="9087613123105158494">"Порука"</string>
<string name="send_to_contacts_text" msgid="124432913980620545">"Пошаљи само мојим контактима"</string>
<string name="send_to_domain_text" msgid="5064559546745918393">"Пошаљи само на <xliff:g id="DOMAIN">%1$s</xliff:g>"</string>
@@ -424,8 +424,8 @@
<string name="custom_date" msgid="5794846334232367838">"Прилагођено"</string>
<string name="date_none" msgid="1061426502665431412">"Нема"</string>
<string name="discard_changes" msgid="5699760550972324746">"Желите ли да одбаците промене?"</string>
- <string name="vacation_responder_changes_saved" msgid="91448817268121249">"Промене одговора на одмору су сачуване"</string>
- <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"Промене одговора на одмору су одбачене"</string>
+ <string name="vacation_responder_changes_saved" msgid="91448817268121249">"Промене аутоматског одговора су сачуване"</string>
+ <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"Промене аутоматског одговора су одбачене"</string>
<string name="vacation_responder_off" msgid="4429909341193366667">"Искључено"</string>
<string name="vacation_responder_on" msgid="4913238379320882449">"Укључено од <xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="vacation_responder_on_with_end_date" msgid="4360941815371475955">"Укључено од <xliff:g id="START_DATE">%1$s</xliff:g> до <xliff:g id="END_DATE">%2$s</xliff:g>"</string>