From fcaf5e4afa8b3c37210b32fc49b1c57a2c768768 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Sat, 7 Sep 2013 19:46:44 +0200
Subject: [PATCH] translation cleanup: moved language name from scope
 UserLanguage to UserSettings

---
 lang/am.json                                |  24 +-
 lang/ar.json                                |  28 +-
 lang/be.json                                |  28 +-
 lang/bg.json                                |  30 +-
 lang/bs.json                                |   2 +-
 lang/ca.json                                |  30 +-
 lang/cs.json                                |  30 +-
 lang/cy.json                                |   2 +-
 lang/da.json                                |  36 +-
 lang/de.json                                |  36 +-
 lang/el.json                                |  36 +-
 lang/en.json                                | 372 ++++++++++----------
 lang/es.json                                |  30 +-
 lang/et.json                                |  12 +-
 lang/eu.json                                |  26 +-
 lang/fa.json                                |  32 +-
 lang/fi.json                                |  30 +-
 lang/fr.json                                |  36 +-
 lang/gl.json                                |  12 +-
 lang/he.json                                |   6 +-
 lang/hi.json                                |   6 +-
 lang/hr.json                                |  20 +-
 lang/hu.json                                |  26 +-
 lang/id.json                                |  36 +-
 lang/is.json                                |  26 +-
 lang/it.json                                |  28 +-
 lang/ja.json                                |  30 +-
 lang/ka.json                                |  26 +-
 lang/ko.json                                |  32 +-
 lang/lt.json                                |  28 +-
 lang/lv.json                                |  28 +-
 lang/nb.json                                |  26 +-
 lang/nl.json                                |  32 +-
 lang/nn.json                                |  26 +-
 lang/pl.json                                |  28 +-
 lang/pt-br.json                             |  36 +-
 lang/pt.json                                |  28 +-
 lang/ro.json                                |  36 +-
 lang/ru.json                                |  32 +-
 lang/sk.json                                |  26 +-
 lang/sl.json                                |  34 +-
 lang/sq.json                                |  28 +-
 lang/sr.json                                |  36 +-
 lang/sv.json                                |  32 +-
 lang/ta.json                                |   2 +-
 lang/te.json                                |  26 +-
 lang/th.json                                |  28 +-
 lang/tr.json                                |  28 +-
 lang/uk.json                                |  26 +-
 lang/zh-cn.json                             |  36 +-
 lang/zh-tw.json                             |  26 +-
 plugins/UserSettings/functions.php          |   2 +-
 tests/PHPUnit/Core/Translate/WriterTest.php |   2 +-
 53 files changed, 802 insertions(+), 898 deletions(-)

diff --git a/lang/am.json b/lang/am.json
index 3d5dba0e2c..245cd95238 100644
--- a/lang/am.json
+++ b/lang/am.json
@@ -606,7 +606,16 @@
         "DistinctCountries": "%s የተለዩ ሀገራት",
         "SubmenuLocations": "አቀማመጦች"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "የማሰሺያ ቤተሰቦች",
+        "Browsers": "ማሰሻዎች",
+        "ColumnBrowser": "ማሰሺያ",
+        "ColumnBrowserFamily": "የማሰሻ ቤተሰብ",
+        "ColumnConfiguration": "ውቅረት",
+        "ColumnPlugin": "ተሰኪ",
+        "ColumnResolution": "ጥራት",
+        "ColumnTypeOfScreen": "የማያ ዓይነት",
+        "Configurations": "ውቅረቶች",
         "Language_aa": "አፋርኛ",
         "Language_ab": "አብሐዚኛ",
         "Language_af": "አፍሪካንስኛ",
@@ -760,18 +769,7 @@
         "Language_yo": "ዮሩባዊኛ",
         "Language_za": "ዡዋንግኛ",
         "Language_zh": "ቻይንኛ",
-        "Language_zu": "ዙሉኛ"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "የማሰሺያ ቤተሰቦች",
-        "Browsers": "ማሰሻዎች",
-        "ColumnBrowser": "ማሰሺያ",
-        "ColumnBrowserFamily": "የማሰሻ ቤተሰብ",
-        "ColumnConfiguration": "ውቅረት",
-        "ColumnPlugin": "ተሰኪ",
-        "ColumnResolution": "ጥራት",
-        "ColumnTypeOfScreen": "የማያ ዓይነት",
-        "Configurations": "ውቅረቶች",
+        "Language_zu": "ዙሉኛ",
         "LanguageCode": "የቋንቋ ኮድ",
         "Plugins": "ተሰኪዎች",
         "Resolutions": "ጥራቶች",
diff --git a/lang/ar.json b/lang/ar.json
index fbe492bb65..82937c833d 100644
--- a/lang/ar.json
+++ b/lang/ar.json
@@ -1276,7 +1276,18 @@
         "toggleFullscreen": "تبديل ملء الشاشة",
         "worldMap": "خريطة العالم"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "عائلات المتصفحات",
+        "Browsers": "المتصفحات",
+        "ColumnBrowser": "المتصفح",
+        "ColumnBrowserFamily": "عائلة المتصفح",
+        "ColumnBrowserVersion": "إصدار المتصفح",
+        "ColumnConfiguration": "الإعداد",
+        "ColumnOperatingSystem": "نظام التشغيل",
+        "ColumnPlugin": "الإضافة",
+        "ColumnResolution": "الكثافة النقطية",
+        "ColumnTypeOfScreen": "نوع الشاشة",
+        "Configurations": "الإعدادات",
         "Language_aa": "الأفارية",
         "Language_ab": "الأبخازية",
         "Language_ae": "الأفستية",
@@ -1459,20 +1470,7 @@
         "Language_yo": "اليوروبية",
         "Language_za": "الزهيونج",
         "Language_zh": "الصينية",
-        "Language_zu": "الزولو"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "عائلات المتصفحات",
-        "Browsers": "المتصفحات",
-        "ColumnBrowser": "المتصفح",
-        "ColumnBrowserFamily": "عائلة المتصفح",
-        "ColumnBrowserVersion": "إصدار المتصفح",
-        "ColumnConfiguration": "الإعداد",
-        "ColumnOperatingSystem": "نظام التشغيل",
-        "ColumnPlugin": "الإضافة",
-        "ColumnResolution": "الكثافة النقطية",
-        "ColumnTypeOfScreen": "نوع الشاشة",
-        "Configurations": "الإعدادات",
+        "Language_zu": "الزولو",
         "LanguageCode": "كود اللغة",
         "OperatingSystems": "أنظمة التشغيل",
         "PluginDescription": "تقارير عن إعدادات المستخدمين المختلفة: المتصفح، عائلة المتصفح، نظام التشغيل، الإضافات البرمجية، كثافة الشاشة النقطية، الإعدادات العامة.",
diff --git a/lang/be.json b/lang/be.json
index 78636d99b0..23318f9c54 100644
--- a/lang/be.json
+++ b/lang/be.json
@@ -1255,7 +1255,18 @@
         "toggleFullscreen": "Уключыць поўнаэкранны рэжым",
         "worldMap": "карта свету"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Па сямействе браўзараў",
+        "Browsers": "Па браўзарах",
+        "ColumnBrowser": "Браўзэр",
+        "ColumnBrowserFamily": "Сямейства браўзэраў",
+        "ColumnBrowserVersion": "Версія браўзэра",
+        "ColumnConfiguration": "Канфігурацыя",
+        "ColumnOperatingSystem": "Аперацыйная сістэма",
+        "ColumnPlugin": "Плагін",
+        "ColumnResolution": "Дазвол",
+        "ColumnTypeOfScreen": "Тып экрана",
+        "Configurations": "Па канфігурацыі",
         "Language_ab": "абхазская",
         "Language_af": "афрыкаанс",
         "Language_am": "амхарская",
@@ -1369,20 +1380,7 @@
         "Language_xh": "хоса",
         "Language_yi": "ідыш",
         "Language_zh": "кітайская",
-        "Language_zu": "зулу"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Па сямействе браўзараў",
-        "Browsers": "Па браўзарах",
-        "ColumnBrowser": "Браўзэр",
-        "ColumnBrowserFamily": "Сямейства браўзэраў",
-        "ColumnBrowserVersion": "Версія браўзэра",
-        "ColumnConfiguration": "Канфігурацыя",
-        "ColumnOperatingSystem": "Аперацыйная сістэма",
-        "ColumnPlugin": "Плагін",
-        "ColumnResolution": "Дазвол",
-        "ColumnTypeOfScreen": "Тып экрана",
-        "Configurations": "Па канфігурацыі",
+        "Language_zu": "зулу",
         "LanguageCode": "Код мовы",
         "OperatingSystems": "Па аперацыйных сістэмах",
         "PluginDescription": "Справаздачы наладак карыстальнікаў: Браўзэр, Сямейства Браўзэр сям'і, Аперацыйная сістэма, Плагіны, Глабальныя параметры.",
diff --git a/lang/bg.json b/lang/bg.json
index a05f2fd311..ab2bf6784d 100644
--- a/lang/bg.json
+++ b/lang/bg.json
@@ -1616,7 +1616,19 @@
         "Unlocated": "<b>%s<\/b> %p посещения от %c вашето местоположение не може да бъде открито.",
         "worldMap": "световна карта"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Фамилия браузъри",
+        "Browsers": "Браузъри",
+        "ColumnBrowser": "Браузър и версия",
+        "ColumnBrowserFamily": "Фамилия браузъри",
+        "ColumnBrowserVersion": "Версия на браузъра",
+        "ColumnConfiguration": "Обобщена конфигурация",
+        "ColumnOperatingSystem": "Операционна система и версия",
+        "ColumnPlugin": "Плъгин",
+        "ColumnResolution": "Разделителна способност на екрана",
+        "ColumnTypeOfScreen": "Тип на екрана",
+        "Configurations": "Конфигурации",
+        "GamingConsole": "Конзола за игри",
         "Language_aa": "афарски",
         "Language_ab": "абхазки",
         "Language_ae": "авестийски",
@@ -1800,21 +1812,7 @@
         "Language_yo": "йоруба",
         "Language_za": "зуанг",
         "Language_zh": "китайски",
-        "Language_zu": "зулуски"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Фамилия браузъри",
-        "Browsers": "Браузъри",
-        "ColumnBrowser": "Браузър и версия",
-        "ColumnBrowserFamily": "Фамилия браузъри",
-        "ColumnBrowserVersion": "Версия на браузъра",
-        "ColumnConfiguration": "Обобщена конфигурация",
-        "ColumnOperatingSystem": "Операционна система и версия",
-        "ColumnPlugin": "Плъгин",
-        "ColumnResolution": "Разделителна способност на екрана",
-        "ColumnTypeOfScreen": "Тип на екрана",
-        "Configurations": "Конфигурации",
-        "GamingConsole": "Конзола за игри",
+        "Language_zu": "зулуски",
         "LanguageCode": "Код на езика",
         "MobileVsDesktop": "Мобилни срещу Настолни",
         "OperatingSystemFamily": "Семейство на оперативната система",
diff --git a/lang/bs.json b/lang/bs.json
index 41758bf625..d39da30230 100644
--- a/lang/bs.json
+++ b/lang/bs.json
@@ -654,7 +654,7 @@
         "country_zm": "Zambija",
         "country_zw": "Zimbabve"
     },
-    "UserLanguage": {
+    "UserSettings": {
         "Language_aa": "afarski",
         "Language_ab": "abkazijski",
         "Language_ae": "avestanski",
diff --git a/lang/ca.json b/lang/ca.json
index be0a72cd3e..3fe064e0ea 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -1767,7 +1767,19 @@
         "toggleFullscreen": "Mostra pantalla completa",
         "worldMap": "Mapa mundial"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Motors dels navegadors",
+        "Browsers": "Navegadors",
+        "ColumnBrowser": "Navegador",
+        "ColumnBrowserFamily": "Família del navegador",
+        "ColumnBrowserVersion": "Versió del navegador",
+        "ColumnConfiguration": "Configuració",
+        "ColumnOperatingSystem": "Sistema operatiu",
+        "ColumnPlugin": "Connector",
+        "ColumnResolution": "Resolució",
+        "ColumnTypeOfScreen": "Tipus de pantalla",
+        "Configurations": "Configuracions",
+        "GamingConsole": "Consola de jocs",
         "Language_aa": "Afar",
         "Language_ab": "Abkhazian",
         "Language_ae": "Avestan",
@@ -1951,21 +1963,7 @@
         "Language_yo": "Yoruba",
         "Language_za": "Chuang",
         "Language_zh": "Xinès",
-        "Language_zu": "Zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Motors dels navegadors",
-        "Browsers": "Navegadors",
-        "ColumnBrowser": "Navegador",
-        "ColumnBrowserFamily": "Família del navegador",
-        "ColumnBrowserVersion": "Versió del navegador",
-        "ColumnConfiguration": "Configuració",
-        "ColumnOperatingSystem": "Sistema operatiu",
-        "ColumnPlugin": "Connector",
-        "ColumnResolution": "Resolució",
-        "ColumnTypeOfScreen": "Tipus de pantalla",
-        "Configurations": "Configuracions",
-        "GamingConsole": "Consola de jocs",
+        "Language_zu": "Zulu",
         "LanguageCode": "Codi de l'idioma",
         "MobileVsDesktop": "Escriptori vs. Mòbil",
         "OperatingSystemFamily": "Família del Sistema Operatiu",
diff --git a/lang/cs.json b/lang/cs.json
index 3445af4c36..5e0fbd6e5c 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -1380,7 +1380,19 @@
         "worldMap": "mapa světa",
         "WorldWide": "Celostvětová"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Rodiny Web prohlížečů",
+        "Browsers": "Web prohlížeče",
+        "ColumnBrowser": "Web prohlížeč",
+        "ColumnBrowserFamily": "Rodina Web prohlížeče",
+        "ColumnBrowserVersion": "Verze prohlížeče",
+        "ColumnConfiguration": "Konfigurace",
+        "ColumnOperatingSystem": "Operační systém",
+        "ColumnPlugin": "Zásuvný modul",
+        "ColumnResolution": "Rozlišení",
+        "ColumnTypeOfScreen": "Typ obrazovky",
+        "Configurations": "Nastavení",
+        "GamingConsole": "Herní konzole",
         "Language_aa": "afarština",
         "Language_ab": "abcházština",
         "Language_ae": "avestánština",
@@ -1563,21 +1575,7 @@
         "Language_yo": "yoruba",
         "Language_za": "zhuang",
         "Language_zh": "čínština",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Rodiny Web prohlížečů",
-        "Browsers": "Web prohlížeče",
-        "ColumnBrowser": "Web prohlížeč",
-        "ColumnBrowserFamily": "Rodina Web prohlížeče",
-        "ColumnBrowserVersion": "Verze prohlížeče",
-        "ColumnConfiguration": "Konfigurace",
-        "ColumnOperatingSystem": "Operační systém",
-        "ColumnPlugin": "Zásuvný modul",
-        "ColumnResolution": "Rozlišení",
-        "ColumnTypeOfScreen": "Typ obrazovky",
-        "Configurations": "Nastavení",
-        "GamingConsole": "Herní konzole",
+        "Language_zu": "zulu",
         "LanguageCode": "Jazykový kód",
         "MobileVsDesktop": "Mobilní vs. Desktop",
         "OperatingSystemFamily": "Operační systém",
diff --git a/lang/cy.json b/lang/cy.json
index 3cf4d798e7..dd709b81df 100644
--- a/lang/cy.json
+++ b/lang/cy.json
@@ -559,7 +559,7 @@
         "country_zm": "Sambia",
         "country_zw": "Simbabwe"
     },
-    "UserLanguage": {
+    "UserSettings": {
         "Language_aa": "Affareg",
         "Language_ab": "Abchaseg",
         "Language_ae": "Afestaneg",
diff --git a/lang/da.json b/lang/da.json
index 76fcdd5288..1f8136e7ba 100644
--- a/lang/da.json
+++ b/lang/da.json
@@ -1967,7 +1967,22 @@
         "worldMap": "Verdenskort",
         "WorldWide": "Hele verden"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Browsertyper",
+        "BrowserLanguage": "Browser sprog",
+        "Browsers": "Browsere",
+        "BrowserWithNoPluginsEnabled": "%1$s med ingen aktiverede udvidelsesmoduler",
+        "BrowserWithPluginsEnabled": "%1$s med udvidelsesmoduler %2$s aktiveret",
+        "ColumnBrowser": "Browser",
+        "ColumnBrowserFamily": "Browsertype",
+        "ColumnBrowserVersion": "Browserversion",
+        "ColumnConfiguration": "Konfiguration",
+        "ColumnOperatingSystem": "Operativsystem",
+        "ColumnPlugin": "Udvidelsesmodul",
+        "ColumnResolution": "Opløsning",
+        "ColumnTypeOfScreen": "Skærmtype",
+        "Configurations": "Indstillinger",
+        "GamingConsole": "Spillekonsol",
         "Language_aa": "Afar",
         "Language_ab": "Abkhasisk",
         "Language_ae": "Avestisk",
@@ -2151,24 +2166,7 @@
         "Language_yo": "Yoruba",
         "Language_za": "Zhuang",
         "Language_zh": "Kinesisk",
-        "Language_zu": "Zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Browsertyper",
-        "BrowserLanguage": "Browser sprog",
-        "Browsers": "Browsere",
-        "BrowserWithNoPluginsEnabled": "%1$s med ingen aktiverede udvidelsesmoduler",
-        "BrowserWithPluginsEnabled": "%1$s med udvidelsesmoduler %2$s aktiveret",
-        "ColumnBrowser": "Browser",
-        "ColumnBrowserFamily": "Browsertype",
-        "ColumnBrowserVersion": "Browserversion",
-        "ColumnConfiguration": "Konfiguration",
-        "ColumnOperatingSystem": "Operativsystem",
-        "ColumnPlugin": "Udvidelsesmodul",
-        "ColumnResolution": "Opløsning",
-        "ColumnTypeOfScreen": "Skærmtype",
-        "Configurations": "Indstillinger",
-        "GamingConsole": "Spillekonsol",
+        "Language_zu": "Zulu",
         "LanguageCode": "Sprogkode",
         "MobileVsDesktop": "Mobil vs skrivebord",
         "OperatingSystemFamily": "Operativsystemsfamilie",
diff --git a/lang/de.json b/lang/de.json
index 0673a1bbc5..cd28476500 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -1971,7 +1971,22 @@
         "worldMap": "Weltkarte",
         "WorldWide": "Weltweit"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Browserfamilien",
+        "BrowserLanguage": "Browsersprache",
+        "Browsers": "Browser",
+        "BrowserWithNoPluginsEnabled": "%1$s mit keinen aktivierten Plugins",
+        "BrowserWithPluginsEnabled": "%1$s mit den Plugins %2$s aktiviert",
+        "ColumnBrowser": "Browser",
+        "ColumnBrowserFamily": "Browserfamilie",
+        "ColumnBrowserVersion": "Browserversion",
+        "ColumnConfiguration": "Konfiguration",
+        "ColumnOperatingSystem": "Betriebssystem",
+        "ColumnPlugin": "Plugin",
+        "ColumnResolution": "Auflösung",
+        "ColumnTypeOfScreen": "Bildschirmtyp",
+        "Configurations": "Konfigurationen",
+        "GamingConsole": "Spielkonsole",
         "Language_aa": "Afar",
         "Language_ab": "Abchasisch",
         "Language_ae": "Avestisch",
@@ -2155,24 +2170,7 @@
         "Language_yo": "Yoruba",
         "Language_za": "Zhuang",
         "Language_zh": "Chinesisch",
-        "Language_zu": "IsiZulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Browserfamilien",
-        "BrowserLanguage": "Browsersprache",
-        "Browsers": "Browser",
-        "BrowserWithNoPluginsEnabled": "%1$s mit keinen aktivierten Plugins",
-        "BrowserWithPluginsEnabled": "%1$s mit den Plugins %2$s aktiviert",
-        "ColumnBrowser": "Browser",
-        "ColumnBrowserFamily": "Browserfamilie",
-        "ColumnBrowserVersion": "Browserversion",
-        "ColumnConfiguration": "Konfiguration",
-        "ColumnOperatingSystem": "Betriebssystem",
-        "ColumnPlugin": "Plugin",
-        "ColumnResolution": "Auflösung",
-        "ColumnTypeOfScreen": "Bildschirmtyp",
-        "Configurations": "Konfigurationen",
-        "GamingConsole": "Spielkonsole",
+        "Language_zu": "IsiZulu",
         "LanguageCode": "Sprach-Code",
         "MobileVsDesktop": "Mobilgerät vs. Desktop",
         "OperatingSystemFamily": "Betriebssystem-Familie",
diff --git a/lang/el.json b/lang/el.json
index 3553e5a005..98417e9b31 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -1956,7 +1956,22 @@
         "worldMap": "παγκόσμιος χάρτης",
         "WorldWide": "Παγκοσμίως"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Ομάδες φυλλομετρητών",
+        "BrowserLanguage": "Γλώσσα φυλλομετρητή",
+        "Browsers": "Φυλλομετρητές",
+        "BrowserWithNoPluginsEnabled": "%1$s με ανενεργά πρόσθετα",
+        "BrowserWithPluginsEnabled": "%1$s με %2$s πρόσθετα ενεργά",
+        "ColumnBrowser": "Φυλλομετρητής",
+        "ColumnBrowserFamily": "Οικογένεια φυλλομετρητών",
+        "ColumnBrowserVersion": "Έκδοση φυλλομετρητή",
+        "ColumnConfiguration": "Ρύθμιση",
+        "ColumnOperatingSystem": "Λειτουργικό σύστημα",
+        "ColumnPlugin": "Πρόσθετο",
+        "ColumnResolution": "Ανάλυση",
+        "ColumnTypeOfScreen": "Τύπος οθόνης",
+        "Configurations": "Ρυθμίσεις",
+        "GamingConsole": "Παιχνιδοκονσόλα",
         "Language_aa": "Αφαρικά",
         "Language_ab": "Αμπχαζικά",
         "Language_ae": "Αβεστανικά",
@@ -2140,24 +2155,7 @@
         "Language_yo": "Γιορούμπα",
         "Language_za": "Ζουάνγκ",
         "Language_zh": "Κινεζικά",
-        "Language_zu": "Ζουλού"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Ομάδες φυλλομετρητών",
-        "BrowserLanguage": "Γλώσσα φυλλομετρητή",
-        "Browsers": "Φυλλομετρητές",
-        "BrowserWithNoPluginsEnabled": "%1$s με ανενεργά πρόσθετα",
-        "BrowserWithPluginsEnabled": "%1$s με %2$s πρόσθετα ενεργά",
-        "ColumnBrowser": "Φυλλομετρητής",
-        "ColumnBrowserFamily": "Οικογένεια φυλλομετρητών",
-        "ColumnBrowserVersion": "Έκδοση φυλλομετρητή",
-        "ColumnConfiguration": "Ρύθμιση",
-        "ColumnOperatingSystem": "Λειτουργικό σύστημα",
-        "ColumnPlugin": "Πρόσθετο",
-        "ColumnResolution": "Ανάλυση",
-        "ColumnTypeOfScreen": "Τύπος οθόνης",
-        "Configurations": "Ρυθμίσεις",
-        "GamingConsole": "Παιχνιδοκονσόλα",
+        "Language_zu": "Ζουλού",
         "LanguageCode": "Κωδικός γλώσσας",
         "MobileVsDesktop": "Κινητό ως προς Επιτραπέζιο",
         "OperatingSystemFamily": "Οικογένεια Λειτουργικού Συστήματος",
diff --git a/lang/en.json b/lang/en.json
index 4f5a669261..2328ecb05a 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1854,7 +1854,191 @@
         "GamingConsole": "Gaming Console",
         "MobileVsDesktop": "Mobile vs Desktop",
         "BrowserLanguage": "Browser language",
-        "LanguageCode": "Language code"
+        "LanguageCode": "Language code",
+        "Language_aa": "Afar",
+        "Language_ab": "Abkhazian",
+        "Language_ae": "Avestan",
+        "Language_af": "Afrikaans",
+        "Language_ak": "Akan",
+        "Language_am": "Amharic",
+        "Language_an": "Aragonese",
+        "Language_ar": "Arabic",
+        "Language_as": "Assamese",
+        "Language_av": "Avaric",
+        "Language_ay": "Aymara",
+        "Language_az": "Azerbaijani",
+        "Language_ba": "Bashkir",
+        "Language_be": "Belarusian",
+        "Language_bg": "Bulgarian",
+        "Language_bh": "Bihari",
+        "Language_bi": "Bislama",
+        "Language_bm": "Bambara",
+        "Language_bn": "Bengali",
+        "Language_bo": "Tibetan",
+        "Language_br": "Breton",
+        "Language_bs": "Bosnian",
+        "Language_ca": "Catalan",
+        "Language_ce": "Chechen",
+        "Language_ch": "Chamorro",
+        "Language_co": "Corsican",
+        "Language_cr": "Cree",
+        "Language_cs": "Czech",
+        "Language_cu": "Church Slavic",
+        "Language_cv": "Chuvash",
+        "Language_cy": "Welsh",
+        "Language_da": "Danish",
+        "Language_de": "German",
+        "Language_dv": "Divehi",
+        "Language_dz": "Dzongkha",
+        "Language_ee": "Ewe",
+        "Language_el": "Greek",
+        "Language_en": "English",
+        "Language_eo": "Esperanto",
+        "Language_es": "Spanish",
+        "Language_et": "Estonian",
+        "Language_eu": "Basque",
+        "Language_fa": "Persian",
+        "Language_ff": "Fulah",
+        "Language_fi": "Finnish",
+        "Language_fj": "Fijian",
+        "Language_fo": "Faroese",
+        "Language_fr": "French",
+        "Language_fy": "Western Frisian",
+        "Language_ga": "Irish",
+        "Language_gd": "Scottish Gaelic",
+        "Language_gl": "Galician",
+        "Language_gn": "Guarani",
+        "Language_gu": "Gujarati",
+        "Language_gv": "Manx",
+        "Language_ha": "Hausa",
+        "Language_he": "Hebrew",
+        "Language_hi": "Hindi",
+        "Language_ho": "Hiri Motu",
+        "Language_hr": "Croatian",
+        "Language_ht": "Haitian Creole",
+        "Language_hu": "Hungarian",
+        "Language_hy": "Armenian",
+        "Language_hz": "Herero",
+        "Language_ia": "Interlingua",
+        "Language_id": "Indonesian",
+        "Language_ie": "Interlingue",
+        "Language_ig": "Igbo",
+        "Language_ii": "Sichuan Yi",
+        "Language_ik": "Inupiaq",
+        "Language_io": "Ido",
+        "Language_is": "Icelandic",
+        "Language_it": "Italian",
+        "Language_iu": "Inuktitut",
+        "Language_ja": "Japanese",
+        "Language_jv": "Javanese",
+        "Language_ka": "Georgian",
+        "Language_kg": "Kongo",
+        "Language_ki": "Kukuyu",
+        "Language_kj": "Kuanyama",
+        "Language_kk": "Kazakh",
+        "Language_kl": "Greenlandic",
+        "Language_km": "Central Khmer",
+        "Language_kn": "Kannada",
+        "Language_ko": "Korean",
+        "Language_kr": "Kanuri",
+        "Language_ks": "Kashmiri",
+        "Language_ku": "Kurdish",
+        "Language_kv": "Komi",
+        "Language_kw": "Cornish",
+        "Language_ky": "Kirghiz",
+        "Language_la": "Latin",
+        "Language_lb": "Luxembourgish",
+        "Language_lg": "Ganda",
+        "Language_li": "Limburgish",
+        "Language_ln": "Lingala",
+        "Language_lo": "Lao",
+        "Language_lt": "Lithuanian",
+        "Language_lu": "Luba-Katanga",
+        "Language_lv": "Latvian",
+        "Language_mg": "Malagasy",
+        "Language_mh": "Marshallese",
+        "Language_mi": "Maori",
+        "Language_mk": "Macedonian",
+        "Language_ml": "Malayalam",
+        "Language_mn": "Mongolian",
+        "Language_mr": "Marathi",
+        "Language_ms": "Malay",
+        "Language_mt": "Maltese",
+        "Language_my": "Burmese",
+        "Language_na": "Nauru",
+        "Language_nb": "Norwegian Bokma°l",
+        "Language_nd": "North Ndebele",
+        "Language_ne": "Nepali",
+        "Language_ng": "Ndonga",
+        "Language_nl": "Dutch",
+        "Language_nn": "Norwegian Nynorsk",
+        "Language_no": "Norwegian",
+        "Language_nr": "South Ndebele",
+        "Language_nv": "Navajo",
+        "Language_ny": "Chichewa",
+        "Language_oc": "Occitan",
+        "Language_oj": "Ojibwa",
+        "Language_om": "Oroma",
+        "Language_or": "Oriya",
+        "Language_os": "Ossetian",
+        "Language_pa": "Panjabi",
+        "Language_pi": "Pali",
+        "Language_pl": "Polish",
+        "Language_ps": "Pashto",
+        "Language_pt": "Portuguese",
+        "Language_qu": "Quechua",
+        "Language_rm": "Raeto-Romance",
+        "Language_rn": "Rundi",
+        "Language_ro": "Romanian",
+        "Language_ru": "Russian",
+        "Language_rw": "Kinyarwanda",
+        "Language_sa": "Sanskrit",
+        "Language_sc": "Sardinian",
+        "Language_sd": "Sindhi",
+        "Language_se": "Northern Sami",
+        "Language_sg": "Sango",
+        "Language_si": "Sinhala",
+        "Language_sk": "Slovak",
+        "Language_sl": "Slovenian",
+        "Language_sm": "Samoan",
+        "Language_sn": "Shona",
+        "Language_so": "Somali",
+        "Language_sq": "Albanian",
+        "Language_sr": "Serbian",
+        "Language_ss": "Swati",
+        "Language_st": "Sotho",
+        "Language_su": "Sundanese",
+        "Language_sv": "Swedish",
+        "Language_sw": "Swahili",
+        "Language_ta": "Tamil",
+        "Language_te": "Telugu",
+        "Language_tg": "Tajik",
+        "Language_th": "Thai",
+        "Language_ti": "Tigrinya",
+        "Language_tk": "Turkmen",
+        "Language_tl": "Tagalog",
+        "Language_tn": "Tswana",
+        "Language_to": "Tonga",
+        "Language_tr": "Turkish",
+        "Language_ts": "Tsonga",
+        "Language_tt": "Tatar",
+        "Language_tw": "Twi",
+        "Language_ty": "Tahitian",
+        "Language_ug": "Uighur",
+        "Language_uk": "Ukrainian",
+        "Language_ur": "Urdu",
+        "Language_uz": "Uzbek",
+        "Language_ve": "Venda",
+        "Language_vi": "Vietnamese",
+        "Language_vo": "Volapük",
+        "Language_wa": "Walloon",
+        "Language_wo": "Wolof",
+        "Language_xh": "Xhosa",
+        "Language_yi": "Yiddish",
+        "Language_yo": "Yoruba",
+        "Language_za": "Chuang",
+        "Language_zh": "Chinese",
+        "Language_zu": "Zulu"
     },
     "UsersManager": {
         "PluginDescription": "Users Management in Piwik: add a new User, edit an existing one, update the permissions. All the actions are also available through the API.",
@@ -2146,192 +2330,6 @@
         "AnnotationOnDate": "Annotation on %1$s: %2$s",
         "ClickToEditOrAdd": "Click to edit or add a new annotation."
     },
-    "UserLanguage": {
-        "Language_aa": "Afar",
-        "Language_ab": "Abkhazian",
-        "Language_ae": "Avestan",
-        "Language_af": "Afrikaans",
-        "Language_ak": "Akan",
-        "Language_am": "Amharic",
-        "Language_an": "Aragonese",
-        "Language_ar": "Arabic",
-        "Language_as": "Assamese",
-        "Language_av": "Avaric",
-        "Language_ay": "Aymara",
-        "Language_az": "Azerbaijani",
-        "Language_ba": "Bashkir",
-        "Language_be": "Belarusian",
-        "Language_bg": "Bulgarian",
-        "Language_bh": "Bihari",
-        "Language_bi": "Bislama",
-        "Language_bm": "Bambara",
-        "Language_bn": "Bengali",
-        "Language_bo": "Tibetan",
-        "Language_br": "Breton",
-        "Language_bs": "Bosnian",
-        "Language_ca": "Catalan",
-        "Language_ce": "Chechen",
-        "Language_ch": "Chamorro",
-        "Language_co": "Corsican",
-        "Language_cr": "Cree",
-        "Language_cs": "Czech",
-        "Language_cu": "Church Slavic",
-        "Language_cv": "Chuvash",
-        "Language_cy": "Welsh",
-        "Language_da": "Danish",
-        "Language_de": "German",
-        "Language_dv": "Divehi",
-        "Language_dz": "Dzongkha",
-        "Language_ee": "Ewe",
-        "Language_el": "Greek",
-        "Language_en": "English",
-        "Language_eo": "Esperanto",
-        "Language_es": "Spanish",
-        "Language_et": "Estonian",
-        "Language_eu": "Basque",
-        "Language_fa": "Persian",
-        "Language_ff": "Fulah",
-        "Language_fi": "Finnish",
-        "Language_fj": "Fijian",
-        "Language_fo": "Faroese",
-        "Language_fr": "French",
-        "Language_fy": "Western Frisian",
-        "Language_ga": "Irish",
-        "Language_gd": "Scottish Gaelic",
-        "Language_gl": "Galician",
-        "Language_gn": "Guarani",
-        "Language_gu": "Gujarati",
-        "Language_gv": "Manx",
-        "Language_ha": "Hausa",
-        "Language_he": "Hebrew",
-        "Language_hi": "Hindi",
-        "Language_ho": "Hiri Motu",
-        "Language_hr": "Croatian",
-        "Language_ht": "Haitian Creole",
-        "Language_hu": "Hungarian",
-        "Language_hy": "Armenian",
-        "Language_hz": "Herero",
-        "Language_ia": "Interlingua",
-        "Language_id": "Indonesian",
-        "Language_ie": "Interlingue",
-        "Language_ig": "Igbo",
-        "Language_ii": "Sichuan Yi",
-        "Language_ik": "Inupiaq",
-        "Language_io": "Ido",
-        "Language_is": "Icelandic",
-        "Language_it": "Italian",
-        "Language_iu": "Inuktitut",
-        "Language_ja": "Japanese",
-        "Language_jv": "Javanese",
-        "Language_ka": "Georgian",
-        "Language_kg": "Kongo",
-        "Language_ki": "Kukuyu",
-        "Language_kj": "Kuanyama",
-        "Language_kk": "Kazakh",
-        "Language_kl": "Greenlandic",
-        "Language_km": "Central Khmer",
-        "Language_kn": "Kannada",
-        "Language_ko": "Korean",
-        "Language_kr": "Kanuri",
-        "Language_ks": "Kashmiri",
-        "Language_ku": "Kurdish",
-        "Language_kv": "Komi",
-        "Language_kw": "Cornish",
-        "Language_ky": "Kirghiz",
-        "Language_la": "Latin",
-        "Language_lb": "Luxembourgish",
-        "Language_lg": "Ganda",
-        "Language_li": "Limburgish",
-        "Language_ln": "Lingala",
-        "Language_lo": "Lao",
-        "Language_lt": "Lithuanian",
-        "Language_lu": "Luba-Katanga",
-        "Language_lv": "Latvian",
-        "Language_mg": "Malagasy",
-        "Language_mh": "Marshallese",
-        "Language_mi": "Maori",
-        "Language_mk": "Macedonian",
-        "Language_ml": "Malayalam",
-        "Language_mn": "Mongolian",
-        "Language_mr": "Marathi",
-        "Language_ms": "Malay",
-        "Language_mt": "Maltese",
-        "Language_my": "Burmese",
-        "Language_na": "Nauru",
-        "Language_nb": "Norwegian Bokma°l",
-        "Language_nd": "North Ndebele",
-        "Language_ne": "Nepali",
-        "Language_ng": "Ndonga",
-        "Language_nl": "Dutch",
-        "Language_nn": "Norwegian Nynorsk",
-        "Language_no": "Norwegian",
-        "Language_nr": "South Ndebele",
-        "Language_nv": "Navajo",
-        "Language_ny": "Chichewa",
-        "Language_oc": "Occitan",
-        "Language_oj": "Ojibwa",
-        "Language_om": "Oroma",
-        "Language_or": "Oriya",
-        "Language_os": "Ossetian",
-        "Language_pa": "Panjabi",
-        "Language_pi": "Pali",
-        "Language_pl": "Polish",
-        "Language_ps": "Pashto",
-        "Language_pt": "Portuguese",
-        "Language_qu": "Quechua",
-        "Language_rm": "Raeto-Romance",
-        "Language_rn": "Rundi",
-        "Language_ro": "Romanian",
-        "Language_ru": "Russian",
-        "Language_rw": "Kinyarwanda",
-        "Language_sa": "Sanskrit",
-        "Language_sc": "Sardinian",
-        "Language_sd": "Sindhi",
-        "Language_se": "Northern Sami",
-        "Language_sg": "Sango",
-        "Language_si": "Sinhala",
-        "Language_sk": "Slovak",
-        "Language_sl": "Slovenian",
-        "Language_sm": "Samoan",
-        "Language_sn": "Shona",
-        "Language_so": "Somali",
-        "Language_sq": "Albanian",
-        "Language_sr": "Serbian",
-        "Language_ss": "Swati",
-        "Language_st": "Sotho",
-        "Language_su": "Sundanese",
-        "Language_sv": "Swedish",
-        "Language_sw": "Swahili",
-        "Language_ta": "Tamil",
-        "Language_te": "Telugu",
-        "Language_tg": "Tajik",
-        "Language_th": "Thai",
-        "Language_ti": "Tigrinya",
-        "Language_tk": "Turkmen",
-        "Language_tl": "Tagalog",
-        "Language_tn": "Tswana",
-        "Language_to": "Tonga",
-        "Language_tr": "Turkish",
-        "Language_ts": "Tsonga",
-        "Language_tt": "Tatar",
-        "Language_tw": "Twi",
-        "Language_ty": "Tahitian",
-        "Language_ug": "Uighur",
-        "Language_uk": "Ukrainian",
-        "Language_ur": "Urdu",
-        "Language_uz": "Uzbek",
-        "Language_ve": "Venda",
-        "Language_vi": "Vietnamese",
-        "Language_vo": "Volapük",
-        "Language_wa": "Walloon",
-        "Language_wo": "Wolof",
-        "Language_xh": "Xhosa",
-        "Language_yi": "Yiddish",
-        "Language_yo": "Yoruba",
-        "Language_za": "Chuang",
-        "Language_zh": "Chinese",
-        "Language_zu": "Zulu"
-    },
     "SegmentEditor": {
         "AddNewSegment": "Add new segment",
         "NewSegment": "New segment",
diff --git a/lang/es.json b/lang/es.json
index ab102c12e3..5bec350a94 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -1798,7 +1798,19 @@
         "toggleFullscreen": "Pantalla completa",
         "worldMap": "mapamundi"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Familia de Navegadores",
+        "Browsers": "Navegadores",
+        "ColumnBrowser": "Navegador",
+        "ColumnBrowserFamily": "Buscadores por familia",
+        "ColumnBrowserVersion": "Versión del navegador",
+        "ColumnConfiguration": "Configuración",
+        "ColumnOperatingSystem": "Sistemas operativos",
+        "ColumnPlugin": "Plugin",
+        "ColumnResolution": "Resoluciones",
+        "ColumnTypeOfScreen": "Tipo de pantalla",
+        "Configurations": "Configuración",
+        "GamingConsole": "Consola de juegos",
         "Language_aa": "Lejos",
         "Language_ab": "Abjasia",
         "Language_ae": "Avéstico",
@@ -1982,21 +1994,7 @@
         "Language_yo": "Yoruba",
         "Language_za": "Chuang",
         "Language_zh": "Chino",
-        "Language_zu": "Zulú"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Familia de Navegadores",
-        "Browsers": "Navegadores",
-        "ColumnBrowser": "Navegador",
-        "ColumnBrowserFamily": "Buscadores por familia",
-        "ColumnBrowserVersion": "Versión del navegador",
-        "ColumnConfiguration": "Configuración",
-        "ColumnOperatingSystem": "Sistemas operativos",
-        "ColumnPlugin": "Plugin",
-        "ColumnResolution": "Resoluciones",
-        "ColumnTypeOfScreen": "Tipo de pantalla",
-        "Configurations": "Configuración",
-        "GamingConsole": "Consola de juegos",
+        "Language_zu": "Zulú",
         "LanguageCode": "Código de idioma",
         "MobileVsDesktop": "Móvil vs Escritorio",
         "OperatingSystemFamily": "Familia de sistema operativo",
diff --git a/lang/et.json b/lang/et.json
index b483525704..599b50698e 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -544,7 +544,10 @@
         "DistinctCountries": "%s eri riigist",
         "SubmenuLocations": "Asukohad"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Sirvijate tüübid",
+        "Browsers": "Veebisirvijad",
+        "Configurations": "Konfiguratsioonid",
         "Language_aa": "afari",
         "Language_ab": "abhaasi",
         "Language_ae": "avesta",
@@ -728,12 +731,7 @@
         "Language_yo": "joruba",
         "Language_za": "tšuangi",
         "Language_zh": "hiina",
-        "Language_zu": "suulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Sirvijate tüübid",
-        "Browsers": "Veebisirvijad",
-        "Configurations": "Konfiguratsioonid",
+        "Language_zu": "suulu",
         "LanguageCode": "Keele kood",
         "OperatingSystems": "Operatsioonisüsteemid",
         "Plugins": "Pluginad",
diff --git a/lang/eu.json b/lang/eu.json
index 2cb96a0450..32318d4c11 100644
--- a/lang/eu.json
+++ b/lang/eu.json
@@ -778,7 +778,17 @@
         "DistinctCountries": "%s herrialde desberdin",
         "SubmenuLocations": "Kokalekuak"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Nabigatzaile-familiak",
+        "Browsers": "Nabigatzaileak",
+        "ColumnBrowser": "Nabigatzailea",
+        "ColumnBrowserFamily": "Nabigatzaile-familia",
+        "ColumnConfiguration": "Konfigurazioa",
+        "ColumnOperatingSystem": "Sistema eragilea",
+        "ColumnPlugin": "Plugina",
+        "ColumnResolution": "Bereizmena",
+        "ColumnTypeOfScreen": "Pantaila mota",
+        "Configurations": "Konfigurazioak",
         "Language_ab": "abkhazera",
         "Language_af": "afrikaans",
         "Language_ak": "Akanera",
@@ -923,19 +933,7 @@
         "Language_yi": "yiddishera",
         "Language_yo": "yorubera",
         "Language_zh": "txinera",
-        "Language_zu": "zuluera"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Nabigatzaile-familiak",
-        "Browsers": "Nabigatzaileak",
-        "ColumnBrowser": "Nabigatzailea",
-        "ColumnBrowserFamily": "Nabigatzaile-familia",
-        "ColumnConfiguration": "Konfigurazioa",
-        "ColumnOperatingSystem": "Sistema eragilea",
-        "ColumnPlugin": "Plugina",
-        "ColumnResolution": "Bereizmena",
-        "ColumnTypeOfScreen": "Pantaila mota",
-        "Configurations": "Konfigurazioak",
+        "Language_zu": "zuluera",
         "LanguageCode": "Hizkuntza-kodea",
         "OperatingSystems": "Sistema eragileak",
         "Plugins": "Pluginak",
diff --git a/lang/fa.json b/lang/fa.json
index 38d2b507e4..07ce775a79 100644
--- a/lang/fa.json
+++ b/lang/fa.json
@@ -1764,7 +1764,20 @@
         "worldMap": "نقشه جهان",
         "WorldWide": "سراسر جهان"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "خانواده مرورگرها",
+        "BrowserLanguage": "زبان مرورگر",
+        "Browsers": "مرورگر ها",
+        "ColumnBrowser": "مرورگر",
+        "ColumnBrowserFamily": "خانواده مرورگر",
+        "ColumnBrowserVersion": "نسخه مرورگر",
+        "ColumnConfiguration": "پیکربندی",
+        "ColumnOperatingSystem": "پیکربندی سیستم",
+        "ColumnPlugin": "افزونه",
+        "ColumnResolution": "رزلوشن",
+        "ColumnTypeOfScreen": "نوع صفحه نمایش",
+        "Configurations": "پیکربندی",
+        "GamingConsole": "کنسول بازی",
         "Language_aa": "آفاری",
         "Language_ab": "آبخازیایی",
         "Language_ae": "اوستایی",
@@ -1948,22 +1961,7 @@
         "Language_yo": "یوروبایی",
         "Language_za": "چوانگی",
         "Language_zh": "چینی",
-        "Language_zu": "زولویی"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "خانواده مرورگرها",
-        "BrowserLanguage": "زبان مرورگر",
-        "Browsers": "مرورگر ها",
-        "ColumnBrowser": "مرورگر",
-        "ColumnBrowserFamily": "خانواده مرورگر",
-        "ColumnBrowserVersion": "نسخه مرورگر",
-        "ColumnConfiguration": "پیکربندی",
-        "ColumnOperatingSystem": "پیکربندی سیستم",
-        "ColumnPlugin": "افزونه",
-        "ColumnResolution": "رزلوشن",
-        "ColumnTypeOfScreen": "نوع صفحه نمایش",
-        "Configurations": "پیکربندی",
-        "GamingConsole": "کنسول بازی",
+        "Language_zu": "زولویی",
         "LanguageCode": "کد زبان",
         "MobileVsDesktop": "موبایل در برابر رومیزی",
         "OperatingSystemFamily": "خانواده سیستم عامل",
diff --git a/lang/fi.json b/lang/fi.json
index 6162f70f7b..0b6852ee49 100644
--- a/lang/fi.json
+++ b/lang/fi.json
@@ -1581,7 +1581,19 @@
         "toggleFullscreen": "Vaihda koko näytön kokoiseen",
         "worldMap": "maailmankartta"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Selainluokat",
+        "Browsers": "Selaimet",
+        "ColumnBrowser": "Selain",
+        "ColumnBrowserFamily": "Selainperhe",
+        "ColumnBrowserVersion": "Selaimen versio",
+        "ColumnConfiguration": "Asetukset",
+        "ColumnOperatingSystem": "Käyttöjärjestelmä",
+        "ColumnPlugin": "Lisäosa",
+        "ColumnResolution": "Resoluutio",
+        "ColumnTypeOfScreen": "Näytön tyyppi",
+        "Configurations": "Asetukset",
+        "GamingConsole": "Pelikonsoli",
         "Language_aa": "afar",
         "Language_ab": "abkhazian",
         "Language_ae": "avestan",
@@ -1765,21 +1777,7 @@
         "Language_yo": "yoruba",
         "Language_za": "chuang",
         "Language_zh": "kiinan kieli",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Selainluokat",
-        "Browsers": "Selaimet",
-        "ColumnBrowser": "Selain",
-        "ColumnBrowserFamily": "Selainperhe",
-        "ColumnBrowserVersion": "Selaimen versio",
-        "ColumnConfiguration": "Asetukset",
-        "ColumnOperatingSystem": "Käyttöjärjestelmä",
-        "ColumnPlugin": "Lisäosa",
-        "ColumnResolution": "Resoluutio",
-        "ColumnTypeOfScreen": "Näytön tyyppi",
-        "Configurations": "Asetukset",
-        "GamingConsole": "Pelikonsoli",
+        "Language_zu": "zulu",
         "LanguageCode": "Kielikoodi",
         "MobileVsDesktop": "Mobiili vs. työpöytä",
         "OperatingSystemFamily": "Käyttöjärjestelmä",
diff --git a/lang/fr.json b/lang/fr.json
index b3a57211cf..1ee20e377e 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1964,7 +1964,22 @@
         "worldMap": "carte du monde",
         "WorldWide": "Mondialement"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Familles de navigateurs",
+        "BrowserLanguage": "Langage du navigateur",
+        "Browsers": "Navigateurs",
+        "BrowserWithNoPluginsEnabled": "%1$s avec aucun plugin activé",
+        "BrowserWithPluginsEnabled": "%1$s avec les plugins %2$s activés",
+        "ColumnBrowser": "Navigateur",
+        "ColumnBrowserFamily": "Famille de navigateur",
+        "ColumnBrowserVersion": "Version du navigateur",
+        "ColumnConfiguration": "Configuration",
+        "ColumnOperatingSystem": "Système d'exploitation",
+        "ColumnPlugin": "Plugin",
+        "ColumnResolution": "Résolution",
+        "ColumnTypeOfScreen": "Type d'écran",
+        "Configurations": "Configurations",
+        "GamingConsole": "Console de jeu",
         "Language_aa": "Afar",
         "Language_ab": "Abkhaze",
         "Language_ae": "Avestique",
@@ -2148,24 +2163,7 @@
         "Language_yo": "Yoruba",
         "Language_za": "Chuang",
         "Language_zh": "Chinois",
-        "Language_zu": "Zoulou"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Familles de navigateurs",
-        "BrowserLanguage": "Langage du navigateur",
-        "Browsers": "Navigateurs",
-        "BrowserWithNoPluginsEnabled": "%1$s avec aucun plugin activé",
-        "BrowserWithPluginsEnabled": "%1$s avec les plugins %2$s activés",
-        "ColumnBrowser": "Navigateur",
-        "ColumnBrowserFamily": "Famille de navigateur",
-        "ColumnBrowserVersion": "Version du navigateur",
-        "ColumnConfiguration": "Configuration",
-        "ColumnOperatingSystem": "Système d'exploitation",
-        "ColumnPlugin": "Plugin",
-        "ColumnResolution": "Résolution",
-        "ColumnTypeOfScreen": "Type d'écran",
-        "Configurations": "Configurations",
-        "GamingConsole": "Console de jeu",
+        "Language_zu": "Zoulou",
         "LanguageCode": "Code langue",
         "MobileVsDesktop": "Mobile vs Fixe",
         "OperatingSystemFamily": "Famille de systèmes d'exploitation",
diff --git a/lang/gl.json b/lang/gl.json
index e1ceb567a2..6849f6a310 100644
--- a/lang/gl.json
+++ b/lang/gl.json
@@ -579,7 +579,10 @@
         "DistinctCountries": "%s continentes distintos",
         "SubmenuLocations": "Lugares"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Familias de navegadores",
+        "Browsers": "Navegadores",
+        "Configurations": "Configuracións",
         "Language_ab": "abkhazo",
         "Language_af": "Afrikaans",
         "Language_ak": "Akán",
@@ -725,12 +728,7 @@
         "Language_yi": "Yiddish",
         "Language_yo": "ioruba",
         "Language_zh": "Chinés",
-        "Language_zu": "Zulú"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Familias de navegadores",
-        "Browsers": "Navegadores",
-        "Configurations": "Configuracións",
+        "Language_zu": "Zulú",
         "LanguageCode": "Código de idioma",
         "OperatingSystems": "Sistemas Operativos",
         "Plugins": "Plugins",
diff --git a/lang/he.json b/lang/he.json
index d48b0c40a9..b441923710 100644
--- a/lang/he.json
+++ b/lang/he.json
@@ -731,7 +731,7 @@
         "country_zm": "זמביה",
         "country_zw": "זימבאבווה"
     },
-    "UserLanguage": {
+    "UserSettings": {
         "Language_aa": "אפארית",
         "Language_ab": "אבחזית",
         "Language_ae": "אבסטן",
@@ -915,9 +915,7 @@
         "Language_yo": "יורובה",
         "Language_za": "ז'ואנג",
         "Language_zh": "סינית",
-        "Language_zu": "זולו"
-    },
-    "UserSettings": {
+        "Language_zu": "זולו",
         "LanguageCode": "קוד שפה"
     },
     "VisitsSummary": {
diff --git a/lang/hi.json b/lang/hi.json
index bd0f6cf8a8..c56ce997cc 100644
--- a/lang/hi.json
+++ b/lang/hi.json
@@ -1865,7 +1865,7 @@
         "GeoIpLocationProviderDesc_ServerBased1": "यह स्थान प्रदाता अपने HTTP सर्वर में स्थापित किया गया है जो GeoIP मॉड्यूल का उपयोग करता है. यह प्रदाता तेज और सटीक है, लेकिन %1$s स्कैन केवल सामान्य ब्राउज़र ट्रैकिंग के साथ इस्तेमाल किया जा सकता है .%2$s",
         "GeoIpLocationProviderDesc_ServerBased2": "आप लॉग इन फ़ाइलों को आयात या कुछ और करना है कि आईपी पतों को स्थापित करने की आवश्यकता हो, तो %1$s PECL GeoIP कार्यान्वयन (अनुशंसित) %2$s या %3$s PHP GeoIP कार्यान्वयन %4$s का उपयोग करें."
     },
-    "UserLanguage": {
+    "UserSettings": {
         "Language_aa": "अफ़ार",
         "Language_ab": "अब्खाज़ियन्",
         "Language_ae": "अवेस्तन",
@@ -2049,9 +2049,7 @@
         "Language_yo": "योरूबा",
         "Language_za": "ज़ुआंग",
         "Language_zh": "चीनी",
-        "Language_zu": "ज़ुलू"
-    },
-    "UserSettings": {
+        "Language_zu": "ज़ुलू",
         "LanguageCode": "भाषा कोड"
     }
 }
\ No newline at end of file
diff --git a/lang/hr.json b/lang/hr.json
index e7bfe92021..495d35d5ec 100644
--- a/lang/hr.json
+++ b/lang/hr.json
@@ -659,7 +659,14 @@
         "Location": "Lokacija",
         "SubmenuLocations": "Lokacije"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "Browsers": "Pretraživači",
+        "ColumnBrowserVersion": "Verzija pretraživača",
+        "ColumnConfiguration": "KOnfiguracija",
+        "ColumnOperatingSystem": "Operativni sustav",
+        "ColumnPlugin": "Dodaci",
+        "ColumnResolution": "Rezolucija",
+        "Configurations": "Konfiguracija",
         "Language_aa": "afarski",
         "Language_ab": "abhaski",
         "Language_ae": "avestan",
@@ -843,16 +850,7 @@
         "Language_yo": "joruba",
         "Language_za": "zhuang",
         "Language_zh": "kineski",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "Browsers": "Pretraživači",
-        "ColumnBrowserVersion": "Verzija pretraživača",
-        "ColumnConfiguration": "KOnfiguracija",
-        "ColumnOperatingSystem": "Operativni sustav",
-        "ColumnPlugin": "Dodaci",
-        "ColumnResolution": "Rezolucija",
-        "Configurations": "Konfiguracija",
+        "Language_zu": "zulu",
         "Plugins": "Dodaci",
         "VisitorSettings": "Postavke posjetitelja"
     },
diff --git a/lang/hu.json b/lang/hu.json
index 71c32334cc..6da912f1dc 100644
--- a/lang/hu.json
+++ b/lang/hu.json
@@ -1143,7 +1143,17 @@
         "toggleFullscreen": "teljes képernyőre",
         "worldMap": "világtérkép"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Böngészőcsaládok",
+        "Browsers": "Böngészők",
+        "ColumnBrowser": "Böngésző",
+        "ColumnBrowserFamily": "Böngészőcsalád",
+        "ColumnConfiguration": "Konfiguráció",
+        "ColumnOperatingSystem": "Operációs rendszer",
+        "ColumnPlugin": "Bővítmény",
+        "ColumnResolution": "Felbontás",
+        "ColumnTypeOfScreen": "Képernyő típusa",
+        "Configurations": "Konfigurációk",
         "Language_aa": "afar",
         "Language_ab": "abház",
         "Language_ae": "avesztán",
@@ -1327,19 +1337,7 @@
         "Language_yo": "joruba",
         "Language_za": "zsuang",
         "Language_zh": "kínai",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Böngészőcsaládok",
-        "Browsers": "Böngészők",
-        "ColumnBrowser": "Böngésző",
-        "ColumnBrowserFamily": "Böngészőcsalád",
-        "ColumnConfiguration": "Konfiguráció",
-        "ColumnOperatingSystem": "Operációs rendszer",
-        "ColumnPlugin": "Bővítmény",
-        "ColumnResolution": "Felbontás",
-        "ColumnTypeOfScreen": "Képernyő típusa",
-        "Configurations": "Konfigurációk",
+        "Language_zu": "zulu",
         "LanguageCode": "Nyelvi kód",
         "OperatingSystems": "Operációs rendszerek",
         "PluginDescription": "Jelentéseket készít a látogatóknál észlelt beállításokról és rendszerkörnyezetről mint például: böngésző típusa, böngészőcsaládok, operációs rendszer, böngésző bővítmények, képernyőfelbontás, globális beállítások.",
diff --git a/lang/id.json b/lang/id.json
index 74fdc2b052..d47efc72f3 100644
--- a/lang/id.json
+++ b/lang/id.json
@@ -1950,7 +1950,22 @@
         "worldMap": "peta dunia",
         "WorldWide": "Seluruh Dunia"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Keluarga Peramban",
+        "BrowserLanguage": "Bahasa Peramban",
+        "Browsers": "Perambang",
+        "BrowserWithNoPluginsEnabled": "%1$s dengan tanpa pengaya diaktifkan",
+        "BrowserWithPluginsEnabled": "%1$s dengan %2$s pengaya diaktifkan",
+        "ColumnBrowser": "Peramban",
+        "ColumnBrowserFamily": "Keluarga Peramban",
+        "ColumnBrowserVersion": "Versi Perambang",
+        "ColumnConfiguration": "Pengaturan",
+        "ColumnOperatingSystem": "Sistem Operasi",
+        "ColumnPlugin": "Pengaya",
+        "ColumnResolution": "Resolusi",
+        "ColumnTypeOfScreen": "Jenis layar",
+        "Configurations": "Pengaturan",
+        "GamingConsole": "Konsol Permainan",
         "Language_aa": "Afar",
         "Language_ab": "Abkhaz",
         "Language_ae": "Avestan",
@@ -2134,24 +2149,7 @@
         "Language_yo": "Yoruba",
         "Language_za": "Zhuang",
         "Language_zh": "Cina",
-        "Language_zu": "Zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Keluarga Peramban",
-        "BrowserLanguage": "Bahasa Peramban",
-        "Browsers": "Perambang",
-        "BrowserWithNoPluginsEnabled": "%1$s dengan tanpa pengaya diaktifkan",
-        "BrowserWithPluginsEnabled": "%1$s dengan %2$s pengaya diaktifkan",
-        "ColumnBrowser": "Peramban",
-        "ColumnBrowserFamily": "Keluarga Peramban",
-        "ColumnBrowserVersion": "Versi Perambang",
-        "ColumnConfiguration": "Pengaturan",
-        "ColumnOperatingSystem": "Sistem Operasi",
-        "ColumnPlugin": "Pengaya",
-        "ColumnResolution": "Resolusi",
-        "ColumnTypeOfScreen": "Jenis layar",
-        "Configurations": "Pengaturan",
-        "GamingConsole": "Konsol Permainan",
+        "Language_zu": "Zulu",
         "LanguageCode": "Kode Bahasa",
         "MobileVsDesktop": "Bergerak banding Desktop",
         "OperatingSystemFamily": "Keluarga sistem operasi",
diff --git a/lang/is.json b/lang/is.json
index 52f581b023..91a69676dc 100644
--- a/lang/is.json
+++ b/lang/is.json
@@ -751,7 +751,17 @@
         "PluginDescription": "Greinir frá hvaða landi gestirnir koma",
         "SubmenuLocations": "Staðsetningar"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Vafrafjölskyldur",
+        "Browsers": "Vafrar",
+        "ColumnBrowser": "Vafri",
+        "ColumnBrowserFamily": "Vafrafjölskylda",
+        "ColumnConfiguration": "Uppsetning",
+        "ColumnOperatingSystem": "Stýrikerfi",
+        "ColumnPlugin": "Íbót",
+        "ColumnResolution": "Skjáupplausn",
+        "ColumnTypeOfScreen": "Skjátegund",
+        "Configurations": "Uppsetningar",
         "Language_aa": "afár",
         "Language_ab": "abkasíska",
         "Language_ae": "avestíska",
@@ -935,19 +945,7 @@
         "Language_yo": "jórúba",
         "Language_za": "súang",
         "Language_zh": "kínverska",
-        "Language_zu": "súlú"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Vafrafjölskyldur",
-        "Browsers": "Vafrar",
-        "ColumnBrowser": "Vafri",
-        "ColumnBrowserFamily": "Vafrafjölskylda",
-        "ColumnConfiguration": "Uppsetning",
-        "ColumnOperatingSystem": "Stýrikerfi",
-        "ColumnPlugin": "Íbót",
-        "ColumnResolution": "Skjáupplausn",
-        "ColumnTypeOfScreen": "Skjátegund",
-        "Configurations": "Uppsetningar",
+        "Language_zu": "súlú",
         "LanguageCode": "Kóði tungumáls",
         "OperatingSystems": "Stýrikerfi",
         "PluginDescription": "Gefur skýrslu um ýmsar stillingar gesta:Vafra, Vafrafjölskyldu, Stýrikerfi, Íbætur, Skjáupplausn, altækar stillingar.",
diff --git a/lang/it.json b/lang/it.json
index 1f568f9fd2..1e16ddf3b9 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -1527,7 +1527,18 @@
         "toggleFullscreen": "Passa a schermo intero",
         "worldMap": "mappamondo"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Famiglie dei Browsers",
+        "Browsers": "Browsers",
+        "ColumnBrowser": "Browser",
+        "ColumnBrowserFamily": "Famiglia del Browser",
+        "ColumnBrowserVersion": "Versione del browser",
+        "ColumnConfiguration": "Configurazione",
+        "ColumnOperatingSystem": "Sistema operativo",
+        "ColumnPlugin": "Plugin",
+        "ColumnResolution": "Risoluzione",
+        "ColumnTypeOfScreen": "Tipo di schermo",
+        "Configurations": "Configurazioni",
         "Language_aa": "afar",
         "Language_ab": "abkhazian",
         "Language_ae": "avestan",
@@ -1711,20 +1722,7 @@
         "Language_yo": "yoruba",
         "Language_za": "zhuang",
         "Language_zh": "cinese",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Famiglie dei Browsers",
-        "Browsers": "Browsers",
-        "ColumnBrowser": "Browser",
-        "ColumnBrowserFamily": "Famiglia del Browser",
-        "ColumnBrowserVersion": "Versione del browser",
-        "ColumnConfiguration": "Configurazione",
-        "ColumnOperatingSystem": "Sistema operativo",
-        "ColumnPlugin": "Plugin",
-        "ColumnResolution": "Risoluzione",
-        "ColumnTypeOfScreen": "Tipo di schermo",
-        "Configurations": "Configurazioni",
+        "Language_zu": "zulu",
         "LanguageCode": "Codice della lingua",
         "OperatingSystems": "Sistemi Operativi",
         "PluginDescription": "Mostra vari settaggi per gli utenti: Browser, Famiglia del Browser, Sistema Operativo, Plugins, Risoluzione Schermo, Settaggi Globali.",
diff --git a/lang/ja.json b/lang/ja.json
index 54607c9474..6a828e4cc8 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -1480,7 +1480,19 @@
         "toggleFullscreen": "フルスクリーンに切り替える",
         "worldMap": "世界地図"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "ブラウザファミリー",
+        "Browsers": "ブラウザ",
+        "ColumnBrowser": "ブラウザ",
+        "ColumnBrowserFamily": "ブラウザファミリー",
+        "ColumnBrowserVersion": "ブラウザのバージョン",
+        "ColumnConfiguration": "環境設定",
+        "ColumnOperatingSystem": "オペレーティングシステム",
+        "ColumnPlugin": "プラグイン",
+        "ColumnResolution": "解像度",
+        "ColumnTypeOfScreen": "画面タイプ",
+        "Configurations": "環境設定",
+        "GamingConsole": "ゲーム機",
         "Language_aa": "アファル語",
         "Language_ab": "アブハズ語",
         "Language_ae": "アヴェスタ語",
@@ -1664,21 +1676,7 @@
         "Language_yo": "ヨルバ語",
         "Language_za": "チワン語",
         "Language_zh": "中国語",
-        "Language_zu": "ズールー語"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "ブラウザファミリー",
-        "Browsers": "ブラウザ",
-        "ColumnBrowser": "ブラウザ",
-        "ColumnBrowserFamily": "ブラウザファミリー",
-        "ColumnBrowserVersion": "ブラウザのバージョン",
-        "ColumnConfiguration": "環境設定",
-        "ColumnOperatingSystem": "オペレーティングシステム",
-        "ColumnPlugin": "プラグイン",
-        "ColumnResolution": "解像度",
-        "ColumnTypeOfScreen": "画面タイプ",
-        "Configurations": "環境設定",
-        "GamingConsole": "ゲーム機",
+        "Language_zu": "ズールー語",
         "LanguageCode": "言語コード",
         "MobileVsDesktop": "モバイル vs デスクトップ",
         "OperatingSystemFamily": "オペレーティングシステムファミリー",
diff --git a/lang/ka.json b/lang/ka.json
index b3b3027637..df4303f1d8 100644
--- a/lang/ka.json
+++ b/lang/ka.json
@@ -1026,7 +1026,17 @@
         "toggleFullscreen": "გადართვა სრულ ეკრანზე",
         "worldMap": "მსოფლიო რუკა"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "ბრაუზერის ოჯახები",
+        "Browsers": "ბრაუზერები",
+        "ColumnBrowser": "ბრაუზერი",
+        "ColumnBrowserFamily": "ბრაუზერის ოჯახი",
+        "ColumnConfiguration": "კონფიგურაცია",
+        "ColumnOperatingSystem": "ოპერაციული სისტემა",
+        "ColumnPlugin": "პლაგინი",
+        "ColumnResolution": "რეზოლუცია",
+        "ColumnTypeOfScreen": "ეკრანის ტიპი",
+        "Configurations": "გონფიგურაციები",
         "Language_aa": "აფარი",
         "Language_ab": "აფხაზური",
         "Language_ae": "ავესტა",
@@ -1183,19 +1193,7 @@
         "Language_yi": "იდიში",
         "Language_yo": "იორუბა",
         "Language_zh": "ჩინური",
-        "Language_zu": "ზულუ"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "ბრაუზერის ოჯახები",
-        "Browsers": "ბრაუზერები",
-        "ColumnBrowser": "ბრაუზერი",
-        "ColumnBrowserFamily": "ბრაუზერის ოჯახი",
-        "ColumnConfiguration": "კონფიგურაცია",
-        "ColumnOperatingSystem": "ოპერაციული სისტემა",
-        "ColumnPlugin": "პლაგინი",
-        "ColumnResolution": "რეზოლუცია",
-        "ColumnTypeOfScreen": "ეკრანის ტიპი",
-        "Configurations": "გონფიგურაციები",
+        "Language_zu": "ზულუ",
         "LanguageCode": "ენის კოდი",
         "OperatingSystems": "ოპერაციული სიტემები",
         "PluginDescription": "იძლევა ანგარიშს მომხმარებლის სხვადასხვა პარამეტრებზე: ბრაუზერები, ბრაუზერის ოჯახი, ოპერაციული სისტემა, პლაგინები, რეზოლუცია, გლობალური პარამეტრები.",
diff --git a/lang/ko.json b/lang/ko.json
index 3804bf89bc..60387a5ffe 100644
--- a/lang/ko.json
+++ b/lang/ko.json
@@ -1840,7 +1840,20 @@
         "worldMap": "세계지도",
         "WorldWide": "전세계"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "브라우저 타입",
+        "BrowserLanguage": "브라우저 언어",
+        "Browsers": "브라우저",
+        "ColumnBrowser": "브라우저",
+        "ColumnBrowserFamily": "브라우저 타입",
+        "ColumnBrowserVersion": "브라우저 버전",
+        "ColumnConfiguration": "구성",
+        "ColumnOperatingSystem": "운영체제",
+        "ColumnPlugin": "플러그인",
+        "ColumnResolution": "해상도",
+        "ColumnTypeOfScreen": "스크린 타입",
+        "Configurations": "구성",
+        "GamingConsole": "게임기",
         "Language_aa": "아파르어",
         "Language_ab": "압하스어",
         "Language_ae": "아베스타어",
@@ -2024,22 +2037,7 @@
         "Language_yo": "요루바어",
         "Language_za": "주앙어",
         "Language_zh": "중국어",
-        "Language_zu": "줄루어"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "브라우저 타입",
-        "BrowserLanguage": "브라우저 언어",
-        "Browsers": "브라우저",
-        "ColumnBrowser": "브라우저",
-        "ColumnBrowserFamily": "브라우저 타입",
-        "ColumnBrowserVersion": "브라우저 버전",
-        "ColumnConfiguration": "구성",
-        "ColumnOperatingSystem": "운영체제",
-        "ColumnPlugin": "플러그인",
-        "ColumnResolution": "해상도",
-        "ColumnTypeOfScreen": "스크린 타입",
-        "Configurations": "구성",
-        "GamingConsole": "게임기",
+        "Language_zu": "줄루어",
         "LanguageCode": "언어 코드",
         "MobileVsDesktop": "모바일 vs 데스크탑",
         "OperatingSystemFamily": "운영 체제 제품군",
diff --git a/lang/lt.json b/lang/lt.json
index 2a87f60e0a..0b6c227ae2 100644
--- a/lang/lt.json
+++ b/lang/lt.json
@@ -1076,7 +1076,18 @@
         "toggleFullscreen": "Perjungti į visą ekraną",
         "worldMap": "pasaulio žamėlapis"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Naršyklių šeimos",
+        "Browsers": "Naršyklės",
+        "ColumnBrowser": "Naršyklė",
+        "ColumnBrowserFamily": "Naršyklių šeimos",
+        "ColumnBrowserVersion": "Naršyklės versija",
+        "ColumnConfiguration": "Konfigūracija",
+        "ColumnOperatingSystem": "OperacinÄ— sistema",
+        "ColumnPlugin": "Papildinys",
+        "ColumnResolution": "Ekrano raiška",
+        "ColumnTypeOfScreen": "Ekrano tipas",
+        "Configurations": "Konfigūracijos",
         "Language_aa": "afarų",
         "Language_ab": "abchazų",
         "Language_ae": "avestų",
@@ -1260,20 +1271,7 @@
         "Language_yo": "joruba",
         "Language_za": "chuang",
         "Language_zh": "kinų",
-        "Language_zu": "zulų"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Naršyklių šeimos",
-        "Browsers": "Naršyklės",
-        "ColumnBrowser": "Naršyklė",
-        "ColumnBrowserFamily": "Naršyklių šeimos",
-        "ColumnBrowserVersion": "Naršyklės versija",
-        "ColumnConfiguration": "Konfigūracija",
-        "ColumnOperatingSystem": "OperacinÄ— sistema",
-        "ColumnPlugin": "Papildinys",
-        "ColumnResolution": "Ekrano raiška",
-        "ColumnTypeOfScreen": "Ekrano tipas",
-        "Configurations": "Konfigūracijos",
+        "Language_zu": "zulų",
         "LanguageCode": "Kalbos kodas",
         "OperatingSystems": "OperacinÄ—s sistemos",
         "PluginDescription": "Parodo įvairius lankytojo nustatymus: naršyklę, naršyklės šeimą, operacinę sistemą, papildinius, ekrano raišką, skiriamąją gebą, globalius nustatymus.",
diff --git a/lang/lv.json b/lang/lv.json
index d4982ce3b3..122f93f073 100644
--- a/lang/lv.json
+++ b/lang/lv.json
@@ -1087,7 +1087,18 @@
         "toggleFullscreen": "Pārslēgt pilnekrāna režīmu",
         "worldMap": "Pasaules karte"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Pārlūku ģimenes",
+        "Browsers": "Pārlūki",
+        "ColumnBrowser": "Pārlūks",
+        "ColumnBrowserFamily": "Pārlūku ģimene",
+        "ColumnBrowserVersion": "Pārlūka versija",
+        "ColumnConfiguration": "Konfigurācija",
+        "ColumnOperatingSystem": "Operētājsistēma",
+        "ColumnPlugin": "Spraudnis",
+        "ColumnResolution": "Ekrāna izšķirtspēja",
+        "ColumnTypeOfScreen": "Ekrāna tips",
+        "Configurations": "Konfigurācijas",
         "Language_aa": "afāru",
         "Language_ab": "abhāzu",
         "Language_ae": "avesta",
@@ -1271,20 +1282,7 @@
         "Language_yo": "jorubu",
         "Language_za": "džuanu",
         "Language_zh": "ķīniešu",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Pārlūku ģimenes",
-        "Browsers": "Pārlūki",
-        "ColumnBrowser": "Pārlūks",
-        "ColumnBrowserFamily": "Pārlūku ģimene",
-        "ColumnBrowserVersion": "Pārlūka versija",
-        "ColumnConfiguration": "Konfigurācija",
-        "ColumnOperatingSystem": "Operētājsistēma",
-        "ColumnPlugin": "Spraudnis",
-        "ColumnResolution": "Ekrāna izšķirtspēja",
-        "ColumnTypeOfScreen": "Ekrāna tips",
-        "Configurations": "Konfigurācijas",
+        "Language_zu": "zulu",
         "LanguageCode": "Valodas kods",
         "OperatingSystems": "Operētājsistēmas",
         "PluginDescription": "Apskata dažādus lietotāju iestatījumus: pārlūku, pārlūku ģimeni, operētājsistēmu, spraudņus, ekrāna izšķirtspēju, globālos iestatījumus.",
diff --git a/lang/nb.json b/lang/nb.json
index 9f928f4926..6d5a9da885 100644
--- a/lang/nb.json
+++ b/lang/nb.json
@@ -1249,7 +1249,17 @@
         "worldMap": "verdenskart",
         "WorldWide": "Verdensbasis"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Nettleserfamilier",
+        "Browsers": "Nettlesere",
+        "ColumnBrowser": "Nettleser",
+        "ColumnBrowserFamily": "Nettleserfamilie",
+        "ColumnConfiguration": "Konfigurasjon",
+        "ColumnOperatingSystem": "Operativsystem",
+        "ColumnPlugin": "Tillegg",
+        "ColumnResolution": "Oppløsning",
+        "ColumnTypeOfScreen": "Skjermtype",
+        "Configurations": "Konfigurasjon",
         "Language_aa": "afar",
         "Language_ab": "abkhasisk",
         "Language_ae": "avestisk",
@@ -1433,19 +1443,7 @@
         "Language_yo": "joruba",
         "Language_za": "zhuang",
         "Language_zh": "kinesisk",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Nettleserfamilier",
-        "Browsers": "Nettlesere",
-        "ColumnBrowser": "Nettleser",
-        "ColumnBrowserFamily": "Nettleserfamilie",
-        "ColumnConfiguration": "Konfigurasjon",
-        "ColumnOperatingSystem": "Operativsystem",
-        "ColumnPlugin": "Tillegg",
-        "ColumnResolution": "Oppløsning",
-        "ColumnTypeOfScreen": "Skjermtype",
-        "Configurations": "Konfigurasjon",
+        "Language_zu": "zulu",
         "LanguageCode": "Språkkode",
         "OperatingSystems": "Operativsystem",
         "PluginDescription": "Rapporterer forskjellige brukerinnstillinger: Nettleser, nettleserfamilie, operativsystem, tillegg, oppløsning, globale innstillinger.",
diff --git a/lang/nl.json b/lang/nl.json
index 8ef122e509..2f3b645681 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -1831,7 +1831,20 @@
         "worldMap": "wereldkaart",
         "WorldWide": "Wereldwijd"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Browser per type",
+        "BrowserLanguage": "Browsertaal",
+        "Browsers": "Browser per versie",
+        "ColumnBrowser": "Browser",
+        "ColumnBrowserFamily": "Browser per Type",
+        "ColumnBrowserVersion": "Browserversie",
+        "ColumnConfiguration": "Configuratie",
+        "ColumnOperatingSystem": "Besturingssysteem",
+        "ColumnPlugin": "Plugin",
+        "ColumnResolution": "Resolutie",
+        "ColumnTypeOfScreen": "Schermtype",
+        "Configurations": "Configuraties",
+        "GamingConsole": "Spelconsole",
         "Language_aa": "Afar",
         "Language_ab": "Abchazisch",
         "Language_ae": "Avestisch",
@@ -2015,22 +2028,7 @@
         "Language_yo": "Yoruba",
         "Language_za": "Zhuang",
         "Language_zh": "Chinees",
-        "Language_zu": "Zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Browser per type",
-        "BrowserLanguage": "Browsertaal",
-        "Browsers": "Browser per versie",
-        "ColumnBrowser": "Browser",
-        "ColumnBrowserFamily": "Browser per Type",
-        "ColumnBrowserVersion": "Browserversie",
-        "ColumnConfiguration": "Configuratie",
-        "ColumnOperatingSystem": "Besturingssysteem",
-        "ColumnPlugin": "Plugin",
-        "ColumnResolution": "Resolutie",
-        "ColumnTypeOfScreen": "Schermtype",
-        "Configurations": "Configuraties",
-        "GamingConsole": "Spelconsole",
+        "Language_zu": "Zulu",
         "LanguageCode": "Taal code",
         "MobileVsDesktop": "Mobiel versus Desktop",
         "OperatingSystemFamily": "Besturingssyteem familie",
diff --git a/lang/nn.json b/lang/nn.json
index d3d9909997..2a3fbe6a92 100644
--- a/lang/nn.json
+++ b/lang/nn.json
@@ -1120,7 +1120,17 @@
         "PluginDescription": "Rapporterer landet til vitjarane",
         "SubmenuLocations": "Plassar"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Nettlesarfamiliar",
+        "Browsers": "Nettlesarar",
+        "ColumnBrowser": "Nettlesar",
+        "ColumnBrowserFamily": "Nettlesarfamilar",
+        "ColumnConfiguration": "Konfigurasjon",
+        "ColumnOperatingSystem": "Operativsystem",
+        "ColumnPlugin": "Innstikk",
+        "ColumnResolution": "Oppløysing",
+        "ColumnTypeOfScreen": "Type skjerm",
+        "Configurations": "Konfigurasjonar",
         "Language_aa": "afar",
         "Language_ab": "abkhasisk",
         "Language_ae": "avestisk",
@@ -1304,19 +1314,7 @@
         "Language_yo": "joruba",
         "Language_za": "zhuang",
         "Language_zh": "kinesisk",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Nettlesarfamiliar",
-        "Browsers": "Nettlesarar",
-        "ColumnBrowser": "Nettlesar",
-        "ColumnBrowserFamily": "Nettlesarfamilar",
-        "ColumnConfiguration": "Konfigurasjon",
-        "ColumnOperatingSystem": "Operativsystem",
-        "ColumnPlugin": "Innstikk",
-        "ColumnResolution": "Oppløysing",
-        "ColumnTypeOfScreen": "Type skjerm",
-        "Configurations": "Konfigurasjonar",
+        "Language_zu": "zulu",
         "LanguageCode": "Språkkode",
         "OperatingSystems": "Operativsystem",
         "PluginDescription": "Rapporter diverse vitjarinnstillingar: Nettlesar, Nettlesarfamilie, operativsystem, oppløysing og globale innstillingar.",
diff --git a/lang/pl.json b/lang/pl.json
index 3d35840345..ca51f1a091 100644
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -1208,7 +1208,18 @@
         "toggleFullscreen": "Tryb pełnoekranowy",
         "worldMap": "mapa świata"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Rodzina przeglÄ…darek",
+        "Browsers": "PrzeglÄ…darki",
+        "ColumnBrowser": "PrzeglÄ…darka",
+        "ColumnBrowserFamily": "Rodzina przeglÄ…darek",
+        "ColumnBrowserVersion": "Wersja przeglÄ…darki",
+        "ColumnConfiguration": "Konfiguracja",
+        "ColumnOperatingSystem": "System operacyjny",
+        "ColumnPlugin": "Wtyczka",
+        "ColumnResolution": "Rozdzielczość",
+        "ColumnTypeOfScreen": "Typ ekranu",
+        "Configurations": "Konfiguracje",
         "Language_aa": "afar",
         "Language_ab": "abchaski",
         "Language_ae": "awestyjski",
@@ -1392,20 +1403,7 @@
         "Language_yo": "joruba",
         "Language_za": "czuang",
         "Language_zh": "chiński",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Rodzina przeglÄ…darek",
-        "Browsers": "PrzeglÄ…darki",
-        "ColumnBrowser": "PrzeglÄ…darka",
-        "ColumnBrowserFamily": "Rodzina przeglÄ…darek",
-        "ColumnBrowserVersion": "Wersja przeglÄ…darki",
-        "ColumnConfiguration": "Konfiguracja",
-        "ColumnOperatingSystem": "System operacyjny",
-        "ColumnPlugin": "Wtyczka",
-        "ColumnResolution": "Rozdzielczość",
-        "ColumnTypeOfScreen": "Typ ekranu",
-        "Configurations": "Konfiguracje",
+        "Language_zu": "zulu",
         "LanguageCode": "Kod języka",
         "OperatingSystems": "Systemy operacyjne",
         "PluginDescription": "Raporty rozmaitych konfiguracji użytkownika: przeglądarki, rodziny przeglądarek, systemów operacyjnych, wtyczek, rozdzielczości, ogólnej konfiguracji.",
diff --git a/lang/pt-br.json b/lang/pt-br.json
index 432b5987f2..13a039fcfd 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -1968,7 +1968,22 @@
         "worldMap": "mapa mundi",
         "WorldWide": "World-Wide"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Família de Navegadores",
+        "BrowserLanguage": "Idioma do navegador",
+        "Browsers": "Navegadores",
+        "BrowserWithNoPluginsEnabled": "%1$s sem plugins ativados",
+        "BrowserWithPluginsEnabled": "%1$s com os plugins %2$s ativados",
+        "ColumnBrowser": "Navegador",
+        "ColumnBrowserFamily": "Família do Navegador",
+        "ColumnBrowserVersion": "Versão do Browser",
+        "ColumnConfiguration": "Configuração",
+        "ColumnOperatingSystem": "Sistema Operacional",
+        "ColumnPlugin": "Plugin",
+        "ColumnResolution": "Resolução",
+        "ColumnTypeOfScreen": "Tipo de tela",
+        "Configurations": "Configurações",
+        "GamingConsole": "Console de jogos",
         "Language_aa": "afar",
         "Language_ab": "abcázio",
         "Language_ae": "avéstico",
@@ -2152,24 +2167,7 @@
         "Language_yo": "ioruba",
         "Language_za": "zhuang",
         "Language_zh": "chinês",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Família de Navegadores",
-        "BrowserLanguage": "Idioma do navegador",
-        "Browsers": "Navegadores",
-        "BrowserWithNoPluginsEnabled": "%1$s sem plugins ativados",
-        "BrowserWithPluginsEnabled": "%1$s com os plugins %2$s ativados",
-        "ColumnBrowser": "Navegador",
-        "ColumnBrowserFamily": "Família do Navegador",
-        "ColumnBrowserVersion": "Versão do Browser",
-        "ColumnConfiguration": "Configuração",
-        "ColumnOperatingSystem": "Sistema Operacional",
-        "ColumnPlugin": "Plugin",
-        "ColumnResolution": "Resolução",
-        "ColumnTypeOfScreen": "Tipo de tela",
-        "Configurations": "Configurações",
-        "GamingConsole": "Console de jogos",
+        "Language_zu": "zulu",
         "LanguageCode": "Código do Idioma",
         "MobileVsDesktop": "Mobile vs Desktop",
         "OperatingSystemFamily": "Família de SO",
diff --git a/lang/pt.json b/lang/pt.json
index 201f181267..b5b93b52a5 100644
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -1279,7 +1279,18 @@
         "toggleFullscreen": "Alternar ecrã inteiro",
         "worldMap": "mapa mundial"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Famílias de navegadores",
+        "Browsers": "Navegadores",
+        "ColumnBrowser": "Navegador",
+        "ColumnBrowserFamily": "Família de navegadores",
+        "ColumnBrowserVersion": "Versão do Navegador",
+        "ColumnConfiguration": "Configuração",
+        "ColumnOperatingSystem": "Sistema operativo",
+        "ColumnPlugin": "Plugin",
+        "ColumnResolution": "Resolução",
+        "ColumnTypeOfScreen": "Tipo de ecrã",
+        "Configurations": "Configurações",
         "Language_aa": "afar",
         "Language_ab": "abcázio",
         "Language_ae": "avéstico",
@@ -1463,20 +1474,7 @@
         "Language_yo": "ioruba",
         "Language_za": "zhuang",
         "Language_zh": "chinês",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Famílias de navegadores",
-        "Browsers": "Navegadores",
-        "ColumnBrowser": "Navegador",
-        "ColumnBrowserFamily": "Família de navegadores",
-        "ColumnBrowserVersion": "Versão do Navegador",
-        "ColumnConfiguration": "Configuração",
-        "ColumnOperatingSystem": "Sistema operativo",
-        "ColumnPlugin": "Plugin",
-        "ColumnResolution": "Resolução",
-        "ColumnTypeOfScreen": "Tipo de ecrã",
-        "Configurations": "Configurações",
+        "Language_zu": "zulu",
         "LanguageCode": "Código do idioma",
         "OperatingSystems": "Sistemas Operativos",
         "PluginDescription": "Relata várias Definições de Utilizador: Navegador, Família de Navegadores, Sistema Operativo, Plugins, Resolução, Definições Globais",
diff --git a/lang/ro.json b/lang/ro.json
index ddb09fd60c..c99d8f645c 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -1274,7 +1274,22 @@
         "worldMap": "Harta Lumii",
         "WorldWide": "World-Wide"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Tip browser",
+        "BrowserLanguage": "Limba browser-ului",
+        "Browsers": "Browsere",
+        "BrowserWithNoPluginsEnabled": "%1$s fără plugin-uri activate",
+        "BrowserWithPluginsEnabled": "%1$s cu plugin-uri %2$s activate",
+        "ColumnBrowser": "Browser",
+        "ColumnBrowserFamily": "Browser după familie",
+        "ColumnBrowserVersion": "Versiunea browser-ului",
+        "ColumnConfiguration": "Configuraţia",
+        "ColumnOperatingSystem": "Sistem de operare",
+        "ColumnPlugin": "Plugin",
+        "ColumnResolution": "Rezoluţie ecran",
+        "ColumnTypeOfScreen": "Tip ecran",
+        "Configurations": "Configurare",
+        "GamingConsole": "Consolă de joc",
         "Language_aa": "Afar",
         "Language_ab": "abhază",
         "Language_ae": "avestană",
@@ -1458,24 +1473,7 @@
         "Language_yo": "yoruba",
         "Language_za": "zhuang",
         "Language_zh": "chineză",
-        "Language_zu": "zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Tip browser",
-        "BrowserLanguage": "Limba browser-ului",
-        "Browsers": "Browsere",
-        "BrowserWithNoPluginsEnabled": "%1$s fără plugin-uri activate",
-        "BrowserWithPluginsEnabled": "%1$s cu plugin-uri %2$s activate",
-        "ColumnBrowser": "Browser",
-        "ColumnBrowserFamily": "Browser după familie",
-        "ColumnBrowserVersion": "Versiunea browser-ului",
-        "ColumnConfiguration": "Configuraţia",
-        "ColumnOperatingSystem": "Sistem de operare",
-        "ColumnPlugin": "Plugin",
-        "ColumnResolution": "Rezoluţie ecran",
-        "ColumnTypeOfScreen": "Tip ecran",
-        "Configurations": "Configurare",
-        "GamingConsole": "Consolă de joc",
+        "Language_zu": "zulu",
         "LanguageCode": "Cod limbă",
         "MobileVsDesktop": "Mobil vs Desktop",
         "OperatingSystemFamily": "Sistem de operare după familie",
diff --git a/lang/ru.json b/lang/ru.json
index 5d814fcf06..92752c996c 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -1881,7 +1881,20 @@
         "worldMap": "карта мира",
         "WorldWide": "Весь мир"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "По семейству браузеров",
+        "BrowserLanguage": "Язык браузера",
+        "Browsers": "По браузерам",
+        "ColumnBrowser": "Браузер",
+        "ColumnBrowserFamily": "Семейство браузеров",
+        "ColumnBrowserVersion": "Версия браузера",
+        "ColumnConfiguration": "Конфигурация",
+        "ColumnOperatingSystem": "Операционная система",
+        "ColumnPlugin": "Плагин",
+        "ColumnResolution": "Разрешение",
+        "ColumnTypeOfScreen": "Тип экрана",
+        "Configurations": "По конфигурации",
+        "GamingConsole": "Игровые консоли",
         "Language_aa": "афар",
         "Language_ab": "абхазский",
         "Language_ae": "авестийский",
@@ -2065,22 +2078,7 @@
         "Language_yo": "йоруба",
         "Language_za": "чжуань",
         "Language_zh": "китайский",
-        "Language_zu": "зулу"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "По семейству браузеров",
-        "BrowserLanguage": "Язык браузера",
-        "Browsers": "По браузерам",
-        "ColumnBrowser": "Браузер",
-        "ColumnBrowserFamily": "Семейство браузеров",
-        "ColumnBrowserVersion": "Версия браузера",
-        "ColumnConfiguration": "Конфигурация",
-        "ColumnOperatingSystem": "Операционная система",
-        "ColumnPlugin": "Плагин",
-        "ColumnResolution": "Разрешение",
-        "ColumnTypeOfScreen": "Тип экрана",
-        "Configurations": "По конфигурации",
-        "GamingConsole": "Игровые консоли",
+        "Language_zu": "зулу",
         "LanguageCode": "Код языка",
         "MobileVsDesktop": "Мобильные посещения vs компьютерных",
         "OperatingSystemFamily": "Тип операционной системы",
diff --git a/lang/sk.json b/lang/sk.json
index e82bd87373..6036eca33b 100644
--- a/lang/sk.json
+++ b/lang/sk.json
@@ -970,7 +970,17 @@
         "toggleFullscreen": "Prepínač na celú obrazovku",
         "worldMap": "svetová mapa"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Rodina prehliadača",
+        "Browsers": "Prehliadače",
+        "ColumnBrowser": "Prehliadač",
+        "ColumnBrowserFamily": "Rodina prehliadača",
+        "ColumnConfiguration": "Konfigurácia",
+        "ColumnOperatingSystem": "Operačný systém",
+        "ColumnPlugin": "Zásuvný modul",
+        "ColumnResolution": "Rozlíšenie",
+        "ColumnTypeOfScreen": "Typ obrazovky",
+        "Configurations": "Konfigurácia",
         "Language_aa": "afarčina",
         "Language_ab": "abcházština",
         "Language_ae": "avestčina",
@@ -1154,19 +1164,7 @@
         "Language_yo": "jorubčina",
         "Language_za": "čuangčina",
         "Language_zh": "čínština",
-        "Language_zu": "zuluština"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Rodina prehliadača",
-        "Browsers": "Prehliadače",
-        "ColumnBrowser": "Prehliadač",
-        "ColumnBrowserFamily": "Rodina prehliadača",
-        "ColumnConfiguration": "Konfigurácia",
-        "ColumnOperatingSystem": "Operačný systém",
-        "ColumnPlugin": "Zásuvný modul",
-        "ColumnResolution": "Rozlíšenie",
-        "ColumnTypeOfScreen": "Typ obrazovky",
-        "Configurations": "Konfigurácia",
+        "Language_zu": "zuluština",
         "LanguageCode": "Kód jazyka",
         "OperatingSystems": "Operačný systém",
         "PluginDescription": "Rôzne reporty užívateľského nastavenia: Prehliadač, Rodina prehliadača, Operačný systém, Pluginy, Rozlíšenie, Globálne nastavenia.",
diff --git a/lang/sl.json b/lang/sl.json
index 12e38a6210..6ee6209648 100644
--- a/lang/sl.json
+++ b/lang/sl.json
@@ -1165,7 +1165,21 @@
         "toggleFullscreen": "Celozaslonski Način",
         "worldMap": "svetovni zemljevid"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Družine brskalnikov",
+        "BrowserLanguage": "Jezik brskalnika",
+        "Browsers": "Brskalniki",
+        "BrowserWithNoPluginsEnabled": "%1$s brez omogočenih vtičnikov",
+        "BrowserWithPluginsEnabled": "%1$s z omogočenimi vtičniki %2$s",
+        "ColumnBrowser": "Brskalnik",
+        "ColumnBrowserFamily": "Družina brskalnika",
+        "ColumnBrowserVersion": "Različica brskalnika",
+        "ColumnConfiguration": "Nastavitev",
+        "ColumnOperatingSystem": "Operacijski sistem",
+        "ColumnPlugin": "Vtičnik",
+        "ColumnResolution": "Resolucija",
+        "ColumnTypeOfScreen": "Tip zaslona",
+        "Configurations": "Nastavitve",
         "Language_aa": "afarščina",
         "Language_ab": "abhaščina",
         "Language_ae": "avestijščina",
@@ -1349,23 +1363,7 @@
         "Language_yo": "jorubščina",
         "Language_za": "za",
         "Language_zh": "kitajščina",
-        "Language_zu": "zulujščina"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Družine brskalnikov",
-        "BrowserLanguage": "Jezik brskalnika",
-        "Browsers": "Brskalniki",
-        "BrowserWithNoPluginsEnabled": "%1$s brez omogočenih vtičnikov",
-        "BrowserWithPluginsEnabled": "%1$s z omogočenimi vtičniki %2$s",
-        "ColumnBrowser": "Brskalnik",
-        "ColumnBrowserFamily": "Družina brskalnika",
-        "ColumnBrowserVersion": "Različica brskalnika",
-        "ColumnConfiguration": "Nastavitev",
-        "ColumnOperatingSystem": "Operacijski sistem",
-        "ColumnPlugin": "Vtičnik",
-        "ColumnResolution": "Resolucija",
-        "ColumnTypeOfScreen": "Tip zaslona",
-        "Configurations": "Nastavitve",
+        "Language_zu": "zulujščina",
         "LanguageCode": "Å ifra jezika",
         "OperatingSystems": "Operacijski sistemi",
         "Plugins": "Vtičniki",
diff --git a/lang/sq.json b/lang/sq.json
index 8773067c89..14413a1c91 100644
--- a/lang/sq.json
+++ b/lang/sq.json
@@ -1349,7 +1349,18 @@
         "toggleFullscreen": "Kalo në\/dil nga mënyra tërë ekrani",
         "worldMap": "hartë e botës"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Familje shfletuesi",
+        "Browsers": "Shfletuesa",
+        "ColumnBrowser": "Shfletues",
+        "ColumnBrowserFamily": "Familje shfletuesi",
+        "ColumnBrowserVersion": "Version shfletuesi",
+        "ColumnConfiguration": "Formësim",
+        "ColumnOperatingSystem": "Sistem operativ",
+        "ColumnPlugin": "Shtojcë",
+        "ColumnResolution": "Qartësi",
+        "ColumnTypeOfScreen": "Lloj ekrani",
+        "Configurations": "Formësime",
         "Language_af": "Afrikanisht",
         "Language_am": "Amharike",
         "Language_ar": "Arabisht",
@@ -1450,20 +1461,7 @@
         "Language_xh": "Xhosa",
         "Language_yi": "Jiden",
         "Language_zh": "Kineze",
-        "Language_zu": "Zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Familje shfletuesi",
-        "Browsers": "Shfletuesa",
-        "ColumnBrowser": "Shfletues",
-        "ColumnBrowserFamily": "Familje shfletuesi",
-        "ColumnBrowserVersion": "Version shfletuesi",
-        "ColumnConfiguration": "Formësim",
-        "ColumnOperatingSystem": "Sistem operativ",
-        "ColumnPlugin": "Shtojcë",
-        "ColumnResolution": "Qartësi",
-        "ColumnTypeOfScreen": "Lloj ekrani",
-        "Configurations": "Formësime",
+        "Language_zu": "Zulu",
         "LanguageCode": "Kod Gjuhe",
         "OperatingSystems": "Sisteme operativë",
         "PluginDescription": "Raporton Rregullime të ndryshme të Përdoruesit: Shfletues, Familje Shfletuesi, Sistem Operativ, Shtojca, Qartësi, Rregullime Globale.",
diff --git a/lang/sr.json b/lang/sr.json
index 495338ad60..54dd09bf36 100644
--- a/lang/sr.json
+++ b/lang/sr.json
@@ -1951,7 +1951,22 @@
         "worldMap": "svetska mapa",
         "WorldWide": "Ceo svet"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Porodica brauzera",
+        "BrowserLanguage": "Jezik brauzera",
+        "Browsers": "Brauzeri",
+        "BrowserWithNoPluginsEnabled": "%1$s sa isključenim dodacima",
+        "BrowserWithPluginsEnabled": "%1$s sa uključenim dodacima %2$s",
+        "ColumnBrowser": "Brauzer",
+        "ColumnBrowserFamily": "Porodica brauzera",
+        "ColumnBrowserVersion": "Verzija brauzera",
+        "ColumnConfiguration": "Podešavanja",
+        "ColumnOperatingSystem": "Operativni sistem",
+        "ColumnPlugin": "Dodatak",
+        "ColumnResolution": "Rezolucija",
+        "ColumnTypeOfScreen": "Tip ekrana",
+        "Configurations": "Podešavanja",
+        "GamingConsole": "Konzole za igranje",
         "Language_aa": "Afar",
         "Language_ab": "Abhazijski",
         "Language_ae": "Avestan",
@@ -2135,24 +2150,7 @@
         "Language_yo": "Joruba",
         "Language_za": "ÄŒueng",
         "Language_zh": "Kineski",
-        "Language_zu": "Zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Porodica brauzera",
-        "BrowserLanguage": "Jezik brauzera",
-        "Browsers": "Brauzeri",
-        "BrowserWithNoPluginsEnabled": "%1$s sa isključenim dodacima",
-        "BrowserWithPluginsEnabled": "%1$s sa uključenim dodacima %2$s",
-        "ColumnBrowser": "Brauzer",
-        "ColumnBrowserFamily": "Porodica brauzera",
-        "ColumnBrowserVersion": "Verzija brauzera",
-        "ColumnConfiguration": "Podešavanja",
-        "ColumnOperatingSystem": "Operativni sistem",
-        "ColumnPlugin": "Dodatak",
-        "ColumnResolution": "Rezolucija",
-        "ColumnTypeOfScreen": "Tip ekrana",
-        "Configurations": "Podešavanja",
-        "GamingConsole": "Konzole za igranje",
+        "Language_zu": "Zulu",
         "LanguageCode": "Kod jezika",
         "MobileVsDesktop": "Mobilni i desktop",
         "OperatingSystemFamily": "Porodica operativnih sistema",
diff --git a/lang/sv.json b/lang/sv.json
index 754dacb0cc..b82c537d8c 100644
--- a/lang/sv.json
+++ b/lang/sv.json
@@ -1870,7 +1870,20 @@
         "worldMap": "världskarta",
         "WorldWide": "Hela världen"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Webbläsarfamiljer",
+        "BrowserLanguage": "Webbläsarspråk",
+        "Browsers": "Webbläsare",
+        "ColumnBrowser": "Webbläsare",
+        "ColumnBrowserFamily": "Webbläsarfamilj",
+        "ColumnBrowserVersion": "Webbläsarversion",
+        "ColumnConfiguration": "Konfiguration",
+        "ColumnOperatingSystem": "Operativsystem",
+        "ColumnPlugin": "Plugin",
+        "ColumnResolution": "Skärmupplösning",
+        "ColumnTypeOfScreen": "Typ av skärm",
+        "Configurations": "Konfiguration",
+        "GamingConsole": "Spelkonsoll",
         "Language_aa": "Afar",
         "Language_ab": "Abchaziska",
         "Language_ae": "Avestiska",
@@ -2054,22 +2067,7 @@
         "Language_yo": "Yoruba",
         "Language_za": "Zhuang",
         "Language_zh": "Kinesiska",
-        "Language_zu": "Zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Webbläsarfamiljer",
-        "BrowserLanguage": "Webbläsarspråk",
-        "Browsers": "Webbläsare",
-        "ColumnBrowser": "Webbläsare",
-        "ColumnBrowserFamily": "Webbläsarfamilj",
-        "ColumnBrowserVersion": "Webbläsarversion",
-        "ColumnConfiguration": "Konfiguration",
-        "ColumnOperatingSystem": "Operativsystem",
-        "ColumnPlugin": "Plugin",
-        "ColumnResolution": "Skärmupplösning",
-        "ColumnTypeOfScreen": "Typ av skärm",
-        "Configurations": "Konfiguration",
-        "GamingConsole": "Spelkonsoll",
+        "Language_zu": "Zulu",
         "LanguageCode": "Språkkod",
         "MobileVsDesktop": "Mobilt vs Stationärt",
         "OperatingSystemFamily": "Operativsystemsfamilj",
diff --git a/lang/ta.json b/lang/ta.json
index 757994db73..f06e550646 100644
--- a/lang/ta.json
+++ b/lang/ta.json
@@ -645,7 +645,7 @@
         "country_zm": "சாம்பியா",
         "country_zw": "ஜிம்பாப்வே"
     },
-    "UserLanguage": {
+    "UserSettings": {
         "Language_aa": "அஃபார்",
         "Language_ab": "அப்காஜியான்",
         "Language_ae": "அவெஸ்தான்",
diff --git a/lang/te.json b/lang/te.json
index 5ceed04fc2..302cfe3e91 100644
--- a/lang/te.json
+++ b/lang/te.json
@@ -647,7 +647,17 @@
         "toggleFullscreen": "నిండుతెర",
         "worldMap": "ప్రపంచ పటం"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "విహారిణి కుటుంబాలు",
+        "Browsers": "విహారిణులు",
+        "ColumnBrowser": "విహారిణి",
+        "ColumnBrowserFamily": "విహారిణి కుటుంబం",
+        "ColumnBrowserVersion": "విహారిణి సంచిక",
+        "ColumnConfiguration": "స్వరూపణం",
+        "ColumnOperatingSystem": "నిర్వాహక వ్యవస్థ",
+        "ColumnPlugin": "ప్లగిన్",
+        "ColumnTypeOfScreen": "తెర యొక్క రకం",
+        "Configurations": "స్వరూపణలు",
         "Language_aa": "అఫార్",
         "Language_ab": "అబ్ఖాజియన్",
         "Language_ae": "అవేస్టాన్",
@@ -831,19 +841,7 @@
         "Language_yo": "యోరుబా",
         "Language_za": "జువాన్",
         "Language_zh": "చైనీస్",
-        "Language_zu": "జూలూ"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "విహారిణి కుటుంబాలు",
-        "Browsers": "విహారిణులు",
-        "ColumnBrowser": "విహారిణి",
-        "ColumnBrowserFamily": "విహారిణి కుటుంబం",
-        "ColumnBrowserVersion": "విహారిణి సంచిక",
-        "ColumnConfiguration": "స్వరూపణం",
-        "ColumnOperatingSystem": "నిర్వాహక వ్యవస్థ",
-        "ColumnPlugin": "ప్లగిన్",
-        "ColumnTypeOfScreen": "తెర యొక్క రకం",
-        "Configurations": "స్వరూపణలు",
+        "Language_zu": "జూలూ",
         "LanguageCode": "భాషా సంకేతం",
         "OperatingSystemFamily": "నిర్వాహక వ్యవస్థ కుటుంబం",
         "OperatingSystems": "నిర్వాహక వ్యవస్థలు",
diff --git a/lang/th.json b/lang/th.json
index d057c8abbc..f5f9f214b9 100644
--- a/lang/th.json
+++ b/lang/th.json
@@ -1353,7 +1353,18 @@
         "toggleFullscreen": "สลับเต็มจอ",
         "worldMap": "แผนที่โลก"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "ตระกูลเบราว์เซอร์",
+        "Browsers": "เบราว์เซอร์",
+        "ColumnBrowser": "เบราว์เซอร์",
+        "ColumnBrowserFamily": "ตระกูลของเบราว์เซอร์",
+        "ColumnBrowserVersion": "รุ่นของโปรแกรมบราวเซอร์",
+        "ColumnConfiguration": "การตั้งค่า",
+        "ColumnOperatingSystem": "ระบบปฏิบัติการ",
+        "ColumnPlugin": "ปลั๊กอิน",
+        "ColumnResolution": "ความละเอียด",
+        "ColumnTypeOfScreen": "ชนิดของจอภาพ",
+        "Configurations": "การกำหนดค่า",
         "Language_aa": "อะฟาร์",
         "Language_ab": "อับคาซ",
         "Language_ae": "อเวสตะ",
@@ -1537,20 +1548,7 @@
         "Language_yo": "โยรูบา",
         "Language_za": "จ้วง",
         "Language_zh": "จีน",
-        "Language_zu": "ซูลู"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "ตระกูลเบราว์เซอร์",
-        "Browsers": "เบราว์เซอร์",
-        "ColumnBrowser": "เบราว์เซอร์",
-        "ColumnBrowserFamily": "ตระกูลของเบราว์เซอร์",
-        "ColumnBrowserVersion": "รุ่นของโปรแกรมบราวเซอร์",
-        "ColumnConfiguration": "การตั้งค่า",
-        "ColumnOperatingSystem": "ระบบปฏิบัติการ",
-        "ColumnPlugin": "ปลั๊กอิน",
-        "ColumnResolution": "ความละเอียด",
-        "ColumnTypeOfScreen": "ชนิดของจอภาพ",
-        "Configurations": "การกำหนดค่า",
+        "Language_zu": "ซูลู",
         "LanguageCode": "รหัสภาษา",
         "MobileVsDesktop": "มือถือ vs เดสก์ท็อป",
         "OperatingSystems": "ระบบปฏิบัติการ",
diff --git a/lang/tr.json b/lang/tr.json
index a583376994..2702f8aca9 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -1120,7 +1120,18 @@
         "VisitorMap": "Ziyaretçi Haritası",
         "worldMap": "Dünya Haritası"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Tarayıcı aileleri",
+        "Browsers": "Tarayıcılar",
+        "ColumnBrowser": "Tarayıcı",
+        "ColumnBrowserFamily": "Tarayıcı ailesi",
+        "ColumnBrowserVersion": "Tarayıcı sürümü",
+        "ColumnConfiguration": "Konfigürasyon",
+        "ColumnOperatingSystem": "Ä°ÅŸletim sistemi",
+        "ColumnPlugin": "Eklenti",
+        "ColumnResolution": "Çözünürlük",
+        "ColumnTypeOfScreen": "Ekran seçimi",
+        "Configurations": "Konfigürasyonları",
         "Language_aa": "Afar",
         "Language_ab": "Abazca",
         "Language_ae": "Avestçe",
@@ -1304,20 +1315,7 @@
         "Language_yo": "Yoruba",
         "Language_za": "Zhuang",
         "Language_zh": "Çince",
-        "Language_zu": "Zulu"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Tarayıcı aileleri",
-        "Browsers": "Tarayıcılar",
-        "ColumnBrowser": "Tarayıcı",
-        "ColumnBrowserFamily": "Tarayıcı ailesi",
-        "ColumnBrowserVersion": "Tarayıcı sürümü",
-        "ColumnConfiguration": "Konfigürasyon",
-        "ColumnOperatingSystem": "Ä°ÅŸletim sistemi",
-        "ColumnPlugin": "Eklenti",
-        "ColumnResolution": "Çözünürlük",
-        "ColumnTypeOfScreen": "Ekran seçimi",
-        "Configurations": "Konfigürasyonları",
+        "Language_zu": "Zulu",
         "LanguageCode": "Dil kodu",
         "OperatingSystems": "Ä°ÅŸletim sistemleri",
         "PluginDescription": "Çeşitli kullanıcı rapor ayalari: Tarayıcı, Tarayıcı Ailesi, İşletim Sistemi, Eklentiler, Çözünürlük, Genel Ayarlar.",
diff --git a/lang/uk.json b/lang/uk.json
index 702f88af9c..e4de85055b 100644
--- a/lang/uk.json
+++ b/lang/uk.json
@@ -1028,7 +1028,17 @@
         "toggleFullscreen": "Увімкнути повноекраний режим",
         "worldMap": "карта світу"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "Категорії веб-оглядачів",
+        "Browsers": "Веб-оглядачі",
+        "ColumnBrowser": "Веб-оглядач",
+        "ColumnBrowserFamily": "Родина веб-оглядача",
+        "ColumnConfiguration": "Конфігурація",
+        "ColumnOperatingSystem": "Операційна система",
+        "ColumnPlugin": "Плагін",
+        "ColumnResolution": "Роздільна здатність",
+        "ColumnTypeOfScreen": "Тип екрану",
+        "Configurations": "Конфігурації",
         "Language_aa": "афарська",
         "Language_ab": "абхазька",
         "Language_ae": "авестійська",
@@ -1212,19 +1222,7 @@
         "Language_yo": "йоруба",
         "Language_za": "чжуан",
         "Language_zh": "китайська",
-        "Language_zu": "зулуська"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "Категорії веб-оглядачів",
-        "Browsers": "Веб-оглядачі",
-        "ColumnBrowser": "Веб-оглядач",
-        "ColumnBrowserFamily": "Родина веб-оглядача",
-        "ColumnConfiguration": "Конфігурація",
-        "ColumnOperatingSystem": "Операційна система",
-        "ColumnPlugin": "Плагін",
-        "ColumnResolution": "Роздільна здатність",
-        "ColumnTypeOfScreen": "Тип екрану",
-        "Configurations": "Конфігурації",
+        "Language_zu": "зулуська",
         "LanguageCode": "Код мови",
         "OperatingSystems": "Операційні системи",
         "PluginDescription": "Повідомляє різні налаштуванян користовувача: веб-оглядач, родина веб-оглядача, операційна система, плагіни, роздільна здатність, глобальні налаштування.",
diff --git a/lang/zh-cn.json b/lang/zh-cn.json
index 85fe97e27a..2306438bba 100644
--- a/lang/zh-cn.json
+++ b/lang/zh-cn.json
@@ -1935,7 +1935,22 @@
         "worldMap": "世界地图",
         "WorldWide": "全世界"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "浏览器种类",
+        "BrowserLanguage": "浏览器语言",
+        "Browsers": "浏览器名称",
+        "BrowserWithNoPluginsEnabled": "%1$s 没有启用插件",
+        "BrowserWithPluginsEnabled": "%1$s 启用插件%2$s",
+        "ColumnBrowser": "浏览器名称",
+        "ColumnBrowserFamily": "浏览器种类",
+        "ColumnBrowserVersion": "浏览器版本",
+        "ColumnConfiguration": "客户端配置",
+        "ColumnOperatingSystem": "操作系统",
+        "ColumnPlugin": "插件",
+        "ColumnResolution": "分辨率",
+        "ColumnTypeOfScreen": "屏幕类型",
+        "Configurations": "客户端配置",
+        "GamingConsole": "游戏机",
         "Language_aa": "阿法文",
         "Language_ab": "阿布哈西亚文",
         "Language_ae": "阿维斯塔文",
@@ -2119,24 +2134,7 @@
         "Language_yo": "约鲁巴文",
         "Language_za": "壮语",
         "Language_zh": "中文",
-        "Language_zu": "祖鲁文"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "浏览器种类",
-        "BrowserLanguage": "浏览器语言",
-        "Browsers": "浏览器名称",
-        "BrowserWithNoPluginsEnabled": "%1$s 没有启用插件",
-        "BrowserWithPluginsEnabled": "%1$s 启用插件%2$s",
-        "ColumnBrowser": "浏览器名称",
-        "ColumnBrowserFamily": "浏览器种类",
-        "ColumnBrowserVersion": "浏览器版本",
-        "ColumnConfiguration": "客户端配置",
-        "ColumnOperatingSystem": "操作系统",
-        "ColumnPlugin": "插件",
-        "ColumnResolution": "分辨率",
-        "ColumnTypeOfScreen": "屏幕类型",
-        "Configurations": "客户端配置",
-        "GamingConsole": "游戏机",
+        "Language_zu": "祖鲁文",
         "LanguageCode": "语言代码",
         "MobileVsDesktop": "移动和桌面",
         "OperatingSystemFamily": "操作系统种类",
diff --git a/lang/zh-tw.json b/lang/zh-tw.json
index c1949b1f42..b1546f29f3 100644
--- a/lang/zh-tw.json
+++ b/lang/zh-tw.json
@@ -1025,7 +1025,17 @@
         "toggleFullscreen": "切換全螢幕",
         "worldMap": "世界地圖"
     },
-    "UserLanguage": {
+    "UserSettings": {
+        "BrowserFamilies": "瀏覽器家族",
+        "Browsers": "使用瀏覽器",
+        "ColumnBrowser": "瀏覽器",
+        "ColumnBrowserFamily": "瀏覽器家族",
+        "ColumnConfiguration": "客戶端配置",
+        "ColumnOperatingSystem": "作業系統",
+        "ColumnPlugin": "外掛",
+        "ColumnResolution": "解析度",
+        "ColumnTypeOfScreen": "螢幕類型",
+        "Configurations": "客戶端配置",
         "Language_aa": "阿法文",
         "Language_ab": "阿布哈西亚文",
         "Language_ae": "阿维斯塔文",
@@ -1209,19 +1219,7 @@
         "Language_yo": "约鲁巴文",
         "Language_za": "壮语",
         "Language_zh": "中文",
-        "Language_zu": "祖鲁文"
-    },
-    "UserSettings": {
-        "BrowserFamilies": "瀏覽器家族",
-        "Browsers": "使用瀏覽器",
-        "ColumnBrowser": "瀏覽器",
-        "ColumnBrowserFamily": "瀏覽器家族",
-        "ColumnConfiguration": "客戶端配置",
-        "ColumnOperatingSystem": "作業系統",
-        "ColumnPlugin": "外掛",
-        "ColumnResolution": "解析度",
-        "ColumnTypeOfScreen": "螢幕類型",
-        "Configurations": "客戶端配置",
+        "Language_zu": "祖鲁文",
         "LanguageCode": "語系代碼",
         "OperatingSystems": "作業系統",
         "PluginDescription": "各個用戶設定報表：瀏覽器、瀏覽器家族、作業系統、外掛、解析度、全域設定。",
diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
index 30359acbdb..06fcae389e 100644
--- a/plugins/UserSettings/functions.php
+++ b/plugins/UserSettings/functions.php
@@ -265,7 +265,7 @@ function languageTranslate($label)
         return Piwik_Translate('General_Unknown');
     }
 
-    $key = 'UserLanguage_Language_' . $label;
+    $key = 'UserSettings_Language_' . $label;
 
     $translation = Piwik_Translate($key);
 
diff --git a/tests/PHPUnit/Core/Translate/WriterTest.php b/tests/PHPUnit/Core/Translate/WriterTest.php
index 6a9711a732..f63bcc2c43 100644
--- a/tests/PHPUnit/Core/Translate/WriterTest.php
+++ b/tests/PHPUnit/Core/Translate/WriterTest.php
@@ -159,7 +159,7 @@ class WriterTest extends PHPUnit_Framework_TestCase
 
         $translationsToWrite = array();
         $translationsToWrite['General'] = $translations['General'];
-        $translationsToWrite['UserLanguage'] = $translations['UserLanguage'];
+        $translationsToWrite['UserSettings'] = $translations['UserSettings'];
         $translationsToWrite['UserCountry'] = $translations['UserCountry'];
 
         $translationsToWrite['General']['Yes'] = 'string with %1$s';
-- 
GitLab