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))