From da22d91ef3a01570c279cc0777a70481722a2597 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 30 Mar 2017 15:35:02 -0300
Subject: [PATCH] Update expiry date and translations

---
 .../android/splash/SplashScreenActivity.java  |  4 +--
 .../src/main/res/values-de/strings.xml        | 26 +++++++++++++++---
 .../src/main/res/values-es/strings.xml        |  3 ---
 .../src/main/res/values-fr/strings.xml        | 21 ++++++++-------
 .../src/main/res/values-it/strings.xml        | 27 ++++++++++++++++---
 .../src/main/res/values-pt-rBR/strings.xml    |  3 ---
 .../src/main/res/values-sq/strings.xml        |  7 ++---
 7 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java
index 36f7adcbe1..283ea0feb6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java
@@ -30,8 +30,8 @@ public class SplashScreenActivity extends BaseActivity {
 	private static final Logger LOG =
 			Logger.getLogger(SplashScreenActivity.class.getName());
 
-	// This build expires on 1 April 2017
-	private static final long EXPIRY_DATE = 1491001200 * 1000L;
+	// This build expires on 1 May 2017
+	private static final long EXPIRY_DATE = 1493593200 * 1000L;
 
 	@Inject
 	protected ConfigController configController;
diff --git a/briar-android/src/main/res/values-de/strings.xml b/briar-android/src/main/res/values-de/strings.xml
index 6383bcec0d..012242b255 100644
--- a/briar-android/src/main/res/values-de/strings.xml
+++ b/briar-android/src/main/res/values-de/strings.xml
@@ -61,6 +61,7 @@
   <string name="hide">Ausblenden</string>
   <string name="ok">OK</string>
   <string name="cancel">Abbrechen</string>
+  <string name="got_it">Okay, verstanden.</string>
   <string name="delete">Löschen</string>
   <string name="accept">Annehmen</string>
   <string name="decline">Ablehnen</string>
@@ -68,9 +69,12 @@
   <string name="online">Online</string>
   <string name="offline">Offline</string>
   <string name="send">Senden</string>
+  <string name="allow">Erlauben</string>
+  <string name="open">Öffnen</string>
   <string name="no_data">Keine Daten</string>
   <string name="ellipsis">…</string>
   <string name="text_too_long">Der eingegebene Text ist leider zu lang</string>
+  <string name="show_onboarding">Hilfe anzeigen</string>
   <!--Contacts and Private Conversations-->
   <string name="no_contacts">Du scheinst hier neu zu sein und noch keine Kontakte zu haben.\n\nVerwende das \"+\"-Icon am oberen Bildschirmrand an und folge den Anweisungen um Freunde zu deiner Kontaktliste hinzuzufügen.\n\nDenke daran dass Du neue Kontakte nur dann hinzufügen kannst, wenn Du ihnen physisch begegnest. Das hindert andere daran, sich als Deine Person auszugeben oder Deine Nachrichten zu lesen.</string>
   <string name="date_no_private_messages">Keine Nachrichten.</string>
@@ -83,6 +87,7 @@
   <!--Adding Contacts-->
   <string name="add_contact_title">Kontakt hinzufügen</string>
   <string name="your_nickname">Wähle die zu verwendende Identität:</string>
+  <string name="face_to_face">Um einen neuen Kontakt hinzufügen zu können, ist eine reale Begegnung erforderlich.\n\nDadurch wird eine betrügerische Impersonation und der unautorisierte Zugriff auf die Kommunikation verhindert.</string>
   <string name="continue_button">Weiter</string>
   <string name="your_invitation_code">Dein Einladungs-Code ist</string>
   <string name="enter_invitation_code">Bitte gib den Einladungs-Code Deines Kontakts an:</string>
@@ -95,6 +100,7 @@
   <string name="your_confirmation_code">Dein Bestätigungscode ist</string>
   <string name="enter_confirmation_code">Bitte gebe den Bestätigungscode Deines Kontakts ein:</string>
   <string name="waiting_for_contact">Warte auf Kontakt\u2026</string>
+  <string name="waiting_for_contact_to_scan">Warte auf Scan und Verbindung mit dem Kontakt\u2026</string>
   <string name="exchanging_contact_details">Kontaktdetails werden ausgetauscht\u2026</string>
   <string name="codes_do_not_match">Codes stimmen nicht überein</string>
   <string name="interfering">Möglicherweise stört jemand Deine Verbindung</string>
@@ -144,21 +150,38 @@
   <string name="groups_create_group_button">Gruppe erstellen</string>
   <string name="groups_create_group_invitation_button">Einladung schicken</string>
   <string name="groups_create_group_hint">Gebe Deiner privaten Gruppe einen Namen</string>
+  <string name="groups_invitation_sent">Gruppeneinladung versendet</string>
   <string name="groups_compose_message">Nachricht erstellen</string>
   <string name="groups_message_sent">Nachricht gesendet</string>
   <string name="groups_member_list">Mitglieder</string>
   <string name="groups_invite_members">Mitglieder einladen</string>
+  <string name="groups_member_created_you">Du hast diese Gruppe erstellt</string>
+  <string name="groups_member_created">%s hat diese Gruppe erstellt</string>
   <string name="groups_member_joined_you">Du bist der Gruppe beigetreten</string>
   <string name="groups_member_joined">%s ist der Gruppe beigetreten</string>
   <string name="groups_leave">Gruppe verlassen</string>
+  <string name="groups_leave_dialog_title">Verlassen der Gruppe bestätigen</string>
   <string name="groups_leave_dialog_message">Bist Du sicher, dass Du die Gruppe verlassen willst?</string>
   <string name="groups_dissolve">Gruppe auflösen</string>
+  <string name="groups_dissolve_dialog_title">Auflösung der Gruppe bestätigen</string>
+  <string name="groups_dissolve_dialog_message">Willst Du wirklich diese Gruppe auflösen?\n\nAlle anderen Teilnehmer verlieren die Möglichkeit der Kommunikation ohne möglicherweise die neuesten Nachrichten erhalten zu haben.</string>
+  <string name="groups_dissolve_button">Auflösen</string>
+  <string name="groups_dissolved_dialog_title">Gruppe wurde aufgelöst</string>
+  <string name="groups_dissolved_dialog_message">Der Ersteller dieser Gruppe hat dieselbe aufgelöst.\n\nEs können keine weiteren Nachrichten mehr in dieser Gruppe geschrieben werden und möglicherweise wurden noch nicht alle Nachrichten empfangen.</string>
   <!--Private Group Invitations-->
   <string name="groups_invitations_title">Gruppeneinladungen</string>
+  <string name="groups_invitations_invitation_sent">%1$s wurde in die Gruppe \"%2$s\" eingeladen.</string>
   <string name="groups_invitations_invitation_received">%1$s hat dich eingeladen der Gruppe \"%2$s\" beizutreten.</string>
   <string name="groups_invitations_joined">Gruppe beigetreten</string>
   <string name="groups_invitations_declined">Gruppeneinladung abgelehnt</string>
+  <string name="groups_invitations_response_accepted_sent">Gruppeneinladung von %s angenommen.</string>
+  <string name="groups_invitations_response_declined_sent">Gruppeneinladung von %s abgelehnt.</string>
+  <string name="groups_invitations_response_accepted_received">%s hat die Einladung zur Gruppe angenommen.</string>
+  <string name="groups_invitations_response_declined_received">%s hat die Einladung zur Gruppe abgelehnt.</string>
   <!--Private Groups Revealing Contacts-->
+  <string name="groups_reveal_contacts">Kontakte teilen</string>
+  <string name="groups_reveal_dialog_message">Kontakte können mit allen derzeitigen und zukünftigen Mitgliedern dieser Gruppe geteilt werden.\n\nDas beschleunigt die Verbindung zu der Gruppe und macht sie zusätzlich zuverlässiger, da Kommunikation mit den Mitgliedern auch dann erfolgen kann, wenn der Ersteller der Gruppe offline ist.</string>
+  <string name="groups_reveal_visible">Verbindung zum Kontakt ist für die Gruppe sichtbar</string>
   <!--Forums-->
   <string name="no_forums">Du hast noch keine Foren.\n\nWarum erstellst du nicht einfach selbst ein neues Forum, indem du auf das \"+\"-Icon am oberen Bildschirmrand tippst?\n\nDu kannst auch deine Kontakte auffordern, Foren mit dir zu teilen.</string>
   <string name="create_forum_title">Neues Forum</string>
@@ -259,9 +282,6 @@
   <string name="bluetooth_setting">Ãœber Bluetooth verbinden</string>
   <string name="bluetooth_setting_enabled">Sobald Kontakte in der Nähe sind</string>
   <string name="bluetooth_setting_disabled">Nur beim Hinzufügen von Kontakten</string>
-  <string name="tor_mobile_setting">Ãœber Tor verbinden</string>
-  <string name="tor_mobile_setting_enabled">Wenn WLAN oder Mobildaten verwendet werden</string>
-  <string name="tor_mobile_setting_disabled">Nur wenn über WLAN verbunden</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Sicherheit</string>
   <string name="change_password">Passwort ändern</string>
diff --git a/briar-android/src/main/res/values-es/strings.xml b/briar-android/src/main/res/values-es/strings.xml
index 424f328155..f4b7c982db 100644
--- a/briar-android/src/main/res/values-es/strings.xml
+++ b/briar-android/src/main/res/values-es/strings.xml
@@ -290,9 +290,6 @@
   <string name="bluetooth_setting">Connectar mediante Bluetooth</string>
   <string name="bluetooth_setting_enabled">Cuando haya contactos cerca</string>
   <string name="bluetooth_setting_disabled">Solo al añadir contactos</string>
-  <string name="tor_mobile_setting">Conectar mediante Tor</string>
-  <string name="tor_mobile_setting_enabled">Cuando se use Wi-Fi o datos móviles</string>
-  <string name="tor_mobile_setting_disabled">Solo usando Wi-Fi</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Seguridad</string>
   <string name="change_password">Cambiar contraseña</string>
diff --git a/briar-android/src/main/res/values-fr/strings.xml b/briar-android/src/main/res/values-fr/strings.xml
index c32f7f9312..436149c560 100644
--- a/briar-android/src/main/res/values-fr/strings.xml
+++ b/briar-android/src/main/res/values-fr/strings.xml
@@ -22,7 +22,7 @@
   <string name="startup_failed_activity_title">Echec de démarrage de Briar.</string>
   <string name="startup_failed_db_error">Pour une raison indéterminée, votre base de donnée Briar est corrompue et irrécupérable. Vos comptes, données et contacts sont perdus. Vous devez malheureusement réinstaller Briar et configurer un nouveau compte.</string>
   <string name="startup_failed_service_error">Briar n\'a pas pu démarrer un module nécessaire. Réinstaller Briar résout généralement ce problème. Veuillez noter que vous perdrez votre compte et toutes les données associées puisque Briar n\'utilise pas de serveurs centralisés pour enregistrer les données.</string>
-  <string name="expiry_warning">Ce logiciel est arrivé à expiration.\n Veuillez installer une version plus récente.</string>
+  <string name="expiry_warning">Ce logiciel est arrivé à expiration.\nVeuillez installer une version plus récente.</string>
   <!--Navigation Drawer-->
   <string name="nav_drawer_open_description">Ouvrir le panneau de navigation</string>
   <string name="nav_drawer_close_description">Fermer le panneau de navigation</string>
@@ -110,8 +110,8 @@
   <string name="qr_code_invalid">Le code QR n\'est pas valide</string>
   <string name="connecting_to_device">Connexion à l\'appareil\u2026</string>
   <string name="authenticating_with_device">Autentification avec l\'appareil\u2026</string>
-  <string name="connection_aborted_local">Nous avons interrompu la conversation ! Il est possible que quelqu\'un tente d\'interférer avec votre connexion</string>
-  <string name="connection_aborted_remote">Votre contact a interrompu la conversation ! Il est possible que quelqu\'un tente d\'interférer avec votre connexion</string>
+  <string name="connection_aborted_local">Nous avons interrompu la connexion ! Il est possible que quelqu\'un tente d\'interférer avec celle-ci</string>
+  <string name="connection_aborted_remote">Votre contact a interrompu la connexion ! Il est possible que quelqu\'un tente d\'interférer avec celle-ci</string>
   <!--Introductions-->
   <string name="introduction_onboarding_title">Introduire vos contacts</string>
   <string name="introduction_onboarding_text">Vous pouvez introduire vos contacts les uns les autres, ils n\'ont donc pas besoin de se rencontrer pour se connecter avec Briar.</string>
@@ -290,9 +290,10 @@
   <string name="bluetooth_setting">Connecter par Bluetooth</string>
   <string name="bluetooth_setting_enabled">Lorsque des contacts sont à proximité</string>
   <string name="bluetooth_setting_disabled">Uniquement lors de l\'ajout de contacts</string>
-  <string name="tor_mobile_setting">Connecté via Tor</string>
-  <string name="tor_mobile_setting_enabled">En Wifi ou en données mobiles</string>
-  <string name="tor_mobile_setting_disabled">Uniquement en Wifi</string>
+  <string name="tor_network_setting">Connecter via Tor</string>
+  <string name="tor_network_setting_never">Jamais</string>
+  <string name="tor_network_setting_wifi">Seulement par Wi-Fi</string>
+  <string name="tor_network_setting_always">Par Wi-Fi ou données mobiles</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Sécurité</string>
   <string name="change_password">Modifier le mot de passe</string>
@@ -300,10 +301,10 @@
   <string name="choose_new_password">Choisir le nouveau mot de passe :</string>
   <string name="confirm_new_password">Confirmer le nouveau mot de passe :</string>
   <string name="password_changed">Le mot de passe a été changé.</string>
-  <string name="panic_setting">Paramètres du bouton Panique.</string>
+  <string name="panic_setting">Paramètres du bouton Panique</string>
   <string name="panic_setting_title">Bouton Panique</string>
-  <string name="panic_setting_hint">Configurer Briar pour l\'utilisation de l\'application du bouton Panique.</string>
-  <string name="panic_app_setting_title">Application bouton Panique.</string>
+  <string name="panic_setting_hint">Configurer Briar pour l\'utilisation de l\'application du bouton Panique</string>
+  <string name="panic_app_setting_title">Application bouton Panique</string>
   <string name="unknown_app">une application inconnue</string>
   <string name="panic_app_setting_summary">Aucune application définie</string>
   <string name="panic_app_setting_none">Aucune</string>
@@ -351,5 +352,5 @@
   <string name="close">Fermer</string>
   <string name="dev_report_saved">Rapport enregistré. Il sera envoyé lors de votre prochaine connexion à Briar.</string>
   <!--Sign Out-->
-  <string name="progress_title_logout">Déconnexion de Briar</string>
+  <string name="progress_title_logout">Déconnexion de Briar ...</string>
 </resources>
diff --git a/briar-android/src/main/res/values-it/strings.xml b/briar-android/src/main/res/values-it/strings.xml
index c7d79c4c11..0c136181c6 100644
--- a/briar-android/src/main/res/values-it/strings.xml
+++ b/briar-android/src/main/res/values-it/strings.xml
@@ -57,12 +57,16 @@
   <string name="delete">Cancella</string>
   <string name="accept">Accetta</string>
   <string name="decline">Declina</string>
+  <string name="options">Opzioni</string>
   <string name="online">Connesso</string>
   <string name="offline">Disconnesso</string>
   <string name="send">Invia</string>
+  <string name="allow">Abilita</string>
+  <string name="open">Apri</string>
   <string name="no_data">Nessun dato</string>
   <string name="ellipsis">...</string>
   <string name="text_too_long">Il testo inserito è troppo lungo</string>
+  <string name="show_onboarding">Mostra l\'aiuto</string>
   <!--Contacts and Private Conversations-->
   <string name="date_no_private_messages">Nessun messaggio.</string>
   <string name="message_hint">Scrivi un messaggio</string>
@@ -112,15 +116,30 @@
   </plurals>
   <!--Private Groups-->
   <string name="groups_created_by">Creato da %s</string>
+  <string name="groups_group_is_empty">Questo gruppo e\' vuoto</string>
+  <string name="groups_group_is_dissolved">Questo gruppo e\' stato sciolto</string>
   <string name="groups_remove">Rimuovere</string>
   <string name="groups_create_group_title">Crea gruppo privato</string>
   <string name="groups_create_group_button">Crea gruppo</string>
   <string name="groups_create_group_invitation_button">Invia invito</string>
+  <string name="groups_create_group_hint">Inserisci un nome per il tuo gruppo privato</string>
+  <string name="groups_invitation_sent">Invito a partecipare al gruppo spedito</string>
+  <string name="groups_compose_message">Scrivi un messaggio</string>
   <string name="groups_message_sent">Messaggio inviato</string>
   <string name="groups_member_list">Lista membri</string>
   <string name="groups_invite_members">Invita Membri</string>
+  <string name="groups_member_created_you">Hai creato un nuovo gruppo</string>
+  <string name="groups_member_created">%s e\' il creatore del gruppo.</string>
   <string name="groups_leave">Lascia gruppo</string>
+  <string name="groups_leave_dialog_title">Abbandonare il gruppo</string>
+  <string name="groups_leave_dialog_message">Sei sicuro di voler abbandonare questo gruppo?</string>
+  <string name="groups_dissolve">Sciogli il gruppo</string>
+  <string name="groups_dissolve_dialog_title">Conferma lo scioglimento del gruppo</string>
+  <string name="groups_dissolve_button">Sciogli</string>
   <!--Private Group Invitations-->
+  <string name="groups_invitations_title">Inviti spediti</string>
+  <string name="groups_invitations_joined">Unito al gruppo</string>
+  <string name="groups_invitations_declined">Invito al gruppo rifiutato</string>
   <!--Private Groups Revealing Contacts-->
   <!--Forums-->
   <string name="create_forum_title">Nuovo Forum</string>
@@ -143,12 +162,14 @@
   <string name="forum_left_toast">Forum lasciato</string>
   <!--Forum Sharing-->
   <string name="forum_share_button">Condividi Forum</string>
+  <string name="contacts_selected">Contatti selezionati</string>
   <string name="activity_share_toolbar_header">Scegli Contatti</string>
   <string name="forum_shared_snackbar">Forum condiviso con i contatti scelti</string>
   <string name="forum_share_error">C\'è stato un errore nella condivisione di questo forum.</string>
   <string name="forum_invitation_received">%1$s ha condiviso il forum \"%2$s\" con te.</string>
   <string name="forum_invitation_sent">Hai condiviso il forum \"%1$s\" con %2$s.</string>
   <string name="forum_invitations_title">Inviti Forum</string>
+  <string name="forum_joined_toast">Unito al forum</string>
   <string name="forum_declined_toast">Invito al forum declinato</string>
   <string name="shared_by_format">Condiviso da %s</string>
   <string name="forum_invitation_already_sharing">Già in condivisione</string>
@@ -201,9 +222,6 @@
   <string name="network_settings_title">Network</string>
   <string name="bluetooth_setting">Connessione attraverso Bluetooth</string>
   <string name="bluetooth_setting_disabled">Solo con l\'aggiunta di contatti</string>
-  <string name="tor_mobile_setting">Connetti via Tor</string>
-  <string name="tor_mobile_setting_enabled">Nel caso di uso Wi-Fi o dati mobile</string>
-  <string name="tor_mobile_setting_disabled">Solo quando in uso il Wi-Fi</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Sicurezza</string>
   <string name="change_password">Cambia password</string>
@@ -214,6 +232,8 @@
   <string name="panic_setting_title">Pulsante panico</string>
   <string name="unknown_app">un\'app sconosciuta</string>
   <string name="panic_app_setting_summary">Nessun app è stata impostata</string>
+  <string name="panic_app_setting_none">Nessuno</string>
+  <string name="lock_setting_title">Esci</string>
   <string name="purge_setting_title">Elimina Account</string>
   <string name="uninstall_setting_title">Disinstalla Briar</string>
   <!--Settings Notifications-->
@@ -224,6 +244,7 @@
   <string name="notify_vibration_setting">Vibrazione</string>
   <string name="notify_sound_setting">Suono</string>
   <string name="notify_sound_setting_default">Suoneria di default</string>
+  <string name="notify_sound_setting_disabled">Nessuno</string>
   <string name="choose_ringtone_title">Scegli suoneria</string>
   <!--Settings Feedback-->
   <!--Link Warning-->
diff --git a/briar-android/src/main/res/values-pt-rBR/strings.xml b/briar-android/src/main/res/values-pt-rBR/strings.xml
index c1c7490e20..51bda22194 100644
--- a/briar-android/src/main/res/values-pt-rBR/strings.xml
+++ b/briar-android/src/main/res/values-pt-rBR/strings.xml
@@ -290,9 +290,6 @@
   <string name="bluetooth_setting">Conectar via Bluetooth</string>
   <string name="bluetooth_setting_enabled">Sempre que estiver perto de contatos</string>
   <string name="bluetooth_setting_disabled">Somente quando adicionando contatos</string>
-  <string name="tor_mobile_setting">Conectar via Tor</string>
-  <string name="tor_mobile_setting_enabled">Quando utilizar Wi-Fi ou rede de dados</string>
-  <string name="tor_mobile_setting_disabled">Somente quando utilizar Wi-Fi</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Segurança</string>
   <string name="change_password">Mudar Senha</string>
diff --git a/briar-android/src/main/res/values-sq/strings.xml b/briar-android/src/main/res/values-sq/strings.xml
index d62d7821c0..72beba0aa9 100644
--- a/briar-android/src/main/res/values-sq/strings.xml
+++ b/briar-android/src/main/res/values-sq/strings.xml
@@ -290,9 +290,10 @@
   <string name="bluetooth_setting">Lidhu përmes Bluetooth-i</string>
   <string name="bluetooth_setting_enabled">Kurdo që kontaktet janë këtej pari</string>
   <string name="bluetooth_setting_disabled">Vetëm kur shtohen kontakte</string>
-  <string name="tor_mobile_setting">Lidhu përmes Tor-i</string>
-  <string name="tor_mobile_setting_enabled">Kur përdoret Wi-Fi ose të dhëna celulari</string>
-  <string name="tor_mobile_setting_disabled">Vetëm kur përdoret Wi-Fi</string>
+  <string name="tor_network_setting">Lidhu përmes Tor-i</string>
+  <string name="tor_network_setting_never">Kurrë</string>
+  <string name="tor_network_setting_wifi">Vetëm kur përdoret Wi-Fi</string>
+  <string name="tor_network_setting_always">Kur përdoret Wi-Fi ose të dhëna celulari</string>
   <!--Settings Security and Panic-->
   <string name="security_settings_title">Siguri</string>
   <string name="change_password">Ndryshoni fjalëkalimin</string>
-- 
GitLab