From 38e0b8d29d4e846f4216fb7829a23c8b83bdf71b Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 21 Dec 2018 15:36:34 +0100
Subject: [PATCH 1/5] update language to reflect "nearby" usage

closes #887
---
 .../org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java    | 4 ++--
 app/src/main/res/values-af/strings.xml                        | 2 --
 app/src/main/res/values-ar/strings.xml                        | 2 --
 app/src/main/res/values-ast/strings.xml                       | 2 --
 app/src/main/res/values-be/strings.xml                        | 2 --
 app/src/main/res/values-bg/strings.xml                        | 3 ---
 app/src/main/res/values-bo/strings.xml                        | 2 --
 app/src/main/res/values-ca/strings.xml                        | 2 --
 app/src/main/res/values-cs/strings.xml                        | 2 --
 app/src/main/res/values-da/strings.xml                        | 2 --
 app/src/main/res/values-de/strings.xml                        | 2 --
 app/src/main/res/values-el/strings.xml                        | 2 --
 app/src/main/res/values-eo/strings.xml                        | 2 --
 app/src/main/res/values-es/strings.xml                        | 2 --
 app/src/main/res/values-et/strings.xml                        | 2 --
 app/src/main/res/values-eu/strings.xml                        | 2 --
 app/src/main/res/values-fa/strings.xml                        | 2 --
 app/src/main/res/values-fi/strings.xml                        | 2 --
 app/src/main/res/values-fr/strings.xml                        | 2 --
 app/src/main/res/values-gl/strings.xml                        | 2 --
 app/src/main/res/values-he/strings.xml                        | 2 --
 app/src/main/res/values-hi/strings.xml                        | 2 --
 app/src/main/res/values-hr/strings.xml                        | 2 --
 app/src/main/res/values-hu/strings.xml                        | 2 --
 app/src/main/res/values-id/strings.xml                        | 2 --
 app/src/main/res/values-is/strings.xml                        | 2 --
 app/src/main/res/values-it/strings.xml                        | 2 --
 app/src/main/res/values-ja/strings.xml                        | 2 --
 app/src/main/res/values-ko/strings.xml                        | 2 --
 app/src/main/res/values-ml/strings.xml                        | 2 --
 app/src/main/res/values-nb/strings.xml                        | 2 --
 app/src/main/res/values-nl-rBE/strings.xml                    | 2 --
 app/src/main/res/values-nl/strings.xml                        | 2 --
 app/src/main/res/values-pl/strings.xml                        | 2 --
 app/src/main/res/values-pt-rBR/strings.xml                    | 2 --
 app/src/main/res/values-pt-rPT/strings.xml                    | 2 --
 app/src/main/res/values-ro/strings.xml                        | 2 --
 app/src/main/res/values-ru/strings.xml                        | 2 --
 app/src/main/res/values-sc/strings.xml                        | 2 --
 app/src/main/res/values-sk/strings.xml                        | 2 --
 app/src/main/res/values-sl/strings.xml                        | 2 --
 app/src/main/res/values-sn/strings.xml                        | 2 --
 app/src/main/res/values-sr/strings.xml                        | 2 --
 app/src/main/res/values-sv/strings.xml                        | 2 --
 app/src/main/res/values-th/strings.xml                        | 2 --
 app/src/main/res/values-tr/strings.xml                        | 2 --
 app/src/main/res/values-uk/strings.xml                        | 2 --
 app/src/main/res/values-vi/strings.xml                        | 2 --
 app/src/main/res/values-zh-rCN/strings.xml                    | 2 --
 app/src/main/res/values-zh-rHK/strings.xml                    | 2 --
 app/src/main/res/values-zh-rTW/strings.xml                    | 2 --
 app/src/main/res/values/strings.xml                           | 4 ++--
 52 files changed, 4 insertions(+), 105 deletions(-)

diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index fd8616fd3..e3b1cb276 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -424,8 +424,8 @@ public class SwapWorkflowActivity extends AppCompatActivity {
     public void startQrWorkflow() {
         if (!getService().isEnabled()) {
             new AlertDialog.Builder(this)
-                    .setTitle(R.string.swap_not_enabled)
-                    .setMessage(R.string.swap_not_enabled_description)
+                    .setTitle(R.string.not_visible_nearby)
+                    .setMessage(R.string.not_visible_nearby_description)
                     .setCancelable(true)
                     .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 0022d232e..e72a39b78 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -295,8 +295,6 @@
     <string name="swap_qr_isnt_for_swap">Die QR kode jy geskandeer het lyk nie soos \'n uitruil kode nie.</string>
     <string name="loading">Laai tans…</string>
     <string name="swap_connection_misc_error">\'n Fout het plaasgevind tydens koppeling met die toestel, dit lyk nie asof ons kan uitruil nie!</string>
-    <string name="swap_not_enabled">Uitruil nie geaktiveer nie</string>
-    <string name="swap_not_enabled_description">Voor uitruil, moet jou toestel sigbaar gemaak word.</string>
 
     <string name="install_confirm">benodig toegang tot</string>
     <string name="install_confirm_update">Wil jy \'n opdatering installeer
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index bb7fcd289..e01186afb 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -254,8 +254,6 @@
     <string name="swap_qr_isnt_for_swap">رمز الاستجابة السريعة الذي تم التقاطه لا يبدو وكأنه رمز المبادلة.</string>
     <string name="loading">يتم التحميل…</string>
     <string name="swap_connection_misc_error">حدث خطأ أثناء الاتصال بالجهاز، ولا يمكن أن يجري المبادلة معه!</string>
-    <string name="swap_not_enabled">المبادلة غير فعالة</string>
-    <string name="swap_not_enabled_description">قبل المبادلة، يجب أن يكون جهازك ظاهر.</string>
 
     <string name="install_confirm">يحتاج إلى الوصول إلى</string>
     <string name="install_confirm_update">هل تريد تحديث
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 08cc9c29c..13f19f207 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -210,7 +210,6 @@
     <string name="swap_setting_up_wifi">Configurando\'l Wi-Fi…</string>
     <string name="swap_not_visible_wifi">Invisible na Wi-Fi</string>
     <string name="swap_no_peers_nearby">Nun pudo alcontrase xente cercano cola qu\'intercambiar.</string>
-    <string name="swap_not_enabled_description">Enantes d\'intercambiar, el preséu ha ser visible.</string>
 
     <string name="install_confirm">precisa acceder a</string>
     <string name="install_confirm_update">¿Quies instalar un anovamientu d\'esta aplicación\? Los datos esistentes nun van perdese. L\'aplicación anovada va consiguir l\'accesu a:</string>
@@ -223,7 +222,6 @@
 
     <string name="perms_description_app">Forníu por %1$s.</string>
     <string name="interval_1h">Comprueba anovamientos cada hora</string>
-    <string name="swap_not_enabled">Nun s\'activó l\'intercambéu</string>
     <string name="status_processing_xml_percent">Procesando %2$s / %3$s (%4$d%%) de %1$s</string>
     <string name="unstable_updates_summary">Suxer los anovamientos a versiones inestables</string>
     <string name="wifi_ap">Puntu Wi-Fi</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index b6d138817..aa338416c 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -278,8 +278,6 @@
     <string name="swap_qr_isnt_for_swap">QR-код, які вы адсканавалі, не выглядае як код абмену.</string>
     <string name="loading">Загрузка…</string>
     <string name="swap_connection_misc_error">Здарылася памылка падчас злучэння з прыладай. Немагчыма прадоўжыць абмен!</string>
-    <string name="swap_not_enabled">Абмен не ўключаны</string>
-    <string name="swap_not_enabled_description">Перад абменам, вы павінны зрабіць прыладу бачнай.</string>
 
     <string name="install_confirm">патрабуе доступ да</string>
     <string name="install_confirm_update">Хочаце ўсталяваць абнаўленне праграмы? Наяўныя дадзеныя не будуць выдалены. Абноўленная праграма атрымае доступ да:</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 54a23f44a..97ed1e692 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -200,10 +200,7 @@
     <string name="swap_not_visible_wifi">Не сте видими чрез Wi-Fi</string>
     <string name="swap_setting_up_wifi">Настройване на Wi-Fi…</string>
     <string name="swap_setting_up_bluetooth">Настройване на Bluetooth…</string>
-    <string name="swap_not_enabled_description">Преди да осъществите размяна вашето устройство трябва да бъде видимо.
-    </string>
 
-    <string name="swap_not_enabled">Забранена размяна</string>
     <string name="swap_nearby">Размяна с устройства наоколо</string>
     <string name="local_repo_running">F-Droid e в готовност за размяна</string>
     <string name="touch_to_configure_local_repo">Натиснете за детайли или да позволите размяна на приложение.</string>
diff --git a/app/src/main/res/values-bo/strings.xml b/app/src/main/res/values-bo/strings.xml
index 33c4fe15c..64ab4a86f 100644
--- a/app/src/main/res/values-bo/strings.xml
+++ b/app/src/main/res/values-bo/strings.xml
@@ -295,8 +295,6 @@
     <string name="swap_qr_isnt_for_swap">ཁྱེད་རང་གིས་འཚག་རྒྱག་པའི་QR ཨང་རྟགས་འདི་བརྗེ་ལེན་ཨང་རྟགས་དང་འདྲ་མཚུངས་མིན་འདུག</string>
     <string name="loading">བཅུག་བཞིན་པ།..…</string>
     <string name="swap_connection_misc_error">ཡོ་བྱད་ལ་མཐུད་པའི་སྐབས་སུ་སྐྱོན་ཤོར་སོང་བས་དེ་དང་མཉམ་དུ་བརྗེ་ལེན་བྱེད་ཐུབ་ཀྱི་མིན་འདུག!</string>
-    <string name="swap_not_enabled">བརྗེ་ལེན་སྒོ་ཕྱེས་མིན་འདུག</string>
-    <string name="swap_not_enabled_description">བརྗེ་ལེན་མ་བྱེད་གོང་ལ་ཁྱེད་རང་གི་ཡོ་བྱད་དེ་ངེས་པར་དུ་མཐོང་ཐུབ་པ་བཟོ་དགོས།</string>
 
     <string name="install_confirm">འདི་ལྟ་ཐུབ་པ་དགོས།</string>
     <string name="bluetooth_activity_not_found">བྷུ་ལུ་ཊུཐ་གཏོང་ཐབས་རྙེད་མ་སོང་། གཅིག་འདེམས།!</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 81da23043..22d89a407 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -247,8 +247,6 @@
     <string name="swap_qr_isnt_for_swap">El codi QR que heu escanejat no sembla un codi d\'intercanvi.</string>
     <string name="loading">S\'està carregant…</string>
     <string name="swap_connection_misc_error">S\'ha produït un error en connectar-se al dispositiu. No us podeu connectar!</string>
-    <string name="swap_not_enabled">Intercanvi no activat</string>
-    <string name="swap_not_enabled_description">Abans d\'intercanviar heu de fer visible el dispositiu.</string>
 
     <string name="install_confirm">necessita accés a</string>
     <string name="install_confirm_update">Voleu instal·lar una actualització d\'aquesta aplicació? Les dades existents no es perdran. L\'aplicació actualitzada tindrà accés a:</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 7d63638b8..ee50e5f45 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -224,8 +224,6 @@
     <string name="swap_confirm">Potvrdit výměnu</string>
     <string name="swap_qr_isnt_for_swap">Naskenovaný QR kód nevypadá jako výměnný kód.</string>
     <string name="loading">Načítání…</string>
-    <string name="swap_not_enabled">Výměna není povolena</string>
-    <string name="swap_not_enabled_description">Před výměnou je třeba zviditelnit přístroj.</string>
 
     <string name="install_confirm">vyžaduje přístup k</string>
 
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 3b5d464f2..a49881846 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -245,8 +245,6 @@
     <string name="swap_qr_isnt_for_swap">Den QR-kode du skannede ligner ikke en udvekslingskode.</string>
     <string name="loading">Indlæser…</string>
     <string name="swap_connection_misc_error">Der opstod en fejl under forbindelsen til enheden, kan udveksle med den!</string>
-    <string name="swap_not_enabled">Udveksling ikke aktiveret</string>
-    <string name="swap_not_enabled_description">Inden udveksling skal din enhed gøres synlig.</string>
 
     <string name="install_confirm">kræver adgang til</string>
     <string name="install_confirm_update">Vil du installere en opdatering til eksisterende app? Dine eksisterende data vil ikke gå tabt. Den opdaterede app vil få adgang til:</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f1a88c614..65b827bfd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -242,8 +242,6 @@
     <string name="swap_nearby">Tausch in der Nähe</string>
     <string name="loading">Ladevorgang …</string>
     <string name="swap_connection_misc_error">Fehler bei der Verbindungsaufnahme zum Zielgerät. Tausch ist nicht möglich!</string>
-    <string name="swap_not_enabled">Tauschen ist nicht aktiviert</string>
-    <string name="swap_not_enabled_description">Vor dem Tausch muss Ihr Gerät sichtbar gemacht werden.</string>
 
     <string name="install_confirm">benötigt Zugriff auf</string>
     <string name="install_confirm_update">Wollen Sie eine Aktualisierung dieser Anwendung installieren? Ihre bestehenden
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 5fa8c0d3d..d06a9e79f 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -228,8 +228,6 @@
     <string name="swap_qr_isnt_for_swap">Ο κώδικας QR που σαρώσατε δεν μοιάζει με έναν κωδικό ανταλλαγής.</string>
     <string name="loading">Φόρτωση…</string>
     <string name="swap_connection_misc_error">Παρουσιάστηκε σφάλμα κατά τη σύνδεση με την συσκευή, φαίνεται ότι δεν μπορούμε να ανταλλάξουμε με αυτή!</string>
-    <string name="swap_not_enabled">Η ανταλλαγή δεν είναι ενεργοποιημένη</string>
-    <string name="swap_not_enabled_description">Πριν από την ανταλλαγή, η συσκευή σας πρέπει να προβάλλεται.</string>
 
     <string name="install_confirm">χρειάζεται πρόσβαση σε</string>
     <string name="install_confirm_update">Θέλετε να ενημερώσετε αυτήν την εφαρμογή;
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index dd3d7eea9..498671650 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -243,8 +243,6 @@
     <string name="swap_qr_isnt_for_swap">La skanita QR-kodo ne estas interŝanĝa kodo.</string>
     <string name="loading">Prilaborado…</string>
     <string name="swap_connection_misc_error">Eraro okazis dum konektado al aparato, ne povas interŝanĝi kun ĝi!</string>
-    <string name="swap_not_enabled">Interŝanĝo malaktiva</string>
-    <string name="swap_not_enabled_description">Antaŭ interŝanĝo via aparato devas esti videbla.</string>
 
     <string name="install_confirm">postulas permeson al</string>
     <string name="install_confirm_update">Ĉu vi volas instali ĝisdatigon al tiu ĉi aplikaĵo? Viaj nunaj datumoj ne foriĝos. La ĝisdatigita aplikaĵo povos aliri al:</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index dc3f9de36..b679a9d43 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -211,8 +211,6 @@
     <string name="swap_qr_isnt_for_swap">El código QR escaneado no parece un código de intercambio.</string>
     <string name="loading">Cargando…</string>
     <string name="swap_connection_misc_error">Ocurrió un error mientras se conectaba al dispositivo. ¡No podemos intercambiar con él!</string>
-    <string name="swap_not_enabled">Intercambio no activado</string>
-    <string name="swap_not_enabled_description">Antes de intercambiar, el dispositivo debe ser visible.</string>
 
     <string name="install_confirm">¿Quiere instalar esta aplicación? Tendrá acceso a</string>
     <string name="install_confirm_update">¿Quieres instalar una actualización de
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 7d0cb601a..ebcec4377 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -271,8 +271,6 @@
     <string name="swap_confirm">Kinnita vahetus</string>
     <string name="swap_qr_isnt_for_swap">Skannitud QR-kood ei paista olevat vahetamise kood.</string>
     <string name="loading">Laadimine…</string>
-    <string name="swap_not_enabled">Vahetamine ei ole lubatud</string>
-    <string name="swap_not_enabled_description">Enne vahetamist pead tegema seadme nähtavaks.</string>
 
     <string name="install_confirm">vajab juurdepääsu</string>
     <string name="newPerms">Uus</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index ce67f3953..b49ff7dfe 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -254,8 +254,6 @@
     </string>
     <string name="swap_qr_isnt_for_swap">Eskaneatu duzun QR kodea ez diruri truke kode bat.</string>
     <string name="swap_connection_misc_error">Errore bat gertatu da gailura konektatzean, ezin dugu honekin trukatu!</string>
-    <string name="swap_not_enabled">Trukea ez dago gaituta</string>
-    <string name="swap_not_enabled_description">Trukatu aurretik, gailua ikusgai jarri behar duzu.</string>
 
     <string name="install_confirm">baimen hauek behar ditu</string>
     <string name="install_confirm_update">Aurretik dagoen aplikazio honen bertsio berriagoa
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 866f147cd..8a6a64117 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -251,8 +251,6 @@
     <string name="swap_qr_isnt_for_swap">رمز QR ای که اسکن کردید، شبیه یک رمز تبادل نیست.</string>
     <string name="loading">در حال بارگزاری…</string>
     <string name="swap_connection_misc_error">هنگام اتّصال به دستگاه خطایی رخ داد، نمی‌توان تبادل کرد!</string>
-    <string name="swap_not_enabled">تبادل فعّال نیست</string>
-    <string name="swap_not_enabled_description">پیش از تبادل، دستگاهتان باید قابل مشاهده باشد.</string>
 
     <string name="install_confirm">نیازمند دسترسی به</string>
     <string name="install_confirm_update">می‌خواهید به‌روزرسانی‌ای برای این کاره نصب کنید؟ داده‌های موجودتان از بین نخواهند رفت. کارهٔ به‌روز شده دسترسی‌های زیر را خواهد داشت:</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 14d52c705..3d8355274 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -278,8 +278,6 @@
     <string name="swap_confirm">Vahvista vaihto</string>
     <string name="swap_qr_isnt_for_swap">Skannaamasi QR-koodi ei näytä vaihtamiseen tarkoitetulta koodilta.</string>
     <string name="swap_connection_misc_error">Tapahtui virhe yhdistettäessä laitteeseen, vaihtaminen ei onnistu!</string>
-    <string name="swap_not_enabled">Vaihtaminen ei ole käytössä</string>
-    <string name="swap_not_enabled_description">Ennen vaihtamista, laitteesi täytyy tehdä näkyväksi.</string>
 
     <string name="install_confirm">tarvitsee luvan käyttää</string>
     <string name="install_confirm_update">Haluatko asentaa päivityksen tähän olemassa olevaan sovellukseen? Nykyiset tietosi eivät häviä. Päivitetty sovellus saa luvan käyttää:</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 723ec2949..089d299af 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -234,7 +234,6 @@
     <string name="swap_connecting">Connexion en cours</string>
     <string name="swap_confirm">Confirmez l\'échange</string>
     <string name="swap_qr_isnt_for_swap">Le code QR que vous avez scanné ne semble pas être un code d\'échange.</string>
-    <string name="swap_not_enabled_description">Votre appareil doit être visible avant de pouvoir commencer l\'échange.</string>
 
     <string name="interval_1h">Vérifier les mises à jour toutes les heures</string>
     <string name="perms_description_app">Fourni par %1$s.</string>
@@ -252,7 +251,6 @@
 
     <string name="swap_cant_find_peers">Vous n\'arrivez pas à trouver ce que vous cherchez ?</string>
     <string name="swap_connection_misc_error">Une erreur a eu lieu lors de la connexion à l\'appareil, impossible de faire l\'échange !</string>
-    <string name="swap_not_enabled">Échange désactivé</string>
     <string name="category_Time">Temps</string>
     <string name="more">Plus</string>
     <string name="less">Moins</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 6ce21ed91..9d1bd5402 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -261,8 +261,6 @@
         intercambio.
     </string>
     <string name="swap_connection_misc_error">Ocurriu un erro durante a conexión co dispositivo, non se pode realizar o intercambio!</string>
-    <string name="swap_not_enabled">Intercambio non dispoñible</string>
-    <string name="swap_not_enabled_description">Antes do intercambio, o teu dispositivo debe estar visible.</string>
 
     <string name="install_confirm">require acceso a</string>
     <string name="install_confirm_update">Desexas instalar unha actualización deste aplicativo existente? Os teus datos existentes non se perderán. A actualización require acceso a:</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 7ac9765d7..e2cc94966 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -227,8 +227,6 @@
     <string name="swap_send_fdroid">שליחת F-Droid</string>
     <string name="swap_confirm">אימות ההחלפה</string>
     <string name="swap_qr_isnt_for_swap">קוד ה־QR שסרקת לא נראה כמו קוד החלפה.</string>
-    <string name="swap_not_enabled">ההחלפה מנוטרלת</string>
-    <string name="swap_not_enabled_description">בטרם ביצוע החלפה, על מכשירך להיות גלוי.</string>
 
     <string name="swap_intro">ניתן להתחבר ולהחליף יישומונים עם אנשים בקרבתך.</string>
     <string name="swap_no_peers_nearby">אין אפשרות למצוא אנשים בקרבת מקום כדי להחליף עמם.</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 450de200d..7260b096e 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -84,9 +84,7 @@
     <string name="allPerms">सब</string>
     <string name="newPerms">नया</string>
     <string name="install_confirm">क्या आप यह एप्लीकेशन इनस्टॉल करना चाहते हैं? ये पहुंच मिल जाएगी:</string>
-    <string name="swap_not_enabled_description">अदला-बदली से पहले, आपका यन्त्र दिखाई देना चाइये|</string>
 
-    <string name="swap_not_enabled">अदला-बदली आसक्षम</string>
     <string name="loading">लोड हो रहा है…</string>
     <string name="swap_connection_misc_error">यन्त्र को जोड़ने मैं एक समस्या आ गयी| यन्त्र से अदला-बदली नहीं हो सकती|
     </string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 645ea4d79..daf24b42c 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -279,8 +279,6 @@
     <string name="swap_connection_misc_error">Došlo je do greške prilikom spajanja na uređaj, čini se da razmjena nije
         moguća.
     </string>
-    <string name="swap_not_enabled">Razmjena nije omogućena</string>
-    <string name="swap_not_enabled_description">Vaš uređaj mora biti vidljiv prije razmjene.</string>
 
     <string name="install_confirm">treba pristup</string>
     <string name="install_confirm_update">Želite li ažurirati ovu postojeću aplikaciju?
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e65c6aa62..e7dd01c89 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -433,8 +433,6 @@
     <string name="swap_confirm">Csere megerősítése</string>
     <string name="swap_qr_isnt_for_swap">A beolvasott QR-kód nem tűnik cserekódnak.</string>
     <string name="swap_connection_misc_error">Hiba történt az eszközhöz kapcsolódás során, nem lehet vele cserélni!</string>
-    <string name="swap_not_enabled">A csere nem engedélyezett</string>
-    <string name="swap_not_enabled_description">A csere előtt láthatóvá kell tennie az eszközét.</string>
 
     <string name="perms_description_app">A(z) %1$s által biztosítva.</string>
     <string name="tts_category_name">Kategória %1$s</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 3f71fb500..838227e72 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -261,8 +261,6 @@
     <string name="swap_qr_isnt_for_swap">Kode QR yang kamu pindai tidak terlihat seperti kode swap.</string>
     <string name="loading">Memuat…</string>
     <string name="swap_connection_misc_error">Galat terjadi ketika menyambungkan ke perangkat, tidak bisa melakukan pertukaran!</string>
-    <string name="swap_not_enabled">Swap dinonaktifkan</string>
-    <string name="swap_not_enabled_description">Sebelum swap, perangkat anda harus dibuat terlihat.</string>
 
     <string name="install_confirm">butuh akses ke</string>
     <string name="install_confirm_update">Apakah Anda ingin memasang pembaruan ke apl ini? Data yang ada tidak akan hilang. Aplikasi yang diperbarui akan mendapatkan akses ke:</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 4f28673c0..ebff24f8d 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -206,7 +206,6 @@
     <string name="swap_connecting">Tengist</string>
     <string name="swap_confirm">Staðfesta býtti</string>
     <string name="loading">Hleð inn…</string>
-    <string name="swap_not_enabled">Forritabýtti eru óvirk</string>
     <string name="install_confirm">þarf aðgang að</string>
     <string name="newPerms">Nýtt</string>
     <string name="allPerms">Allt</string>
@@ -327,7 +326,6 @@
     <string name="swap_join_this_hotspot">Hjálpaðu vini þínum að tengjast tengipunktinum þínum</string>
     <string name="swap_scan_or_type_url">Einn aðili þarf að skanna QR-kóðann, eða slá slóð hins inn í vafra.</string>
     <string name="swap_connection_misc_error">Villa kom upp við að tengjast við tækið, ekki er hægt að nota það við býtti!</string>
-    <string name="swap_not_enabled_description">Áður en farið er í að býtta þarf að gera tækið þitt sýnilegt.</string>
 
     <string name="install_confirm_update">Viltu setja inn uppfærslu á þessu forriti? Fyrirliggjandi gögn sem þú átt
         tapast ekki.
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5c5da5968..4a0449fdb 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -207,7 +207,6 @@
     <string name="uninstall_update_confirm">Vuoi sostituire questa app con la sua versione originale?</string>
     <string name="perm_costs_money">Questo potrebbe essere a pagamento</string>
     <string name="newPerms">Nuovo</string>
-    <string name="swap_not_enabled_description">Prima dello scambio, il tuo dispositivo deve essere visibile.</string>
 
     <string name="swap_confirm">Conferma lo scambio</string>
     <string name="swap_qr_isnt_for_swap">Il codice QR che hai scansionato non sembra essere un codice di scambio.
@@ -280,7 +279,6 @@
     </string>
     <string name="swap_send_fdroid">Invia F-Droid</string>
     <string name="swap_connection_misc_error">È avvenuto un errore durante la connessione al dispositivo, non sembra possibile effettuare lo scambio!</string>
-    <string name="swap_not_enabled">Scambio non abilitato</string>
     <string name="install_confirm_update_no_perms">Vuoi installare una versione aggiornata
         di questa app? I dati presenti
         non saranno rimossi. Non è richiesto alcun accesso speciale.
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3bb9bd65b..ed08053a6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -194,8 +194,6 @@
     <string name="downloading">ダウンロード中</string>
 
     <string name="swap_connection_misc_error">端末への接続中にエラーが発生しました。交換できません！</string>
-    <string name="swap_not_enabled">交換が無効です</string>
-    <string name="swap_not_enabled_description">交換する前に、お使いの端末が表示されている必要があります。</string>
 
     <string name="install_confirm">アクセス権限が必要</string>
     <string name="install_confirm_update">インストール済みのアプリにアップデートをインストールしますか？既存のデータは失われません。更新されたアプリの権限:</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 65ca4cbb0..8cbbfae29 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -225,8 +225,6 @@
     <string name="swap_qr_isnt_for_swap">스캔한 QR 코드는 교환 코드가 아닌 것으로 파악됩니다.</string>
     <string name="loading">불러오는 중…</string>
     <string name="swap_connection_misc_error">장치에 연결하는 동안 오류가 발생했습니다. 교환할 수 없습니다!</string>
-    <string name="swap_not_enabled">교환이 활성화되어 있지 않음</string>
-    <string name="swap_not_enabled_description">교환을 하기 전에, 당신의 장치가 보여져야 합니다.</string>
 
     <string name="install_confirm">다음에의 접근 권한이 필요합니다</string>
     <string name="install_confirm_update">기존 이 앱의 업데이트를 설치하시겠습니까? 기존의 데이터는 사라지지 않을 것입니다. 업데이트된 앱은 다음에 접근할 수 있습니다:</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index c3797ccfe..48690a116 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -307,8 +307,6 @@
     <string name="swap_qr_isnt_for_swap">നിങ്ങൾ സ്കാന്‍ ചെയ്ത QR കോഡ് ഒരു സ്വാപ്പ് കോഡ് പോലെ തോന്നുന്നില്ല.</string>
     <string name="loading">ലോഡുചെയ്യുന്നു…</string>
     <string name="swap_connection_misc_error">ഉപകരണത്തിലേക്ക് കണക്റ്റുചെയ്യുമ്പോൾ പിശക് സംഭവിച്ചു, അതുമായി കെെമാറ്റം ചെയ്യാന്‍ പറ്റുന്നില്ല!</string>
-    <string name="swap_not_enabled">കെെമാറ്റം സജ്ജമല്ല</string>
-    <string name="swap_not_enabled_description">കെെമാറ്റം ചെയ്യുന്നതിനു മ‌ുമ്പ് നിങ്ങളുടെ ഉപകരണം ദൃശ്യമാക്കേണ്ടതുണ്ട്.</string>
 
     <string name="install_confirm">അനുമതി ആവശ്യമുണ്ട്</string>
     <string name="allPerms">എല്ലാം</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 9e8e65cc7..076bc7336 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -250,8 +250,6 @@
     <string name="swap_connection_misc_error">En feil inntraff under tilkobling til enheten, klarer ikke å sirkulere med
         den.
     </string>
-    <string name="swap_not_enabled">Sirkulering ikke påskrudd</string>
-    <string name="swap_not_enabled_description">Før sirkulering må din enhet være i synlig modus.</string>
 
     <string name="install_confirm_update">Ønsker du å installere en oppdatering
         til dette eksisterende programmet? Dataen du har vil ikke
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 6980d235d..7bf3b063e 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -369,8 +369,6 @@
     <string name="use_bluetooth">Bluetooth gebruiken</string>
     <string name="loading">Laden…</string>
     <string name="swap_connection_misc_error">Fout bij verbinden met apparaat, we kunnen der niet mee uitwisselen!</string>
-    <string name="swap_not_enabled">Uitwisselen niet ingeschakeld</string>
-    <string name="swap_not_enabled_description">Vooraleer dat we kunnen uitwisselen moet het apparaat zichtbaar gemaakt worden.</string>
     <string name="swap_toast_invalid_url">Ongeldigen URL voor uitwisselen: %1$s</string>
     <string name="swap_toast_hotspot_enabled">Wifi-hotspot ingeschakeld</string>
     <string name="swap_toast_could_not_enable_hotspot">Kon wifi-hotspot niet inschakelen!</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2a8b581c4..5362f48d2 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -206,8 +206,6 @@
     <string name="swap_qr_isnt_for_swap">De QR-code die je gescand hebt lijkt geen uitwisselcode te zijn.</string>
     <string name="loading">Laden…</string>
     <string name="swap_connection_misc_error">Fout bij verbinden met apparaat, we kunnen er niet mee uit te wisselen!</string>
-    <string name="swap_not_enabled">Uitwisselen niet ingeschakeld</string>
-    <string name="swap_not_enabled_description">Voordat we kunnen uitwisselen moet het apparaat zichtbaar gemaakt worden.</string>
 
     <string name="install_confirm">heeft toegang nodig tot</string>
     <string name="install_confirm_update">Wil je een update voor deze app installeren? De bestaande gegevens zullen niet verloren gaan. De geüpdatete app zal toegang krijgen tot:</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 68a1cbb2a..3d7abc534 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -212,8 +212,6 @@
     <string name="swap_qr_isnt_for_swap">Kod QR który został zeskanowany nie wygląda na kod do wymiany aplikacji.</string>
     <string name="loading">Ładowanie…</string>
     <string name="swap_connection_misc_error">Wystąpił błąd podczas łączenia się z urządzeniem wymiana nie powiodła się!</string>
-    <string name="swap_not_enabled">Wymiana nie jest włączona</string>
-    <string name="swap_not_enabled_description">Przed wymiana, musisz ustawić swoje urządzenie jako widoczne.</string>
 
     <string name="install_confirm">wymaga dostępu do</string>
     <string name="install_confirm_update">Czy chcesz zaktualizować tą aplikację? Aktualizacja dostanie dostęp do:
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index bbb47304d..a9369ceb9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -216,8 +216,6 @@
     <string name="swap_qr_isnt_for_swap">O código QR que você escaneou não parece com um código de permuta.</string>
     <string name="loading">Carregando…</string>
     <string name="swap_connection_misc_error">Ocorreu um erro ao conectar o dispositivo, não foi possível trocar com ele!</string>
-    <string name="swap_not_enabled">Permuta não habilitada</string>
-    <string name="swap_not_enabled_description">Antes de permutar, seu dispositivo deve estar visível.</string>
 
     <string name="install_confirm">necessário acesso à</string>
     <string name="install_confirm_update">Você quer instalar uma atualização para este aplicativo já existente? Seus dados não serão perdidos. O aplicativo atualizado terá acesso a:</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index a4a154336..86098568c 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -263,8 +263,6 @@
     <string name="swap_confirm">Confirmação de troca</string>
     <string name="swap_qr_isnt_for_swap">O código QR digitalizado não parece ser um código de troca.</string>
     <string name="swap_connection_misc_error">Ocorreu um erro ao estabelecer a ligação e não será possível a troca!</string>
-    <string name="swap_not_enabled">Troca não ativa</string>
-    <string name="swap_not_enabled_description">Antes de trocar, o seu dispositivo tem que estar disponível.</string>
 
     <string name="install_confirm">requer acesso a</string>
     <string name="more">Mais</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 0d2667a07..8b5f68af7 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -230,7 +230,6 @@
     <string name="interval_1w">Verificare actualizări săptămânal</string>
     <string name="interval_1d">Verificare actualizări zilnic</string>
     <string name="interval_12h">Verificare actualizări o dată la 12 ore</string>
-    <string name="swap_not_enabled">Schimbul nu este activat</string>
     <string name="swap_not_visible_wifi">Nu este vizibil prin Wi-Fi</string>
     <string name="enable_proxy_summary">Configurează proxy HTTP pentru toate conexiunile de rețea</string>
     <string name="repos_unchanged">Toate depozitele sunt actualizate</string>
@@ -435,7 +434,6 @@
     <string name="swap_scan_or_type_url">O persoană trebuie să scaneze codul sau să introducă URL-ul celuilalt într-un browser.</string>
     <string name="swap_qr_isnt_for_swap">Codul QR scanat nu arată ca un cod de schimb.</string>
     <string name="swap_connection_misc_error">Eroare produsă în timpul conectării la dispozitiv, nu se poate face schimbul!</string>
-    <string name="swap_not_enabled_description">Înaintea schimbului, dispozitivul tău trebuie făcut vizibil.</string>
 
     <string name="app_details__incompatible_mismatched_signature">Semnătură diferită de cea instalată</string>
     <string name="app_details__no_versions__show_incompat_versions">Pentru a afișa aici și versiunile incompatibile, activați setarea \"%1$s\".</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 64a509328..78e25b67f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -273,8 +273,6 @@
     <string name="swap_confirm">Подтвердить обмен</string>
     <string name="swap_qr_isnt_for_swap">QR-код, который вы отсканировали, не похож на код обмена.</string>
     <string name="swap_connection_misc_error">При подключении к устройству произошла ошибка, невозможно провести с ним обмен!</string>
-    <string name="swap_not_enabled">Обмен не включен</string>
-    <string name="swap_not_enabled_description">Для выполнения обмена следует сделать ваше устройство видимым.</string>
 
     <string name="perms_description_app">Предоставлено %1$s.</string>
     <string name="update_auto_download">Получать обновления автоматически</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index de28e8acd..642673b65 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -216,8 +216,6 @@
     <string name="swap_confirm">Cunfirma cumpartzidura</string>
     <string name="swap_qr_isnt_for_swap">Su còdighe QR iscansidu non paret unu còdighe de cumpartzidura.</string>
     <string name="loading">Carrighende…</string>
-    <string name="swap_not_enabled">Cumpartzidura non abilitada</string>
-    <string name="swap_not_enabled_description">In antis de cumpartzire, su dispositivu depet èssere postu visìbile.</string>
 
     <string name="install_confirm">at a tènnere atzessu a</string>
     <string name="install_confirm_update">Boles installare un’agiornamentu
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 78b5d217a..d32935455 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -274,8 +274,6 @@
     <string name="swap_confirm">Potvrdiť výmenu</string>
     <string name="swap_qr_isnt_for_swap">Naskenovaný QR kód nevyzerá ako kód na výmenu.</string>
     <string name="swap_connection_misc_error">Pri pokuse o pripojenie došlo k chybe, zdá sa, že výmena sa neuskutoční!</string>
-    <string name="swap_not_enabled">Výmena nie je povolená</string>
-    <string name="swap_not_enabled_description">Pred výmenou musí byť zariadenie viditeľné.</string>
 
     <string name="install_confirm_update">Chcete nainštalovať aktualizáciu
         k tejto existujúcej aplikácií? Dáta aplikácie nebudú
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index a32a17359..2c8378192 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -322,8 +322,6 @@
     <string name="use_bluetooth">Uporabi Bluetooth</string>
     <string name="loading">Nalagam…</string>
     <string name="swap_connection_misc_error">Napaka pri povezovanju z napravo, z njo ne gre zamenjati!</string>
-    <string name="swap_not_enabled">Menjava ni omogočena</string>
-    <string name="swap_not_enabled_description">Pred menjavo mora biti Vaša naprava napravljena vidna.</string>
     <string name="swap_toast_invalid_url">Neveljaven URL za zamenjavo: %1$s</string>
     <string name="swap_toast_hotspot_enabled">Wi-Fi Hotspot omogočen</string>
     <string name="swap_toast_could_not_enable_hotspot">Ni bilo mogoče omogočiti Wi-Fi Hotspot!</string>
diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
index b0e96b753..bdcf7beca 100644
--- a/app/src/main/res/values-sn/strings.xml
+++ b/app/src/main/res/values-sn/strings.xml
@@ -305,8 +305,6 @@
     <string name="swap_connection_misc_error">Pane kanganiso yaitika pakuhakira kumuchina, hatisi kukwanisa kutsinhana
         nayo.
     </string>
-    <string name="swap_not_enabled">Kutsinhana hakuna kubvumirwa</string>
-    <string name="swap_not_enabled_description">Tisati tatsinhana, muchina wako unofanirwa kuita kuti uwonekwe.</string>
 
     <string name="install_confirm">inoda hupindwa pa</string>
     <string name="install_confirm_update">Unoda kuvakirira chekunatsa
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 5be36cf90..f0157f1a7 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -187,7 +187,6 @@
     <string name="swap_connecting">Повезујем се</string>
     <string name="swap_confirm">Потврди размену</string>
     <string name="loading">Учитавам…</string>
-    <string name="swap_not_enabled">Размена није укључена</string>
     <string name="newPerms">Ново</string>
     <string name="allPerms">Све</string>
     <string name="perms_new_perm_prefix">Ново:</string>
@@ -213,7 +212,6 @@
     <string name="uninstall_update_confirm">Желите ли да замените ову апликацију фабрички уграђеном?</string>
     <string name="uninstall_confirm">Желите ли да уклоните ову аликацију?</string>
 
-    <string name="swap_not_enabled_description">Пре размене, ваш уређај мора бити видљив.</string>
 
     <string name="swap_visible_bluetooth">Видљив преко блутута</string>
     <string name="swap_not_visible_bluetooth">Нисам видљив преко блутута</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 6c876cfba..fe7756c47 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -235,8 +235,6 @@
     <string name="swap_qr_isnt_for_swap">QR-koden du läst av ser inte ut som en utbytarkod.</string>
     <string name="loading">Öppnar…</string>
     <string name="swap_connection_misc_error">Fel uppstod under enhetsanslutning, går inte att utföra utbyte med den!</string>
-    <string name="swap_not_enabled">Utbyta inte aktiverat</string>
-    <string name="swap_not_enabled_description">Innan utbyte måste din enhet synliggöras.</string>
 
     <string name="install_confirm">behöver åtkomst till</string>
     <string name="install_confirm_update">Vill du installera en uppdatering till denna befintlig app? Din befintliga data försvinner inte. Den uppdaterade appen kommer att få åtkomst till:</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 013ddbd76..1eb8f007c 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -168,8 +168,6 @@
     <string name="swap_confirm">ยืนยันการส่งต่อ</string>
     <string name="loading">กำลังโหลด…</string>
     <string name="swap_connection_misc_error">การเชื่อมต่อกับอีกเครื่องล้มเหลว, ไม่สามารถส่งต่อโปรแกรมได้</string>
-    <string name="swap_not_enabled">ไม่เปิดใช้การส่งต่อโปรแกรม</string>
-    <string name="swap_not_enabled_description">ก่อนจะทำการส่งต่อโปรแกรม, เครื่องของคุณจะต้องปรากฎตัวก่อน</string>
 
     <string name="install_confirm">ต้องการเข้าถึง</string>
     <string name="install_confirm_update">คุณต้องการติดตั้งอัพเดตของโปรแกรมนี้หรือไม่? ข้อมูลภายในของโปรแกรมจะยังคงอยู่
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c08ed6e07..0c8577ef0 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -239,8 +239,6 @@
     <string name="swap_qr_isnt_for_swap">Taradığınız QR kodu bir takas kodu gibi görünmüyor.</string>
     <string name="loading">Yükleniyor…</string>
     <string name="swap_connection_misc_error">Aygıta bağlanılırken hata oluştu, onunla takas yapılamaz!</string>
-    <string name="swap_not_enabled">Takas etkinleştirilmemiş</string>
-    <string name="swap_not_enabled_description">Takas yapmadan önce aygıtınızın görünebilir yapılmalıdır.</string>
 
     <string name="install_confirm">erişmesi gerekenler</string>
     <string name="install_confirm_update">Var olan bu uygulama için bir güncelleme kurmak istiyor musunuz? Var olan verileriniz kaybolmayacak. Güncellenmiş uygulamanın şunlara erişimi olacak:</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 08b6c1911..9684bc43f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -212,7 +212,6 @@
     <string name="swap_setting_up_wifi">Налаштовую Wi-Fi…</string>
     <string name="swap_not_visible_wifi">Не видимий через Wi-Fi</string>
     <string name="swap_confirm">Підтвердьте обмін</string>
-    <string name="swap_not_enabled">Обмін не увімкнено</string>
     <string name="wifi_ap">Точка доступу</string>
 
     <string name="category_Writing">Написання</string>
@@ -222,7 +221,6 @@
     <string name="swap_scanning_for_peers">Пошук людей поблизу…</string>
     <string name="swap_nearby">Ближній обмін</string>
     <string name="swap_not_visible_bluetooth">Невидимий через Bluetooth</string>
-    <string name="swap_not_enabled_description">Перед обміном, ви повинні зробити пристрій видимим.</string>
 
     <string name="install_confirm_update">Бажаєте встановити оновлення для існуючого застосунку? Це не видалить ваші наявні дані. Оновлений застосунок матиме доступ до:</string>
     <string name="install_confirm_update_system">Бажаєте встановити оновлення на вбудований застосунок? Ваші наявні дані не буде втрачено. Оновлений застосунок матиме доступ до:</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index b7de4ef8d..8f1d8d834 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -215,9 +215,7 @@
     <string name="swap_confirm">Xác nhận trao đổi</string>
     <string name="swap_qr_isnt_for_swap">Mã QR đã quét không phải là mã trao đổi.</string>
     <string name="loading">Đang tải…</string>
-    <string name="swap_not_enabled">Trao đổi đang tắt</string>
     <string name="swap_connection_misc_error">Đã xảy ra lỗi khi kết nối, không thể trao đổi ứng dụng!</string>
-    <string name="swap_not_enabled_description">Trước khi trao đổi, máy của bạn phải nhìn thấy được qua mạng.</string>
 
     <string name="install_confirm">cần truy cập</string>
     <string name="install_confirm_update">Bạn có muốn cập nhật ứng dụng này không? Dữ liệu đã có sẽ không bị mất. Ứng dụng được cập nhật sẽ có quyền truy cập vào:</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index fd99b8af0..71c168b11 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -222,8 +222,6 @@
     <string name="swap_qr_isnt_for_swap">你扫描的二维码似乎不是一个交换代码。</string>
     <string name="loading">加载中…</string>
     <string name="swap_connection_misc_error">连接设备时出错，无法交换应用！</string>
-    <string name="swap_not_enabled">未启用交换功能</string>
-    <string name="swap_not_enabled_description">交换之前，你的设备必须是可见的。</string>
 
     <string name="install_confirm">确定要安装这个应用吗？它将有以下权限</string>
     <string name="install_confirm_update">是否更新现有应用？已有数据不会丢失。更新后该应用具有以下访问权限：</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index ae759d6ba..c5a691d25 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -192,9 +192,7 @@
     <string name="less">顯示較少</string>
 
     <string name="theme_night">深夜色系</string>
-    <string name="swap_not_enabled_description">在交換之前，您的裝置必須可被其他裝置發現。</string>
 
-    <string name="swap_not_enabled">沒有啟用交換功能</string>
     <string name="swap_connection_misc_error">與裝置連接時發生了問題，未能進行交換！</string>
     <string name="loading">正在載入…</string>
     <string name="swap_qr_isnt_for_swap">您所掃描的 QR 碼不是一個交換碼。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f894daffb..260b45b68 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -209,7 +209,6 @@
     <string name="swap_send_fdroid">傳送F-Droid</string>
     <string name="swap_no_peers_nearby">找不到附近的人來進行交換。</string>
     <string name="swap_confirm">確認交換</string>
-    <string name="swap_not_enabled">沒有啟用交換功能</string>
     <string name="uninstall_confirm">您想要解除安裝此應用程式嗎？</string>
     <string name="download_error">下載失敗！</string>
 
@@ -286,7 +285,6 @@
     <string name="download_pending">等待開始下載…</string>
     <string name="install_confirm">需要存取</string>
     <string name="loading">正在載入…</string>
-    <string name="swap_not_enabled_description">在交換之前，您的裝置必須可以被看見。</string>
 
     <string name="uninstall_update_confirm">您確定要以原始版本取代此應用程式嗎？</string>
     <string name="install_error_notify_title">%s 安裝時錯誤</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 076eba5ee..b7bc47db7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -456,8 +456,8 @@ This often occurs with apps installed via Google Play or other sources, if they
     <string name="use_bluetooth">Use Bluetooth</string>
     <string name="loading">Loading…</string>
     <string name="swap_connection_misc_error">Error occurred while connecting to device, can\'t swap with it!</string>
-    <string name="swap_not_enabled">Swapping not enabled</string>
-    <string name="swap_not_enabled_description">Before swapping, your device must be made visible.</string>
+    <string name="not_visible_nearby">Nearby not enabled</string>
+    <string name="not_visible_nearby_description">Before swapping with nearby devices, make your device visible.</string>
     <string name="swap_toast_using_path">Using %1$s</string>
     <string name="swap_toast_not_removable_storage">That choice did not match any removeable storage devices, try
         again!</string>

From c031f49ede2a1615b88531379a6e5fc984fce4f9 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 21 Dec 2018 16:12:27 +0100
Subject: [PATCH 2/5] sync up "Nearby" translation with Android standard
 strings

fdroid/fdroidclient#1569
fdroid/fdroidclient#887

```python
import glob
import os
import re

locale_pat = re.compile(r'.*values-([a-zA-Z-]*)/strings.xml')
translation_pat = re.compile(r'.*name="corpus_name_websearch_nearby">([^<]*).*')
for f in glob.glob('/tmp/Velvet/res/values-*/strings.xml'):
    m = locale_pat.search(f)
    if m:
        locale = m.group(1)
    with open(f) as fp:
        m = translation_pat.search(fp.read())
        if m:
            word = m.group(1)
            print(locale, '\t', word)
            fdroid = '/home/hans/code/fdroid/client/app/src/main/res/values-' + locale + '/strings.xml'
            if os.path.exists(fdroid):
                with open(fdroid) as fp:
                    data = fp.read()
                with open(fdroid, 'w') as fp:
                    fp.write(re.sub(r'main_menu__swap_nearby">[^<]+</string', 'main_menu__swap_nearby">' + word + '</string', data))
```
---
 app/src/main/res/values-ast/strings.xml    | 2 +-
 app/src/main/res/values-be/strings.xml     | 2 +-
 app/src/main/res/values-bg/strings.xml     | 2 +-
 app/src/main/res/values-ca/strings.xml     | 2 +-
 app/src/main/res/values-cs/strings.xml     | 2 +-
 app/src/main/res/values-da/strings.xml     | 2 +-
 app/src/main/res/values-de/strings.xml     | 2 +-
 app/src/main/res/values-es/strings.xml     | 2 +-
 app/src/main/res/values-et/strings.xml     | 2 +-
 app/src/main/res/values-fa/strings.xml     | 2 +-
 app/src/main/res/values-fr/strings.xml     | 2 +-
 app/src/main/res/values-gl/strings.xml     | 2 +-
 app/src/main/res/values-hi/strings.xml     | 2 +-
 app/src/main/res/values-hr/strings.xml     | 1 +
 app/src/main/res/values-hu/strings.xml     | 2 +-
 app/src/main/res/values-hy/strings.xml     | 1 +
 app/src/main/res/values-id/strings.xml     | 2 +-
 app/src/main/res/values-is/strings.xml     | 2 +-
 app/src/main/res/values-it/strings.xml     | 2 +-
 app/src/main/res/values-ja/strings.xml     | 2 +-
 app/src/main/res/values-kn/strings.xml     | 2 +-
 app/src/main/res/values-ko/strings.xml     | 2 +-
 app/src/main/res/values-lt/strings.xml     | 2 +-
 app/src/main/res/values-mk/strings.xml     | 1 +
 app/src/main/res/values-ml/strings.xml     | 2 +-
 app/src/main/res/values-my/strings.xml     | 2 +-
 app/src/main/res/values-nl/strings.xml     | 2 +-
 app/src/main/res/values-pl/strings.xml     | 2 +-
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 app/src/main/res/values-pt-rPT/strings.xml | 2 +-
 app/src/main/res/values-ro/strings.xml     | 2 +-
 app/src/main/res/values-sq/strings.xml     | 1 +
 app/src/main/res/values-sr/strings.xml     | 2 +-
 app/src/main/res/values-sv/strings.xml     | 2 +-
 app/src/main/res/values-ta/strings.xml     | 1 +
 app/src/main/res/values-te/strings.xml     | 2 +-
 app/src/main/res/values-th/strings.xml     | 1 +
 app/src/main/res/values-tr/strings.xml     | 2 +-
 app/src/main/res/values-uk/strings.xml     | 2 +-
 app/src/main/res/values-ur/strings.xml     | 1 +
 app/src/main/res/values-vi/strings.xml     | 2 +-
 41 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 13f19f207..23469755a 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -353,7 +353,7 @@
 
     <string name="antifeatureswarning">Esta aplicación tien carauterístiques que quiciabes nun te presten.</string>
     <string name="main_menu__latest_apps">Novedaes</string>
-<string name="main_menu__swap_nearby">Cercanía</string>
+<string name="main_menu__swap_nearby">Cercano</string>
 
     <string name="notification_title_summary_install_error">Falló la instalación</string>
     <string name="by_author_format">por %s</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index aa338416c..d50354d9a 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -350,7 +350,7 @@
 
     <string name="main_menu__latest_apps">Апошнія</string>
     <string name="main_menu__categories">Катэгорыі</string>
-    <string name="main_menu__swap_nearby">Блізка</string>
+    <string name="main_menu__swap_nearby">Паблізу</string>
 
 
     <plurals name="button_view_all_apps_in_category">
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 97ed1e692..e11d926dd 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -325,7 +325,7 @@
     <string name="repositories_summary">Добавяне на допълнителни източници на приложения</string>
     <string name="main_menu__latest_apps">Последни</string>
     <string name="main_menu__categories">Категории</string>
-    <string name="main_menu__swap_nearby">Наблизо</string>
+    <string name="main_menu__swap_nearby">В района</string>
 
     <string name="latest__empty_state__no_recent_apps">Няма намерени нови приложения</string>
 <string name="preference_manage_installed_apps">Управление на инсталираните  приложения</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 22d89a407..1bc159029 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -314,7 +314,7 @@
 
     <string name="main_menu__latest_apps">Novetats</string>
     <string name="main_menu__categories">Categories</string>
-    <string name="main_menu__swap_nearby">Al voltant</string>
+    <string name="main_menu__swap_nearby">A prop</string>
 
     <string name="notification_title_single_update_available">Actualització disponible</string>
     <string name="notification_title_single_ready_to_install">Llest per a instal·lar</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ee50e5f45..4f5ca8bd3 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -358,7 +358,7 @@
     <string name="installed_app__updates_ignored">Ignorované aktualizace</string>
     <string name="installed_app__updates_ignored_for_suggested_version">Aktualizace na verzi %1$s jsou ignorovány</string>
 
-    <string name="main_menu__swap_nearby">Poblíž</string>
+    <string name="main_menu__swap_nearby">Nablízku</string>
 
     <string name="preference_category__my_apps">Moje aplikace</string>
     <string name="preference_manage_installed_apps">Spravovat nainstalované aplikace</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index a49881846..70f3e49f4 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -311,7 +311,7 @@
     <string name="warning_no_internet">Kan ikke opdatere, er du forbundet til Internettet?</string>
 <string name="main_menu__latest_apps">Seneste</string>
     <string name="main_menu__categories">Kategorier</string>
-    <string name="main_menu__swap_nearby">I nærheden</string>
+    <string name="main_menu__swap_nearby">Tæt på</string>
 
     <string name="preference_manage_installed_apps">Administrer installerede apps</string>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 65b827bfd..bafd780b4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -347,7 +347,7 @@
     <string name="main_menu__categories">Kategorien</string>
 
 
-    <string name="main_menu__swap_nearby">Nah</string>
+    <string name="main_menu__swap_nearby">In der Nähe</string>
     <string name="app_recommended_version_installed">Version %1$s (Empfohlen)</string>
     <string name="app_new">Neu</string>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b679a9d43..631968aa4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -323,7 +323,7 @@
 
     <string name="main_menu__latest_apps">Último</string>
     <string name="main_menu__categories">Categorías</string>
-    <string name="main_menu__swap_nearby">Cercanía</string>
+    <string name="main_menu__swap_nearby">Cercano</string>
 
 
     <plurals name="button_view_all_apps_in_category">
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index ebcec4377..772e9c265 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -320,7 +320,7 @@
     </string>
 <string name="main_menu__latest_apps">Uusimad</string>
     <string name="main_menu__categories">Kategooriad</string>
-    <string name="main_menu__swap_nearby">Lähedal</string>
+    <string name="main_menu__swap_nearby">Läheduses</string>
 
     <string name="preference_manage_installed_apps">Halda paigaldatud rakendusi</string>
 
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 8a6a64117..2f3bc1a59 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -328,7 +328,7 @@
     <string name="menu_video">ویدیو</string>
     <string name="main_menu__latest_apps">جدیدترین</string>
     <string name="main_menu__categories">دسته‌ها</string>
-    <string name="main_menu__swap_nearby">نزدیک</string>
+    <string name="main_menu__swap_nearby">اطراف</string>
 
     <string name="latest__empty_state__no_recent_apps">کارهٔ جدیدی پیدا نشد</string>
     <string name="latest__empty_state__never_updated">پس از به‌روز رسانی فهرست کاره‌های‌تان، جدیدترین کاره‌ها در این‌‌جا نمایش می‌یابند</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 089d299af..d6ae3fb9f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -340,7 +340,7 @@
 
     <string name="main_menu__latest_apps">Nouveau</string>
     <string name="main_menu__categories">Catégories</string>
-    <string name="main_menu__swap_nearby">Autour</string>
+    <string name="main_menu__swap_nearby">À proximité</string>
 
 
     <string name="app_recommended_version_installed">Version %1$s (recommandée)</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 9d1bd5402..72a298d98 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -276,7 +276,7 @@
     <string name="menu_settings">Preferencias</string>
     <string name="main_menu__latest_apps">Últimas</string>
     <string name="main_menu__categories">Categorías</string>
-    <string name="main_menu__swap_nearby">Veciñanza</string>
+    <string name="main_menu__swap_nearby">Cerca</string>
 
     <string name="preference_manage_installed_apps">Xestionar aplicacións instaladas</string>
 
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 7260b096e..8411d57d0 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -173,7 +173,7 @@
     <string name="menu_install">इंस्टॉल करें</string>
     <string name="menu_uninstall">स्थापना रद्द करें</string>
     <string name="menu_upgrade">अपडेट करें</string>
-    <string name="main_menu__swap_nearby">आपके निकट</string>
+    <string name="main_menu__swap_nearby">आस–पास</string>
     <string name="preference_manage_installed_apps">स्थापित एप्स संशोधित करें</string>
     <string name="details_notinstalled">स्थापित नहीं है</string>
     <string name="next">अगला</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index daf24b42c..2fac0f337 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -17,6 +17,7 @@
     <string name="unstable_updates">Nestabilna ažuriranja</string>
     <string name="unstable_updates_summary">Predloži ažuriranja za nestabilne verzije</string>
     <string name="other">Ostalo</string>
+    <string name="main_menu__swap_nearby">U blizini</string>
 
     <string name="update_interval">Interval automatskog ažuriranja</string>
     <string name="update_auto_download">Automatski preuzmi ažuriranja</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index e7dd01c89..a394a0baa 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -272,7 +272,7 @@
     <string name="local_repo_running">Az F-Droid cserére kész</string>
 <string name="main_menu__latest_apps">Legújabb</string>
     <string name="main_menu__categories">Kategóriák</string>
-    <string name="main_menu__swap_nearby">Közelben</string>
+    <string name="main_menu__swap_nearby">Közeli</string>
 
     <string name="preference_manage_installed_apps">Telepített alkalmazások kezelése</string>
 
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index 3c405ba41..bb74ceac6 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -43,6 +43,7 @@
     <string name="enable">Միացնել</string>
     <string name="add_key">Ավելացնել բանալի</string>
     <string name="clear_search">Մաքրել որոնումը</string>
+    <string name="main_menu__swap_nearby">Մոտակայքում</string>
 
     <string name="menu_search">Որոնել</string>
     <string name="menu_share">Կիսվել</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 838227e72..9ca4af001 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -352,7 +352,7 @@
         <item quantity="other">Tampilkan semua %d</item>
     </plurals>
 
-    <string name="main_menu__swap_nearby">Dekat</string>
+    <string name="main_menu__swap_nearby">Di sekitar</string>
     <string name="app_recommended_version_installed">Versi %1$s (Direkomendasikan)</string>
     <string name="app_new">Baru</string>
     <string name="app_list__name__downloading_in_progress">Mengunduh %1$s</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index ebff24f8d..cf6d8856b 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -370,7 +370,7 @@
     <string name="repositories_summary">Bæta við öðrum upptökum fyrir hugbúnað</string>
     <string name="main_menu__latest_apps">Nýjustu</string>
     <string name="main_menu__categories">Flokkar</string>
-    <string name="main_menu__swap_nearby">Nálægt</string>
+    <string name="main_menu__swap_nearby">Í grenndinni</string>
 
     <string name="preference_category__my_apps">Forritin mín</string>
     <string name="preference_manage_installed_apps">Sýsla með uppsett forrit</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4a0449fdb..590c48a22 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -359,7 +359,7 @@
     <string name="notification_action_cancel">Annulla</string>
     <string name="notification_action_install">Installa</string>
 
-    <string name="main_menu__swap_nearby">Vicino</string>
+    <string name="main_menu__swap_nearby">Qui vicino</string>
 <string name="preference_category__my_apps">Mie App</string>
     <string name="preference_manage_installed_apps">Gestisci app installate</string>
 
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ed08053a6..d9f6fb6c6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -322,7 +322,7 @@
 
     <string name="main_menu__latest_apps">新着</string>
     <string name="main_menu__categories">カテゴリ</string>
-    <string name="main_menu__swap_nearby">Nearby</string>
+    <string name="main_menu__swap_nearby">付近</string>
 
 
     <plurals name="button_view_all_apps_in_category">
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index b1d972267..b2ffc2c28 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -41,7 +41,7 @@
     <string name="next">ಮುಂದೆ</string>
     <string name="details_new_in_version">%s ನೇ ಆವೃತ್ತಿಯಲ್ಲಿ ಹೊಸತು</string>
 
-    <string name="main_menu__swap_nearby">ಹತ್ತಿರದ</string>
+    <string name="main_menu__swap_nearby">ಹತ್ತಿರವೇನಿದೆ</string>
 
     <string name="main_menu__latest_apps">ಇತ್ತೀಚಿನ</string>
     <string name="menu_donate">ದೇಣಿಗೆ</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 8cbbfae29..e01064bff 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -285,7 +285,7 @@
     <string name="crash_dialog_comment_prompt">여기에 추가적인 정보와 댓글을 추가할 수 있습니다:</string>
 <string name="main_menu__latest_apps">최신</string>
     <string name="main_menu__categories">카테고리</string>
-    <string name="main_menu__swap_nearby">근처</string>
+    <string name="main_menu__swap_nearby">주변</string>
 
     <string name="preference_manage_installed_apps">설치된 앱 관리</string>
 
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 8e99066a1..8f8152983 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -71,7 +71,7 @@
     <string name="menu_settings">Nustatymai</string>
     <string name="main_menu__latest_apps">Naujausios</string>
     <string name="main_menu__categories">Kategorijos</string>
-    <string name="main_menu__swap_nearby">Netoliese</string>
+    <string name="main_menu__swap_nearby">U okolini</string>
 
     <string name="preference_manage_installed_apps">Tvarkyti įdiegtas programėles</string>
 
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 8bcd4056e..e0877b27f 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -18,6 +18,7 @@
     </string>
     <string name="keep_install_history">Задржи ја историјата на инсталацијата</string>
     <string name="other">Други</string>
+    <string name="main_menu__swap_nearby">Во близина</string>
 
     <string name="update_interval">Автоматско ажурирање временски интервал</string>
 </resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 48690a116..ddf55b78c 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -20,7 +20,7 @@
     <string name="menu_upgrade">പുതുക്കുക</string>
     <string name="main_menu__latest_apps">പുതിയത്</string>
     <string name="main_menu__categories">ഇനങ്ങള്‍</string>
-    <string name="main_menu__swap_nearby">അടുത്തുള്ള</string>
+    <string name="main_menu__swap_nearby">സമീപം</string>
 
     <string name="preference_manage_installed_apps">പ്രയോഗങ്ങളെ നിയന്ത്രിക്കുക</string>
 
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index cc5fcc094..f5cd4db26 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -273,7 +273,7 @@
     <string name="menu_video">ဗွီဒီယို</string>
     <string name="main_menu__latest_apps">နောက်ဆုံး</string>
     <string name="main_menu__categories">ခေါင်းစဉ်</string>
-    <string name="main_menu__swap_nearby">အနီးအနားရှိ</string>
+    <string name="main_menu__swap_nearby">အနီးတဝိုက်</string>
 
     <string name="latest__empty_state__no_recent_apps">မကြာသေးခင်က အက်ပ်စ်များမတွေ့ပါ</string>
     <string name="latest__empty_state__never_updated">"သင်၏အက်ပ်စ့်များကို အသစ်မွမ်းမံပြီးပါက နောက်ဆုံးအသစ်မွမ်းမံသည့်အက်ပ်စ်များကို
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 5362f48d2..d09501e5b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -337,7 +337,7 @@
     <string name="repositories_summary">Voeg extra pakketbronnen voor apps toe</string>
     <string name="main_menu__latest_apps">Nieuwste</string>
     <string name="main_menu__categories">Categorieën</string>
-    <string name="main_menu__swap_nearby">Dichtbij</string>
+    <string name="main_menu__swap_nearby">In de buurt</string>
 
     <string name="preference_category__my_apps">Mijn apps</string>
     <string name="preference_manage_installed_apps">Beheer geïnstalleerde apps</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3d7abc534..b79681a61 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -343,7 +343,7 @@
 
     <string name="main_menu__latest_apps">Ostatnie</string>
     <string name="main_menu__categories">Kategorie</string>
-    <string name="main_menu__swap_nearby">Blisko</string>
+    <string name="main_menu__swap_nearby">W pobliżu</string>
 
 
     <plurals name="button_view_all_apps_in_category">
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a9369ceb9..5628eb702 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -347,7 +347,7 @@
 
     <string name="main_menu__latest_apps">Mais recentes</string>
     <string name="main_menu__categories">Categorias</string>
-    <string name="main_menu__swap_nearby">Próximo</string>
+    <string name="main_menu__swap_nearby">Por perto</string>
 
 
     <plurals name="button_view_all_apps_in_category">
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 86098568c..65feaa4d5 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -368,7 +368,7 @@
     <string name="repositories_summary">Adicionar mais fontes de aplicações</string>
     <string name="main_menu__latest_apps">Últimas</string>
     <string name="main_menu__categories">Categorias</string>
-    <string name="main_menu__swap_nearby">Vizinhança</string>
+    <string name="main_menu__swap_nearby">Próximo</string>
 
     <string name="latest__empty_state__no_recent_apps">Nenhuma aplicação recente</string>
     <string name="latest__empty_state__never_updated">Assim que a lista de aplicações for atualizada, as aplicações mais recentes serão mostradas aqui</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 8b5f68af7..fdba9246a 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -349,7 +349,7 @@
 
     <string name="latest__empty_state__never_updated">Odată actualizată lista de aplicații, cele mai noi ar trebui să apară aici</string>
     <string name="latest__empty_state__no_recent_apps">Nu s-a găsit nici o aplicație recentă</string>
-    <string name="main_menu__swap_nearby">Schimb</string>
+    <string name="main_menu__swap_nearby">În apropiere</string>
 
     <string name="main_menu__categories">Categorii</string>
     <string name="main_menu__latest_apps">Noutăți</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 08e183e2b..8b3b6aba9 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -19,6 +19,7 @@
     <string name="added_on">Shtuar me %s</string>
 
     <string name="ok">OK</string>
+    <string name="main_menu__swap_nearby">Në afërsi</string>
 
     <string name="yes">Po</string>
     <string name="no">Jo</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index f0157f1a7..8353b773f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -349,7 +349,7 @@
     <string name="notification_action_cancel">Одустани</string>
     <string name="notification_action_install">Инсталирај</string>
 
-    <string name="main_menu__swap_nearby">Оближње</string>
+    <string name="main_menu__swap_nearby">У околини</string>
     <plurals name="button_view_all_apps_in_category">
         <item quantity="one">Прикажи %d</item>
         <item quantity="few">Прикажи све %d</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index fe7756c47..6d0f2066d 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -315,7 +315,7 @@
 
     <string name="main_menu__latest_apps">Senaste</string>
     <string name="main_menu__categories">Kategorier</string>
-    <string name="main_menu__swap_nearby">Nära</string>
+    <string name="main_menu__swap_nearby">I närheten</string>
 
     <string name="preference_category__my_apps">Mina appar</string>
     <string name="preference_manage_installed_apps">Hantera installerade appar</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 9f55fc70f..93522d98e 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -18,6 +18,7 @@
     <string name="login_password">கடவுச்சொல்</string>
     <string name="repo_edit_credentials">கடவுச்சொல்லை மாற்று</string>
     <string name="repo_error_empty_username">பயனர் பெயர் கொடுக்கப்படாததால் எந்த மாற்றமும் இல்லை</string>
+    <string name="main_menu__swap_nearby">அருகிலுள்ளவை</string>
 
     <string name="app_details">செயலி விபரங்கள்</string>
     <string name="no_such_app">அப்படி எந்த செயலியும் இல்லை</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index b8650a010..fc43aa17f 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -14,7 +14,7 @@
     <string name="menu_share">పంచుకోండి</string>
     <string name="menu_install">స్థాపించు</string>
     <string name="main_menu__categories">వర్గాలు</string>
-    <string name="main_menu__swap_nearby">చుట్టుపక్కల</string>
+    <string name="main_menu__swap_nearby">సమీపంలోనివి</string>
 
     <string name="next">తదుపరి</string>
     <string name="pref_language">భాష</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 1eb8f007c..0ad15aa3e 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -23,6 +23,7 @@
     <string name="about_site">เว็บไซต์</string>
     <string name="about_source">ซอร์สโค้ด</string>
     <string name="about_license">สัญญาอนุญาต</string>
+    <string name="main_menu__swap_nearby">ใกล้เคียง</string>
 
     <string name="app_incompatible">เข้ากันไม่ได้</string>
     <string name="app_installed">ติดตั้งอยู่</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0c8577ef0..e332af109 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -319,7 +319,7 @@
     <string name="repositories_summary">Ek uygulama kaynakları ekle</string>
     <string name="main_menu__latest_apps">En Son</string>
     <string name="main_menu__categories">Kategoriler</string>
-    <string name="main_menu__swap_nearby">Yakında</string>
+    <string name="main_menu__swap_nearby">Etrafımda</string>
 
 
     <string name="notification_title_single_update_available">Güncelleme Var</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9684bc43f..e89e57547 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -340,7 +340,7 @@
 
     <string name="main_menu__latest_apps">Останні</string>
     <string name="main_menu__categories">Категорії</string>
-    <string name="main_menu__swap_nearby">Сусідні</string>
+    <string name="main_menu__swap_nearby">Поруч</string>
 
     <string name="preference_category__my_apps">Мої застосунки</string>
     <string name="preference_manage_installed_apps">Керування встановленими застосунками</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 681a3cbbd..eac839d0b 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -17,6 +17,7 @@
     <string name="unstable_updates">غیر مستحکم اپ ڈیٹس</string>
     <string name="unstable_updates_summary">غیر مستحکم ورژن کی تازہ کاریاں تجویز کریں</string>
     <string name="other">دیگر</string>
+    <string name="main_menu__swap_nearby">قریبی</string>
 
     <string name="update_interval">خودکار تازہ کاری کرنے کا وقفہ</string>
     <string name="notify">تازہ کاریوں کی اطلاعات</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 8f1d8d834..e130aeb4e 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -275,7 +275,7 @@
     <string name="menu_email">E-mail tác giả</string>
     <string name="useTor">Sử dụng Tor</string>
     <string name="useTorSummary">Tải xuống thông qua Tor để tăng tính riêng tư. Cần ứng dụng Orbot</string>
-<string name="main_menu__swap_nearby">Gần đây</string>
+<string name="main_menu__swap_nearby">Lân cận</string>
 
     <string name="main_menu__latest_apps">Mới nhất</string>
     <string name="main_menu__categories">Hạng mục</string>

From 3868b815875c176bb44f118b75b35ec0a0445965 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 21 Dec 2018 16:45:17 +0100
Subject: [PATCH 3/5] sync up "Settings" translation with Android standard
 strings

fdroid/fdroidclient#1569

```python
import glob
import os
import re

locale_pat = re.compile(r'.*values-([a-z][a-z][a-zA-Z-]*)/strings.xml')
translation_pat = re.compile(r'.*name="settings_label"[^>]*>"?([^"<]*).*')
for f in glob.glob('/home/hans/code/android.googlesource.com/packages/apps/Settings/res/values-[a-z][a-z]*/strings.xml'):
    m = locale_pat.search(f)
    if m:
        locale = m.group(1)
        if locale.endswith('-nokeys'):
            continue
    #print(locale)
    with open(f) as fp:
        m = translation_pat.search(fp.read())
        if m:
            word = m.group(1)
            print(locale, '\t', word)
            fdroid = '/home/hans/code/fdroid/client/app/src/main/res/values-' + locale + '/strings.xml'
            if os.path.exists(fdroid):
                with open(fdroid) as fp:
                    data = fp.read()
                with open(fdroid, 'w') as fp:
                    fp.write(re.sub(r'menu_settings">[^<]+</string', 'menu_settings">' + word + '</string', data))
```
---
 app/src/main/res/values-ar/strings.xml |  2 +-
 app/src/main/res/values-ca/strings.xml |  2 +-
 app/src/main/res/values-de/strings.xml |  2 +-
 app/src/main/res/values-fr/strings.xml |  2 +-
 app/src/main/res/values-gl/strings.xml |  2 +-
 app/src/main/res/values-hi/strings.xml |  2 +-
 app/src/main/res/values-id/strings.xml |  2 +-
 app/src/main/res/values-kn/strings.xml |  2 +-
 app/src/main/res/values-mk/strings.xml |  1 +
 app/src/main/res/values-ml/strings.xml |  2 +-
 app/src/main/res/values-my/strings.xml |  2 +-
 app/src/main/res/values-sk/strings.xml |  2 +-
 app/src/main/res/values-sq/strings.xml |  2 +-
 app/src/main/res/values-sr/strings.xml |  2 +-
 app/src/main/res/values-ta/strings.xml |  2 +-
 app/src/main/res/values-te/strings.xml |  2 +-
 app/src/main/res/values-th/strings.xml |  2 +-
 app/src/main/res/values-uk/strings.xml |  2 +-
 app/src/main/res/values-ur/strings.xml |  1 +
 app/src/main/res/values-vi/strings.xml |  2 +-
 tools/find-translations.py             | 27 ++++++++++++++++++++++++++
 21 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100755 tools/find-translations.py

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e01186afb..ad8318a75 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -103,7 +103,7 @@
     <string name="malformed_repo_uri">تجاهل عناوين URI للمستودعات  التالفة : %s</string>
     <string name="repo_provider">مستودع: %s</string>
 
-    <string name="menu_settings">إعدادات</string>
+    <string name="menu_settings">الإعدادات</string>
     <string name="menu_add_repo">مستودع جديد</string>
 
     <string name="menu_website">الموقع الإلكتروني</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 1bc159029..a2524b3a7 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -171,7 +171,7 @@
     <string name="choose_bt_send">Trieu el mètode d\'enviament per Bluetooth</string>
     <string name="bad_fingerprint">Empremta digital incorrecta</string>
     <string name="invalid_url">L\'adreça URL és invàlida.</string>
-    <string name="menu_settings">Opcions</string>
+    <string name="menu_settings">Configuració</string>
     <string name="menu_changelog">Registre de canvis</string>
     <string name="status_download_unknown_size">S\'està baixant\n%2$s des de\n%1$s</string>
     <string name="status_processing_xml_percent">S\'està processant %2$s / %3$s (%4$d%%) de %1$s</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bafd780b4..4ac832296 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -197,7 +197,7 @@
 
     <string name="theme_light">Hell</string>
     <string name="theme_dark">Dunkel</string>
-    <string name="menu_settings">Optionen</string>
+    <string name="menu_settings">Einstellungen</string>
     <string name="menu_bitcoin">Bitcoin</string>
     <string name="menu_litecoin">Litecoin</string>
     <string name="menu_flattr">Flattr</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d6ae3fb9f..7b310b0cf 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -257,7 +257,7 @@
 
     <string name="permissions">Autorisations</string>
     <string name="theme_night">Nuit</string>
-    <string name="menu_settings">Options</string>
+    <string name="menu_settings">Paramètres</string>
     <string name="login_title">Identification requise</string>
     <string name="login_name">Nom d\'utilisateur</string>
     <string name="login_password">Mot de passe</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 72a298d98..bc73c2596 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -273,7 +273,7 @@
 
     <string name="perms_description_app">Ofertado por %1$s.</string>
     <string name="writing_index_jar">Escribindo índice firmado para o ficheiro (index.jar)…</string>
-    <string name="menu_settings">Preferencias</string>
+    <string name="menu_settings">Configuración</string>
     <string name="main_menu__latest_apps">Últimas</string>
     <string name="main_menu__categories">Categorías</string>
     <string name="main_menu__swap_nearby">Cerca</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 8411d57d0..91ad9cc04 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -139,7 +139,7 @@
 <string name="SignatureMismatch">नया संस्करण किसी दूसरी \'की\' से साईन किया हुआ है। इस नये संस्करण को स्थापित करने के लिए पुराने वाले को अस्थापित करें। कृपया फिर से कोशिश करें। (याद रखें कि अस्थापित करने के बाद ऐप्लिकेशन डेटा नष्ट हो जायेगा)</string>
     <string name="keep_install_history">स्थापना इतिहास देखें</string>
     <string name="keep_install_history_summary">सभी स्थापनाओं और अस्थापनाओं के लॉग को F-Droid में रखें</string>
-<string name="menu_settings">सेटिंग्स</string>
+<string name="menu_settings">सेटिंग</string>
     <string name="menu_search">खोज़</string>
     <string name="menu_share">साझा करें</string>
     <string name="main_menu__latest_apps">नवीनतम</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 9ca4af001..acc163050 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -139,7 +139,7 @@
     <string name="repo_last_update">Terakhir diperbarui</string>
     <string name="repo_name">Nama</string>
     <string name="unknown">Tidak diketahui</string>
-    <string name="menu_settings">Pengaturan</string>
+    <string name="menu_settings">Setelan</string>
     <string name="unsigned_description">Ini artinya daftar apl tersebut tidak bisa diverifikasi. Anda harus berhati-hati dengan apl yang diunduh dari daftar yang tidak terverifikasi.</string>
     <string name="repo_not_yet_updated">Repositori ini belum digunakan.
         Anda harus mengaktifkannya untuk melihat aplikasi yang disediakan.
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index b2ffc2c28..88c8a5291 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -49,7 +49,7 @@
     <string name="menu_email">ಲೇಖಕರ ಇ-ಅಂಚೆ</string>
     <string name="menu_share">ಹಂಚಿರಿ</string>
     <string name="menu_search">ಹುಡುಕಿ</string>
-    <string name="menu_settings">ಆದ್ಯತೆಗಳು</string>
+    <string name="menu_settings">ಸೆಟ್ಟಿಂಗ್‌ಗಳು</string>
     <string name="back">ಹಿಂದಕ್ಕೆ</string>
     <string name="links">ಕೊಂಡಿಗಳು</string>
     <string name="versions">ಆವೃತ್ತಿಗಳು</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index e0877b27f..52d2582f1 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -19,6 +19,7 @@
     <string name="keep_install_history">Задржи ја историјата на инсталацијата</string>
     <string name="other">Други</string>
     <string name="main_menu__swap_nearby">Во близина</string>
+    <string name="menu_settings">Поставки</string>
 
     <string name="update_interval">Автоматско ажурирање временски интервал</string>
 </resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index ddf55b78c..c6fa9e210 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -9,7 +9,7 @@
     <string name="back">പിന്നോട്ട്</string>
     <string name="cancel">റദ്ദാക്കുക</string>
     <string name="menu_manage">സംഭരണികള്‍</string>
-    <string name="menu_settings">ക്രമീകരണങ്ങള്‍</string>
+    <string name="menu_settings">ക്രമീകരണം</string>
     <string name="menu_search">തെരയുക</string>
     <string name="menu_add_repo">സംഭരണി ചേര്‍ക്കുക</string>
 
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index f5cd4db26..f099c429d 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -78,7 +78,7 @@
     <string name="repo_provider">Repository: %s</string>
 
     <string name="menu_manage">Repository မ်ား</string>
-    <string name="menu_settings">ျပင္ဆင္ရန္</string>
+    <string name="menu_settings">ဆက်တင်များ</string>
     <string name="menu_search">ရွာေဖြမည္</string>
     <string name="menu_add_repo">Repository အသစ္</string>
 
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d32935455..dd92ad470 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -249,7 +249,7 @@
     <string name="more">Viac</string>
     <string name="less">Menej</string>
 
-    <string name="menu_settings">Nastaviť</string>
+    <string name="menu_settings">Nastavenia</string>
     <string name="menu_email">Poslať e-mail autorovi</string>
     <string name="antinonfreeassetslist">Táto aplikácia obsahuje proprietárne časti</string>
 
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 8b3b6aba9..6ff9685d9 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -35,7 +35,7 @@
     <string name="bluetooth_activity_not_found">Nuk u gjet ndonjë mënyrë dërgimi me Bluetooth, zgjidhni një!</string>
     <string name="choose_bt_send">Zgjidhni mënyrën e dërgimit me Bluetooth</string>
 
-    <string name="menu_settings">Rregullimet</string>
+    <string name="menu_settings">Cilësimet</string>
     <string name="menu_search">Kërko</string>
     <string name="menu_share">Shpërndaj</string>
     <string name="menu_install">Instalo</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 8353b773f..e62c740d4 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -251,7 +251,7 @@
     <string name="menu_flattr">Флатр</string>
 
 
-    <string name="menu_settings">Поставке</string>
+    <string name="menu_settings">Подешавања</string>
     <string name="swap_connection_misc_error">Десила се грешка приликом повезивања са уређајем, не можемо размењивати са њим!</string>
     <string name="swap_join_same_wifi_desc">Да бисте размењивали преко бежичног морате бити на истој мрежи. Ако немате
         приступ истој мрежи, једно од вас може да направи бежичну врућу тачку.
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 93522d98e..91483c9bf 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -54,7 +54,7 @@
     <string name="repo_add_url">களஞ்சிய முகவரி</string>
     <string name="invalid_url">இந்த முகவரி ஏற்புடையதல்ல</string>
     <string name="menu_manage">களஞ்சியங்கள்</string>
-    <string name="menu_settings">அமைப்புகள்</string>
+    <string name="menu_settings">அமைப்பு</string>
     <string name="menu_search">தேடல்</string>
     <string name="menu_add_repo">புதிய களஞ்சியம்</string>
 
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index fc43aa17f..863e6df40 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -8,7 +8,7 @@
     <string name="no">కాదు</string>
     <string name="back">వెనుకకు</string>
     <string name="cancel">రద్దుచేయి</string>
-    <string name="menu_settings">అమరికలు</string>
+    <string name="menu_settings">సెట్టింగ్‌లు</string>
     <string name="menu_search">వెతుకు</string>
     <string name="menu_launch">నడుపు</string>
     <string name="menu_share">పంచుకోండి</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 0ad15aa3e..10f5a2364 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -52,7 +52,7 @@
     <string name="repo_provider">แหล่งโปรแกรม: %s</string>
 
     <string name="menu_manage">แหล่งโปรแกรม</string>
-    <string name="menu_settings">ตั้งค่า</string>
+    <string name="menu_settings">การตั้งค่า</string>
     <string name="menu_search">ค้นหา</string>
     <string name="menu_add_repo">เพิ่มแหล่งโปรแกรมใหม่</string>
 
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index e89e57547..0c14d9df6 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -251,7 +251,7 @@
     <string name="more">Більше</string>
     <string name="less">Менше</string>
 
-    <string name="menu_settings">Параметри</string>
+    <string name="menu_settings">Налаштування</string>
     <string name="permissions">Привілеї</string>
     <string name="theme_night">Нічна</string>
     <string name="category_Connectivity">Зв\'язок</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index eac839d0b..8567dee48 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -18,6 +18,7 @@
     <string name="unstable_updates_summary">غیر مستحکم ورژن کی تازہ کاریاں تجویز کریں</string>
     <string name="other">دیگر</string>
     <string name="main_menu__swap_nearby">قریبی</string>
+    <string name="menu_settings">ترتیبات</string>
 
     <string name="update_interval">خودکار تازہ کاری کرنے کا وقفہ</string>
     <string name="notify">تازہ کاریوں کی اطلاعات</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index e130aeb4e..6e448ab32 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -260,7 +260,7 @@
         cho chúng tôi!
     </string>
     <string name="theme_night">Đen</string>
-    <string name="menu_settings">Tuỳ chọn</string>
+    <string name="menu_settings">Cài đặt</string>
     <string name="repo_add_fingerprint">Mã kiểm tra (không bắt buộc)</string>
     <string name="bad_fingerprint">Mã kiểm tra sai</string>
     <string name="login_title">Yêu cầu xác thực</string>
diff --git a/tools/find-translations.py b/tools/find-translations.py
new file mode 100755
index 000000000..d312b3058
--- /dev/null
+++ b/tools/find-translations.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+#
+
+import glob
+import os
+import re
+
+locale_pat = re.compile(r'.*values-([a-z][a-z][a-zA-Z-]*)/strings.xml')
+translation_pat = re.compile(r'.*name="settings_button"[^>]*>"?([^"<]*).*')
+for f in glob.glob('/home/hans/code/android.googlesource.com/packages/apps/Settings/res/values-[a-z][a-z]*/strings.xml'):
+    m = locale_pat.search(f)
+    if m:
+        locale = m.group(1)
+        if locale.endswith('-nokeys'):
+            continue
+    #print(locale)
+    with open(f) as fp:
+        m = translation_pat.search(fp.read())
+        if m:
+            word = m.group(1)
+            print(locale, '\t', word)
+            fdroid = '/home/hans/code/fdroid/client/app/src/main/res/values-' + locale + '/strings.xml'
+            if os.path.exists(fdroid):
+                with open(fdroid) as fp:
+                    data = fp.read()
+                with open(fdroid, 'w') as fp:
+                    fp.write(re.sub(r'menu_settings">[^<]+</string', 'menu_settings">' + word + '</string', data))

From 0a4ee450834ad69d82ee697ecb8943aab37e8624 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 21 Dec 2018 17:16:25 +0100
Subject: [PATCH 4/5] sync up "Categories" translation with Android standard
 strings

fdroid/fdroidclient#1569
---
 app/src/main/res/values-hr/strings.xml | 1 +
 app/src/main/res/values-hy/strings.xml | 1 +
 app/src/main/res/values-kn/strings.xml | 2 +-
 app/src/main/res/values-lt/strings.xml | 2 +-
 app/src/main/res/values-mk/strings.xml | 1 +
 app/src/main/res/values-ml/strings.xml | 2 +-
 app/src/main/res/values-my/strings.xml | 2 +-
 app/src/main/res/values-sq/strings.xml | 1 +
 app/src/main/res/values-ta/strings.xml | 2 +-
 app/src/main/res/values-th/strings.xml | 1 +
 app/src/main/res/values-ur/strings.xml | 1 +
 11 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 2fac0f337..a93d14d22 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -17,6 +17,7 @@
     <string name="unstable_updates">Nestabilna ažuriranja</string>
     <string name="unstable_updates_summary">Predloži ažuriranja za nestabilne verzije</string>
     <string name="other">Ostalo</string>
+    <string name="main_menu__categories">Kategorije</string>
     <string name="main_menu__swap_nearby">U blizini</string>
 
     <string name="update_interval">Interval automatskog ažuriranja</string>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index bb74ceac6..0f4d369d6 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -43,6 +43,7 @@
     <string name="enable">Միացնել</string>
     <string name="add_key">Ավելացնել բանալի</string>
     <string name="clear_search">Մաքրել որոնումը</string>
+    <string name="main_menu__categories">Կատեգորիաներ</string>
     <string name="main_menu__swap_nearby">Մոտակայքում</string>
 
     <string name="menu_search">Որոնել</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 88c8a5291..59037cc79 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -80,7 +80,7 @@
     <string name="other">ಇತರೆ</string>
 
     <string name="delete">ಅಳಿಸು</string>
-<string name="main_menu__categories">ವಿಂಗಡಣೆಗಳು</string>
+<string name="main_menu__categories">ವಿಭಾಗಗಳು</string>
     <string name="category_Internet">ಅಂತರ್ಜಾಲ</string>
     <string name="category_Money">ಹಣ</string>
     <string name="category_Reading">ಓದು</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 8f8152983..7e4448320 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -70,7 +70,7 @@
     <string name="back">Atgal</string>
     <string name="menu_settings">Nustatymai</string>
     <string name="main_menu__latest_apps">Naujausios</string>
-    <string name="main_menu__categories">Kategorijos</string>
+    <string name="main_menu__categories">Kategorije</string>
     <string name="main_menu__swap_nearby">U okolini</string>
 
     <string name="preference_manage_installed_apps">Tvarkyti įdiegtas programėles</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 52d2582f1..ca4d9cdcc 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -20,6 +20,7 @@
     <string name="other">Други</string>
     <string name="main_menu__swap_nearby">Во близина</string>
     <string name="menu_settings">Поставки</string>
+    <string name="main_menu__categories">Категории</string>
 
     <string name="update_interval">Автоматско ажурирање временски интервал</string>
 </resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index c6fa9e210..99be2c5ea 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -19,7 +19,7 @@
     <string name="menu_uninstall">ഒഴിവാക്കുക</string>
     <string name="menu_upgrade">പുതുക്കുക</string>
     <string name="main_menu__latest_apps">പുതിയത്</string>
-    <string name="main_menu__categories">ഇനങ്ങള്‍</string>
+    <string name="main_menu__categories">വിഭാഗങ്ങള്‍</string>
     <string name="main_menu__swap_nearby">സമീപം</string>
 
     <string name="preference_manage_installed_apps">പ്രയോഗങ്ങളെ നിയന്ത്രിക്കുക</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index f099c429d..25adc8403 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -272,7 +272,7 @@
     <string name="menu_issues">ထွက်ရှိမှုများ</string>
     <string name="menu_video">ဗွီဒီယို</string>
     <string name="main_menu__latest_apps">နောက်ဆုံး</string>
-    <string name="main_menu__categories">ခေါင်းစဉ်</string>
+    <string name="main_menu__categories">အမျိုးအစားများ</string>
     <string name="main_menu__swap_nearby">အနီးတဝိုက်</string>
 
     <string name="latest__empty_state__no_recent_apps">မကြာသေးခင်က အက်ပ်စ်များမတွေ့ပါ</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 6ff9685d9..7f137fe54 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -19,6 +19,7 @@
     <string name="added_on">Shtuar me %s</string>
 
     <string name="ok">OK</string>
+    <string name="main_menu__categories">Kategoritë</string>
     <string name="main_menu__swap_nearby">Në afërsi</string>
 
     <string name="yes">Po</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 91483c9bf..18eafccdf 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -81,7 +81,7 @@
     </string>
 <string name="menu_launch">இயக்க</string>
     <string name="main_menu__latest_apps">சமீபத்திய</string>
-    <string name="main_menu__categories">பகுப்புகள்</string>
+    <string name="main_menu__categories">வகைகள்</string>
     <string name="category_Internet">இணையம்</string>
     <string name="category_Money">பணம்</string>
     <string name="newPerms">புதியன</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 10f5a2364..c07152589 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -23,6 +23,7 @@
     <string name="about_site">เว็บไซต์</string>
     <string name="about_source">ซอร์สโค้ด</string>
     <string name="about_license">สัญญาอนุญาต</string>
+    <string name="main_menu__categories">หมวดหมู่</string>
     <string name="main_menu__swap_nearby">ใกล้เคียง</string>
 
     <string name="app_incompatible">เข้ากันไม่ได้</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 8567dee48..d44e11444 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -19,6 +19,7 @@
     <string name="other">دیگر</string>
     <string name="main_menu__swap_nearby">قریبی</string>
     <string name="menu_settings">ترتیبات</string>
+    <string name="main_menu__categories">زمرے</string>
 
     <string name="update_interval">خودکار تازہ کاری کرنے کا وقفہ</string>
     <string name="notify">تازہ کاریوں کی اطلاعات</string>

From 4b30b42e160a8d635e4f17889f4c6cded12af0d3 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 21 Dec 2018 17:13:41 +0100
Subject: [PATCH 5/5] add "Updates" translation to kn from Android strings

---
 app/src/main/res/values-kn/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 59037cc79..83f795f28 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -81,6 +81,7 @@
 
     <string name="delete">ಅಳಿಸು</string>
 <string name="main_menu__categories">ವಿಭಾಗಗಳು</string>
+    <string name="updates">ವಿಭಾಗಗಳು</string>
     <string name="category_Internet">ಅಂತರ್ಜಾಲ</string>
     <string name="category_Money">ಹಣ</string>
     <string name="category_Reading">ಓದು</string>