From 82385e38f67ef897598482709bd9a9a6e20223df Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 9 Feb 2017 20:14:44 +0100
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-bg/strings.xml     | 1 +
 src/main/res/values-de/strings.xml     | 1 +
 src/main/res/values-fr/strings.xml     | 9 +++++++++
 src/main/res/values-hu/strings.xml     | 8 ++++----
 src/main/res/values-it/strings.xml     | 1 +
 src/main/res/values-ja/strings.xml     | 1 +
 src/main/res/values-nl/strings.xml     | 1 +
 src/main/res/values-ro-rRO/strings.xml | 1 +
 8 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 2a512382e..89b1abf3b 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -698,5 +698,6 @@
   <string name="pref_automatically_delete_messages">Автоматично изтриване на съобщенията</string>
   <string name="pref_automatically_delete_messages_description">Автоматично изтриване на съобщенията от това устройство, които са по-стари от зададеното време.</string>
   <string name="encrypting_message">Шифроване на съобщението</string>
+  <string name="not_fetching_history_retention_period">Съобщенията не се изтеглят поради местния период на задържане.</string>
   <string name="transcoding_video_progress">Компресиране на видеото (%s%%)</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 20528ebb6..c10d47bf4 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -698,5 +698,6 @@
   <string name="pref_automatically_delete_messages">Automatische Nachrichtenlöschung</string>
   <string name="pref_automatically_delete_messages_description">Lösche Nachrichten automatisch, wenn diese älter sind als die eingestellte Zeit.</string>
   <string name="encrypting_message">Nachricht wird verschlüsselt</string>
+  <string name="not_fetching_history_retention_period">Nachrichten werden aufgrund der eingestellten lokalen Speicherfrist nicht abgerufen. </string>
   <string name="transcoding_video_progress">Video wird komprimiert (%s%% abgeschlossen)</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index d32e6f85a..127ea7f46 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -691,4 +691,13 @@
   <string name="hide_inactive_devices">Masquer les appareils inactifs</string>
   <string name="distrust_omemo_key">Ne plus faire confiance à cet appareil</string>
   <string name="distrust_omemo_key_text">Êtes-vous sûr de vouloir supprimer la vérification pour cet appareil ?\nCet appareil et les messages qui en proviennent seront marqués comme n\'étant pas dignes de confiance.</string>
+  <string name="timeout_24_hours">24 heures</string>
+  <string name="timeout_7_days">7 jours</string>
+  <string name="timeout_30_days">30 jours</string>
+  <string name="timeout_6_months">6 mois</string>
+  <string name="pref_automatically_delete_messages">Suppression messages auto</string>
+  <string name="pref_automatically_delete_messages_description">Efface automatiquement de cet appareil les messages plus anciens que l\'intervalle choisi.</string>
+  <string name="encrypting_message">Chiffrement du message en cours</string>
+  <string name="not_fetching_history_retention_period">Aucun message récupéré, en raison de la configuration de rétention de l\'appareil.</string>
+  <string name="transcoding_video_progress">Compression de la vidéo en cours (%s%% effectués)</string>
 </resources>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 47aca491e..a3d426d31 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -52,7 +52,7 @@
   <string name="cancel">Mégse</string>
   <string name="set">Beállít</string>
   <string name="add">Hozzáad</string>
-  <string name="edit">Szerkeszt</string>
+  <string name="edit">Kész</string>
   <string name="delete">Töröl</string>
   <string name="block">Tilt</string>
   <string name="unblock">Tiltás vége</string>
@@ -148,7 +148,7 @@
   <string name="account_status_not_found">Szerver nem található</string>
   <string name="account_status_no_internet">Nincs kapcsolat</string>
   <string name="account_status_regis_fail">Regisztráció nem sikerült</string>
-  <string name="account_status_regis_conflict">Felhasználónév már foglalt</string>
+  <string name="account_status_regis_conflict">Ez a felhasználónév már foglalt</string>
   <string name="account_status_regis_success">Sikeres regisztráció</string>
   <string name="account_status_regis_not_sup">A szerver nem támogatja a regisztrációt</string>
   <string name="account_status_security_error">Biztonsági hiba</string>
@@ -251,8 +251,8 @@
   <string name="edit_subject_hint">A konferencia témája</string>
   <string name="joining_conference">Konferenciához csatlakozás...</string>
   <string name="leave">Távozás</string>
-  <string name="contact_added_you">Felhasználó hozzáadott a névjegyzékéhez</string>
-  <string name="add_back">Te is hozzáadod</string>
+  <string name="contact_added_you">Ez a felhasználó hozzáadott téged a névjegyeihez</string>
+  <string name="add_back">Én is hozzáadom</string>
   <string name="contact_has_read_up_to_this_point">%s eddig olvasta el</string>
   <string name="publish">Közzétesz</string>
   <string name="touch_to_choose_picture">Érintsd meg a piktogramot kép kiválasztásához </string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index f2bcaf863..89b8b5ff7 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -698,5 +698,6 @@
   <string name="pref_automatically_delete_messages">Eliminazione automatica messaggi</string>
   <string name="pref_automatically_delete_messages_description">Elimina automaticamente da questo dispositivo i messaggi più vecchi del lasso di tempo configurato.</string>
   <string name="encrypting_message">Cifratura del messaggio</string>
+  <string name="not_fetching_history_retention_period">Nessun recupero di messaggi a causa del periodo di conservazione locale.</string>
   <string name="transcoding_video_progress">Compressione del video (%s%% completato)</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index a2c765b89..dcf12ea50 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -695,5 +695,6 @@
   <string name="pref_automatically_delete_messages">自動メッセージ削除</string>
   <string name="pref_automatically_delete_messages_description">設定された期間よりも古いメッセージを、このデバイスから自動的に削除します。</string>
   <string name="encrypting_message">メッセージの暗号化中</string>
+  <string name="not_fetching_history_retention_period">ローカル保存期間のためにメッセージを取得しません。</string>
   <string name="transcoding_video_progress">ビデオの圧縮中 (%s%% 完了)</string>
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index bd15059de..3a4e9f149 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -698,5 +698,6 @@
   <string name="pref_automatically_delete_messages">Automatisch berichten verwijderen</string>
   <string name="pref_automatically_delete_messages_description">Verwijder automatisch berichten van dit apparaat ouder dan de ingestelde tijdsperiode.</string>
   <string name="encrypting_message">Bericht wordt versleuteld</string>
+  <string name="not_fetching_history_retention_period">Berichten worden niet opgehaald wegens lokale bewaarperiode.</string>
   <string name="transcoding_video_progress">Video wordt gecomprimeerd (%s%% voltooid)</string>
 </resources>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index d82a5248c..c1898562a 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -702,5 +702,6 @@ Emitent</string>
   <string name="pref_automatically_delete_messages">Ștergerea automată a mesajelor</string>
   <string name="pref_automatically_delete_messages_description">De pe acest dispozitiv se vor șterge dacă sunt mai vechi de perioada selectată.</string>
   <string name="encrypting_message">Mesajul se criptează</string>
+  <string name="not_fetching_history_retention_period">Politica de retenție locală împiedică descărcarea altor mesaje.</string>
   <string name="transcoding_video_progress">Se comprimă clipul video (%s%% gata)</string>
 </resources>