Import revised translations. DO NOT MERGE
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 4ed9f25..e127d5f 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -44,11 +44,11 @@
<item msgid="1093906245140165107">"Hej!"</item>
<item msgid="888834839864150170">"Cool"</item>
<item msgid="6320683740534773967">"Cinkání zlaťáků"</item>
- <item msgid="6610111212478853990">"Šlápota v úsměvu"</item>
+ <item msgid="6610111212478853990">"Trapas!"</item>
<item msgid="1706035208563940251">"V rozpacích"</item>
<item msgid="9079275787422313427">"Andílek"</item>
<item msgid="4630490399784004880">"Nerozhodný"</item>
- <item msgid="7002574538342357456">"Rozplakaný"</item>
+ <item msgid="7002574538342357456">"Bůůů, fňuk, fňuk"</item>
<item msgid="850324578089267455">"Ani muk"</item>
<item msgid="6334637439528489607">"Smějící se"</item>
<item msgid="7602915122893958066">"Zmatený"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 51a6c3d..ecbbb3f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -151,22 +151,22 @@
<string name="preferences_title" msgid="6650089610332670157">"Paramètres"</string>
<string name="restore_default" msgid="7165341506551155053">"Rétablir les paramètres par défaut"</string>
<string name="pref_notification_settings_title" msgid="4860726154770053004">"Paramètres de notification"</string>
- <string name="pref_mms_settings_title" msgid="2573616208360684392">"Paramètres des messages multimédia (MMS)"</string>
- <string name="pref_sms_settings_title" msgid="9088516111717417514">"Paramètres des messages SMS"</string>
+ <string name="pref_mms_settings_title" msgid="2573616208360684392">"Paramètres des MMS"</string>
+ <string name="pref_sms_settings_title" msgid="9088516111717417514">"Paramètres des SMS"</string>
<string name="pref_sms_storage_title" msgid="2531726671883516470">"Paramètres de stockage"</string>
<string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Gérer les messages enregistrés sur votre carte SIM"</string>
<string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Demander un accusé de réception pour chaque message envoyé"</string>
<string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Demander une confirmation de lecture pour chaque message envoyé"</string>
<string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Demander un accusé de réception pour chaque message envoyé"</string>
- <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Supprimer les anciens messages lorsque la limite est atteinte"</string>
+ <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_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_auto_delete" msgid="7227835692631701134">"Supprimer les anciens messages"</string>
- <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limite des messages"</string>
- <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limite des messages MMS"</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>
<string name="pref_title_notification_enabled" msgid="9118792213953729414">"Notifications"</string>
<string name="pref_summary_notification_enabled" msgid="619729096820999905">"Afficher les notifications de message dans la barre d\'état"</string>
<string name="pref_title_notification_vibrate" msgid="7076203487928035310">"Vibreur"</string>
@@ -175,7 +175,7 @@
<string name="pref_messages_to_save" msgid="3202539743892934926">"Définir le nombre de messages à enregistrer"</string>
<string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Récupération auto"</string>
<string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Récupérer automatiquement les messages"</string>
- <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Réc. auto en itinérance"</string>
+ <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Itinérance"</string>
<string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Récupérer automatiquement les messages en itinérance"</string>
<string name="to_label" msgid="2355268818058389047">"À "</string>
<string name="confirm_dialog_title" msgid="5810813994465120375">"Supprimer"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 6fba57b6..64d0efa 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -81,7 +81,7 @@
<string name="remove" msgid="4625444913256213175">"Rimuovi"</string>
<string name="send" msgid="4589898724889248486">"Invia"</string>
<string name="all_threads" msgid="2663426830306307194">"Tutti i thread"</string>
- <string name="type_to_compose_text_enter_to_send" msgid="7553404984078924360">"Digita per comporre"</string>
+ <string name="type_to_compose_text_enter_to_send" msgid="7553404984078924360">"Digita un testo qui"</string>
<string name="open_keyboard_to_compose_message" msgid="1668723196441776085">"Apri tastiera per scrivere il messaggio"</string>
<string name="image_too_large" msgid="261880224164478061">"Immagine troppo grande"</string>
<string name="ask_for_automatically_resize" msgid="7657603662407738758">"Ridimensionare automaticamente l\'immagine prima di inviarla?"</string>
@@ -121,7 +121,7 @@
<string name="layout_selector_title" msgid="7344600117972450771">"Layout presentazione "</string>
<string name="layout_top" msgid="6811021650398972346">"Layout (superiore)"</string>
<string name="layout_bottom" msgid="5822765871095491843">"Layout (inferiore)"</string>
- <string name="type_to_compose_text_or_leave_blank" msgid="6171524929347648837">"Digita per comporre il testo o lascia vuoto"</string>
+ <string name="type_to_compose_text_or_leave_blank" msgid="6171524929347648837">"Digita il testo o lascia vuoto"</string>
<string name="duration_not_a_number" msgid="8005480904677546322">"La durata deve essere un numero"</string>
<string name="duration_zero" msgid="109945354056393575">"La durata deve essere superiore a zero secondi"</string>
<string name="secs" msgid="6886003523109967972">"sec"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 3a0146d..dd45e4d 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -39,7 +39,7 @@
<item msgid="1601611480575517120">"Smutny"</item>
<item msgid="1531181614218625881">"Mruga"</item>
<item msgid="3858808057949077894">"Pokazuje język"</item>
- <item msgid="7835238297967185651">"Zdziwienie"</item>
+ <item msgid="7835238297967185651">"Zdziwiony"</item>
<item msgid="1756223535005296033">"Całuje"</item>
<item msgid="1093906245140165107">"Krzyczy"</item>
<item msgid="888834839864150170">"Na luzie"</item>
@@ -51,6 +51,6 @@
<item msgid="7002574538342357456">"Płacze"</item>
<item msgid="850324578089267455">"Milczy jak grób"</item>
<item msgid="6334637439528489607">"Śmieje się"</item>
- <item msgid="7602915122893958066">"Zakłopotanie"</item>
+ <item msgid="7602915122893958066">"Zakłopotany"</item>
</string-array>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 746d6ce..d7be1f8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,7 +15,7 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="1503967887341230795">"Сообщения"</string>
+ <string name="app_label" msgid="1503967887341230795">"SMS/MMS"</string>
<string name="new_message" msgid="1530369762346003973">"Новое сообщение"</string>
<string name="create_new_message" msgid="8735943333953093860">"Написать новое сообщение"</string>
<string name="menu_call_back" msgid="7538482331117914146">"Позвонить абоненту <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 375459e..10457d9 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -35,13 +35,13 @@
<item msgid="4888792634429693183">"o_O"</item>
</string-array>
<string-array name="default_smiley_names">
- <item msgid="1831934949361041701">"幸福"</item>
- <item msgid="1601611480575517120">"悲伤"</item>
+ <item msgid="1831934949361041701">"开心"</item>
+ <item msgid="1601611480575517120">"忧伤"</item>
<item msgid="1531181614218625881">"眨眼"</item>
- <item msgid="3858808057949077894">"吐舌头"</item>
+ <item msgid="3858808057949077894">"吐舌"</item>
<item msgid="7835238297967185651">"惊讶"</item>
<item msgid="1756223535005296033">"亲吻"</item>
- <item msgid="1093906245140165107">"大喊"</item>
+ <item msgid="1093906245140165107">"叫喊"</item>
<item msgid="888834839864150170">"酷"</item>
<item msgid="6320683740534773967">"财迷"</item>
<item msgid="6610111212478853990">"说错了话"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4fa4551..f28eec9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -235,7 +235,7 @@
<string name="attach_video" msgid="4264272693501538294">"视频"</string>
<string name="attach_record_video" msgid="3099814114743078615">"拍摄视频"</string>
<string name="attach_sound" msgid="3149325985970669609">"音频"</string>
- <string name="attach_record_sound" msgid="6011431304469858929">"录制音频"</string>
+ <string name="attach_record_sound" msgid="6011431304469858929">"录音"</string>
<string name="attach_slideshow" msgid="3497422151091037063">"幻灯片"</string>
<string name="select_bottom_text" msgid="4201966447623311931">"底部文本"</string>
<string name="select_top_text" msgid="6734183477539197815">"顶部文本"</string>
@@ -254,16 +254,16 @@
<string name="type_video" msgid="8521556159545168441">"视频"</string>
<string name="confirm" msgid="3155110885840591914">"确认"</string>
<string name="message_send_read_report" msgid="6997117678914261250">"将会发送已读报告。"</string>
- <string name="message_queued" msgid="8869479754825264671">"当前无法发送信息。信息将在服务可用时送出。"</string>
+ <string name="message_queued" msgid="8869479754825264671">"当前无法发送信息，将在服务恢复后发送。"</string>
<string name="no_subject" msgid="4168963736134552285">"（无主题）"</string>
<string name="unknown_sender" msgid="4929330613278853635">"未知发送者"</string>
- <string name="dl_failure_notification" msgid="2457080452886498701">"下载来自<xliff:g id="FROM">%s</xliff:g>的<xliff:g id="SUBJECT">%s</xliff:g>信息失败。"</string>
+ <string name="dl_failure_notification" msgid="2457080452886498701">"从 <xliff:g id="FROM">%s</xliff:g> 下载<xliff:g id="SUBJECT">%s</xliff:g>信息失败。"</string>
<string name="dl_expired_notification" msgid="950390029992535809">"此短信已过期，将被删除。"</string>
<string name="rate_limit_surpassed" msgid="1347801608211628177">"确认"</string>
- <string name="confirm_rate_limit" msgid="234228299751243067">"即将发送大量多媒体信息。确定要这样做吗？"</string>
+ <string name="confirm_rate_limit" msgid="234228299751243067">"正在发送多条彩信。目前的速度如何？"</string>
<string name="message_download_failed_title" msgid="5722226064394767921">"信息未下载"</string>
<string name="message_send_failed_title" msgid="3469894907399046372">"信息未发送"</string>
- <string name="message_failed_body" msgid="2740907094762116644">"选择查看信息并重试。"</string>
+ <string name="message_failed_body" msgid="2740907094762116644">"选择以查看信息并重试。"</string>
<string name="download_later" msgid="4486286146421650880">"当前无法下载。请稍后再试。"</string>
<string name="select_audio" msgid="3120822451872772124">"选择音频"</string>
<string name="copy_to_sdcard" msgid="6056459122898138734">"将附件复制到 SD 卡"</string>
@@ -272,7 +272,7 @@
<string name="save_ringtone" msgid="2310157075045201051">"另存为铃声"</string>
<string name="saved_ringtone" msgid="6616730290861857836">"铃声已保存"</string>
<string name="saved_ringtone_fail" msgid="5447210504935083544">"无法保存铃声"</string>
- <string name="menu_insert_smiley" msgid="4964504393061025071">"插入表情符"</string>
+ <string name="menu_insert_smiley" msgid="4964504393061025071">"插入表情符号"</string>
<string name="select_link_title" msgid="600168208731216059">"选择操作"</string>
<string name="slide_number" msgid="1923958526266726635">"幻灯片 <xliff:g id="NUMBER">%s</xliff:g>"</string>
<plurals name="slide_duration">
