Import revised translations

Change-Id: Iec10782854c4ae81d4959100a7f06ed1a756274f
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 296ed58..9e4eed0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Zvolte možnost zkontrolovat zprávu a pokuste se ji odeslat znovu."</string>
     <string name="download_later" msgid="4486286146421650880">"Zprávy momentálně nelze stáhnout. Zkuste to prosím znovu později."</string>
     <string name="select_audio" msgid="3120822451872772124">"Vybrat zvuk"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Kopírovat přílohu na kartu SD"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Příloha byla zkopírována na kartu SD"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Přílohu se na kartu SD nepodařilo zkopírovat"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Uložit přílohu"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Příloha byla uložena"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Přílohu nelze uložit"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Uložit jako vyzváněcí tón"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Vyzváněcí tón byl uložen"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Uložení vyzváněcího tónu se nezdařilo"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Zprávu nyní nelze odeslat. Máte příliš mnoho neodeslaných multimediálních zpráv."</string>
     <string name="me" msgid="341726346007839961">"Já"</string>
     <string name="sending_message" msgid="222836893217450538">"Odesílání…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Stav není v souladu"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"Stav konverzací a příjemců není v souladu. Pořiďte prosím snímek chybového hlášení a odešlete jej na adresu android-sms-bugs@google.com."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7bba552..de2e0a6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Vælg at vise beskeden igen, og prøv igen."</string>
     <string name="download_later" msgid="4486286146421650880">"Der kan ikke downloades i øjeblikket. Prøv igen senere."</string>
     <string name="select_audio" msgid="3120822451872772124">"Vælg lyd"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Kopier den vedhæftede fil til SD-kortet"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Den vedhæftede fil er kopieret til SD-kortet"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Kopiering af vedhæftet fil til SD-kortet mislykkedes"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Gem vedhæftet fil"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Vedhæftet fil blev gemt."</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Vedhæftet fil kunne ej gemmes"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Gem som ringetone"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Ringetone gemt"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Ringetonen blev ikke gemt"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Kan ikke sende besked lige nu. Der er for mange mms-beskeder, der ikke er sendt."</string>
     <string name="me" msgid="341726346007839961">"Mig"</string>
     <string name="sending_message" msgid="222836893217450538">"Sender..."</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Svingende tilstand"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"Tilstanden af tråde og modtagere er svingende. Opret en fejlrapport, og send den til android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 076096e..597ffbc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -174,8 +174,8 @@
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Leseberichte"</string>
     <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Zustellberichte"</string>
     <string name="pref_title_auto_delete" msgid="7227835692631701134">"Alte Nachrichten löschen"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Höchstzahl an Textnachrichten"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Max. Multimedia-Nachr."</string>
+    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Höchstzahl an SMS"</string>
+    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Höchstzahl an MMS"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Benachrichtigungen"</string>
     <string name="pref_summary_notification_enabled" msgid="619729096820999905">"Bei Nachrichteneingang Benachrichtigung in Statuszeile anzeigen"</string>
     <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibration"</string>
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Überprüfen Sie die Nachricht und versuchen Sie es erneut."</string>
     <string name="download_later" msgid="4486286146421650880">"Herunterladen derzeit nicht möglich. Bitte versuchen Sie es später erneut."</string>
     <string name="select_audio" msgid="3120822451872772124">"Audio auswählen"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Anhang auf SD-Karte kopieren"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Anhang auf SD-Karte kopiert"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Kopieren von Anhang auf SD-Karte fehlgeschlagen"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Anhang speichern"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Anhang gespeichert"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Anhang nicht gespeichert"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Als Klingelton speichern"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Klingelton gespeichert"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Fehler beim Speichern des Klingeltons"</string>
@@ -315,7 +315,7 @@
     <string name="search_hint" msgid="7183732852849365466">"SMS/MMS durchsuchen"</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 Übereinstimmungen"</string>
+    <string name="search_empty" msgid="645052646985297065">"Keine Treffer"</string>
   <plurals name="search_results_title">
     <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> Ergebnis für \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</item>
     <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> Ergebnisse für \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</item>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Nachricht kann jetzt nicht gesendet werden. Es sind zu viele ungesendete Multimedia-Nachrichten vorhanden."</string>
     <string name="me" msgid="341726346007839961">"Ich"</string>
     <string name="sending_message" msgid="222836893217450538">"Wird gesendet…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Inkonsistenter Status"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"Der Status von Threads und Empfängern ist uneinheitlich. Bitte erstellen Sie einen Fehlerbericht und senden Sie ihn an android-sms-bugs@google.com."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index edf6c81..005e70b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Επιλέξτε να ελέγξετε το μήνυμα και δοκιμάστε ξανά."</string>
     <string name="download_later" msgid="4486286146421650880">"Δεν είναι δυνατή η λήψη αυτήν τη στιγμή. Δοκιμάστε ξανά αργότερα."</string>
     <string name="select_audio" msgid="3120822451872772124">"Επιλογή ήχου"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Αντιγραφή επισύναψης στην κάρτα SD"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Έγινε αντιγραφή της επισύναψης στην κάρτα SD"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Η αντιγραφή της επισύναψης στην κάρτα SD απέτυχε"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Αποθήκευση επισύναψης"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Η επισύναψη αποθηκεύτηκε"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Αδυναμία αποθήκ. επισύναψης"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Αποθήκευση ως ήχος κλήσης"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Ο ήχος κλήσης αποθηκεύτηκε"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Απέτυχε η αποθήκευση ήχου κλήσης"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Δεν είναι δυνατή η αποστολή μηνύματος αυτή τη στιγμή. Υπάρχουν υπερβολικά πολλά μη απεσταλμένα μηνύματα πολυμέσων."</string>
     <string name="me" msgid="341726346007839961">"Για εμένα"</string>
     <string name="sending_message" msgid="222836893217450538">"Αποστολή…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Ασταθής κατάσταση"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"Η κατάσταση των νημάτων και των παραληπτών δεν είναι σταθερή. Κάντε καταγραφή ενός σφάλματος αναφοράς και στείλτε το στη διεύθυνση android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1176f38..4a0c934 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Selecciona revisar el mensaje y vuelve a intentarlo."</string>
     <string name="download_later" msgid="4486286146421650880">"No es posible realizar la descarga en este momento. Vuelve a intentarlo más tarde."</string>
     <string name="select_audio" msgid="3120822451872772124">"Seleccionar audio"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Copiar adjunto a tarjeta SD"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Adjunto copiado a la tarjeta SD"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Error al copiar adjuntos a la tarjeta SD"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Guardar archivo adjunto"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Archivo adjunto"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"No se pudo guardar archivo adjunto."</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Guardar como timbre"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Timbre guardado"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Ha ocurrido un error al guardar el timbre"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"No se puede enviar el mensaje en este momento. Hay demasiados mensajes multimedia sin enviar."</string>
     <string name="me" msgid="341726346007839961">"Yo"</string>
     <string name="sending_message" msgid="222836893217450538">"Enviando…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Estado inconsistente"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"El estado de los hilos y los destinatarios no es consistente. Captura un informe de error y envíalo a android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2492452..db5e54e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Selecciona esta opción para revisar el mensaje e intenta enviarlo de nuevo."</string>
     <string name="download_later" msgid="4486286146421650880">"No es posible descargar los mensajes en este momento. Inténtalo de nuevo más tarde."</string>
     <string name="select_audio" msgid="3120822451872772124">"Seleccionar audio"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Copiar archivo adjunto en tarjeta SD"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Archivo adjunto copiado en tarjeta SD"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Error al copiar archivo adjunto en tarjeta SD"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Guardar archivo adjunto"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Adjunto guardado"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"No se puede guardar el adjunto"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Guardar como tono"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Tono guardado"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Error al guardar tono"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"En este momento no se puede enviar el mensaje porque hay demasiados mensajes multimedia sin enviar."</string>
     <string name="me" msgid="341726346007839961">"Yo"</string>
     <string name="sending_message" msgid="222836893217450538">"Enviando…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Estado inconsistente"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"El estado de las cadenas y de los destinatarios es inconsistente. Realiza un informe de errores y envíalo a android-sms-bugs@google.com."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ee60a8b..2291a58 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Sélectionnez le message pour le relire, puis réessayez."</string>
     <string name="download_later" msgid="4486286146421650880">"Téléchargement impossible pour l\'instant. Merci de réessayer ultérieurement."</string>
     <string name="select_audio" msgid="3120822451872772124">"Sélectionnez un fichier audio"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Copier la pièce jointe sur la carte SD"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Pièce jointe copiée sur la carte SD"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Échec de la copie de la pièce jointe sur la carte SD"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Enregistrer la PJ"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Pièce jointe enregistrée"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Impossible d\'enregistrer la PJ"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Enregistrer comme sonnerie"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Sonnerie enregistrée"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Échec de l\'enregistrement de la sonnerie"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Impossible d\'envoyer le message maintenant. Il existe un trop grand nombre de messages multimédias non envoyés."</string>
     <string name="me" msgid="341726346007839961">"Moi"</string>
     <string name="sending_message" msgid="222836893217450538">"Envoi en cours…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"État incohérent"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"L\'état des fils de discussion et des destinataires n\'est pas cohérent. Générez un rapport sur les bugs et envoyez-le à android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2de1dd6..2288bf1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Seleziona per controllare il messaggio e riprovare."</string>
     <string name="download_later" msgid="4486286146421650880">"Download attualmente non disponibile. Riprova più tardi."</string>
     <string name="select_audio" msgid="3120822451872772124">"Seleziona audio"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Copia allegato in scheda SD"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Allegato copiato in scheda SD"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Copia dell\'allegato nella scheda SD non riuscita"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Salva allegato"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Allegato salvato"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Impossibile salvare l\'allegato"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Salva come suoneria"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Suoneria salvata"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Salvataggio della suoneria non riuscito"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Impossibile inviare il messaggio in questo momento. Troppi messaggi multimediali non inviati."</string>
     <string name="me" msgid="341726346007839961">"Io"</string>
     <string name="sending_message" msgid="222836893217450538">"Invio in corso..."</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Stato non coerente"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"Lo stato di thread e destinatari non è coerente. Acquisisci un rapporto bug e invialo all\'indirizzo android-sms-bugs@google.com."</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8b64de1..eac7b7f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"メッセージを確認してもう一度送信します。"</string>
     <string name="download_later" msgid="4486286146421650880">"現在ダウンロードできません。しばらくしてからもう一度お試しください。"</string>
     <string name="select_audio" msgid="3120822451872772124">"オーディオの選択"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"添付ファイルをSDカードにコピー"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"添付ファイルをSDカードにコピーしました"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"添付ファイルをSDカードにコピーできませんでした"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"添付ファイルを保存"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"添付ファイルを保存しました"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"添付ファイルを保存できません"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"着信音として保存"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"着信音を保存しました"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"着信音の保存に失敗しました"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"今すぐメッセージを送信することはできません。未送信のマルチメディアメッセージが多すぎます。"</string>
     <string name="me" msgid="341726346007839961">"自分"</string>
     <string name="sending_message" msgid="222836893217450538">"送信中..."</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"データの不整合"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"スレッドや宛先のデータに不整合があります。バグレポートをキャプチャして android-sms-bugs@google.com に送信してください。"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ff8fcda..ac5bfd5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"메시지를 검토한 다음 다시 시도해 보세요."</string>
     <string name="download_later" msgid="4486286146421650880">"다운로드할 수 없습니다. 잠시 후에 다시 시도해 주세요."</string>
     <string name="select_audio" msgid="3120822451872772124">"오디오 선택"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"SD 카드에 첨부파일 복사"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"SD 카드에 첨부 파일이 복사되었습니다."</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"SD 카드에 첨부파일을 복사하지 못했습니다."</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"첨부파일 저장"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"첨부파일이 저장되었습니다."</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"첨부파일을 저장할 수 없습니다."</string>
     <string name="save_ringtone" msgid="2310157075045201051">"벨소리로 저장"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"벨소리를 저장했습니다."</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"벨소리를 저장하지 못했습니다."</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"현재 메시지를 보낼 수 없습니다. 보내지 않은 멀티미디어 메시지가 너무 많습니다."</string>
     <string name="me" msgid="341726346007839961">"나"</string>
     <string name="sending_message" msgid="222836893217450538">"보내는 중..."</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"변경으로 인한 불일치 상태"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"대화목록과 받는사람의 상태가 일치하지 않습니다. 버그 보고서를 캡쳐하여 android-sms-bugs@google.com으로 보내주세요."</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 663911f..430148e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Velg for å se over meldingen, og prøv igjen."</string>
     <string name="download_later" msgid="4486286146421650880">"Kunne ikke laste ned nå. Prøv igjen senere."</string>
     <string name="select_audio" msgid="3120822451872772124">"Velg lyd"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Kopier vedlegg til minnekort"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Kopiert vedlegg til minnekort"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Kunne ikke kopiere vedlegg til minnekort"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Lagre vedlegg"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Vedlegget lagret"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Kan ikke lagre vedlegg"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Lagre som ringetone"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Ringetone lagret"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Lagring av ringetone mislyktes"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Kan ikke sende meldingen nå. Det er for mange usendte MMS-meldinger."</string>
     <string name="me" msgid="341726346007839961">"Meg"</string>
     <string name="sending_message" msgid="222836893217450538">"Sender …"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Inkonsekvente data"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"Trådene og mottakerne er ikke konsekvente. Send en feilrapport til android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ca25637..35e831a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Selecteer dit om het bericht te controleren en opnieuw te proberen."</string>
     <string name="download_later" msgid="4486286146421650880">"Kan momenteel niet downloaden. Probeer het later opnieuw."</string>
     <string name="select_audio" msgid="3120822451872772124">"Audio selecteren"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Bijlage kopiëren naar SD-kaart"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Bijlage gekopieerd naar SD-kaart"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Kan de bijlage niet kopiëren naar de SD-kaart"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Bijlage opslaan"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Bijlage opgeslagen"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Kan bijlage niet opslaan"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Opslaan als beltoon"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Beltoon is opgeslagen"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Opslaan van beltoon mislukt"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Kan bericht nu niet verzenden. Er zijn te veel niet-verzonden MMS-berichten."</string>
     <string name="me" msgid="341726346007839961">"Ik"</string>
     <string name="sending_message" msgid="222836893217450538">"Verzenden…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Inconsistente status"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"De status van threads en ontvangers is inconsistent. Maak een bugrapport en verzend dit naar android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f6588fa..5a94e82 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Wyświetl wiadomość i spróbuj ponownie."</string>
     <string name="download_later" msgid="4486286146421650880">"Nie można pobrać w tej chwili. Spróbuj ponownie później."</string>
     <string name="select_audio" msgid="3120822451872772124">"Wybierz plik audio"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Kopiuj załącznik na kartę SD"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Załącznik został skopiowany na kartę SD"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Kopiowanie załącznika na kartę SD nie powiodło się"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Zapisz załącznik"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Załącznik zapisany"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Nie można zapisać załącznika"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Zapisz jako dzwonek"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Dzwonek został zapisany"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Zapisanie dzwonka nie powiodło się"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Nie można teraz wysłać wiadomości. Istnieje zbyt wiele niewysłanych wiadomości multimedialnych."</string>
     <string name="me" msgid="341726346007839961">"Ja"</string>
     <string name="sending_message" msgid="222836893217450538">"Trwa wysyłanie…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Niezgodny stan"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"Stan wątków i odbiorców jest niezgodny. Utwórz raport o błędzie i wyślij go na adres android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8a7f0e7..76e95ba 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Seleccione para rever a mensagem e tente novamente."</string>
     <string name="download_later" msgid="4486286146421650880">"De momento não é possível transferir as mensagens. Tente novamente mais tarde."</string>
     <string name="select_audio" msgid="3120822451872772124">"Seleccionar áudio"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Copiar anexo para o cartão SD"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Anexo copiado para o cartão SD"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"A cópia do anexo para o cartão SD falhou"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Guardar anexo"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Anexo guardado"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Não é possível guardar anexo"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Guardar como toque"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Toque guardado"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Falha ao guardar o toque"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Não é possível enviar a mensagem neste momento. Existem demasiadas mensagens multimédia por enviar."</string>
     <string name="me" msgid="341726346007839961">"Eu"</string>
     <string name="sending_message" msgid="222836893217450538">"A enviar…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Estado inconsistente"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"O estado dos tópicos e dos destinatários é inconsistente. Capture um relatório de erros e envie-o para android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 909f5f6..9250fde 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Selecione para rever a mensagem e tentar novamente."</string>
     <string name="download_later" msgid="4486286146421650880">"Não é possível fazer o download no momento. Tente novamente mais tarde."</string>
     <string name="select_audio" msgid="3120822451872772124">"Selecionar áudio"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Cópia anexada ao cartão SD"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Anexo copiado no cartão SD"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Falha ao copiar anexo no cartão SD"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Salvar anexo"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Anexo salvo"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Não foi possível salvar anexo"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Salvar como toque"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Toque salvo"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Falha ao salvar o toque"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Não é possível enviar a mensagem agora. Existem muitas mensagens multimídia que não foram enviadas."</string>
     <string name="me" msgid="341726346007839961">"Eu"</string>
     <string name="sending_message" msgid="222836893217450538">"Enviando…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Estado inconsistente"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"O estado das conversas e destinatários está inconsistente. Capture um relatório de bug e envie-o para android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5408705..c8376c4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -285,9 +285,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Выберите, чтобы просмотреть сообщение и повторить попытку."</string>
     <string name="download_later" msgid="4486286146421650880">"В настоящий момент загрузка невозможна. Повторите попытку позже."</string>
     <string name="select_audio" msgid="3120822451872772124">"Выбор аудио"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Копировать приложение на SD-карту"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Приложение скопировано на SD-карту"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Не удалось скопировать приложение на SD-карту"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Сохранить приложение"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Прикрепленный файл сохранен"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Не удалось сохранить приложение"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Сохранить как мелодию звонка"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Мелодия сохранена"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Не удалось сохранить мелодию"</string>
@@ -334,8 +334,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Не удается отправить сообщение сейчас. Слишком много неотправленных MMS."</string>
     <string name="me" msgid="341726346007839961">"Я"</string>
     <string name="sending_message" msgid="222836893217450538">"Идет отправка…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Данные были изменены"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"Цепочки не соответствуют получателям. Сделайте снимок экрана и отправьте сообщение об ошибке по адресу android-sms-bugs@google.com."</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ec8e6fe..769190f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"Välj om du vill granska meddelandet och försöka igen."</string>
     <string name="download_later" msgid="4486286146421650880">"Det går inte att hämta just nu. Försök igen senare."</string>
     <string name="select_audio" msgid="3120822451872772124">"Välja ljud"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Kopia bifogad till SD-kort"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Bilaga kopierad till SD-kort"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Det gick inte att kopiera bilagorna till SD-kortet"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Spara bilagan"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Bilagan har sparats"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Bilagan kunde inte sparas"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Spara som ringsignal"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Ringsignalen sparad"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Det gick inte att spara ringsignalen"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"Det går inte att skicka meddelandet nu. Det finns för många MMS som inte har skickats."</string>
     <string name="me" msgid="341726346007839961">"Jag"</string>
     <string name="sending_message" msgid="222836893217450538">"Skickar…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Inkonsekvent status"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"Statusen för trådar och mottagare är inkonsekvent. Fota felet och skicka en rapport till android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5a9488b..1f4771b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"İletiyi incelemek üzere seçin ve tekrar deneyin."</string>
     <string name="download_later" msgid="4486286146421650880">"Şu an için indirilemiyor. Lütfen daha sonra tekrar deneyin."</string>
     <string name="select_audio" msgid="3120822451872772124">"Sesi seç"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"Kopya SD karta eklendi"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Ek SD karta kopyalandı"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Ek SD karta kopyalanamadı"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"Eki kaydet"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"Ek kaydedildi"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"Ek kaydedilemedi"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"Zil sesi olarak kaydet"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"Zil sesi kaydedildi"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"Zil sesi kaydedilemedi"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"İleti şu anda gönderilemiyor. Gönderilmemiş çok fazla multimedya iletisi var."</string>
     <string name="me" msgid="341726346007839961">"Ben"</string>
     <string name="sending_message" msgid="222836893217450538">"Gönderiliyor…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"Tutarsız durum"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"İleti dizilerinin ve alıcıların durumları tutarsız. Lütfen bir hata raporu alın ve android-sms-bug@google.com adresine gönderin"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 6dce73a..7e9fa1a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"选择以检查信息并重试。"</string>
     <string name="download_later" msgid="4486286146421650880">"当前无法下载。请稍后再试。"</string>
     <string name="select_audio" msgid="3120822451872772124">"选择音频"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"将附件复制到 SD 卡"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"已将附件复制到 SD 卡"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"无法将附件复制到 SD 卡"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"保存附件"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"附件已保存"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"无法保存附件"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"另存为铃声"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"铃声已保存"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"无法保存铃声"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"目前不能发送消息。未发送的彩信过多。"</string>
     <string name="me" msgid="341726346007839961">"本机号码"</string>
     <string name="sending_message" msgid="222836893217450538">"正在发送…"</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"状态不一致"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"会话和收件人的状态不一致。请对错误报告拍照并发送至 android-sms-bugs@google.com"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 39ebd0d..401b8a6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -284,9 +284,9 @@
     <string name="message_failed_body" msgid="2740907094762116644">"檢視此簡訊並再試一次。"</string>
     <string name="download_later" msgid="4486286146421650880">"目前無法下載。請稍後再試一次。"</string>
     <string name="select_audio" msgid="3120822451872772124">"選取音訊"</string>
-    <!-- outdated translation 6056459122898138734 -->     <string name="copy_to_sdcard" msgid="757028609638184856">"將附件儲存至 SD 卡"</string>
-    <!-- outdated translation 5322211009838330188 -->     <string name="copy_to_sdcard_success" msgid="6940309183311068648">"已將附件儲存至 SD 卡"</string>
-    <!-- outdated translation 2726421767948392438 -->     <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"無法將附件複製到 SD 卡"</string>
+    <string name="copy_to_sdcard" msgid="757028609638184856">"儲存附件"</string>
+    <string name="copy_to_sdcard_success" msgid="6940309183311068648">"已儲存附件"</string>
+    <string name="copy_to_sdcard_fail" msgid="4209780336940754675">"無法儲存附件"</string>
     <string name="save_ringtone" msgid="2310157075045201051">"儲存為鈴聲"</string>
     <string name="saved_ringtone" msgid="6616730290861857836">"已儲存鈴聲"</string>
     <string name="saved_ringtone_fail" msgid="5447210504935083544">"無法儲存鈴聲"</string>
@@ -333,8 +333,6 @@
     <string name="too_many_unsent_mms" msgid="8005932837414848242">"還有太多尚未傳送的多媒體訊息,因此目前無法傳送訊息。"</string>
     <string name="me" msgid="341726346007839961">"我"</string>
     <string name="sending_message" msgid="222836893217450538">"正在傳送..."</string>
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (5006221625000536698) -->
-    <skip />
+    <string name="error_state" msgid="5177386717626893507">"狀態不一致"</string>
+    <string name="error_state_text" msgid="5006221625000536698">"會話串和收件者的狀態不一致,請擷取錯誤報告並傳送到 android-sms-bugs@google.com"</string>
 </resources>