From 8b00a87f213a835457b6528fc4969780f54441a0 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Wed, 26 Oct 2011 10:22:15 -0700
Subject: [PATCH] Import revised translations.  DO NOT MERGE

Change-Id: I34af6f2637ea0adb730c30f2c87eeff9c8336066
---
 res/values-de/arrays.xml      |  6 +++---
 res/values-de/strings.xml     |  8 ++++----
 res/values-en-rGB/arrays.xml  |  2 +-
 res/values-es/arrays.xml      |  4 ++--
 res/values-fr/strings.xml     |  6 +++---
 res/values-iw/strings.xml     |  4 ++--
 res/values-ms/strings.xml     |  2 +-
 res/values-pl/strings.xml     | 22 +++++++++++-----------
 res/values-ru/arrays.xml      | 12 ++++++------
 res/values-ru/strings.xml     |  2 +-
 res/values-th/arrays.xml      |  2 +-
 res/values-th/strings.xml     |  6 +++---
 res/values-zh-rCN/strings.xml | 16 ++++++++--------
 13 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 3c97b7dd2..297ce06a9 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -45,7 +45,7 @@
     <item msgid="1831934949361041701">"Glücklich"</item>
     <item msgid="1601611480575517120">"Traurig"</item>
     <item msgid="1531181614218625881">"Zwinkern"</item>
-    <item msgid="3858808057949077894">"Zunge rausstrecken"</item>
+    <item msgid="3858808057949077894">"Frech"</item>
     <item msgid="7835238297967185651">"Überrascht"</item>
     <item msgid="1756223535005296033">"Kuss"</item>
     <item msgid="1093906245140165107">"Ausruf"</item>
@@ -57,9 +57,9 @@
     <item msgid="4630490399784004880">"Unentschlossen"</item>
     <item msgid="7002574538342357456">"Weinen"</item>
     <item msgid="850324578089267455">"Versiegelte Lippen"</item>
-    <item msgid="6334637439528489607">"Lachen"</item>
+    <item msgid="6334637439528489607">"Fröhlich"</item>
     <item msgid="7602915122893958066">"Verwirrt"</item>
-    <item msgid="3939233701582771068">"Herz"</item>
+    <item msgid="3939233701582771068">"Verliebt"</item>
     <item msgid="1414759480575851587">"Verärgert"</item>
     <item msgid="8479809115158836070">"Grinsen"</item>
     <item msgid="638612939305162424">"Pokergesicht"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4ce572830..330ff0d81 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -93,7 +93,7 @@
     <string name="resize_image_error_information" msgid="4897031754321114959">"Das Bild ist trotz Größenanpassung zu groß zum Senden."</string>
     <string name="forward_prefix" msgid="276280492803486464">"WG: "</string>
     <string name="discard_message" msgid="6078326880056142781">"Verwerfen"</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"Die Nachricht wird verworfen, da keine gültigen Empfänger für sie vorhanden sind."</string>
+    <string name="discard_message_reason" msgid="2667664943003796133">"Die Nachricht wird verworfen, da keine gültigen Empfänger vorhanden sind."</string>
     <string name="has_invalid_recipient" msgid="1485388396900997383">"Ungültige(r) Empfänger: &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
     <string name="invalid_destination" msgid="4573835601024786416">"Ungültige Zieladresse"</string>
     <string name="service_not_activated" msgid="9178218144019626176">"Dieser Dienst ist nicht im Netzwerk aktiviert."</string>
@@ -149,9 +149,9 @@
     <string name="edit" msgid="5912118407791492696">"Bearbeiten"</string>
     <string name="try_to_send" msgid="1996751738286080976">"Sendeversuch starten"</string>
     <string name="preferences_title" msgid="6650089610332670157">"Einstellungen"</string>
-    <string name="restore_default" msgid="7165341506551155053">"Standardeinstellungen wiederherstellen"</string>
+    <string name="restore_default" msgid="7165341506551155053">"Zurück auf Standardeinstellungen"</string>
     <string name="pref_notification_settings_title" msgid="4860726154770053004">"Benachrichtigungseinstellungen"</string>
-    <string name="pref_mms_settings_title" msgid="2573616208360684392">"Einstellungen für Multimedia-Nachr. (MMS)"</string>
+    <string name="pref_mms_settings_title" msgid="2573616208360684392">"Einstellungen für Multimedia-Nachrichten (MMS)"</string>
     <string name="pref_sms_settings_title" msgid="9088516111717417514">"Einstellungen für SMS"</string>
     <string name="pref_sms_storage_title" msgid="2531726671883516470">"Speichereinstellungen"</string>
     <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Auf der SIM-Karte gespeicherte Nachrichten verwalten"</string>
@@ -298,7 +298,7 @@
     <string name="slideshow_activity" msgid="5658249461317434432">"Diashow"</string>
     <string name="class_0_message_activity" msgid="8474176218999130627">"Nachricht Klasse 0"</string>
     <string name="search_label" msgid="6042598929386174964">"SMS/MMS"</string>
-    <string name="search_hint" msgid="7183732852849365466">"SMS/MMS durchsuchen"</string>
+    <string name="search_hint" msgid="7183732852849365466">"In SMS/MMS suchen"</string>
     <string name="search" msgid="7560238620274735199">"SMS/MMS"</string>
     <string name="search_setting_description" msgid="4104004595086437572">"Text in meinen Nachrichten"</string>
     <string name="search_empty" msgid="645052646985297065">"Keine Treffer"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 283c01607..093cc67b8 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -60,7 +60,7 @@
     <item msgid="6334637439528489607">"Laughing"</item>
     <item msgid="7602915122893958066">"Confused"</item>
     <item msgid="3939233701582771068">"Heart"</item>
-    <item msgid="1414759480575851587">"Mad"</item>
+    <item msgid="1414759480575851587">"Angry"</item>
     <item msgid="8479809115158836070">"Smirk"</item>
     <item msgid="638612939305162424">"Poker face"</item>
   </string-array>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index a3f9c17d2..83d875991 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -48,7 +48,7 @@
     <item msgid="3858808057949077894">"Sacando la lengua"</item>
     <item msgid="7835238297967185651">"Sorprendido"</item>
     <item msgid="1756223535005296033">"Besando"</item>
-    <item msgid="1093906245140165107">"Gritando"</item>
+    <item msgid="1093906245140165107">"Sorpresa"</item>
     <item msgid="888834839864150170">"Atractivo"</item>
     <item msgid="6320683740534773967">"Dinero en la boca"</item>
     <item msgid="6610111212478853990">"Metedura de pata"</item>
@@ -61,7 +61,7 @@
     <item msgid="7602915122893958066">"Confuso"</item>
     <item msgid="3939233701582771068">"Corazón"</item>
     <item msgid="1414759480575851587">"Enfadado"</item>
-    <item msgid="8479809115158836070">"Sonrisita"</item>
+    <item msgid="8479809115158836070">"No mola"</item>
     <item msgid="638612939305162424">"Cara de póquer"</item>
   </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 83012eb98..389674ade 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -161,9 +161,9 @@
     <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Supprimer lorsque les limites suivantes sont atteintes"</string>
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> messages par conversation"</string>
     <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Gestion messages carte SIM"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Accusés de réception"</string>
+    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Accusé de réception"</string>
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Confirmations de lecture"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Accusés de réception"</string>
+    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Accusé de réception"</string>
     <string name="pref_title_auto_delete" msgid="7227835692631701134">"Anciens messages"</string>
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limite pour les SMS"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite pour les MMS"</string>
@@ -232,7 +232,7 @@
     <string name="delivery_header_title" msgid="5361719578869045764">"Rapport"</string>
     <string name="status_none" msgid="8253075950774894961">"(Aucun)"</string>
     <string name="status_pending" msgid="2739860824607984892">"En attente"</string>
-    <string name="status_read" msgid="7576195253780627332">"Lire"</string>
+    <string name="status_read" msgid="7576195253780627332">"Lu"</string>
     <string name="status_received" msgid="7264334589461906965">"Reçu"</string>
     <string name="status_failed" msgid="1998776666856593544">"Échec"</string>
     <string name="status_unread" msgid="8555305495998700198">"Non lu"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b4f3f9443..ec0a4e1a4 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -33,7 +33,7 @@
     <string name="menu_delete" msgid="1851666911396479006">"מחק שרשור"</string>
     <string name="menu_view" msgid="7448852683948080108">"הצג שרשור"</string>
     <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"מרענן???"</string>
+    <string name="refreshing" msgid="987335057871404222">"מרענן…"</string>
     <string name="has_draft" msgid="2487465595514636160">"טיוטה"</string>
     <string name="no_subject_view" msgid="7795086723069563537">"(ללא נושא)"</string>
     <string name="messagelist_sender_self" msgid="3579016854116401602">"אני"</string>
@@ -137,7 +137,7 @@
     <item msgid="3400770414689795703">"8 שניות"</item>
     <item msgid="4358760614161107970">"9 שניות"</item>
     <item msgid="2618179407176906471">"10 שניות"</item>
-    <item msgid="6238597861937337981">"אחר???"</item>
+    <item msgid="6238597861937337981">"אחר…"</item>
   </string-array>
     <string name="menu_view_contact" msgid="1414670584423909451">"הצג איש קשר"</string>
     <string name="menu_add_to_contacts" msgid="2978074583938544513">"הוסף לאנשי קשר"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6d432353f..1233b12c1 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -317,7 +317,7 @@
     <string name="storage_limits_setting" msgid="4952781049308537373">"Tetapkan had"</string>
     <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"Tiada had"</string>
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Tidak boleh menghantar mesej sekarang. Terdapat terlalu banyak mesej multimedia yang belum dihantar."</string>
-    <string name="sending_message" msgid="2054406576361149715">"MENGHANTAR???"</string>
+    <string name="sending_message" msgid="2054406576361149715">"MENGHANTAR…"</string>
     <string name="pick_too_many_recipients" msgid="650087588867628044">"Terlalu banyak penerima"</string>
     <string name="adding_recipients" msgid="2962810172527532357">"Menambah penerima..."</string>
     <string name="draft_separator" msgid="5402575086540243019">", "</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 748751119..40678cb4f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -149,20 +149,20 @@
     <string name="edit" msgid="5912118407791492696">"Edytuj"</string>
     <string name="try_to_send" msgid="1996751738286080976">"Spróbuj wysłać"</string>
     <string name="preferences_title" msgid="6650089610332670157">"Ustawienia"</string>
-    <string name="restore_default" msgid="7165341506551155053">"Przywróć ustawienia domyślne"</string>
+    <string name="restore_default" msgid="7165341506551155053">"Przywróć domyślne"</string>
     <string name="pref_notification_settings_title" msgid="4860726154770053004">"Ustawienia powiadomień"</string>
     <string name="pref_mms_settings_title" msgid="2573616208360684392">"Ustawienia wiadomości MMS"</string>
     <string name="pref_sms_settings_title" msgid="9088516111717417514">"Ustawienia wiadomości SMS"</string>
     <string name="pref_sms_storage_title" msgid="2531726671883516470">"Ustawienia pamięci"</string>
     <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Zarządzanie wiadomościami zapisanymi na karcie SIM"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Żądaj potwierdzenia dostarczenia każdej wysłanej wiadomości"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Żądanie raportu przeczytania każdej wysłanej wiadomości"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Żądaj potwierdzenia dostarczenia każdej wysłanej wiadomości"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Usuń stare wiadomości po osiągnięciu limitów"</string>
+    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Potwierdzaj dostarczenie każdej wysłanej wiadomości"</string>
+    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Potwierdzaj, że wysłana wiadomość została przeczytana"</string>
+    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Potwierdzaj dostarczenie każdej wysłanej wiadomości"</string>
+    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Usuń stare wiadomości po osiągnięciu limitu"</string>
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> wiadomości w wątku"</string>
     <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Wiadomości na karcie SIM"</string>
     <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Raporty dostarczenia"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Raporty odczytu"</string>
+    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Raporty przeczytania"</string>
     <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Raporty dostarczenia"</string>
     <string name="pref_title_auto_delete" msgid="7227835692631701134">"Usuń stare wiadomości"</string>
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limit wiadomości tekstowych"</string>
@@ -181,7 +181,7 @@
     <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"Wibracje"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Autoodbieranie"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Odbierz wiadomości automatycznie"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Autoodbieranie w roamingu"</string>
+    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"W roamingu"</string>
     <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Odbierz wiadomości automatycznie w roamingu"</string>
     <string name="confirm_dialog_title" msgid="5810813994465120375">"Usuń"</string>
     <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"Czy usunąć zablokowaną wiadomość?"</string>
@@ -226,7 +226,7 @@
     <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"Kopiuj do pamięci tabletu"</string>
     <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"Kopiuj do pamięci telefonu"</string>
     <string name="sim_delete" msgid="610790510655316922">"Usuń"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"Wiadomości tekstowe na karcie SIM"</string>
+    <string name="sim_manage_messages_title" msgid="3989147182100584333">"Wiadomości na karcie SIM"</string>
     <string name="sim_view" msgid="1997173541766393706">"Wyświetl"</string>
     <string name="sim_empty" msgid="1763174398613486328">"Brak wiadomości na karcie SIM"</string>
     <string name="delivery_header_title" msgid="5361719578869045764">"Raport"</string>
@@ -241,7 +241,7 @@
     <string name="status_label" msgid="7283375460919181660">"Stan: "</string>
     <string name="attach_image" msgid="6439985727687107742">"Zdjęcia"</string>
     <string name="attach_take_photo" msgid="4280601313184373837">"Zrób zdjęcie"</string>
-    <string name="attach_video" msgid="4264272693501538294">"Filmy wideo"</string>
+    <string name="attach_video" msgid="4264272693501538294">"Filmy"</string>
     <string name="attach_record_video" msgid="3099814114743078615">"Nagraj film wideo"</string>
     <string name="attach_sound" msgid="3149325985970669609">"Audio"</string>
     <string name="attach_record_sound" msgid="6011431304469858929">"Nagraj audio"</string>
@@ -304,9 +304,9 @@
     <string name="search_empty" msgid="645052646985297065">"Brak wyników"</string>
   <plurals name="search_results_title">
     <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> wynik dla zapytania „<xliff:g id="SEARCH">%2$s</xliff:g>”"</item>
-    <item quantity="other" msgid="6196382287749539209">"Liczba wyników dla zapytania „<xliff:g id="SEARCH">%2$s</xliff:g>”: <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
+    <item quantity="other" msgid="6196382287749539209">"Wyniki dla „<xliff:g id="SEARCH">%2$s</xliff:g>”: <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
   </plurals>
-    <string name="search_history" msgid="4127805495662693154">"Liczba wyników dla zapytania „<xliff:g id="SEARCH">%2$s</xliff:g>”: <xliff:g id="COUNT">%1$s</xliff:g>"</string>
+    <string name="search_history" msgid="4127805495662693154">"Wyniki dla „<xliff:g id="SEARCH">%2$s</xliff:g>”: <xliff:g id="COUNT">%1$s</xliff:g>"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"Wyczyść"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"Historia wyszukiwania zostanie wyczyszczona."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Wyczyść historię wyszukiwania"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 38142e074..43f1ed010 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -22,19 +22,19 @@
     <item msgid="6418813270603201918">":-)"</item>
     <item msgid="5037069969500587717">":-("</item>
     <item msgid="1706022067142803863">";-)"</item>
-    <item msgid="1248733150365342132">":-П"</item>
-    <item msgid="817475806953665071">"=-Др"</item>
+    <item msgid="1248733150365342132">":-P"</item>
+    <item msgid="817475806953665071">"=-O"</item>
     <item msgid="2791428909459014455">":-*"</item>
-    <item msgid="3521914049512875091">":Др"</item>
-    <item msgid="1245726345240784103">"Б-)"</item>
+    <item msgid="3521914049512875091">":O"</item>
+    <item msgid="1245726345240784103">"B-)"</item>
     <item msgid="6236841507652113784">":-$"</item>
     <item msgid="9041518876704445176">":-!"</item>
     <item msgid="5938573563873054892">":-["</item>
-    <item msgid="662834190186827918">"Др:-)"</item>
+    <item msgid="662834190186827918">"O:-)"</item>
     <item msgid="8667007781479284572">":-\\"</item>
     <item msgid="6895634303037073990">":\'("</item>
     <item msgid="3660685022708121640">":-X"</item>
-    <item msgid="2893940139682468617">":-Д"</item>
+    <item msgid="2893940139682468617">":-D"</item>
     <item msgid="4888792634429693183">"o_O"</item>
     <item msgid="1585296316137615252">"&lt;3"</item>
     <item msgid="5254456916552252873">"x-("</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index be4b87526..114136183 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -240,7 +240,7 @@
     <string name="recipient_label" msgid="3922667485312634446">"Получатель: "</string>
     <string name="status_label" msgid="7283375460919181660">"Статус: "</string>
     <string name="attach_image" msgid="6439985727687107742">"Рисунки"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"Сделать фотографию"</string>
+    <string name="attach_take_photo" msgid="4280601313184373837">"Снять фото"</string>
     <string name="attach_video" msgid="4264272693501538294">"Видео"</string>
     <string name="attach_record_video" msgid="3099814114743078615">"Снять видео"</string>
     <string name="attach_sound" msgid="3149325985970669609">"Аудио"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index ecb5b6163..20b17aeb5 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -42,7 +42,7 @@
     <item msgid="5729958058423636943">":-I"</item>
   </string-array>
   <string-array name="default_smiley_names">
-    <item msgid="1831934949361041701">"ยินดี"</item>
+    <item msgid="1831934949361041701">"ดีใจ"</item>
     <item msgid="1601611480575517120">"เศร้า"</item>
     <item msgid="1531181614218625881">"ขยิบตา"</item>
     <item msgid="3858808057949077894">"แลบลิ้น"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d57f81fb6..4c7b50c23 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -165,8 +165,8 @@
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"รายงานการอ่าน"</string>
     <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"รายงานการส่ง"</string>
     <string name="pref_title_auto_delete" msgid="7227835692631701134">"ลบข้อความเก่า"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"จำนวนสูงสุดของข้อความตัวอักษร"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"จำนวนสูงสุดของข้อความมัลติมีเดีย"</string>
+    <string name="pref_title_sms_delete" msgid="6890538316799296878">"ข้อความตัวอักษรสูงสุด"</string>
+    <string name="pref_title_mms_delete" msgid="7265878070847351664">"ข้อความมัลติมีเดียสูงสุด"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"การแจ้งเตือน"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"แสดงการแจ้งเตือนข้อความบนแถบสถานะ"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"สั่น"</string>
@@ -176,7 +176,7 @@
   <string-array name="prefEntries_vibrateWhen">
     <item msgid="2520871831815631409">"ทุกครั้ง"</item>
     <item msgid="6069709696037750627">"เฉพาะเมื่อปิดเสียง"</item>
-    <item msgid="7486145357487111435">"ไม่เคย"</item>
+    <item msgid="7486145357487111435">"ไม่ต้องเลย"</item>
   </string-array>
     <string name="prefDialogTitle_vibrateWhen" msgid="6419655771690242118">"สั่น"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"เรียกอัตโนมัติ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4583932e0..d61c66bb8 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -81,7 +81,7 @@
     <string name="send" msgid="4589898724889248486">"发送"</string>
     <string name="mms" msgid="1587631213714914559">"彩信"</string>
     <string name="all_threads" msgid="2663426830306307194">"所有会话"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"键入讯息"</string>
+    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"键入信息"</string>
     <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"打开键盘键入讯息"</string>
     <string name="compressing" msgid="1961357529661045180">"图片过大。正在压缩…"</string>
     <string name="unsupported_media_format" msgid="5037111178813903722">"不支持<xliff:g id="NAME">%1$s</xliff:g>格式"</string>
@@ -159,7 +159,7 @@
     <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"要求每次发送信息后都返回已读回执"</string>
     <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"要求每次发送信息后都返回发送报告"</string>
     <string name="pref_summary_auto_delete" msgid="7719538116486177613">"达到数量上限时删除旧信息"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"每个会话限存储 <xliff:g id="COUNT">%1$s</xliff:g> 条短信"</string>
+    <string name="pref_summary_delete_limit" msgid="597128041393045216">"每个会话限存储 <xliff:g id="COUNT">%1$s</xliff:g> 条信息"</string>
     <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"管理 SIM 卡中的信息"</string>
     <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"发送报告"</string>
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"已读报告"</string>
@@ -172,7 +172,7 @@
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"振动"</string>
     <string name="pref_summary_notification_vibrateWhen" msgid="669655090822561447">"收到通知时还振动提醒"</string>
     <string name="pref_title_notification_ringtone" msgid="5159574093788155149">"选择铃声"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"设置要保存的彩信数量"</string>
+    <string name="pref_messages_to_save" msgid="3202539743892934926">"设置要保存的信息数量"</string>
   <string-array name="prefEntries_vibrateWhen">
     <item msgid="2520871831815631409">"始终"</item>
     <item msgid="6069709696037750627">"仅在静音时"</item>
@@ -228,7 +228,7 @@
     <string name="sim_delete" msgid="610790510655316922">"删除"</string>
     <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM 卡上的短信"</string>
     <string name="sim_view" msgid="1997173541766393706">"查看"</string>
-    <string name="sim_empty" msgid="1763174398613486328">"SIM 卡中无信息。"</string>
+    <string name="sim_empty" msgid="1763174398613486328">"SIM 卡中未存短信。"</string>
     <string name="delivery_header_title" msgid="5361719578869045764">"报告"</string>
     <string name="status_none" msgid="8253075950774894961">"(无)"</string>
     <string name="status_pending" msgid="2739860824607984892">"待发送"</string>
@@ -297,7 +297,7 @@
     <string name="edit_slide_activity" msgid="8752829671778696983">"编辑幻灯片"</string>
     <string name="slideshow_activity" msgid="5658249461317434432">"播放幻灯片"</string>
     <string name="class_0_message_activity" msgid="8474176218999130627">"0 类信息"</string>
-    <string name="search_label" msgid="6042598929386174964">"正在传递短信"</string>
+    <string name="search_label" msgid="6042598929386174964">"短信"</string>
     <string name="search_hint" msgid="7183732852849365466">"搜索短信"</string>
     <string name="search" msgid="7560238620274735199">"短信"</string>
     <string name="search_setting_description" msgid="4104004595086437572">"消息中的文字"</string>
@@ -308,9 +308,9 @@
   </plurals>
     <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> 项符合“<xliff:g id="SEARCH">%2$s</xliff:g>”的搜索结果"</string>
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"清除"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"搜索历史记录将被清除。"</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"清除搜索历史记录"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"清除以前的短信搜索历史记录，使其不再出现在“搜索”框中"</string>
+    <string name="confirm_clear_search_text" msgid="8731877031837077478">"搜索记录将被清除。"</string>
+    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"清除搜索记录"</string>
+    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"清除以前的短信搜索记录，使其不再出现在“搜索”框中"</string>
     <string name="save" msgid="6847069284991531310">"保存"</string>
     <string name="storage_limits_title" msgid="7074684882530693016">"限制短信数"</string>
     <string name="storage_limits_message" msgid="8729608389698270388">"是否要限制每个会话存储的短信数？"</string>