gui: Use nested namespace for theme name translation keys (#9220)

Following up on #9192, this makes use of the new mechanism for the theme
names.

The dummy string added for testing is removed again here. All
translations are updated to the new nested syntax, except Chinese
(zh-HK) where the string weren't actually translated.

gui/default/assets/lang/lang-bg.json

@@ -538,10 +538,14 @@
     "modified": "променено",
     "permit": "разрешаване",
     "seconds": "секунди",
-    "theme-name-black": "Черна",
+    "theme": {
-    "theme-name-dark": "Тъмна",
+        "name": {
-    "theme-name-default": "По подразбиране",
+            "black": "Черна",
-    "theme-name-light": "Светла",
+            "dark": "Тъмна",
+            "default": "По подразбиране",
+            "light": "Светла"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} споделя папката „{{folder}}“.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} споделя папката „{{folderlabel}}“ ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "Поръчителят {{reintroducer}} може отново да предложи това устройство."

gui/default/assets/lang/lang-ca.json

@@ -518,10 +518,14 @@
     "modified": "modificat",
     "permit": "permís",
     "seconds": "segons",
-    "theme-name-black": "Negre",
+    "theme": {
-    "theme-name-dark": "Fosc",
+        "name": {
-    "theme-name-default": "Per defecte",
+            "black": "Negre",
-    "theme-name-light": "Clar",
+            "dark": "Fosc",
+            "default": "Per defecte",
+            "light": "Clar"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartir la carpeta \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vol compartir la carpeta \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} podria tornar a introduir aquest dispositiu."

gui/default/assets/lang/lang-ca@valencia.json

@@ -518,10 +518,14 @@
     "modified": "modificat",
     "permit": "permís",
     "seconds": "segons",
-    "theme-name-black": "Negre",
+    "theme": {
-    "theme-name-dark": "Fosc",
+        "name": {
-    "theme-name-default": "Per defecte",
+            "black": "Negre",
-    "theme-name-light": "Clar",
+            "dark": "Fosc",
+            "default": "Per defecte",
+            "light": "Clar"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vol compartit la carpeta \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vol compartir la carpeta \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} podria tornar a introduir aquest dispositiu."

gui/default/assets/lang/lang-cs.json

@@ -499,10 +499,14 @@
     "full documentation": "úplná dokumentace",
     "items": "položky",
     "seconds": "sekund",
-    "theme-name-black": "Černý",
+    "theme": {
-    "theme-name-dark": "Tmavý",
+        "name": {
-    "theme-name-default": "Výchozí",
+            "black": "Černý",
-    "theme-name-light": "Světlý",
+            "dark": "Tmavý",
+            "default": "Výchozí",
+            "light": "Světlý"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce sdílet složku „{{folder}}“.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce sdílet složku „{{folderlabel}}“ ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} může toto zařízení znovu uvést."

gui/default/assets/lang/lang-da.json

@@ -538,10 +538,14 @@
     "modified": "ændret",
     "permit": "tillad",
     "seconds": "sekunder",
-    "theme-name-black": "Sort",
+    "theme": {
-    "theme-name-dark": "Mørk",
+        "name": {
-    "theme-name-default": "Standard",
+            "black": "Sort",
-    "theme-name-light": "Lys",
+            "dark": "Mørk",
+            "default": "Standard",
+            "light": "Lys"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ønsker at dele mappen “{{folder}}”.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ønsker at dele mappen “{{folderlabel}}” ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} vil muligvis genindføre denne enhed."

gui/default/assets/lang/lang-de.json

@@ -538,10 +538,14 @@
     "modified": "geändert",
     "permit": "erlauben",
     "seconds": "Sekunden",
-    "theme-name-black": "Schwarz",
+    "theme": {
-    "theme-name-dark": "Dunkel",
+        "name": {
-    "theme-name-default": "Standard",
+            "black": "Schwarz",
-    "theme-name-light": "Hell",
+            "dark": "Dunkel",
+            "default": "Standard",
+            "light": "Hell"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} möchte den Ordner „{{folder}}“ teilen.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} möchte den Ordner „{{folderlabel}}“ ({{folder}}) teilen.",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} könnte dieses Gerät wieder einführen."

gui/default/assets/lang/lang-en-AU.json

@@ -518,10 +518,14 @@
     "modified": "modified",
     "permit": "permit",
     "seconds": "seconds",
-    "theme-name-black": "Black",
+    "theme": {
-    "theme-name-dark": "Dark",
+        "name": {
-    "theme-name-default": "Default",
+            "black": "Black",
-    "theme-name-light": "Light",
+            "dark": "Dark",
+            "default": "Default",
+            "light": "Light"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device."

gui/default/assets/lang/lang-en-GB.json

@@ -538,10 +538,14 @@
     "modified": "modified",
     "permit": "permit",
     "seconds": "seconds",
-    "theme-name-black": "Black",
+    "theme": {
-    "theme-name-dark": "Dark",
+        "name": {
-    "theme-name-default": "Default",
+            "black": "Black",
-    "theme-name-light": "Light",
+            "dark": "Dark",
+            "default": "Default",
+            "light": "Light"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device."

gui/default/assets/lang/lang-en.json

@@ -304,7 +304,6 @@
     "QR code": "QR code",
     "QUIC LAN": "QUIC LAN",
     "QUIC WAN": "QUIC WAN",
-    "QUIC connections are in most cases considered suboptimal": "QUIC connections are in most cases considered suboptimal",
     "Quick guide to supported patterns": "Quick guide to supported patterns",
     "Random": "Random",
     "Receive Encrypted": "Receive Encrypted",
@@ -538,15 +537,14 @@
     "modified": "modified",
     "permit": "permit",
     "seconds": "seconds",
-    "test": {
+    "theme": {
-        "translation": {
+        "name": {
-            "dummy": "(This is just a test string for nested translation namespaces. This does not need to be translated.)"
+            "black": "Black",
+            "dark": "Dark",
+            "default": "Default",
+            "light": "Light"
         }
     },
-    "theme-name-black": "Black",
-    "theme-name-dark": "Dark",
-    "theme-name-default": "Default",
-    "theme-name-light": "Light",
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wants to share folder \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} might reintroduce this device."

gui/default/assets/lang/lang-es.json

@@ -538,10 +538,14 @@
     "modified": "modificado",
     "permit": "permiso",
     "seconds": "segundos",
-    "theme-name-black": "Negro",
+    "theme": {
-    "theme-name-dark": "Oscuro",
+        "name": {
-    "theme-name-default": "Por Defecto",
+            "black": "Negro",
-    "theme-name-light": "Claro",
+            "dark": "Oscuro",
+            "default": "Por Defecto",
+            "light": "Claro"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quiere compartir la carpeta \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quiere compartir la carpeta \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} puede reintroducir este dispositivo."

gui/default/assets/lang/lang-fi.json

@@ -376,10 +376,14 @@
     "files": "tiedostot",
     "full documentation": "täysi dokumentaatio",
     "items": "kohteet",
-    "theme-name-black": "Musta",
+    "theme": {
-    "theme-name-dark": "Tumma",
+        "name": {
-    "theme-name-default": "Oletus",
+            "black": "Musta",
-    "theme-name-light": "Vaalea",
+            "dark": "Tumma",
+            "default": "Oletus",
+            "light": "Vaalea"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} haluaa jakaa kansion \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} haluaa jakaa kansion \"{{folderlabel}}\" ({{folder}})."
 }

gui/default/assets/lang/lang-fr.json

@@ -538,10 +538,14 @@
     "modified": "modifié",
     "permit": "partager tous les attributs",
     "seconds": "secondes",
-    "theme-name-black": "Noir",
+    "theme": {
-    "theme-name-dark": "Sombre",
+        "name": {
-    "theme-name-default": "Par défaut (système)",
+            "black": "Noir",
-    "theme-name-light": "Clair",
+            "dark": "Sombre",
+            "default": "Par défaut (système)",
+            "light": "Clair"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vous invite au partage \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vous invite au partage \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} pourrait ré-enrôler cet appareil."

gui/default/assets/lang/lang-hu.json

@@ -507,10 +507,14 @@
     "items": "elem",
     "modified": "módosított",
     "seconds": "másodperc",
-    "theme-name-black": "Fekete",
+    "theme": {
-    "theme-name-dark": "Sötét",
+        "name": {
-    "theme-name-default": "Alapértelmezett",
+            "black": "Fekete",
-    "theme-name-light": "Világos",
+            "dark": "Sötét",
+            "default": "Alapértelmezett",
+            "light": "Világos"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} szeretné megosztani a mappát: „{{folder}}”.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} szeretné megosztani a mappát: „{{folderlabel}}” ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} újra bevezetheti ezt az eszközt."

gui/default/assets/lang/lang-id.json

@@ -452,10 +452,14 @@
     "full documentation": "dokumentasi penuh",
     "items": "berkas",
     "seconds": "detik",
-    "theme-name-black": "Hitam",
+    "theme": {
-    "theme-name-dark": "Gelap",
+        "name": {
-    "theme-name-default": "Bawaan",
+            "black": "Hitam",
-    "theme-name-light": "Terang",
+            "dark": "Gelap",
+            "default": "Bawaan",
+            "light": "Terang"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ingin berbagi folder \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ingin berbagi folder \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} mungkin memperkenalkan ulang perangkat ini."

gui/default/assets/lang/lang-it.json

@@ -537,10 +537,14 @@
     "modified": "modificato",
     "permit": "permettere",
     "seconds": "secondi",
-    "theme-name-black": "Nero",
+    "theme": {
-    "theme-name-dark": "Scuro",
+        "name": {
-    "theme-name-default": "Predefinito",
+            "black": "Nero",
-    "theme-name-light": "Chiaro",
+            "dark": "Scuro",
+            "default": "Predefinito",
+            "light": "Chiaro"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vuole condividere la cartella \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vuole condividere la cartella \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} potrebbe reintrodurre questo dispositivo."

gui/default/assets/lang/lang-ja.json

@@ -440,10 +440,14 @@
     "items": "項目",
     "modified": "更新",
     "seconds": "秒",
-    "theme-name-black": "ブラック",
+    "theme": {
-    "theme-name-dark": "ダーク",
+        "name": {
-    "theme-name-default": "デフォルト",
+            "black": "ブラック",
-    "theme-name-light": "ライト",
+            "dark": "ダーク",
+            "default": "デフォルト",
+            "light": "ライト"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} がフォルダー \"{{folder}}\" を共有するよう求めています。",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} がフォルダー「{{folderlabel}}」 ({{folder}}) を共有するよう求めています。"
 }

gui/default/assets/lang/lang-ko-KR.json

@@ -538,10 +538,14 @@
     "modified": "수정됨",
     "permit": "허용",
     "seconds": "초",
-    "theme-name-black": "검은색",
+    "theme": {
-    "theme-name-dark": "어두운 색",
+        "name": {
-    "theme-name-default": "기본 색",
+            "black": "검은색",
-    "theme-name-light": "밝은 색",
+            "dark": "어두운 색",
+            "default": "기본 색",
+            "light": "밝은 색"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 기기가 \"{{folder}}\" 폴더를 공유하길 원합니다.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} 기기가 \"{{folderlabel}}\" ({{folder}}) 폴더를 공유하길 원합니다.",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} 기기에서 이 기기를 다시 소개할 수 있습니다."

gui/default/assets/lang/lang-nl.json

@@ -538,10 +538,14 @@
     "modified": "gewijzigd",
     "permit": "toestaan",
     "seconds": "seconden",
-    "theme-name-black": "Zwart",
+    "theme": {
-    "theme-name-dark": "Donker",
+        "name": {
-    "theme-name-default": "Standaard",
+            "black": "Zwart",
-    "theme-name-light": "Licht",
+            "dark": "Donker",
+            "default": "Standaard",
+            "light": "Licht"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wil map \"{{folder}}\" delen.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} wil map \"{{folderlabel}}\" ({{folder}}) delen.",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} kan dit apparaat mogelijk opnieuw introduceren."

gui/default/assets/lang/lang-pl.json

@@ -538,10 +538,14 @@
     "modified": "modyfikacja",
     "permit": "zezwól",
     "seconds": "sekundy",
-    "theme-name-black": "Czarny",
+    "theme": {
-    "theme-name-dark": "Ciemny",
+        "name": {
-    "theme-name-default": "Domyślny",
+            "black": "Czarny",
-    "theme-name-light": "Jasny",
+            "dark": "Ciemny",
+            "default": "Domyślny",
+            "light": "Jasny"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "Urządzenie {{device}} chce współdzielić folder \"{{folder}}\"",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "Urządzenie {{device}} chce współdzielić folder \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "Urządzenie {{reintroducer}} może ponownie wprowadzić to urządzenie."

gui/default/assets/lang/lang-pt-BR.json

@@ -536,10 +536,14 @@
     "modified": "modificado",
     "permit": "permitir",
     "seconds": "segundos",
-    "theme-name-black": "Preto",
+    "theme": {
-    "theme-name-dark": "Escuro",
+        "name": {
-    "theme-name-default": "Padrão",
+            "black": "Preto",
-    "theme-name-light": "Claro",
+            "dark": "Escuro",
+            "default": "Padrão",
+            "light": "Claro"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer compartilhar a pasta \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quer compartilhar a pasta \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} pode reintroduzir este dispositivo."

gui/default/assets/lang/lang-pt-PT.json

@@ -538,10 +538,14 @@
     "modified": "modificado",
     "permit": "permitir",
     "seconds": "segundos",
-    "theme-name-black": "Preto",
+    "theme": {
-    "theme-name-dark": "Escuro",
+        "name": {
-    "theme-name-default": "Predefinido",
+            "black": "Preto",
-    "theme-name-light": "Claro",
+            "dark": "Escuro",
+            "default": "Predefinido",
+            "light": "Claro"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} quer partilhar a pasta \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} quer partilhar a pasta \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} poderá reintroduzir este dispositivo."

gui/default/assets/lang/lang-ru.json

@@ -497,10 +497,14 @@
     "items": "элементы",
     "modified": "изменено",
     "seconds": "сек.",
-    "theme-name-black": "Чёрная",
+    "theme": {
-    "theme-name-dark": "Тёмная",
+        "name": {
-    "theme-name-default": "По умолчанию",
+            "black": "Чёрная",
-    "theme-name-light": "Светлая",
+            "dark": "Тёмная",
+            "default": "По умолчанию",
+            "light": "Светлая"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} хочет поделиться папкой «{{folder}}».",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} хочет поделиться папкой «{{folderlabel}}» ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} может повторно рекомендовать это устройство."

gui/default/assets/lang/lang-si.json

@@ -502,10 +502,14 @@
     "modified": "සංශෝධිතයි",
     "permit": "අවසරය",
     "seconds": "තත්පර",
-    "theme-name-black": "කළු",
+    "theme": {
-    "theme-name-dark": "අඳුරු",
+        "name": {
-    "theme-name-default": "පෙරනිමි",
+            "black": "කළු",
-    "theme-name-light": "දීප්ත",
+            "dark": "අඳුරු",
+            "default": "පෙරනිමි",
+            "light": "දීප්ත"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} ට \"{{folder}}\" ෆෝල්ඩරය බෙදා ගැනීමට අවශ්‍යයි.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} ට \"{{folderlabel}}\" ({{folder}}) ෆෝල්ඩරය බෙදා ගැනීමට අවශ්‍යයි.",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} මෙම උපාංගය නැවත හඳුන්වා දිය හැක."

gui/default/assets/lang/lang-sk.json

@@ -538,10 +538,14 @@
     "modified": "zmenené",
     "permit": "povolenie",
     "seconds": "sekúnd",
-    "theme-name-black": "Čierna",
+    "theme": {
-    "theme-name-dark": "Tmavé",
+        "name": {
-    "theme-name-default": "Predvolené",
+            "black": "Čierna",
-    "theme-name-light": "Svetlá",
+            "dark": "Tmavé",
+            "default": "Predvolené",
+            "light": "Svetlá"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce zdieľať adresár \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} chce zdieľať adresár \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} môže znova uviesť toto zariadenie."

gui/default/assets/lang/lang-sl.json

@@ -456,10 +456,14 @@
     "items": "predmeti",
     "modified": "spremenjeno",
     "seconds": "sekunde",
-    "theme-name-black": "Črna",
+    "theme": {
-    "theme-name-dark": "Temno",
+        "name": {
-    "theme-name-default": "Privzeto",
+            "black": "Črna",
-    "theme-name-light": "Svetlo",
+            "dark": "Temno",
+            "default": "Privzeto",
+            "light": "Svetlo"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} želi deliti mapo \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} želi deliti mapo \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} bo morda znova predstavil to napravo."

gui/default/assets/lang/lang-sv.json

@@ -538,10 +538,14 @@
     "modified": "ändrad",
     "permit": "tillåt",
     "seconds": "sekunder",
-    "theme-name-black": "Svart",
+    "theme": {
-    "theme-name-dark": "Mörkt",
+        "name": {
-    "theme-name-default": "Standard",
+            "black": "Svart",
-    "theme-name-light": "Ljust",
+            "dark": "Mörkt",
+            "default": "Standard",
+            "light": "Ljust"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} vill dela mapp \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} vill dela mapp \"{{folderlabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} kan återinföra denna enhet."

gui/default/assets/lang/lang-tr.json

@@ -538,10 +538,14 @@
     "modified": "değiştirildi",
     "permit": "izin ver",
     "seconds": "saniye",
-    "theme-name-black": "Siyah",
+    "theme": {
-    "theme-name-dark": "Koyu",
+        "name": {
-    "theme-name-default": "Varsayılan",
+            "black": "Siyah",
-    "theme-name-light": "Açık",
+            "dark": "Koyu",
+            "default": "Varsayılan",
+            "light": "Açık"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}}, \"{{folder}}\" klasörünü paylaşmak istiyor.",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}}, \"{{folderlabel}}\" ({{folder}}) klasörünü paylaşmak istiyor.",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} bu cihazı yeniden tanıtabilir."

gui/default/assets/lang/lang-uk.json

@@ -507,10 +507,14 @@
     "items": "елементи",
     "modified": "змінено",
     "seconds": "секунд",
-    "theme-name-black": "Чорна",
+    "theme": {
-    "theme-name-dark": "Темна",
+        "name": {
-    "theme-name-default": "Стандартна",
+            "black": "Чорна",
-    "theme-name-light": "Світла",
+            "dark": "Темна",
+            "default": "Стандартна",
+            "light": "Світла"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} хоче поділитися папкою \"{{folder}}\".",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} хоче поділитися папкою \"{{folderLabel}}\" ({{folder}}).",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} може повторно порекомендувати цей пристрій."

gui/default/assets/lang/lang-zh-CN.json

@@ -538,10 +538,14 @@
     "modified": "已修改",
     "permit": "允许",
     "seconds": "秒",
-    "theme-name-black": "黑色",
+    "theme": {
-    "theme-name-dark": "深色",
+        "name": {
-    "theme-name-default": "默认",
+            "black": "黑色",
-    "theme-name-light": "浅色",
+            "dark": "深色",
+            "default": "默认",
+            "light": "浅色"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想将 “{{folder}}” 文件夹共享给您。",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} 想要共享 \"{{folderlabel}}\" ({{folder}}) 文件夹给您。",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}}可能会重新引入此设备。"

gui/default/assets/lang/lang-zh-HK.json

@@ -498,10 +498,6 @@
     "full documentation": "完整文檔",
     "items": "條目",
     "seconds": "秒",
-    "theme-name-black": "theme-name-black",
-    "theme-name-dark": "theme-name-dark",
-    "theme-name-default": "theme-name-default",
-    "theme-name-light": "theme-name-light",
     "{%device%} wants to share folder \"{%folder%}\".": "{%device%} 想將 「{%folder%}」 文件夾共享給您。",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{%device%} 想要共享 \"{%folderlabel%}\" ({%folder%}) 文件夾給您。",
     "{%reintroducer%} might reintroduce this device.": "{%reintroducer%} 可能會重新引入此設備。"

gui/default/assets/lang/lang-zh-TW.json

@@ -456,10 +456,14 @@
     "full documentation": "完整說明文件",
     "items": "個項目",
     "seconds": "秒",
-    "theme-name-black": "黑色",
+    "theme": {
-    "theme-name-dark": "深色",
+        "name": {
-    "theme-name-default": "預設",
+            "black": "黑色",
-    "theme-name-light": "淺色",
+            "dark": "深色",
+            "default": "預設",
+            "light": "淺色"
+        }
+    },
     "{%device%} wants to share folder \"{%folder%}\".": "{{device}} 想要共享資料夾 \"{{folder}}\"。",
     "{%device%} wants to share folder \"{%folderlabel%}\" ({%folder%}).": "{{device}} 想要共享資料夾 \"{{folderlabel}}\" ({{folder}})。",
     "{%reintroducer%} might reintroduce this device.": "{{reintroducer}} 可能會重新引入此裝置。"

gui/default/index.html

@@ -1091,6 +1091,5 @@
   <script type="text/javascript" src="syncthing/app.js"></script>
   <!-- / gui application code -->
 
-  <div translate="test.translation.dummy" style="display: none;">(This is just a test string for nested translation namespaces. This does not need to be translated.)</div>
 </body>
 </html>

gui/default/syncthing/core/syncthingController.js

@@ -3215,8 +3215,8 @@ angular.module('syncthing.core')
         };
 
         $scope.themeName = function (theme) {
-            var translation = $translate.instant("theme-name-" + theme);
+            var translation = $translate.instant("theme.name." + theme);
-            if (translation.indexOf("theme-name-") == 0) {
+            if (translation.indexOf("theme.name.") == 0) {
                 // Fall back to simple Title Casing on missing translation
                 translation = theme.toLowerCase().replace(/(?:^|\s)\S/g, function (a) {
                     return a.toUpperCase();

script/translate.go

@@ -104,6 +104,21 @@ func inTranslate(n *html.Node, translationId string, filename string) {
 	}
 }
 
+func isTranslated(id string) bool {
+	namespace := trans
+	idParts := strings.Split(id, ".")
+	id = idParts[len(idParts)-1]
+	for _, subNamespace := range idParts[0 : len(idParts)-1] {
+		if _, ok := namespace[subNamespace]; !ok {
+			return false
+		}
+		namespace = namespace[subNamespace].(map[string]interface{})
+	}
+
+	_, ok := namespace[id]
+	return ok
+}
+
 func translation(id string, v string) {
 	namespace := trans
 	idParts := strings.Split(id, ".")
@@ -169,10 +184,10 @@ func collectThemes(basePath string) {
 	}
 	for _, f := range files {
 		if f.IsDir() {
-			key := "theme-name-" + f.Name()
+			key := "theme.name." + f.Name()
-			if _, ok := trans[key]; !ok {
+			if !isTranslated(key) {
 				name := strings.Title(f.Name())
-				trans[key] = name
+				translation(key, name)
 			}
 		}
 	}