diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 53f1c12..143f341 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -7,7 +7,7 @@
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
 
     <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
-                android:label="Access to TextSecure Secrets"
+                android:label="Access to ChatSafe Secrets"
                 android:protectionLevel="signature" />    
     
 	<uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"></uses-permission>
diff --git a/NOTICE b/NOTICE
index 1408e55..d329bf2 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-TextSecure provides encrypted text messages for Android.
+ChatSafe provides encrypted text messages for Android.
 Copyright 2011 Whisper Systems
 
 This software has the follow third party dependencies:
diff --git a/README.md b/README.md
index d310f0d..97a5819 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,20 @@
-TextSecure
+ChatSafe
 =================
 
 A secure text messaging application for Android.
 
-TextSecure is a replacement for the standard text messaging application, allowing you to send and receive text messages as normal.  Additionally, TextSecure provides:
+Chatsafe is a replacement for the standard text messaging application, allowing you to send and receive text messages as normal.  Additionally, Chatsafe provides:
 
-1. *Local Encryption* -- All text messages, regardless of destination, that are sent or received with TextSecure are stored in an encrypted database on your phone.
-2. *Wire Encryption* -- When communicating with a recipient who is also using TextSecure, text messages are encrypted during transmission.
 
-Bug tracker
------------
+1. *Local Encryption* -- All text messages, regardless of destination, that are sent or received with ChatSafe are stored in an encrypted database on your phone.
+2. *Wire Encryption* -- When communicating with a recipient who is also using ChatSafe, text messages are encrypted during transmission.
 
-Have a bug? Please create an issue here on GitHub!
-
-https://github.com/WhisperSystems/TextSecure/issues
-
-
-Documentation
--------------
-
-Looking for documentation? Check out the wiki!
-
-https://github.com/WhisperSystems/TextSecure/wiki
-
-Mailing list
-------------
-
-Have a question? Ask on our mailing list!
-
-whispersystems@lists.riseup.net
-
-https://lists.riseup.net/www/info/whispersystems
-
-Translation
-------------
-
-Interested in helping to translate TextSecure? Contribute here:
-
-https://www.transifex.com/projects/p/textsecure-official/
+ChatSafe is a fork of TextSecure.
 
 Downloads
 ------------
 
-TextSecure can be downloaded from the Play Store here:
-
-https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms
+ChatSafe can be downloaded from http://f-droid.org
 
 Cryptography Notice
 ------------
diff --git a/build.xml b/build.xml
index c601eef..a1d8966 100644
--- a/build.xml
+++ b/build.xml
@@ -22,4 +22,26 @@
     <!-- version-tag: 1 -->
     <import file="${sdk.dir}/tools/ant/build.xml" />
 
+    <target name="-package-resources" depends="-crunch">
+        <exec executable="${aapt}" failonerror="true">
+            <arg value="package" />
+            <arg value="-f" />
+            <arg value="-M" />
+            <arg path="AndroidManifest.xml" />
+            <arg value="-F" />
+            <arg path="${out.absolute.dir}/${resource.package.file.name}" />
+            <arg value="-I" />
+            <arg path="${android.jar}" />
+            <arg value="-S" />
+            <arg path="${resource.absolute.dir}" />
+            <arg value="-S" />
+            <arg path="${android.library.reference.1}/res" />
+            <arg value="--extra-packages" />
+            <arg value="com.actionbarsherlock" />
+            <arg value="--auto-add-overlay" />
+            <arg value="--rename-manifest-package" />
+            <arg value="org.fdroid.chatsafe" />
+        </exec>
+   </target>
+
 </project>
diff --git a/res/raw/disclaimer b/res/raw/disclaimer
index a9287d2..14d62f2 100644
--- a/res/raw/disclaimer
+++ b/res/raw/disclaimer
@@ -1,5 +1,4 @@
-Thank you for helping us test this BETA vesion of TextSecure.
 
 This is BETA software, please do not use it in situations where security is critical.
 
-Please report any problems at https://github.com/WhisperSystems/TextSecure/issues
+ChatSafe is based on TextSecure: https://github.com/WhisperSystems/TextSecure
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ff362f5..dab5857 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Ja</string>
   <string name="no">Nein</string>
   <string name="delete">Löschen</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">Sollen die Datenbank und die Einstellungen importiert werden?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">Sollen die TextSecure Datenbank, Schlüssel und Einstellungen von der SD-Karte importiert werden?\n\nACHTUNG: Alle existierenden Nachrichten, Schlüssel und Einstellungen werden dadurch überschrieben. </string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Sollen die ChatSafe Datenbank, Schlüssel und Einstellungen von der SD-Karte importiert werden?\n\nACHTUNG: Alle existierenden Nachrichten, Schlüssel und Einstellungen werden dadurch überschrieben. </string>
   <string name="ApplicationExportManager_importing_database_and_keys">Datenbank und Schlüssel importieren</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">SMS Datenbank, Schlüssel und Einstellungen werden importiert...</string>
   <string name="ApplicationExportManager_export_database_question">Soll die Datenbank exportiert werden?</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Sollen die TextSecure Datenbank, Schlüssel und Einstellungen auf die SD-Karte exportiert werden?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Sollen die ChatSafe Datenbank, Schlüssel und Einstellungen auf die SD-Karte exportiert werden?</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">Datenbank und Schlüssel exportieren</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">SMS Datenbank, Schlüssel und Einstellungen werden exportiert...</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">Keine SD-Karte vorhanden!</string>
@@ -181,14 +181,14 @@
   <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Passwort gecached</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">ChatSafe Passwort gecached</string>
   <string name="KeyCachingService_passphrase_cached">Passwort gecached</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Neue Nachrichten</string>
   <string name="MessageNotifier_most_recent_from_s">Letzte Nachricht von: %s</string>
   <!--SmsReceiver-->
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Sie haben eine Nachricht von jemand empfangen, der verschlüsselte Sitzungen über TextSecure unterstützt. Wollen Sie jetzt eine sicher Sitzung aufbauen?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Sie haben eine Nachricht von jemand empfangen, der verschlüsselte Sitzungen über ChatSafe unterstützt. Wollen Sie jetzt eine sicher Sitzung aufbauen?</string>
   <string name="auto_initiate_activity__initiate_exchange">Austausch initieren</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Altes Passwort:</string>
@@ -248,7 +248,7 @@
   <string name="AndroidManifest__create_passphrase">Passwort erstellen</string>
   <string name="AndroidManifest__enter_passphrase">Passwort eingeben</string>
   <string name="AndroidManifest__select_contacts">Kontakt auswählen</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure erkannt.</string>
+  <string name="AndroidManifest__textsecure_detected">ChatSafe erkannt.</string>
   <string name="AndroidManifest__public_identity_key">Öffentlicher Schlüssel</string>
   <string name="AndroidManifest__change_passphrase">Passwort ändern</string>
   <string name="AndroidManifest__verify_session">Sitzung verifizieren</string>
@@ -261,8 +261,8 @@
   <string name="preferences__use_settings">Nutzungs-Einstellungen</string>
   <string name="preferences__pref_all_sms_title">Für alle SMS benutzen</string>
   <string name="preferences__pref_all_mms_title">Für alle MMS benutzen</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure zur Anzeige und Speicherung aller eingehenden SMS verwenden.</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure zur Anzeige und Speicherung aller eingehenden MMS verwenden.</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">ChatSafe zur Anzeige und Speicherung aller eingehenden SMS verwenden.</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">ChatSafe zur Anzeige und Speicherung aller eingehenden MMS verwenden.</string>
   <string name="preferences__input_settings">Eingabe-Einstellungen</string>
   <string name="preferences__pref_enter_sends_title">Enter schickt ab</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enter Taste versendet Nachrichten</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 383b6eb..d1ec10e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Sí</string>
   <string name="no">No</string>
   <string name="delete">Borrar</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">¿Importar la base de datos y las preferencias?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">¿Desea importar la base de datos TextSecure, claves y preferencias desde la tarjeta SD?\n\nADVERTENCIA: Esto escribirá sobre cualquier mensaje existente, claves y preferencias anteriores.</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">¿Desea importar la base de datos ChatSafe, claves y preferencias desde la tarjeta SD?\n\nADVERTENCIA: Esto escribirá sobre cualquier mensaje existente, claves y preferencias anteriores.</string>
   <string name="ApplicationExportManager_importing_database_and_keys">Importando base de datos y claves</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Importando su base de datos SMS, claves y preferencias...</string>
   <string name="ApplicationExportManager_export_database_question">¿Exportar la base de datos?</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">¿Exportar la base de datos TextSecure, claves y preferencias a la tarjeta SD?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">¿Exportar la base de datos ChatSafe, claves y preferencias a la tarjeta SD?</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">Exportando la base de datos y claves</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">Exportando su base de datos SMS, claves y preferencias...</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">¡No se encontró ninguna tarjeta SD!</string>
@@ -107,7 +107,7 @@
   <!--PromptApnActivity-->
   <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Debes especificar una URL MMSC para tu operador.</string>
   <string name="PromptApnActivity_mms_settings_updated">Configuración MMS Actualizada</string>
-  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Puedes modificar estos valores en el menú de configuración de TextSecure en cualquier momento.</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Puedes modificar estos valores en el menú de configuración de ChatSafe en cualquier momento.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">ERROR:\n\nHa recibido una clave pública dañada.  Esta clave no puede ser procesada, por favor reinicie su sesión segura. </string>
   <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">ERROR:\n\nHa recibido una clave pública de una versión no soportada del protocolo. Esta clave no puede ser procesada, por favor reinicie la sesión segura.</string>
@@ -199,7 +199,7 @@
   <string name="ApplicationMigrationService_import_in_progress">Importación en progreso</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importando Mensajes de Texto</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Frase de contraseña de TextSecure en memoria caché</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Frase de contraseña de ChatSafe en memoria caché</string>
   <string name="KeyCachingService_passphrase_cached">Frase de contraseña en memoria caché</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) nuevos mensajes</string>
@@ -214,7 +214,7 @@
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Actualmente no se puede enviar tu mensaje SMS. Será enviado en cuanto el servicio esté disponible.</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Ha recibido un mensaje de alguien que tiene soporte para sesiones cifradas de TextSecure. ¿Desea iniciar una sesión segura?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Ha recibido un mensaje de alguien que tiene soporte para sesiones cifradas de ChatSafe. ¿Desea iniciar una sesión segura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Iniciar intercambio</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Frase de contraseña anterior:</string>
@@ -246,7 +246,7 @@
   <string name="create_passphrase_activity__continue">Continuar</string>
   <string name="create_passphrase_activity__generating_secrets">GENERANDO SECRETOS</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">¿Te gustaría importar los mensajes de texto existentes en la base de datos cifrada de TextSecure?</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">¿Te gustaría importar los mensajes de texto existentes en la base de datos cifrada de ChatSafe?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de datos de sistema por defecto no será modificada o alterada de ningún modo.</string>
   <string name="database_migration_activity__skip">Saltar</string>
   <string name="database_migration_activity__import">Importar</string>
@@ -256,7 +256,7 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">FRASE DE CONTRASEÑA DE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
   <!--prompt_apn_activity-->
-  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure necesita las opciones de APN para enviar mensajes multimedia por tu operador móvil. Tu dispositivo no proporciona esta información, lo que sería porque tu dispositivo está bloqueado o presenta otra configuración restrictiva.</string>
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">ChatSafe necesita las opciones de APN para enviar mensajes multimedia por tu operador móvil. Tu dispositivo no proporciona esta información, lo que sería porque tu dispositivo está bloqueado o presenta otra configuración restrictiva.</string>
   <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Para enviar mensajes multimedia, por favor completa la información APN necesaria abajo. Los valores para tu proveedor pueden por lo general ser encontrados buscando \'&amp;lt;tu operador&amp;gt; APN\'. Solo necesitarás hacer esto una única vez.</string>
   <string name="prompt_apn_activity__mmsc_url_required">URL MMSC (REQUERIDA):</string>
   <string name="prompt_apn_activity__mms_proxy_host_optional">MMS PROXY HOST (OPCIONAL):</string>
@@ -289,7 +289,7 @@
   <string name="AndroidManifest__create_passphrase">Crear frase de contraseña</string>
   <string name="AndroidManifest__enter_passphrase">Ingresar frase de contraseña</string>
   <string name="AndroidManifest__select_contacts">Seleccionar Contactos</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure detectado</string>
+  <string name="AndroidManifest__textsecure_detected">ChatSafe detectado</string>
   <string name="AndroidManifest__public_identity_key">Clave de Identidad Pública</string>
   <string name="AndroidManifest__change_passphrase">Cambiar la frase de contraseña</string>
   <string name="AndroidManifest__verify_session">Verificar sesión</string>
@@ -302,8 +302,8 @@
   <string name="preferences__use_settings">Preferencias de uso</string>
   <string name="preferences__pref_all_sms_title">Usar para todos los SMS</string>
   <string name="preferences__pref_all_mms_title">Usar para todos los MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usar TextSecure para ver y guardar todos los mensajes de texto entrantes</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usar TextSecure para ver y guardar todos los mensajes multimedia entrantes</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usar ChatSafe para ver y guardar todos los mensajes de texto entrantes</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usar ChatSafe para ver y guardar todos los mensajes multimedia entrantes</string>
   <string name="preferences__input_settings">Preferencias de escritura</string>
   <string name="preferences__pref_enter_sends_title">Envío con la tecla de entrada</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Presionar la tecla de entrada enviará sus mensajes de texto</string>
@@ -423,6 +423,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure es una aplicacion de mensajería de texto con énfasis en la seguridad que sirve de reemplazo a la aplicación de mensajería de texto por defecto. Los mensajes enviados a otros usuarios de TextSecure están cifrados al vuelo, y todos los mensajes de texto están cifrados en una base de datos en el dispositivo. Si tu teléfono se pierde o es robado, tus mensajes estarán seguros, y la comunicación con otros usuarios de TextSecure no será monitorizada en el aire.</string>
+  <string name="PlayStoreListing">ChatSafe es una aplicacion de mensajería de texto con énfasis en la seguridad que sirve de reemplazo a la aplicación de mensajería de texto por defecto. Los mensajes enviados a otros usuarios de ChatSafe están cifrados al vuelo, y todos los mensajes de texto están cifrados en una base de datos en el dispositivo. Si tu teléfono se pierde o es robado, tus mensajes estarán seguros, y la comunicación con otros usuarios de ChatSafe no será monitorizada en el aire.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c22019e..d53a153 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Oui</string>
   <string name="no">Non</string>
   <string name="delete">Effacer</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">Importer la base de données et les paramètres ?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">Importer la base de données, les clés et les paramètres de TextSecure depuis la carte SD ?\n\nAVERTISSEMENT: Cela détruira tous les messages, clés et paramètres existant !</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Importer la base de données, les clés et les paramètres de ChatSafe depuis la carte SD ?\n\nAVERTISSEMENT: Cela détruira tous les messages, clés et paramètres existant !</string>
   <string name="ApplicationExportManager_importing_database_and_keys">Importation de la base de données et des clés</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Importation de votre base de données SMS, des clés et des paramètres…</string>
   <string name="ApplicationExportManager_export_database_question">Exporter la base de données ?</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exporter la base de données TextSecure, les clés et les paramètres vers la carte SD ?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exporter la base de données ChatSafe, les clés et les paramètres vers la carte SD ?</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">Exportation de la base de donnée et des clés</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">Exportation de votre base de données SMS, des clés et des paramètres…</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">Aucune carte SD trouvée !</string>
@@ -107,7 +107,7 @@
   <!--PromptApnActivity-->
   <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Vous devez indiquer une URL MMSC de votre opérateur.</string>
   <string name="PromptApnActivity_mms_settings_updated">Paramètres MMS mis à jour</string>
-  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vous pouvez modifier ces valeurs depuis le menu des paramètres de TextSecure à tout moment.</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vous pouvez modifier ces valeurs depuis le menu des paramètres de ChatSafe à tout moment.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">ERREUR:\n\nVous avez reçu une clef publique corrompue. Cette clef est inutilisable, veuillez renouveler la session sécurisée.</string>
   <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">ERREUR:\n\nVous avez reçu une clef publique issue d\'une version de protocole non supportée. Cette clef est inutilisable, veuillez renouveler la session sécurisée.</string>
@@ -199,7 +199,7 @@
   <string name="ApplicationMigrationService_import_in_progress">Importation en cours</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importation des Messages Texte</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Phrase de passe TextSecure en cache</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Phrase de passe ChatSafe en cache</string>
   <string name="KeyCachingService_passphrase_cached">Phrase de passe en cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nouveaux messages</string>
@@ -214,7 +214,7 @@
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Impossible d’envoyer votre message SMS pour le moment. Il sera envoyé  lorsque le service deviendra disponible.</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Vous avez reçu un message de quelqu\'un qui utilise les sessions chiffrées TextSecure. Voulez vous commencer une session chiffrée avec lui?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Vous avez reçu un message de quelqu\'un qui utilise les sessions chiffrées ChatSafe. Voulez vous commencer une session chiffrée avec lui?</string>
   <string name="auto_initiate_activity__initiate_exchange">Commencer l\'échange</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Ancienne phrase de passe :</string>
@@ -246,7 +246,7 @@
   <string name="create_passphrase_activity__continue">Continuer</string>
   <string name="create_passphrase_activity__generating_secrets">GÉNÉRATION DE CLÉS SECRÈTES</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Voulez-vous importer vos messages texte existant dans la base de données chiffrée de TextSecure ?</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Voulez-vous importer vos messages texte existant dans la base de données chiffrée de ChatSafe ?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de donnée par défaut du système ne sera en aucune façon modifiée ou altérée.</string>
   <string name="database_migration_activity__skip">Passer</string>
   <string name="database_migration_activity__import">Importer</string>
@@ -256,7 +256,7 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">PHRASE DE PASSE TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Déverrouiller</string>
   <!--prompt_apn_activity-->
-  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure nécessite que les paramètres APN distribuent les messages multimédia via votre opérateur mobile. Votre appareil ne rend pas ces informations disponibles, ce qui est parfois le cas des appareils verrouillés et d’autres configurations restrictives.</string>
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">ChatSafe nécessite que les paramètres APN distribuent les messages multimédia via votre opérateur mobile. Votre appareil ne rend pas ces informations disponibles, ce qui est parfois le cas des appareils verrouillés et d’autres configurations restrictives.</string>
   <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Pour envoyer des messages multimédia, merci de compléter les informations sur l’APN ci-dessous. Les valeurs de votre opérateur peuvent généralement être trouvées en cherchant \'APN &amp;lt;votre opérateur&amp;gt;\'. Vous aurez besoin de faire cela une seule fois.</string>
   <string name="prompt_apn_activity__mmsc_url_required">URL MMSC (OBLIGATOIRE) :</string>
   <string name="prompt_apn_activity__mms_proxy_host_optional">HÔTE PROXY MMS (OPTIONNEL) :</string>
@@ -289,7 +289,7 @@
   <string name="AndroidManifest__create_passphrase">Créer une phrase de passe</string>
   <string name="AndroidManifest__enter_passphrase">Saisir la phrase de passe</string>
   <string name="AndroidManifest__select_contacts">Sélectionner des contacts</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure détecté</string>
+  <string name="AndroidManifest__textsecure_detected">ChatSafe détecté</string>
   <string name="AndroidManifest__public_identity_key">Clef d\'Identité Publique</string>
   <string name="AndroidManifest__change_passphrase">Modifier la phrase de passe</string>
   <string name="AndroidManifest__verify_session">Vérifier la session</string>
@@ -302,8 +302,8 @@
   <string name="preferences__use_settings">Paramètres d’utilisation</string>
   <string name="preferences__pref_all_sms_title">Utiliser pour tous les SMS</string>
   <string name="preferences__pref_all_mms_title">Utiliser pour tous les MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utiliser TextSecure pour consulter et stocker tous les messages texte entrant ?</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser TextSecure pour consulter et stocker tous les messages multimédia entrant ?</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utiliser ChatSafe pour consulter et stocker tous les messages texte entrant ?</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser ChatSafe pour consulter et stocker tous les messages multimédia entrant ?</string>
   <string name="preferences__input_settings">Paramètres de saisie</string>
   <string name="preferences__pref_enter_sends_title">La touche Entrée envoie</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">La touche entrée enverra les messages texte</string>
@@ -423,6 +423,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Vérifié</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure est une application de messagerie texte avec une sécurité améliorée, qui constitue une alternative complète à l’application de messagerie texte par défaut. Les messages à d’autres utilisateurs de TextSecure sont chiffrés à la volée, et tous les messages sont stockés dans une base de données chiffrée sur l’appareil. Si votre téléphone est perdu ou volé, vos messages seront en sécurité, et les communications avec d’autres utilisateurs de TextSecure ne peuvent pas être espionnées à la volée.</string>
+  <string name="PlayStoreListing">ChatSafe est une application de messagerie texte avec une sécurité améliorée, qui constitue une alternative complète à l’application de messagerie texte par défaut. Les messages à d’autres utilisateurs de ChatSafe sont chiffrés à la volée, et tous les messages sont stockés dans une base de données chiffrée sur l’appareil. Si votre téléphone est perdu ou volé, vos messages seront en sécurité, et les communications avec d’autres utilisateurs de ChatSafe ne peuvent pas être espionnées à la volée.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 38596f9..a54f12b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Sì</string>
   <string name="no">No</string>
   <string name="delete">Cancella</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">Importare il Database e le Impostazioni?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">Importare il Database, le chiavi e le impostazioni di TextSecure dalla memoria SD?\nATTENZIONE: Questa operazione sovrascriverà ogni messaggio, chiave e impostazione esistente!</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Importare il Database, le chiavi e le impostazioni di ChatSafe dalla memoria SD?\nATTENZIONE: Questa operazione sovrascriverà ogni messaggio, chiave e impostazione esistente!</string>
   <string name="ApplicationExportManager_importing_database_and_keys">Sto importando il Database e le chiavi</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Sto importando il database degli SMS, le chiavi e le impostazioni...</string>
   <string name="ApplicationExportManager_export_database_question">Esportare il Database?</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Esportare il Database, le chiavi e le impostazioni di TextSecure nella memoria SD?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Esportare il Database, le chiavi e le impostazioni di ChatSafe nella memoria SD?</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">Sto esportando il Database e le chiavi</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">Sto esportando il database degli SMS, le chiavi e le impostazioni...</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">Nessuna memoria SD trovata!</string>
@@ -172,14 +172,14 @@
   <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Password di TextSecure salvata in cache</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Password di ChatSafe salvata in cache</string>
   <string name="KeyCachingService_passphrase_cached">Password salvata in cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nuovi messaggi</string>
   <string name="MessageNotifier_most_recent_from_s">Più recente da: %s</string>
   <!--SmsReceiver-->
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Hai ricevuto un messaggio da qualcuno che supporta una sessione cifrata di TextSecure. Vuoi iniziare una sessione sicura?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Hai ricevuto un messaggio da qualcuno che supporta una sessione cifrata di ChatSafe. Vuoi iniziare una sessione sicura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Inizio scambio delle chiavi</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Vecchia password:</string>
@@ -235,7 +235,7 @@
   <string name="AndroidManifest__create_passphrase">Crea una password</string>
   <string name="AndroidManifest__enter_passphrase">Inserisci la password</string>
   <string name="AndroidManifest__select_contacts">Seleziona i contatti</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure trovato!</string>
+  <string name="AndroidManifest__textsecure_detected">ChatSafe trovato!</string>
   <string name="AndroidManifest__public_identity_key">Chiave dell\'identità pubblica</string>
   <string name="AndroidManifest__change_passphrase">Cambia password</string>
   <string name="AndroidManifest__verify_session">Verifica sessione</string>
@@ -248,8 +248,8 @@
   <string name="preferences__use_settings">Usa le impostazioni</string>
   <string name="preferences__pref_all_sms_title">Utilizza per tutti gli SMS</string>
   <string name="preferences__pref_all_mms_title">Utilizza per tutti gli MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usa TextSecure per vedere e salvare tutti i messaggi in arrivo</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usa TextSecure per vedere e salvare tutti gli MMS in arrivo</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usa ChatSafe per vedere e salvare tutti i messaggi in arrivo</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usa ChatSafe per vedere e salvare tutti gli MMS in arrivo</string>
   <string name="preferences__input_settings">Impostazioni di Input</string>
   <string name="preferences__pref_enter_sends_title">Inserisci inviati</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Premere il tasto Invio manderà i messaggi</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d99539d..17096b8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Ja</string>
   <string name="no">Nee</string>
   <string name="delete">Verwijder</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">Importeer Database en Instellingen?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">Importeer TextSecure database, sleutels en instellingen vanaf de SD-kaart?\n\nWAARSCHUWING: Dit kan bestaande berichten, sleutels en instellingen aantasten!</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Importeer ChatSafe database, sleutels en instellingen vanaf de SD-kaart?\n\nWAARSCHUWING: Dit kan bestaande berichten, sleutels en instellingen aantasten!</string>
   <string name="ApplicationExportManager_importing_database_and_keys">Importeren van Database en Sleutels</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">SMS database, sleutels en instellingen aan het importeren...</string>
   <string name="ApplicationExportManager_export_database_question">Exporteer Database?</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exporteer TextSecure database, sleutels en instellingen naar de SD-kaart?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exporteer ChatSafe database, sleutels en instellingen naar de SD-kaart?</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">Exporteren van Database en Sleutels</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">SMS database, sleutels en instellingen aan het exporteren...</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">Geen SD-kaart gevonden!</string>
@@ -107,7 +107,7 @@
   <!--PromptApnActivity-->
   <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">U moet een MMSC URL specificeren voor uw provider.</string>
   <string name="PromptApnActivity_mms_settings_updated">MMS Instellingen Geupdate</string>
-  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">U kunt deze instellingen op elk gewenst moment wijzigen via het TextSecure instellingen menu.</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">U kunt deze instellingen op elk gewenst moment wijzigen via het ChatSafe instellingen menu.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">FOUT: U heeft een corrupte publieke sleutel ontvangen. Deze sleutel kan niet verwerkt worden, herinitiëer alstublieft een beveiligde sessie.</string>
   <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">FOUT: U heeft een publieke sleutel ontvangen van een niet ondersteunde versie van het protocol. Deze sleutel kan niet verwerkt worden, herinitiëer alstublieft een beveiligde sessie.</string>
@@ -199,7 +199,7 @@
   <string name="ApplicationMigrationService_import_in_progress">Bezig met importeren</string>
   <string name="ApplicationMigrationService_importing_text_messages">Tekstberichten aan het importeren</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Wachtwoord In Cache</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">ChatSafe Wachtwoord In Cache</string>
   <string name="KeyCachingService_passphrase_cached">Wachtwoord In Cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nieuwe berichten</string>
@@ -214,7 +214,7 @@
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Momenteel niet in staat om uw SMS bericht te versturen. Zodra de service beschikbaar is zal het verzonden worden .</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">U heeft een bericht ontvangen van iemand die versleutelde TextSecure sessies ondersteunt. Wilt u een beveiligde sessie initiëren?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">U heeft een bericht ontvangen van iemand die versleutelde ChatSafe sessies ondersteunt. Wilt u een beveiligde sessie initiëren?</string>
   <string name="auto_initiate_activity__initiate_exchange">Initieer Uitwisseling</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Oud wachtwoord:</string>
@@ -246,7 +246,7 @@
   <string name="create_passphrase_activity__continue">Doorgaan</string>
   <string name="create_passphrase_activity__generating_secrets">GEHEIMEN AAN HET GENEREREN</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Wilt u uw huidige tekstberichtendatabase importeren naar de versleutelde database van TextSecure?</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Wilt u uw huidige tekstberichtendatabase importeren naar de versleutelde database van ChatSafe?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">De standaard systeemdatabase zal niet gewijzigd of aangepast worden op enigerlei wijze.</string>
   <string name="database_migration_activity__skip">Overslaan</string>
   <string name="database_migration_activity__import">Importeer</string>
@@ -256,7 +256,7 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE WACHTWOORD</string>
   <string name="prompt_passphrase_activity__unlock">Ontgrendel</string>
   <!--prompt_apn_activity-->
-  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure heeft APN instellingen nodig om mediaberichten te kunnen versturen via uw telefoonprovider. Uw toestel heeft deze informatie niet beschikbaar, iets wat vaker voorkomt bij gelockte toestellen en andere beperkende configuraties.</string>
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">ChatSafe heeft APN instellingen nodig om mediaberichten te kunnen versturen via uw telefoonprovider. Uw toestel heeft deze informatie niet beschikbaar, iets wat vaker voorkomt bij gelockte toestellen en andere beperkende configuraties.</string>
   <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Om mediaberichten te versturen, moet u de benodigde APN informatie hieronder opgeven. De waarden voor uw provider kunnen meestal gevonden worden door te zoeken naar \'&amp;lt;uw provider&amp;gt; APN\'. U hoeft dit maar eenmaal te doen.</string>
   <string name="prompt_apn_activity__mmsc_url_required">MMSC URL (VEREIST):</string>
   <string name="prompt_apn_activity__mms_proxy_host_optional">MMS PROXY HOST (OPTIONEEL):</string>
@@ -289,7 +289,7 @@
   <string name="AndroidManifest__create_passphrase">Creëer Wachtwoord</string>
   <string name="AndroidManifest__enter_passphrase">Voer Wachtwoord In</string>
   <string name="AndroidManifest__select_contacts">Selecteer Contacten</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure gedetecteerd</string>
+  <string name="AndroidManifest__textsecure_detected">ChatSafe gedetecteerd</string>
   <string name="AndroidManifest__public_identity_key">Publieke Identiteitssleutel</string>
   <string name="AndroidManifest__change_passphrase">Wachtwoord Veranderen</string>
   <string name="AndroidManifest__verify_session">Verifieer Sessie</string>
@@ -302,8 +302,8 @@
   <string name="preferences__use_settings">Gebruiksinstellingen</string>
   <string name="preferences__pref_all_sms_title">Gebruik voor alle SMS</string>
   <string name="preferences__pref_all_mms_title">Gebruik voor alle MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gebruik TextSecure voor het bekijken en opslaan van alle inkomende tekstberichten</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Gebruik TextSecure voor het bekijken en opslaan van alle inkomende multimediaberichten</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gebruik ChatSafe voor het bekijken en opslaan van alle inkomende tekstberichten</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Gebruik ChatSafe voor het bekijken en opslaan van alle inkomende multimediaberichten</string>
   <string name="preferences__input_settings">Invoer Instellingen</string>
   <string name="preferences__pref_enter_sends_title">Enter verstuurt</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">De \'Enter\' toets gebruiken voor versturen tekstberichten</string>
@@ -423,6 +423,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Geverifieerd</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure is een tekstberichtapplicatie met verbeterde beveiliging die dient als een volledige vervanger voor de standaard tekstberichtapplicatie. Berichten naar andere TextSecure gebruikers worden versleuteld en alle tekstberichten worden opgeslagen in een versleutelde database op uw telefoon. Wanneer uw telefoon kwijt of gestolen is, zijn uw berichten veilig en communicatie met andere TextSecure gebruikers kan niet afgeluisterd worden.</string>
+  <string name="PlayStoreListing">ChatSafe is een tekstberichtapplicatie met verbeterde beveiliging die dient als een volledige vervanger voor de standaard tekstberichtapplicatie. Berichten naar andere ChatSafe gebruikers worden versleuteld en alle tekstberichten worden opgeslagen in een versleutelde database op uw telefoon. Wanneer uw telefoon kwijt of gestolen is, zijn uw berichten veilig en communicatie met andere ChatSafe gebruikers kan niet afgeluisterd worden.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index 5ef36af..861817e 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Ja</string>
   <string name="no">Nei</string>
   <string name="delete">Slett</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">Importer database og instillinger?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">Importer TextSecure meldingsdatabase, nøkler og innstillinger fra SD-kort? \n\nADVARSEL: Dette vil overskrive eksisterende meldinger, nøkler og innstillinger!</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Importer ChatSafe meldingsdatabase, nøkler og innstillinger fra SD-kort? \n\nADVARSEL: Dette vil overskrive eksisterende meldinger, nøkler og innstillinger!</string>
   <string name="ApplicationExportManager_importing_database_and_keys">Importerer database og nøkler</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Importerer meldingsdatabasen din, nøkler og instillinger...</string>
   <string name="ApplicationExportManager_export_database_question">Eksporter database?</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Eksporter TextSecure meldingsdatabase, nøkler og instillinger til SD-kort?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Eksporter ChatSafe meldingsdatabase, nøkler og instillinger til SD-kort?</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">Eksporterer database og nøkler</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">Eksporterer meldingsdatabasen din, nøkler og instillinger...</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">SD-kort ikke funnet!</string>
@@ -107,7 +107,7 @@
   <!--PromptApnActivity-->
   <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Du må spesifisere en MMSC URL for din operatør.</string>
   <string name="PromptApnActivity_mms_settings_updated">MMS konfigurasjon oppdatert</string>
-  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kan forandre disse verdiene når som helst i konfigurasjonsmenyen for TextSecure.</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kan forandre disse verdiene når som helst i konfigurasjonsmenyen for ChatSafe.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">EN FEIL HAR OPPSTÅTT:\n\nDu har mottatt en korrupt offentlig nøkkel. Denne nøkkelen kan ikke prosesseres; vær vennlig å gjenoppta en sikker sesjon.</string>
   <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">EN FEIL HAR OPPSTÅTT: \n\nDu har mottatt en offentlig nøkkel fra en usupportert versjon av protokollen. Denne nøkkelen kan ikke prosesseres; vær vennlig å gjenoppta en sikker sesjon.</string>
@@ -199,7 +199,7 @@
   <string name="ApplicationMigrationService_import_in_progress">Import pågår</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importerer SMS meldinger</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure passordet er bufret</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">ChatSafe passordet er bufret</string>
   <string name="KeyCachingService_passphrase_cached">Passord bufret</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nye meldinger</string>
@@ -214,7 +214,7 @@
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Det er ikke mulig å sende SMS meldingen akkurat nå. Den vil sendes når tjenesten blir tilgjengelig igjen.</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Du har mottatt en melding fra noen som støtter TextSecure krypterte sesjoner. Ønsker du å initiere en sikker sesjon?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Du har mottatt en melding fra noen som støtter ChatSafe krypterte sesjoner. Ønsker du å initiere en sikker sesjon?</string>
   <string name="auto_initiate_activity__initiate_exchange">Start nøkkelutveksling</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Gammelt passord:</string>
@@ -246,7 +246,7 @@
   <string name="create_passphrase_activity__continue">Gå videre</string>
   <string name="create_passphrase_activity__generating_secrets">GENERER NØKLER</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Ønsker du å importere dine eksisterende meldinger til TextSecures krypterte database?</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Ønsker du å importere dine eksisterende meldinger til ChatSafes krypterte database?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Den eksisterende systemdatabasen vil ikke på noen måte bli endret.</string>
   <string name="database_migration_activity__skip">Hopp over</string>
   <string name="database_migration_activity__import">Importer</string>
@@ -256,7 +256,7 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSORD</string>
   <string name="prompt_passphrase_activity__unlock">Lås opp</string>
   <!--prompt_apn_activity-->
-  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">En gyldig APN konfigurasjon er nødvendig for at TextSecure kan sende og motta multimedia meldinger via operatøren din. Enheten din tilgjengeliggjør ikke denne konfigurasjonen. Dette er ofte tilfelle for operatørlåste enheter og annen restriktiv konfigurasjon.</string>
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">En gyldig APN konfigurasjon er nødvendig for at ChatSafe kan sende og motta multimedia meldinger via operatøren din. Enheten din tilgjengeliggjør ikke denne konfigurasjonen. Dette er ofte tilfelle for operatørlåste enheter og annen restriktiv konfigurasjon.</string>
   <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">For å sende multimedia meldinger, vær vennlig å fullfør den nødvendige APN informasjonen under. Verdiene for din operatør kan ofte finnes ved å lete etter \'&amp;lt;din operatør&amp;gt; APN\'. Du trenger kun å gjøre dette en gang.</string>
   <string name="prompt_apn_activity__mmsc_url_required">MMSC URL (PÅKREVD):</string>
   <string name="prompt_apn_activity__mms_proxy_host_optional">MMS PROXY VERT (IKKE PÅKREVD):</string>
@@ -289,7 +289,7 @@
   <string name="AndroidManifest__create_passphrase">Opprett passord</string>
   <string name="AndroidManifest__enter_passphrase">Tast inn passord</string>
   <string name="AndroidManifest__select_contacts">Velg kontakter</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure oppdaget</string>
+  <string name="AndroidManifest__textsecure_detected">ChatSafe oppdaget</string>
   <string name="AndroidManifest__public_identity_key">Offentlig ID-nøkkel</string>
   <string name="AndroidManifest__change_passphrase">Bytt passord</string>
   <string name="AndroidManifest__verify_session">Bekreft sesjon</string>
@@ -302,8 +302,8 @@
   <string name="preferences__use_settings">Innstillinger for bruk</string>
   <string name="preferences__pref_all_sms_title">Benytt for all SMS</string>
   <string name="preferences__pref_all_mms_title">Benytt for all MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Benytt TextSecure for å lese og lagre alle innkommende SMS meldinger.</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Benytt TextSecure for å lese og lagre alle innkommende MMS meldinger.</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Benytt ChatSafe for å lese og lagre alle innkommende SMS meldinger.</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Benytt ChatSafe for å lese og lagre alle innkommende MMS meldinger.</string>
   <string name="preferences__input_settings">Innstillinger for inndata</string>
   <string name="preferences__pref_enter_sends_title">\"Enter\" sender</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Inntasting av \"Enter\" fører til at meldingen blir sendt</string>
@@ -423,6 +423,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Bekreftet</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure er en tekstmeldingsapplikasjon hvor sikkerheten er forbedret. TextSecure fungerer som en full erstatning for mobilterminalens standard SMS/MMS applikasjon. Meldinger til andre TextSecure brukere sendes kryptert, og alle meldinger lagres i en kryptert database på mobilterminalen. Dersom telefonen blir stjålet eller mistet, vil meldingene være trygge, og kommunikasjon med andre TextSecure brukere kan ikke overvåkes.</string>
+  <string name="PlayStoreListing">ChatSafe er en tekstmeldingsapplikasjon hvor sikkerheten er forbedret. ChatSafe fungerer som en full erstatning for mobilterminalens standard SMS/MMS applikasjon. Meldinger til andre ChatSafe brukere sendes kryptert, og alle meldinger lagres i en kryptert database på mobilterminalen. Dersom telefonen blir stjålet eller mistet, vil meldingene være trygge, og kommunikasjon med andre ChatSafe brukere kan ikke overvåkes.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index ad9573d..4df3b96 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Sim</string>
   <string name="no">Não</string>
   <string name="delete">Apagar</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">Importar base de dados e configurações?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">Importar a base de dados, chaves e configurações TextSecure a partir do Cartão SD?⏎ ⏎ AVISO: Isto vai sobreescrever as mensagens, chaves e configurações existentes!</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Importar a base de dados, chaves e configurações ChatSafe a partir do Cartão SD?⏎ ⏎ AVISO: Isto vai sobreescrever as mensagens, chaves e configurações existentes!</string>
   <string name="ApplicationExportManager_importing_database_and_keys">Importar base de dados e chaves</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">A importar a base de dados de SMS, chaves e configurações...</string>
   <string name="ApplicationExportManager_export_database_question">Exportar base de dados?</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exportar a base de dados, chaves e configurações TextSecure para o Cartão SD?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exportar a base de dados, chaves e configurações ChatSafe para o Cartão SD?</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">Exportar base de dados e chaves</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">A exportar a base de dados de SMS, chaves e configurações...</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">Não foi encontrado um cartão SD!</string>
@@ -107,7 +107,7 @@
   <!--PromptApnActivity-->
   <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Você deve especificar a URL do MMSC da sua operadora.</string>
   <string name="PromptApnActivity_mms_settings_updated">Configurações MMS Atualizadas</string>
-  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Você pode modificar estes valores a qualquer momento nas configurações do TextSecure.</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Você pode modificar estes valores a qualquer momento nas configurações do ChatSafe.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">ERRO:⏎ ⏎ Recebeu uma chave pública corrompida. Esta chave não pode ser processada, por favor reinicie uma sessão segura.</string>
   <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">ERRO:⏎ ⏎ Recebeu uma chave pública de uma versão do protocolo não suportada. Esta chave não pode ser processada, por favor reinicie uma sessão segura.</string>
@@ -199,7 +199,7 @@
   <string name="ApplicationMigrationService_import_in_progress">Importação em andamento</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importando mensagens de texto</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Frase-chave TextSecure guardada em memória cache</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Frase-chave ChatSafe guardada em memória cache</string>
   <string name="KeyCachingService_passphrase_cached">Frase-chave guardada em cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) novas mensagens</string>
@@ -214,7 +214,7 @@
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Mensagem SMS não pôde ser enviada agora. Será enviada quando o serviço estiver disponível.</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Recebeu uma mensagem de alguém que suporta sessões cifradas TextSecure. Deseja iniciar uma sessão segura?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Recebeu uma mensagem de alguém que suporta sessões cifradas ChatSafe. Deseja iniciar uma sessão segura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Iniciar intercâmbio</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Frase-chave anterior:</string>
@@ -246,17 +246,17 @@
   <string name="create_passphrase_activity__continue">Continuar</string>
   <string name="create_passphrase_activity__generating_secrets">Gerando segredos</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Gostaria de importar suas mensagens de texto existentes para a base de dados criptografada do TextSecure?</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Gostaria de importar suas mensagens de texto existentes para a base de dados criptografada do ChatSafe?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">A base de dados padrão do sistema não será alterada.</string>
   <string name="database_migration_activity__skip">Pular</string>
   <string name="database_migration_activity__import">Importar</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Isso pode demorar um pouco. Seja paciente, iremos notificá-lo quando a importação terminar.</string>
   <string name="database_migration_activity__importing">Importando</string>
   <!--prompt_passphrase_activity-->
-  <string name="prompt_passphrase_activity__textsecure_passphrase">Palavra-chave do TextSecure</string>
+  <string name="prompt_passphrase_activity__textsecure_passphrase">Palavra-chave do ChatSafe</string>
   <string name="prompt_passphrase_activity__unlock">Desbloquear</string>
   <!--prompt_apn_activity-->
-  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">O TextSecure precisa das configurações de APN para entregar mensagens MMS via sua operadora móvel. Seu aparelho não disponibiliza esta informação, o que pode ocorrer em aparelhos bloqueados ou com configurações restritivas.</string>
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">O ChatSafe precisa das configurações de APN para entregar mensagens MMS via sua operadora móvel. Seu aparelho não disponibiliza esta informação, o que pode ocorrer em aparelhos bloqueados ou com configurações restritivas.</string>
   <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Para enviar mensagens MMS, complete as informações de APN abaixo. Os valores para sua operadora normalmente podem ser localizados procurando por \'&amp;lt;operadora&amp;gt; APN\'. Você só precisará fazer isso uma vez.</string>
   <string name="prompt_apn_activity__mmsc_url_required">URL MMSC (NECESSÁRIO):</string>
   <string name="prompt_apn_activity__mms_proxy_host_optional">PROXY MMS (OPCIONAL):</string>
@@ -289,7 +289,7 @@
   <string name="AndroidManifest__create_passphrase">Criar frase-chave</string>
   <string name="AndroidManifest__enter_passphrase">Introduzir frase-chave</string>
   <string name="AndroidManifest__select_contacts">Seleccionar contactos</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure detectado</string>
+  <string name="AndroidManifest__textsecure_detected">ChatSafe detectado</string>
   <string name="AndroidManifest__public_identity_key">Chave de identidade pública</string>
   <string name="AndroidManifest__change_passphrase">Mudar frase-chave</string>
   <string name="AndroidManifest__verify_session">Verificar sessão</string>
@@ -302,8 +302,8 @@
   <string name="preferences__use_settings">Utilizar configurações</string>
   <string name="preferences__pref_all_sms_title">Utilizar para todas as SMS</string>
   <string name="preferences__pref_all_mms_title">Utilizar para todas as MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens de texto recebidas</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens multimédia recebidas</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar ChatSafe para visualizar e armazenar todas as mensagens de texto recebidas</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar ChatSafe para visualizar e armazenar todas as mensagens multimédia recebidas</string>
   <string name="preferences__input_settings">Configurações de introdução</string>
   <string name="preferences__pref_enter_sends_title">Tecla de enter envia</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressionar a tecla Enter envia mensagem de texto</string>
@@ -423,6 +423,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure é umaaplicação de mensagens seguras que funciona como uma alternativa integral à aplicação de mensagens por omissão. Mensagens para outros utilizadores TextSecure são cifradas em trânsito e todas as mensagens são armazenadas numa base de dados cifrada no dispositivo. Se o seu telemóvel for perdido ou roubado, as suas mensages estarão seguras e comunicações com outros utilizadores TextSecure não podem ser monitorizadas em trânsito.</string>
+  <string name="PlayStoreListing">ChatSafe é umaaplicação de mensagens seguras que funciona como uma alternativa integral à aplicação de mensagens por omissão. Mensagens para outros utilizadores ChatSafe são cifradas em trânsito e todas as mensagens são armazenadas numa base de dados cifrada no dispositivo. Se o seu telemóvel for perdido ou roubado, as suas mensages estarão seguras e comunicações com outros utilizadores ChatSafe não podem ser monitorizadas em trânsito.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9b1b4f5..35ba0c6 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Sim</string>
   <string name="no">Não</string>
   <string name="delete">Apagar</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">Importar base de dados e configurações?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">Importar a base de dados, chaves e configurações TextSecure a partir do Cartão SD?⏎ ⏎ AVISO: Isto vai sobreescrever as mensagens, chaves e configurações existentes!</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Importar a base de dados, chaves e configurações ChatSafe a partir do Cartão SD?⏎ ⏎ AVISO: Isto vai sobreescrever as mensagens, chaves e configurações existentes!</string>
   <string name="ApplicationExportManager_importing_database_and_keys">Importar base de dados e chaves</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">A importar a base de dados de SMS, chaves e configurações...</string>
   <string name="ApplicationExportManager_export_database_question">Exportar base de dados?</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exportar a base de dados, chaves e configurações TextSecure para o Cartão SD?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exportar a base de dados, chaves e configurações ChatSafe para o Cartão SD?</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">Exportar base de dados e chaves</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">A exportar a base de dados de SMS, chaves e configurações...</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">Não foi encontrado um cartão SD!</string>
@@ -196,7 +196,7 @@
   <string name="ApplicationMigrationService_import_in_progress">Importação em progresso</string>
   <string name="ApplicationMigrationService_importing_text_messages">A importar mensages de texto</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Frase-chave TextSecure guardada em memória cache</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Frase-chave ChatSafe guardada em memória cache</string>
   <string name="KeyCachingService_passphrase_cached">Frase-chave guardada em cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) novas mensagens</string>
@@ -211,7 +211,7 @@
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Presentemente não é possível remeter a mensagem SMS. Será reenviada assim que o serviço esteja disponível.</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Recebeu uma mensagem de alguém que suporta sessões cifradas TextSecure. Deseja iniciar uma sessão segura?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Recebeu uma mensagem de alguém que suporta sessões cifradas ChatSafe. Deseja iniciar uma sessão segura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Iniciar intercâmbio</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Frase-chave anterior:</string>
@@ -243,7 +243,7 @@
   <string name="create_passphrase_activity__continue">Continuar</string>
   <string name="create_passphrase_activity__generating_secrets">A GERAR SEGREDOS</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Deseja importar as suas mensages de texto para a base de dados TextSecure cifrada?</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Deseja importar as suas mensages de texto para a base de dados ChatSafe cifrada?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">A base de dados de sistema não será modificada ou alterada de nenhuma forma.</string>
   <string name="database_migration_activity__skip">Saltar</string>
   <string name="database_migration_activity__import">Importar</string>
@@ -281,7 +281,7 @@
   <string name="AndroidManifest__create_passphrase">Criar frase-chave</string>
   <string name="AndroidManifest__enter_passphrase">Introduzir frase-chave</string>
   <string name="AndroidManifest__select_contacts">Seleccionar contactos</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure detectado</string>
+  <string name="AndroidManifest__textsecure_detected">ChatSafe detectado</string>
   <string name="AndroidManifest__public_identity_key">Chave de identidade pública</string>
   <string name="AndroidManifest__change_passphrase">Mudar frase-chave</string>
   <string name="AndroidManifest__verify_session">Verificar sessão</string>
@@ -294,8 +294,8 @@
   <string name="preferences__use_settings">Utilizar configurações</string>
   <string name="preferences__pref_all_sms_title">Utilizar para todas as SMS</string>
   <string name="preferences__pref_all_mms_title">Utilizar para todas as MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens de texto recebidas</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens multimédia recebidas</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar ChatSafe para visualizar e armazenar todas as mensagens de texto recebidas</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar ChatSafe para visualizar e armazenar todas as mensagens multimédia recebidas</string>
   <string name="preferences__input_settings">Configurações de introdução</string>
   <string name="preferences__pref_enter_sends_title">Tecla de enter envia</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressionar a tecla Enter envia mensagem de texto</string>
@@ -415,6 +415,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure é umaaplicação de mensagens seguras que funciona como uma alternativa integral à aplicação de mensagens por omissão. Mensagens para outros utilizadores TextSecure são cifradas em trânsito e todas as mensagens são armazenadas numa base de dados cifrada no dispositivo. Se o seu telemóvel for perdido ou roubado, as suas mensages estarão seguras e comunicações com outros utilizadores TextSecure não podem ser monitorizadas em trânsito.</string>
+  <string name="PlayStoreListing">ChatSafe é umaaplicação de mensagens seguras que funciona como uma alternativa integral à aplicação de mensagens por omissão. Mensagens para outros utilizadores ChatSafe são cifradas em trânsito e todas as mensagens são armazenadas numa base de dados cifrada no dispositivo. Se o seu telemóvel for perdido ou roubado, as suas mensages estarão seguras e comunicações com outros utilizadores ChatSafe não podem ser monitorizadas em trânsito.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index e791c54..0d856cf 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Áno</string>
   <string name="no">Nie</string>
   <string name="delete">Zmaž</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">Importovať databázu a nastavenia?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">Importovať TextSecure databázu, kľúče a nastavenia z SD karty?\n\nPOZOR: Akcia zničí existujúce správy, kľúče a nastavenia!</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Importovať ChatSafe databázu, kľúče a nastavenia z SD karty?\n\nPOZOR: Akcia zničí existujúce správy, kľúče a nastavenia!</string>
   <string name="ApplicationExportManager_importing_database_and_keys">Importujem databázu a kľúče</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Importujem SMS databázu, kľúče a nastavenia...</string>
   <string name="ApplicationExportManager_export_database_question">Exportovať databázu?</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exportovať TextSecure databázu, kľúče a nastavenia na SD kartu?</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Exportovať ChatSafe databázu, kľúče a nastavenia na SD kartu?</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">Exportujem databázu a kľúče</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">Exportujem SMS databázu, kľúče a nastavenia...</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">Nenašiel som SD kartu!</string>
@@ -185,14 +185,14 @@
   <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Heslo pre TextSecure kešované</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Heslo pre ChatSafe kešované</string>
   <string name="KeyCachingService_passphrase_cached">Heslo kešované</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) nových správ</string>
   <string name="MessageNotifier_most_recent_from_s">Najnovšia od: %s</string>
   <!--SmsReceiver-->
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Dostali ste správu od klienta podporujúceho TextSecure bezpečnú session.  Želáte si vytvoriť bezpečnú session?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Dostali ste správu od klienta podporujúceho ChatSafe bezpečnú session.  Želáte si vytvoriť bezpečnú session?</string>
   <string name="auto_initiate_activity__initiate_exchange">Začni vzájomnú výmenu</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Staré heslo:</string>
@@ -254,7 +254,7 @@
   <string name="AndroidManifest__create_passphrase">Vytvor heslo</string>
   <string name="AndroidManifest__enter_passphrase">Zadaj heslo</string>
   <string name="AndroidManifest__select_contacts">Vyber kontakty</string>
-  <string name="AndroidManifest__textsecure_detected">Detekovaný TextSecure</string>
+  <string name="AndroidManifest__textsecure_detected">Detekovaný ChatSafe</string>
   <string name="AndroidManifest__public_identity_key">Kľúč verejnej totožnosti</string>
   <string name="AndroidManifest__change_passphrase">Zmeň heslo</string>
   <string name="AndroidManifest__verify_session">Verifikuj session</string>
@@ -267,8 +267,8 @@
   <string name="preferences__use_settings">Použi nastavenia</string>
   <string name="preferences__pref_all_sms_title">Použi pre všetky SMS</string>
   <string name="preferences__pref_all_mms_title">Použi pre všetky MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Použi TextSecure na zobrazenie a uloženie všetkých prichádzajúcich správ</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Použi TextSecure na zobrazenie a uloženie všetkých prichádzajúcich miltimediálnych správ</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Použi ChatSafe na zobrazenie a uloženie všetkých prichádzajúcich správ</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Použi ChatSafe na zobrazenie a uloženie všetkých prichádzajúcich miltimediálnych správ</string>
   <string name="preferences__input_settings">Nastavenia vstupu</string>
   <string name="preferences__pref_enter_sends_title">Enter odošle</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Stlačením Enter odošlete textové správy</string>
@@ -388,6 +388,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Overené</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure je aplikácia na bezpečné posielanie textových správ, plne nahradzujúca štandardnú aplikáciu pre prácu so správami.  Správy ostatným užívateľom TextSecure sú posielané kryptované. Všetky textové správy sú uložené v kryptovanej databáze Vášho zariadenia. V prípade straty alebo krádeže Vášho zariadenia zostávajú Vaše správy zabezpečené a komunikácia s ostatnými užívateľmi TextSecure nemôže byť počas prenosu monitorovaná.</string>
+  <string name="PlayStoreListing">ChatSafe je aplikácia na bezpečné posielanie textových správ, plne nahradzujúca štandardnú aplikáciu pre prácu so správami.  Správy ostatným užívateľom ChatSafe sú posielané kryptované. Všetky textové správy sú uložené v kryptovanej databáze Vášho zariadenia. V prípade straty alebo krádeže Vášho zariadenia zostávajú Vaše správy zabezpečené a komunikácia s ostatnými užívateľmi ChatSafe nemôže byť počas prenosu monitorovaná.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 48f1f35..85ac0d3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">Da</string>
   <string name="no">Ne</string>
   <string name="delete">Izbriši</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">Uvozim podatkovno zbirko in nastavitve?</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">Naj uvozim podatkovno zbirko TextSecure, ključe in nastavitve s kartice SD?\n\nPOZOR: To bo izbrisalo vsa obstoječa sporočila, ključe in     nastavitve!</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">Naj uvozim podatkovno zbirko ChatSafe, ključe in nastavitve s kartice SD?\n\nPOZOR: To bo izbrisalo vsa obstoječa sporočila, ključe in     nastavitve!</string>
   <string name="ApplicationExportManager_importing_database_and_keys">Uvoz podatkovne zbirke in ključev</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Uvažam vašo zbirko SMS sporočil, ključe in nastavitve...</string>
   <string name="ApplicationExportManager_export_database_question">Naj izvozim podatkovno zbirko?</string>
@@ -107,7 +107,7 @@
   <!--PromptApnActivity-->
   <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">Navesti morate MMSC URL vašega operaterja.</string>
   <string name="PromptApnActivity_mms_settings_updated">Nastavitve MMS posodobljene</string>
-  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vnešeno lahko kadarkoli popravite v nastavitvah TextSecure.</string>
+  <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vnešeno lahko kadarkoli popravite v nastavitvah ChatSafe.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">POZOR:\n\nPrejeli ste okvarjen javni ključ.   Ključa ne morem obdelati, prosim ponovno vzpostavite varno sejo.</string>
   <string name="ReceiveKeyActivity_error_you_have_received_a_public_key_from_an_unsupported_version_of_the_protocol">POZOR:\n\nPrejeli ste javni ključ nepodprte verzije protokola.    Ključa ne morem obdelati, prosim ponovno vzpostavite varno sejo.</string>
@@ -199,7 +199,7 @@
   <string name="ApplicationMigrationService_import_in_progress">Uvoz v teku</string>
   <string name="ApplicationMigrationService_importing_text_messages">Uvažanje kratkih sporočil</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Geslo TextSecure zajeto</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Geslo ChatSafe zajeto</string>
   <string name="KeyCachingService_passphrase_cached">Geslo zajeto</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d novih sporočil</string>
@@ -214,7 +214,7 @@
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Sporočila SMS trenutno ni mogoče poslati. Poslano bo, takoj ko bo mogoče.</string>
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Prejeli ste sporočilo nekoga, ki uporablja šifriranje s TextSecure.    Želite začeti varno sejo?</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Prejeli ste sporočilo nekoga, ki uporablja šifriranje s ChatSafe.    Želite začeti varno sejo?</string>
   <string name="auto_initiate_activity__initiate_exchange">Začni izmenjavo</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Staro geslo:</string>
@@ -246,7 +246,7 @@
   <string name="create_passphrase_activity__continue">Nadaljuj</string>
   <string name="create_passphrase_activity__generating_secrets">USTVARJAM TAJNE KLJUČE</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Želite uvoziti vaša obstoječa SMS sporočila v šifrirano podatkovno zbirko TextSecure?</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Želite uvoziti vaša obstoječa SMS sporočila v šifrirano podatkovno zbirko ChatSafe?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Osnovna SMS podatkovna zbirka bo ostala nespremenjena.</string>
   <string name="database_migration_activity__skip">Preskoči</string>
   <string name="database_migration_activity__import">Uvoz</string>
@@ -256,7 +256,7 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">GESLO TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Odkleni</string>
   <!--prompt_apn_activity-->
-  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">Za posredovanje sporočil preko vašega mobilnega operaterja potrebuje TextSecure ustrezne nastavitve APN. Pri vaši napravi ti podatki niso na voljo. To je značilno predvsem za zaklenjene naprave ali različne omejene konfiguracije.</string>
+  <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">Za posredovanje sporočil preko vašega mobilnega operaterja potrebuje ChatSafe ustrezne nastavitve APN. Pri vaši napravi ti podatki niso na voljo. To je značilno predvsem za zaklenjene naprave ali različne omejene konfiguracije.</string>
   <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">Za pošiljanje multimedijskih sporočil vnesite ustrezne nastavitve APN. Podatke za vašega operaterja lahko verjetno najdete s poizvedbo za \'&amp;lt;vaš operater&amp;gt; APN\'. To morate storiti le enkrat.</string>
   <string name="prompt_apn_activity__mmsc_url_required">MMSC URL (ZAHTEVANO):</string>
   <string name="prompt_apn_activity__mms_proxy_host_optional">GOSTITELJ POSRED. STREŽNIKA MMS (IZBIRNO):</string>
@@ -289,7 +289,7 @@
   <string name="AndroidManifest__create_passphrase">Ustvari geslo</string>
   <string name="AndroidManifest__enter_passphrase">Vpiši geslo</string>
   <string name="AndroidManifest__select_contacts">Izberi stike</string>
-  <string name="AndroidManifest__textsecure_detected">TextSecure zaznan</string>
+  <string name="AndroidManifest__textsecure_detected">ChatSafe zaznan</string>
   <string name="AndroidManifest__public_identity_key">Javni identifikacijski ključ</string>
   <string name="AndroidManifest__change_passphrase">Zamenjaj geslo</string>
   <string name="AndroidManifest__verify_session">Preveri sejo</string>
@@ -302,8 +302,8 @@
   <string name="preferences__use_settings">Nastavitve uporabe</string>
   <string name="preferences__pref_all_sms_title">Uporabljaj za vsa SMS sporočila</string>
   <string name="preferences__pref_all_mms_title">Uporabljaj za vsa MMS sporočila</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Uporabi TextSecure za ogled in shranjevanje vseh dohodnih SMS sporočil</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Uporabi TextSecure za ogled in shranjevanje vseh dohodnih MMS sporočil</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Uporabi ChatSafe za ogled in shranjevanje vseh dohodnih SMS sporočil</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Uporabi ChatSafe za ogled in shranjevanje vseh dohodnih MMS sporočil</string>
   <string name="preferences__input_settings">Nastavitve vnosa</string>
   <string name="preferences__pref_enter_sends_title">Tipka Naprej (Enter) pošlje</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">S pritiskom na tipko Naprej (Enter) bo sporočilo poslano</string>
@@ -423,6 +423,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Overjeno</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure je varnostno napredna aplikacija za sporočila SMS in lahko popolnoma nadomesti sistemsko privzeto SMS aplikacijo.     Sporočila drugim uporabnikom TextSecure so med prenosom šifrirana, vsa prejeta in poslana sporočila so shranjena v šifrirani zbirki podatkov na napravi. Če telefon izgubite ali vam ga ukradejo, bodo vaša sporočila vseeno ostala varna. Oddaljen nadzor šifrirane komunikacije z drugimi uporabniki TextSecure ni mogoč.</string>
+  <string name="PlayStoreListing">ChatSafe je varnostno napredna aplikacija za sporočila SMS in lahko popolnoma nadomesti sistemsko privzeto SMS aplikacijo.     Sporočila drugim uporabnikom ChatSafe so med prenosom šifrirana, vsa prejeta in poslana sporočila so shranjena v šifrirani zbirki podatkov na napravi. Če telefon izgubite ali vam ga ukradejo, bodo vaša sporočila vseeno ostala varna. Oddaljen nadzor šifrirane komunikacije z drugimi uporabniki ChatSafe ni mogoč.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 0a7138f..b3fafc9 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">TextSecure</string>
+  <string name="app_name">ChatSafe</string>
   <string name="yes">是</string>
   <string name="no">否</string>
   <string name="delete">删除</string>
   <!--ApplicationExportManager-->
   <string name="ApplicationExportManager_import_database_and_settings_title">导入数据库和设置？</string>
-  <string name="ApplicationExportManager_import_database_and_settings_message">从 SD 卡导入 TextSecure 数据库、密钥和设置？ 警告： 这将覆盖所有现有消息、密钥和设置！</string>
+  <string name="ApplicationExportManager_import_database_and_settings_message">从 SD 卡导入 ChatSafe 数据库、密钥和设置？ 警告： 这将覆盖所有现有消息、密钥和设置！</string>
   <string name="ApplicationExportManager_importing_database_and_keys">正在导入数据库和密钥</string>
   <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">正在导入您的短信数据库、密钥和设置...</string>
   <string name="ApplicationExportManager_export_database_question">导出数据库？</string>
-  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">导出 TextSecure 数据库、密钥和设置到 SD 卡？</string>
+  <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">导出 ChatSafe 数据库、密钥和设置到 SD 卡？</string>
   <string name="ApplicationExportManager_exporting_database_and_keys">正在导出数据库和密钥</string>
   <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">正在导出您的短信数据库、密钥和设置...</string>
   <string name="ApplicationExportManager_no_sd_card_found_exclamation">未找到 SD 卡！</string>
@@ -180,14 +180,14 @@
   <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure 密码已缓存</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">ChatSafe 密码已缓存</string>
   <string name="KeyCachingService_passphrase_cached">密码已缓存</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) 新邮件</string>
   <string name="MessageNotifier_most_recent_from_s">最新邮件来自： %s</string>
   <!--SmsReceiver-->
   <!--auto_initiate_activity-->
-  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">您收到一条支持 TextSecure 加密会话的人发送的消息。  是否要启动安全会话？</string>
+  <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">您收到一条支持 ChatSafe 加密会话的人发送的消息。  是否要启动安全会话？</string>
   <string name="auto_initiate_activity__initiate_exchange">启动交换</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">旧密码：</string>
@@ -248,7 +248,7 @@
   <string name="AndroidManifest__create_passphrase">创建密码</string>
   <string name="AndroidManifest__enter_passphrase">输入密码</string>
   <string name="AndroidManifest__select_contacts">选择联系人</string>
-  <string name="AndroidManifest__textsecure_detected">检测到 TextSecure</string>
+  <string name="AndroidManifest__textsecure_detected">检测到 ChatSafe</string>
   <string name="AndroidManifest__public_identity_key">身份公钥</string>
   <string name="AndroidManifest__change_passphrase">更改密码</string>
   <string name="AndroidManifest__verify_session">验证会话</string>
@@ -261,8 +261,8 @@
   <string name="preferences__use_settings">使用设置</string>
   <string name="preferences__pref_all_sms_title">用于所有短信</string>
   <string name="preferences__pref_all_mms_title">用于所有彩信</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">使用 TextSecure 查看和存储所有入站文本消息</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">使用 TextSecure 查看和存储所有入站多媒体消息</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">使用 ChatSafe 查看和存储所有入站文本消息</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">使用 ChatSafe 查看和存储所有入站多媒体消息</string>
   <string name="preferences__input_settings">输入设置</string>
   <string name="preferences__pref_enter_sends_title">输入发送</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">按下 enter 键将发送文本消息</string>
@@ -365,6 +365,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">已验证</string>
   <!--Misc. piggybacking-->
-  <string name="PlayStoreListing">TextSecure 是一个安全增强文本消息应用程序，用于完全替代默认文本消息应用程序。 无线发送给其他 TextSecure 用户的消息都经过加密，同时所有文本消息都存储在设备的加密数据库中。 如果电话丢失或被盗，您的消息将保持安全，同时无法空中监控与其他 TextSecure 用户的无线通信。</string>
+  <string name="PlayStoreListing">ChatSafe 是一个安全增强文本消息应用程序，用于完全替代默认文本消息应用程序。 无线发送给其他 ChatSafe 用户的消息都经过加密，同时所有文本消息都存储在设备的加密数据库中。 如果电话丢失或被盗，您的消息将保持安全，同时无法空中监控与其他 ChatSafe 用户的无线通信。</string>
   <!--EOF-->
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0856488..92c0fd8 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">TextSecure</string>
+    <string name="app_name">ChatSafe</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="delete">Delete</string>
     
     <!-- ApplicationExportManager -->
     <string name="ApplicationExportManager_import_database_and_settings_title">Import Database and Settings?</string>
-    <string name="ApplicationExportManager_import_database_and_settings_message">Import TextSecure database, keys, and settings from the SD Card?\n\nWARNING: This will clobber any existing messages, keys, and  settings!</string>
+    <string name="ApplicationExportManager_import_database_and_settings_message">Import ChatSafe database, keys, and settings from the SD Card?\n\nWARNING: This will clobber any existing messages, keys, and  settings!</string>
     <string name="ApplicationExportManager_importing_database_and_keys">Importing Database and Keys</string>
     <string name="ApplicationExportManager_importing_your_sms_database_keys_and_settings">Importing your SMS database, keys, and settings...</string>
     <string name="ApplicationExportManager_export_database_question">Export Database?</string>
-    <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Export TextSecure database, keys, and settings to the SD Card?</string>
+    <string name="ApplicationExportManager_export_textsecure_database_keys_and_settings_prompt">Export ChatSafe database, keys, and settings to the SD Card?</string>
     <string name="ApplicationExportManager_exporting_database_and_keys">Exporting Database and Keys</string>
     <string name="ApplicationExportManager_exporting_your_sms_database_keys_and_settings">Exporting your SMS database, keys, and settings...</string>
     <string name="ApplicationExportManager_no_sd_card_found_exclamation">No SD card found!</string>
@@ -123,7 +123,7 @@
     <!-- PromptApnActivity -->
     <string name="PromptApnActivity_you_must_specify_an_mmsc_url_for_your_carrier">You must specify an MMSC URL for your carrier.</string>
     <string name="PromptApnActivity_mms_settings_updated">MMS Settings Updated</string>
-    <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">You can modify these values from the TextSecure settings menu at any time.</string>    
+    <string name="PromptApnActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">You can modify these values from the ChatSafe settings menu at any time.</string>    
     
     <!-- ReceiveKeyActivity -->
     <string name="ReceiveKeyActivity_error_you_have_received_a_corrupted_public_key">ERROR:\n\nYou have received a corrupted public key.  This key can not be processed, please re-initiate a secure session.</string>
@@ -229,7 +229,7 @@
     <string name="ApplicationMigrationService_importing_text_messages">Importing Text Messages</string>
     
     <!-- KeyCachingService -->
-    <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Passphrase Cached</string>
+    <string name="KeyCachingService_textsecure_passphrase_cached">ChatSafe Passphrase Cached</string>
     <string name="KeyCachingService_passphrase_cached">Passphrase Cached</string>
     
     <!-- MessageNotifier -->
@@ -247,7 +247,7 @@
     <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Currently unable to send your SMS message. It will be sent once service becomes available.</string>
     
     <!-- auto_initiate_activity -->
-    <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">You have received a message from someone who supports TextSecure encrypted sessions.  Would you like to initiate a secure session?</string>
+    <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">You have received a message from someone who supports ChatSafe encrypted sessions.  Would you like to initiate a secure session?</string>
     <string name="auto_initiate_activity__initiate_exchange">Initiate Exchange</string>
     
     <!-- change_passphrase_activity -->
@@ -289,7 +289,7 @@
     <string name="create_passphrase_activity__generating_secrets">GENERATING SECRETS</string>
     
     <!-- database_migration_activity -->
-    <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Would you like to import your existing text messages into TextSecure\'s encrypted database?</string>
+    <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Would you like to import your existing text messages into ChatSafe\'s encrypted database?</string>
     <string name="database_migration_activity__the_default_system_database_will_not_be_modified">The default system database will not be modified or altered in any way.</string>
     <string name="database_migration_activity__skip">Skip</string>
     <string name="database_migration_activity__import">Import</string>
@@ -301,7 +301,7 @@
     <string name="prompt_passphrase_activity__unlock">Unlock</string>
     
     <!-- prompt_apn_activity -->
-    <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure requires APN settings to deliver media messages via your wireless carrier.  Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string>
+    <string name="prompt_apn_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">ChatSafe requires APN settings to deliver media messages via your wireless carrier.  Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string>
     <string name="prompt_apn_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">To send media messages, please complete the necessary APN information below. The values for your carrier can generally be located by searching for \'&amp;lt;your carrier&amp;gt; APN\'.  You will only need to do this once.</string>
     <string name="prompt_apn_activity__mmsc_url_required">MMSC URL (REQUIRED):</string>
     <string name="prompt_apn_activity__mms_proxy_host_optional">MMS PROXY HOST (OPTIONAL):</string>
@@ -344,7 +344,7 @@
     <string name="AndroidManifest__create_passphrase">Create Passphrase</string>
     <string name="AndroidManifest__enter_passphrase">Enter Passphrase</string>
     <string name="AndroidManifest__select_contacts">Select Contacts</string>
-    <string name="AndroidManifest__textsecure_detected">TextSecure Detected</string>
+    <string name="AndroidManifest__textsecure_detected">ChatSafe Detected</string>
     <string name="AndroidManifest__public_identity_key">Public Identity Key</string>
     <string name="AndroidManifest__change_passphrase">Change Passphrase</string>
     <string name="AndroidManifest__verify_session">Verify Session</string>
@@ -359,8 +359,8 @@
     <string name="preferences__use_settings">Use Settings</string>
     <string name="preferences__pref_all_sms_title">Use for all SMS</string>
     <string name="preferences__pref_all_mms_title">Use for all MMS</string> 
-    <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Use TextSecure for viewing and storing all incoming text messages</string>
-    <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Use TextSecure for viewing and storing all incoming multimedia messages</string>
+    <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Use ChatSafe for viewing and storing all incoming text messages</string>
+    <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Use ChatSafe for viewing and storing all incoming multimedia messages</string>
     <string name="preferences__input_settings">Input Settings</string>
     <string name="preferences__pref_enter_sends_title">Enter sends</string>
     <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressing the enter key will send text messages</string>
@@ -498,7 +498,7 @@
     <string name="verify_keys__menu_verified">Verified</string>
 
     <!-- Misc. piggybacking -->
-    <string name="PlayStoreListing">TextSecure is a security enhanced text messaging application that serves as a full replacement for the default text messaging application.  Messages to other TextSecure users are encrypted over the air, and all text messages are stored in an encrypted database on the device. If your phone is lost or stolen, your messages will be safe, and communication with other TextSecure users can\'t be monitored over the air.</string>
+    <string name="PlayStoreListing">ChatSafe is a security enhanced text messaging application that serves as a full replacement for the default text messaging application.  Messages to other ChatSafe users are encrypted over the air, and all text messages are stored in an encrypted database on the device. If your phone is lost or stolen, your messages will be safe, and communication with other ChatSafe users can\'t be monitored over the air.</string>
     
     <!-- EOF -->
     
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 3f145ee..afe60ef 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -31,7 +31,7 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
     setContentView(R.layout.conversation_list_activity);
-    getSupportActionBar().setTitle("TextSecure");
+    getSupportActionBar().setTitle("ChatSafe");
 
     initializeSenderReceiverService();
     initializeResources();
diff --git a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
index 464ad2f..a5e463f 100644
--- a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
+++ b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
@@ -183,7 +183,7 @@ public class ApplicationMigrationService extends Service
       NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
       builder.setSmallIcon(R.drawable.icon_notification);
       builder.setContentTitle("Import Complete");
-      builder.setContentText("TextSecure system database import is complete.");
+      builder.setContentText("ChatSafe system database import is complete.");
       builder.setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, RoutingActivity.class), 0));
       builder.setWhen(System.currentTimeMillis());
       builder.setDefaults(Notification.DEFAULT_VIBRATE);
