summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-07-03 22:25:54 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-03 22:25:55 +0000
commitdeff1b645b0700d1d98a9224f09f35f7d912d612 (patch)
tree99dd437aa76adf9c70c49d3ffc6fff4c99dd0857
parentb6d3b88847eab5a0b3b414662c3a1acda7b1dfc5 (diff)
parent9d83ff1f39886a8834f26c423cf3ddf44e8a7c12 (diff)
downloadandroid_packages_apps_UnifiedEmail-deff1b645b0700d1d98a9224f09f35f7d912d612.tar.gz
android_packages_apps_UnifiedEmail-deff1b645b0700d1d98a9224f09f35f7d912d612.tar.bz2
android_packages_apps_UnifiedEmail-deff1b645b0700d1d98a9224f09f35f7d912d612.zip
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
-rw-r--r--res/values-hr/strings.xml2
-rw-r--r--res/values-nb/strings.xml2
-rw-r--r--res/values-ru/strings.xml4
3 files changed, 4 insertions, 4 deletions
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index dce6c7adf..d747d2a2c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -420,5 +420,5 @@
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Dodirnite sliku pošiljatelja da biste odabrali taj razgovor."</string>
<string name="folder_icon_desc" msgid="1500547397347480618">"Ikona mape"</string>
<string name="add_account" msgid="2162808366829269770">"Dodaj račun"</string>
- <string name="attached_message" msgid="4267189489654642035">"Priložena poruka"</string>
+ <string name="attached_message" msgid="4267189489654642035">"Poruka u privitku"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d563b8de9..cbd04fccc 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -145,7 +145,7 @@
<string name="contextmenu_add_contact" msgid="8395100913366045250">"Legg til kontakt"</string>
<string name="contextmenu_send_mail" msgid="8301941130009797208">"Send e-post"</string>
<string name="contextmenu_map" msgid="7721544518698532954">"Kart"</string>
- <string name="contextmenu_sharelink" msgid="6213520416250245200">"Del kobling"</string>
+ <string name="contextmenu_sharelink" msgid="6213520416250245200">"Del link"</string>
<string name="contextmenu_help" msgid="4651718679842414097">"Hjelp"</string>
<string name="contextmenu_feedback" msgid="4429118420169571473">"Send tilbakemelding"</string>
<!-- no translation found for num_selected (5723323585692387843) -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6fbf5b39f..18a83b62d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -386,7 +386,7 @@
<string name="new_messages" msgid="4419173946074516420">"Новых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Без звука"</string>
- <string name="preference_removal_action_title" msgid="6585232628422090835">"Архивация и удаление"</string>
+ <string name="preference_removal_action_title" msgid="6585232628422090835">"Архивация или удаление"</string>
<string-array name="prefEntries_removal_action">
<item msgid="1938422987822134657">"Только архивировать"</item>
<item msgid="5737880287951287278">"Только удалять"</item>
@@ -397,7 +397,7 @@
<item msgid="8350973578419775975">"Только удалять"</item>
<item msgid="2967059853409454648">"Архивировать или удалять"</item>
</string-array>
- <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Архивация и удаление"</string>
+ <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Я предпочитаю:"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Отвечать всем"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Использовать по умолчанию для всех ответов"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Быстрая архивация"</string>