From 00281112b96e4b1d5a189203dc30d1c3a83094e9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 11 Jun 2018 13:36:52 +0200
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-de/strings.xml     | 2 ++
 src/main/res/values-eu/strings.xml     | 5 +++++
 src/main/res/values-it/strings.xml     | 1 +
 src/main/res/values-nl/strings.xml     | 2 ++
 src/main/res/values-pt-rBR/strings.xml | 1 +
 src/main/res/values-ro-rRO/strings.xml | 2 ++
 src/main/res/values-zh-rCN/strings.xml | 1 +
 7 files changed, 14 insertions(+)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 7bb5462d0..5a3324387 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -712,4 +712,6 @@
   <string name="copy_link">Internetadresse kopieren</string>
   <string name="copy_jabber_id">Jabber-ID kopieren</string>
   <string name="p1_s3_filetransfer">HTTP-Dateifreigabe für S3</string>
+  <string name="pref_start_search">Direkte Suche </string>
+  <string name="pref_start_search_summary">Beim Dialog \'Unterhaltung beginnen\' Tastatur öffnen und den Cursor im Suchfeld platzieren</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 456c54fc7..6d4bc8638 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -673,11 +673,15 @@
   <string name="disable_encryption">Enkriptazioa ezgaitu</string>
   <string name="error_trustkey_general">Conversationsek ezin du %1$s(r)i enkriptatutako mezuak bidali. Hau gerta daiteke zure kontaktuak zaharkitutako zerbitzari bat erabiltzen duelako edo erabiltzen ari den aplikazioak OMEMO ezin duelako kudeatu.</string>
   <string name="error_trustkey_device_list">Ezin izan da gailuen zerrenda eskuratu</string>
+  <string name="error_trustkey_bundle">Ezin izan dira gailuen bilgarriak eskuratu</string>
+  <string name="error_trustkey_hint_mutual">Lagungarria: kasu batzuetan bakoitzak bestea bere kontaktuen zerrendara gehituz konpon daiteke.</string>
+  <string name="disable_encryption_message">Ziur al zaude OMEMO enkriptazioa ezgaitu nahi duzulaz elkarrizketa honetarako?\nHonek zure zerbitzariaren administratzaileari zure mezuak irakurtzea ahalbidetuko dio, baina aplikazio zaharrak erabiltzen dituzten pertsonekin komunikatzeko modu bakarra izan daiteke.</string>
   <string name="disable_now">Orain ezgaitu</string>
   <string name="draft">Zirriborroa:</string>
   <string name="pref_omemo_setting">OMEMO enkriptazioa</string>
   <string name="pref_omemo_setting_summary_always">OMEMO beti erabiliko da biren artean eta taldeko txat pribatetuetan</string>
   <string name="pref_omemo_setting_summary_default_on">OMEMO elkarrizketa berrietan lehenetsi bezala erabiliko da</string>
+  <string name="pref_omemo_setting_summary_default_off">OMEMO esplizituki piztu beharko da elkarrizketa berrietarako</string>
   <string name="create_shortcut">Lasterbidea sortu</string>
   <string name="pref_font_size">Letraren neurria</string>
   <string name="pref_font_size_summary">Aplikazioaren barruan erabiliko den letraren neurri erlatiboa.</string>
@@ -707,4 +711,5 @@
   <string name="pref_use_share_location_plugin_summary">Erabili kokapena partekatzeko plugina mapa erabili beharrean</string>
   <string name="copy_link">Web helbidea kopiatu</string>
   <string name="copy_jabber_id">Jabber IDa kopiatu</string>
+  <string name="p1_s3_filetransfer">HTTP fitxategiak partekatzea S3rentzako</string>
 </resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index b16d025ae..7bdd5392e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -711,4 +711,5 @@
   <string name="pref_use_share_location_plugin_summary">Usa il Plugin Condivisione Posizione al posto della mappa integrata</string>
   <string name="copy_link">Copia indirizzo web</string>
   <string name="copy_jabber_id">Copia ID Jabber</string>
+  <string name="p1_s3_filetransfer">Condivisione file in HTTP per S3</string>
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index b36dff156..82c3094c5 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -712,4 +712,6 @@
   <string name="copy_link">Webadres kopiëren</string>
   <string name="copy_jabber_id">Jabber-ID kopiëren</string>
   <string name="p1_s3_filetransfer">Bestanden delen via HTTP voor S3</string>
+  <string name="pref_start_search">Rechtstreeks zoeken</string>
+  <string name="pref_start_search_summary">Open het toetsenbord op het scherm ‘Gesprek starten’ en plaats de cursor in het zoekveld</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index d278d0ae3..e4b75fff4 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -711,4 +711,5 @@
   <string name="pref_use_share_location_plugin_summary">Use o Plugin de Compartilhamento de Localização ao invés do mapa nativo</string>
   <string name="copy_link">Copiar endereço web</string>
   <string name="copy_jabber_id">Copiar ID do Jabber</string>
+  <string name="p1_s3_filetransfer">Compartilhamento de arquivos via HTTP para S3</string>
 </resources>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 853efe0f7..66dd387ee 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -723,4 +723,6 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="copy_link">Copiază adresa web</string>
   <string name="copy_jabber_id">Copiază ID Jabber</string>
   <string name="p1_s3_filetransfer">Partajare fișiere prin HTTP pentru S3</string>
+  <string name="pref_start_search">Activează direct căutarea</string>
+  <string name="pref_start_search_summary">În ecranul \"Pornește o conversație\" focalizează câmpul de căutare și arată tastatura</string>
 </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 5e092b17d..58b8a84f3 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -704,4 +704,5 @@
   <string name="pref_use_share_location_plugin_summary">使用共享位置插件而不是内置地图</string>
   <string name="copy_link">复制web地址</string>
   <string name="copy_jabber_id">复制Jabber ID</string>
+  <string name="p1_s3_filetransfer">用于S3的HTTP文件共享</string>
 </resources>