diff --git a/F-Droid/res/values-bg/strings.xml b/F-Droid/res/values-bg/strings.xml
index 58442d245..aeae3ceb5 100644
--- a/F-Droid/res/values-bg/strings.xml
+++ b/F-Droid/res/values-bg/strings.xml
@@ -206,7 +206,6 @@
     <string name="install_error_unknown">Инсталирането се провали поради неизвестна грешка</string>
     <string name="uninstall_error_unknown">Деинсталирането се провали поради неизвестна грешка</string>
     <string name="system_install_first_time_notification_message_short">Натиснете за повече информация.</string>
-    <string name="swap_join_same_wifi_desc"/>
     <string name="swap_choose_apps">Изберете приложения</string>
     <string name="swap_wifi_device_name">Име на устройството</string>
     <string name="swap_cant_find_peers">Не можете да откриете тези, които търсите?</string>
diff --git a/F-Droid/res/values-gl/strings.xml b/F-Droid/res/values-gl/strings.xml
index cbdfca56f..e62d9cda1 100644
--- a/F-Droid/res/values-gl/strings.xml
+++ b/F-Droid/res/values-gl/strings.xml
@@ -332,9 +332,7 @@ Publicado con licenza GNU GPLv3.</string>
     <string name="perms_description_app">Ofertado por %1$s.</string>
     <string name="repo_exists_add_fingerprint">Este repositorio xa está instalado, engadirase información adicional sobre a chave.</string>
     <string name="writing_index_jar">Escribindo índice firmado para o ficheiro (index.jar)…</string>
-    <string name="system_install_first_time_notification_message"/>
     <string name="system_install_post_success_message">F-Droid Privileged Extension instalouse correctamente. Esto permite á F-Droid instalar, actualizar e desinstalar aplicativos pola súa conta.</string>
     <string name="system_install_post_fail_message">A instalación de F-Droid Privileged Extension fallou. O método de instalación non está dispoñible para todas as distribucións Android, por favor, consulta o seguimento de erros de F-Droid para máis información.</string>
-    <string name="system_install_first_time_message"/>
     <string name="app_description">F-Droid es un catálogo instalable de aplicativos FOSS (Free and Open Source Software) para a plataforma Android. O cliente facilita a navegación, instalación e actualización no teu dispositivo.</string>
     </resources>
diff --git a/F-Droid/res/values-id/strings.xml b/F-Droid/res/values-id/strings.xml
index 5d72a1233..9715d1705 100644
--- a/F-Droid/res/values-id/strings.xml
+++ b/F-Droid/res/values-id/strings.xml
@@ -24,7 +24,6 @@
     <string name="notify_on">Beri tahu jika pembaruan aplikasi tersedia</string>
     <string name="update_history">Riwayat pembaruan</string>
     <string name="update_history_summ">Jumlah hari sebuah aplikasi dianggap baru atau mutakhir: %s</string>
-    <string name="system_installer"/>
     <string name="system_installer_on">Gunakan F-Droid Privileged Extension untuk memasang, memperbarui, dan mencopot paket</string>
     <string name="uninstall_system">Perbarui/Copot Privileged Extension</string>
     <string name="uninstall_system_summary">Buka layar detail Privileged Extension untuk memperbarui/mencopotnya</string>
diff --git a/F-Droid/tools/remove-unused-trans.py b/F-Droid/tools/remove-unused-trans.py
index dc40eae92..12e487d2c 100755
--- a/F-Droid/tools/remove-unused-trans.py
+++ b/F-Droid/tools/remove-unused-trans.py
@@ -28,6 +28,8 @@ for d in glob.glob(os.path.join('res', 'values-*')):
             name = e.attrib['name']
             if name not in strings:
                 root.remove(e)
+            if not e.text:
+                root.remove(e)
 
         result = re.sub(r' />', r'/>', ElementTree.tostring(root, encoding='utf-8'))