Change language files format to json

42 files changed, 1739 insertions, 1734 deletions

diff --git a/web/app/view/LoginController.js b/web/app/view/LoginController.js
index cd5a174d5..0b2090ffb 100644
--- a/web/app/view/LoginController.js
+++ b/web/app/view/LoginController.js
@@ -48,7 +48,6 @@ Ext.define('Traccar.view.LoginController', {
                             Traccar.ErrorManager.error(Strings.loginFailed);
                         }
                     }
-
                 }
             });
         }
diff --git a/web/l10n/bg.js b/web/l10n/bg.js
deleted file mode 100644
index 7bfec6a84..000000000
--- a/web/l10n/bg.js
+++ /dev/null
@@ -1,88 +0,0 @@
-var Strings = {
-    sharedLoading: 'Зареждане...',
-    sharedSave: 'Запази',
-    sharedCancel: 'Отказ',
-    sharedAdd: 'Добави',
-    sharedEdit: 'Редактирай',
-    sharedRemove: 'Премахни',
-    sharedRemoveConfirm: 'Премахване на Устройство?',
-    sharedKm: 'км',
-    sharedMi: 'мл',
-    sharedKmh: 'км/ч',
-    sharedMph: 'мл/ч',
-    sharedHour: 'Час',
-    sharedMinute: 'Минута',
-    sharedSecond: 'Секунда',
-
-    errorTitle: 'Грешка',
-    errorUnknown: 'Непозната Грешка',
-
-    userName: 'Име',
-    userEmail: 'Пощенска кутия',
-    userPassword: 'Парола',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Идентификация',
-    loginLanguage: 'Език',
-    loginRegister: 'Регистрация',
-    loginLogin: 'Вход',
-    loginFailed: 'Грешен потребител или парола',
-    loginCreated: 'Регистриран Нов Потребител',
-    loginLogout: 'Изход',
-
-    deviceDialog: 'Обекти',
-    deviceTitle: 'Устройства',
-    deviceName: 'Име',
-    deviceIdentifier: 'Идентификатор',
-    deviceCommand: 'Команда',
-
-    settingsTitle: 'Настройки',
-    settingsUser: 'Профил',
-    settingsServer: 'Сървър',
-    settingsUsers: 'Потребител',
-    settingsDistanceUnit: 'Разстояние',
-    settingsSpeedUnit: 'Скорост',
-
-    reportTitle: 'Доклад',
-    reportDevice: 'Устройство',
-    reportFrom: 'От',
-    reportTo: 'До',
-    reportShow: 'Покажи',
-    reportClear: 'Изчисти',
-
-    positionFixTime: 'Време',
-    positionValid: 'Валидност',
-    positionLatitude: 'Географска Ширина',
-    positionLongitude: 'Географска Дължина',
-    positionAltitude: 'Надморска височина',
-    positionSpeed: 'Скорост',
-    positionCourse: 'Посока',
-    positionAddress: 'Адрес',
-    positionProtocol: 'Протокол',
-
-    serverTitle: 'Настройки на Сървъра',
-    serverZoom: 'Приближение',
-    serverRegistration: 'Регистрация',
-
-    mapTitle: 'Карта',
-    mapLayer: 'Слой',
-    mapCustom: 'Потребителска Карта',
-    mapOsm: 'Open Street Map',
-    mapBingKey: 'Bing Maps Key',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'Състояние',
-    stateName: 'Параметър',
-    stateValue: 'Стойност',
-
-    commandTitle: 'Команда',
-    commandSend: 'Изпрати',
-    commandType: 'Тип',
-    commandPositionPeriodic: 'Периодичен Доклад',
-    commandPositionStop: 'Спри Доклада',
-    commandEngineStop: 'Спри Двигател',
-    commandEngineResume: 'Стартирай Двигател',
-    commandFrequency: 'Честота',
-    commandUnit: 'Обект'
-};
diff --git a/web/l10n/bg.json b/web/l10n/bg.json
new file mode 100644
index 000000000..f907cce5c
--- /dev/null
+++ b/web/l10n/bg.json
@@ -0,0 +1,88 @@
+{
+    "sharedLoading": "Зареждане...",
+    "sharedSave": "Запази",
+    "sharedCancel": "Отказ",
+    "sharedAdd": "Добави",
+    "sharedEdit": "Редактирай",
+    "sharedRemove": "Премахни",
+    "sharedRemoveConfirm": "Премахване на Устройство?",
+    "sharedKm": "км",
+    "sharedMi": "мл",
+    "sharedKmh": "км/ч",
+    "sharedMph": "мл/ч",
+    "sharedHour": "Час",
+    "sharedMinute": "Минута",
+    "sharedSecond": "Секунда",
+
+    "errorTitle": "Грешка",
+    "errorUnknown": "Непозната Грешка",
+
+    "userName": "Име",
+    "userEmail": "Пощенска кутия",
+    "userPassword": "Парола",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Идентификация",
+    "loginLanguage": "Език",
+    "loginRegister": "Регистрация",
+    "loginLogin": "Вход",
+    "loginFailed": "Грешен потребител или парола",
+    "loginCreated": "Регистриран Нов Потребител",
+    "loginLogout": "Изход",
+
+    "deviceDialog": "Обекти",
+    "deviceTitle": "Устройства",
+    "deviceName": "Име",
+    "deviceIdentifier": "Идентификатор",
+    "deviceCommand": "Команда",
+
+    "settingsTitle": "Настройки",
+    "settingsUser": "Профил",
+    "settingsServer": "Сървър",
+    "settingsUsers": "Потребител",
+    "settingsDistanceUnit": "Разстояние",
+    "settingsSpeedUnit": "Скорост",
+
+    "reportTitle": "Доклад",
+    "reportDevice": "Устройство",
+    "reportFrom": "От",
+    "reportTo": "До",
+    "reportShow": "Покажи",
+    "reportClear": "Изчисти",
+
+    "positionFixTime": "Време",
+    "positionValid": "Валидност",
+    "positionLatitude": "Географска Ширина",
+    "positionLongitude": "Географска Дължина",
+    "positionAltitude": "Надморска височина",
+    "positionSpeed": "Скорост",
+    "positionCourse": "Посока",
+    "positionAddress": "Адрес",
+    "positionProtocol": "Протокол",
+
+    "serverTitle": "Настройки на Сървъра",
+    "serverZoom": "Приближение",
+    "serverRegistration": "Регистрация",
+
+    "mapTitle": "Карта",
+    "mapLayer": "Слой",
+    "mapCustom": "Потребителска Карта",
+    "mapOsm": "Open Street Map",
+    "mapBingKey": "Bing Maps Key",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "Състояние",
+    "stateName": "Параметър",
+    "stateValue": "Стойност",
+
+    "commandTitle": "Команда",
+    "commandSend": "Изпрати",
+    "commandType": "Тип",
+    "commandPositionPeriodic": "Периодичен Доклад",
+    "commandPositionStop": "Спри Доклада",
+    "commandEngineStop": "Спри Двигател",
+    "commandEngineResume": "Стартирай Двигател",
+    "commandFrequency": "Честота",
+    "commandUnit": "Обект"
+}
diff --git a/web/l10n/cs.js b/web/l10n/cs.js
deleted file mode 100755
index 603b2368a..000000000
--- a/web/l10n/cs.js
+++ /dev/null
@@ -1,89 +0,0 @@
-var Strings = {
-    sharedLoading: 'Načítání...',
-    sharedSave: 'Uložit',
-    sharedCancel: 'Zrušit',
-    sharedAdd: 'Přidat',
-    sharedEdit: 'Změnit',
-    sharedRemove: 'Odstranit',
-    sharedRemoveConfirm: 'Odstranit položku?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Hodina',
-    sharedMinute: 'Minuta',
-    sharedSecond: 'Sekunda',
-
-    errorTitle: 'Chyba',
-    errorUnknown: 'Neznámá chyba',
-
-    userName: 'Jméno',
-    userEmail: 'Email',
-    userPassword: 'Heslo',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Přihlášení',
-    loginLanguage: 'Jazyk',
-    loginRegister: 'Registrace',
-    loginLogin: 'Přihlášení',
-    loginFailed: 'Nesprávný email nebo heslo',
-    loginCreated: 'Nový uživatel byl zaregistrován',
-    loginLogout: 'Odhlášení',
-
-    deviceDialog: 'Zařízení',
-    deviceTitle: 'Zařízení',
-    deviceName: 'Název',
-    deviceIdentifier: 'Identifikace',
-    deviceCommand: 'Příkaz',
-
-    settingsTitle: 'Nastavení',
-    settingsUser: 'Účet',
-    settingsServer: 'Server',
-    settingsUsers: 'Uživatelé',
-    settingsDistanceUnit: 'Vzdálenost',
-    settingsSpeedUnit: 'Rychlost',
-
-    reportTitle: 'Zpráva',
-    reportDevice: 'Zařízení',
-    reportFrom: 'Od',
-    reportTo: 'Komu',
-    reportShow: 'Zobrazit',
-    reportClear: 'Vyčistit',
-
-    positionFixTime: 'Čas',
-    positionValid: 'Správný',
-    positionLatitude: 'Šířka',
-    positionLongitude: 'Délka',
-    positionAltitude: 'Výška',
-    positionSpeed: 'Rychlost',
-    positionCourse: 'Směr',
-    positionAddress: 'Adresa',
-    positionProtocol: 'Protokol',
-
-    serverTitle: 'Nastavení serveru',
-    serverZoom: 'Přiblížení',
-    serverRegistration: 'Registrace',
-
-    mapTitle: 'Mapa',
-    mapLayer: 'Vrstva mapy',
-    mapCustom: 'Upravená mapa',
-    mapOsm: 'Open Street mapa',
-    mapBingKey: 'Bing Maps klíč',
-    mapBingRoad: 'Bing Maps cesta',
-    mapBingAerial: 'Bing Maps anténa',
-
-    stateTitle: 'Stav',
-    stateName: 'Atribut',
-    stateValue: 'Hodnota',
-
-    commandTitle: 'Příkaz',
-    commandSend: 'Odeslat',
-    commandType: 'Napsat',
-    commandSent: 'Příkaz byl odeslán',
-    commandPositionPeriodic: 'Pravidelný report',
-    commandPositionStop: 'Zastavit report',
-    commandEngineStop: 'Zastavit motor',
-    commandEngineResume: 'Nastartovat motor',
-    commandFrequency: 'Frekvence',
-    commandUnit: 'Jednotka'
-};
diff --git a/web/l10n/cs.json b/web/l10n/cs.json
new file mode 100644
index 000000000..79197589f
--- /dev/null
+++ b/web/l10n/cs.json
@@ -0,0 +1,89 @@
+{
+    "sharedLoading": "Načítání...",
+    "sharedSave": "Uložit",
+    "sharedCancel": "Zrušit",
+    "sharedAdd": "Přidat",
+    "sharedEdit": "Změnit",
+    "sharedRemove": "Odstranit",
+    "sharedRemoveConfirm": "Odstranit položku?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Hodina",
+    "sharedMinute": "Minuta",
+    "sharedSecond": "Sekunda",
+
+    "errorTitle": "Chyba",
+    "errorUnknown": "Neznámá chyba",
+
+    "userName": "Jméno",
+    "userEmail": "Email",
+    "userPassword": "Heslo",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Přihlášení",
+    "loginLanguage": "Jazyk",
+    "loginRegister": "Registrace",
+    "loginLogin": "Přihlášení",
+    "loginFailed": "Nesprávný email nebo heslo",
+    "loginCreated": "Nový uživatel byl zaregistrován",
+    "loginLogout": "Odhlášení",
+
+    "deviceDialog": "Zařízení",
+    "deviceTitle": "Zařízení",
+    "deviceName": "Název",
+    "deviceIdentifier": "Identifikace",
+    "deviceCommand": "Příkaz",
+
+    "settingsTitle": "Nastavení",
+    "settingsUser": "Účet",
+    "settingsServer": "Server",
+    "settingsUsers": "Uživatelé",
+    "settingsDistanceUnit": "Vzdálenost",
+    "settingsSpeedUnit": "Rychlost",
+
+    "reportTitle": "Zpráva",
+    "reportDevice": "Zařízení",
+    "reportFrom": "Od",
+    "reportTo": "Komu",
+    "reportShow": "Zobrazit",
+    "reportClear": "Vyčistit",
+
+    "positionFixTime": "Čas",
+    "positionValid": "Správný",
+    "positionLatitude": "Šířka",
+    "positionLongitude": "Délka",
+    "positionAltitude": "Výška",
+    "positionSpeed": "Rychlost",
+    "positionCourse": "Směr",
+    "positionAddress": "Adresa",
+    "positionProtocol": "Protokol",
+
+    "serverTitle": "Nastavení serveru",
+    "serverZoom": "Přiblížení",
+    "serverRegistration": "Registrace",
+
+    "mapTitle": "Mapa",
+    "mapLayer": "Vrstva mapy",
+    "mapCustom": "Upravená mapa",
+    "mapOsm": "Open Street mapa",
+    "mapBingKey": "Bing Maps klíč",
+    "mapBingRoad": "Bing Maps cesta",
+    "mapBingAerial": "Bing Maps anténa",
+
+    "stateTitle": "Stav",
+    "stateName": "Atribut",
+    "stateValue": "Hodnota",
+
+    "commandTitle": "Příkaz",
+    "commandSend": "Odeslat",
+    "commandType": "Napsat",
+    "commandSent": "Příkaz byl odeslán",
+    "commandPositionPeriodic": "Pravidelný report",
+    "commandPositionStop": "Zastavit report",
+    "commandEngineStop": "Zastavit motor",
+    "commandEngineResume": "Nastartovat motor",
+    "commandFrequency": "Frekvence",
+    "commandUnit": "Jednotka"
+}
diff --git a/web/l10n/de.js b/web/l10n/de.js
deleted file mode 100644
index 6a8bc12ff..000000000
--- a/web/l10n/de.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Lade...',
-    sharedSave: 'Speichern',
-    sharedCancel: 'Abbrechen',
-    sharedAdd: 'Hinzufügen',
-    sharedEdit: 'Bearbeiten',
-    sharedRemove: 'Entfernen',
-    sharedRemoveConfirm: 'Objekt entfernen?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Stunde',
-    sharedMinute: 'Minute',
-    sharedSecond: 'Sekunde',
-
-    errorTitle: 'Fehler',
-    errorUnknown: 'Unbekannter Fehler',
-
-    userName: 'Name',
-    userEmail: 'Email',
-    userPassword: 'Passwort',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Anmeldung',
-    loginLanguage: 'Sprache',
-    loginRegister: 'Registrieren',
-    loginLogin: 'Anmelden',
-    loginFailed: 'Falsche Emailadresse oder Passwort',
-    loginCreated: 'Neuer Benutzer wurde registriert',
-    loginLogout: 'Abmelden',
-
-    deviceDialog: 'Gerät',
-    deviceTitle: 'Geräte',
-    deviceName: 'Name',
-    deviceIdentifier: 'Kennung',
-    deviceCommand: 'Befehl',
-
-    settingsTitle: 'Einstellungen',
-    settingsUser: 'Benutzerkonto',
-    settingsServer: 'Server',
-    settingsUsers: 'Benutzer',
-    settingsDistanceUnit: 'Entfernung',
-    settingsSpeedUnit: 'Geschwindigkeit',
-
-    reportTitle: 'Berichte',
-    reportDevice: 'Gerät',
-    reportFrom: 'Von',
-    reportTo: 'Bis',
-    reportShow: 'Anzeigen',
-    reportClear: 'Leeren',
-
-    positionFixTime: 'Zeit',
-    positionValid: 'Gültig',
-    positionLatitude: 'Latitude',
-    positionLongitude: 'Longitude',
-    positionAltitude: 'Altitude',
-    positionSpeed: 'Geschwindigkeit',
-    positionCourse: 'Richtung',
-    positionAddress: 'Adresse',
-    positionProtocol: 'Protokoll',
-
-    serverTitle: 'Server Einstellungen',
-    serverZoom: 'Zoomen',
-    serverRegistration: 'Registrierung zulassen',
-
-    mapTitle: 'Karte',
-    mapLayer: 'Karten Layer',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Strassenkarte',
-    mapBingAerial: 'Bing Luftbilder',
-
-    stateTitle: 'Status',
-    stateName: 'Parameter',
-    stateValue: 'Wert',
-
-    commandTitle: 'Befehl',
-    commandSend: 'Senden',
-    commandType: 'Typ',
-    commandPositionPeriodic: 'Position Fix',
-    commandPositionStop: 'Position Stop',
-    commandEngineStop: 'Motor Stop',
-    commandEngineResume: 'Motor fortsetzen',
-    commandFrequency: 'Frequenz',
-    commandUnit: 'Einheit'
-};
diff --git a/web/l10n/de.json b/web/l10n/de.json
new file mode 100644
index 000000000..f90dad977
--- /dev/null
+++ b/web/l10n/de.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Lade...",
+    "sharedSave": "Speichern",
+    "sharedCancel": "Abbrechen",
+    "sharedAdd": "Hinzufügen",
+    "sharedEdit": "Bearbeiten",
+    "sharedRemove": "Entfernen",
+    "sharedRemoveConfirm": "Objekt entfernen?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Stunde",
+    "sharedMinute": "Minute",
+    "sharedSecond": "Sekunde",
+
+    "errorTitle": "Fehler",
+    "errorUnknown": "Unbekannter Fehler",
+
+    "userName": "Name",
+    "userEmail": "Email",
+    "userPassword": "Passwort",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Anmeldung",
+    "loginLanguage": "Sprache",
+    "loginRegister": "Registrieren",
+    "loginLogin": "Anmelden",
+    "loginFailed": "Falsche Emailadresse oder Passwort",
+    "loginCreated": "Neuer Benutzer wurde registriert",
+    "loginLogout": "Abmelden",
+
+    "deviceDialog": "Gerät",
+    "deviceTitle": "Geräte",
+    "deviceName": "Name",
+    "deviceIdentifier": "Kennung",
+    "deviceCommand": "Befehl",
+
+    "settingsTitle": "Einstellungen",
+    "settingsUser": "Benutzerkonto",
+    "settingsServer": "Server",
+    "settingsUsers": "Benutzer",
+    "settingsDistanceUnit": "Entfernung",
+    "settingsSpeedUnit": "Geschwindigkeit",
+
+    "reportTitle": "Berichte",
+    "reportDevice": "Gerät",
+    "reportFrom": "Von",
+    "reportTo": "Bis",
+    "reportShow": "Anzeigen",
+    "reportClear": "Leeren",
+
+    "positionFixTime": "Zeit",
+    "positionValid": "Gültig",
+    "positionLatitude": "Latitude",
+    "positionLongitude": "Longitude",
+    "positionAltitude": "Altitude",
+    "positionSpeed": "Geschwindigkeit",
+    "positionCourse": "Richtung",
+    "positionAddress": "Adresse",
+    "positionProtocol": "Protokoll",
+
+    "serverTitle": "Server Einstellungen",
+    "serverZoom": "Zoomen",
+    "serverRegistration": "Registrierung zulassen",
+
+    "mapTitle": "Karte",
+    "mapLayer": "Karten Layer",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Strassenkarte",
+    "mapBingAerial": "Bing Luftbilder",
+
+    "stateTitle": "Status",
+    "stateName": "Parameter",
+    "stateValue": "Wert",
+
+    "commandTitle": "Befehl",
+    "commandSend": "Senden",
+    "commandType": "Typ",
+    "commandPositionPeriodic": "Position Fix",
+    "commandPositionStop": "Position Stop",
+    "commandEngineStop": "Motor Stop",
+    "commandEngineResume": "Motor fortsetzen",
+    "commandFrequency": "Frequenz",
+    "commandUnit": "Einheit"
+}
diff --git a/web/l10n/dk.js b/web/l10n/dk.js
deleted file mode 100644
index 9136bebdf..000000000
--- a/web/l10n/dk.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Loading...',
-    sharedSave: 'Gem',
-    sharedCancel: 'Fortryd',
-    sharedAdd: 'Tilføj',
-    sharedEdit: 'Rediger',
-    sharedRemove: 'Fjern',
-    sharedRemoveConfirm: 'Fjern enhed?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/t',
-    sharedMph: 'mph',
-    sharedHour: 'Time',
-    sharedMinute: 'Minut',
-    sharedSecond: 'Sekund',
-
-    errorTitle: 'Fejl',
-    errorUnknown: 'Ukendt Fejl',
-
-    userName: 'Navn',
-    userEmail: 'Email',
-    userPassword: 'Kodeord',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Log på',
-    loginLanguage: 'Sprog',
-    loginRegister: 'Registrer',
-    loginLogin: 'Log på',
-    loginFailed: 'Fejl i email adresse eller kodeord',
-    loginCreated: 'Ny bruger er registreret',
-    loginLogout: 'Log af',
-
-    deviceDialog: 'Enhed',
-    deviceTitle: 'Enheder',
-    deviceName: 'Navn',
-    deviceIdentifier: 'Imei nr',
-    deviceCommand: 'Kommando',
-
-    settingsTitle: 'Indstillinger',
-    settingsUser: 'Konto',
-    settingsServer: 'Server',
-    settingsUsers: 'Brugere',
-    settingsDistanceUnit: 'Distance',
-    settingsSpeedUnit: 'Hastighed',
-
-    reportTitle: 'Rapporter',
-    reportDevice: 'Enhed',
-    reportFrom: 'Fra',
-    reportTo: 'Til',
-    reportShow: 'Vis',
-    reportClear: 'Ryd',
-
-    positionFixTime: 'Tid',
-    positionValid: 'Valid',
-    positionLatitude: '>Breddegrad',
-    positionLongitude: 'Længdegrad',
-    positionAltitude: 'Højde',
-    positionSpeed: 'Hastighed',
-    positionCourse: 'Kurs',
-    positionAddress: 'Addresse',
-    positionProtocol: 'Protocol',
-
-    serverTitle: 'Server indstillinger',
-    serverZoom: 'Zoom',
-    serverRegistration: 'Registrering',
-
-    mapTitle: 'Kort',
-    mapLayer: 'Kort opsætning',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'Status',
-    stateName: 'Parameter',
-    stateValue: 'Værdi',
-
-    commandTitle: 'Kommando',
-    commandSend: 'Send',
-    commandType: 'Type',
-    commandPositionPeriodic: 'Periodisk Rapportering',
-    commandPositionStop: 'Stop Rapportering',
-    commandEngineStop: 'Stop motor',
-    commandEngineResume: 'Genstart motor',
-    commandFrequency: 'Frekvens',
-    commandUnit: 'Enhed'
-};
diff --git a/web/l10n/dk.json b/web/l10n/dk.json
new file mode 100644
index 000000000..a3c37882d
--- /dev/null
+++ b/web/l10n/dk.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Loading...",
+    "sharedSave": "Gem",
+    "sharedCancel": "Fortryd",
+    "sharedAdd": "Tilføj",
+    "sharedEdit": "Rediger",
+    "sharedRemove": "Fjern",
+    "sharedRemoveConfirm": "Fjern enhed?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/t",
+    "sharedMph": "mph",
+    "sharedHour": "Time",
+    "sharedMinute": "Minut",
+    "sharedSecond": "Sekund",
+
+    "errorTitle": "Fejl",
+    "errorUnknown": "Ukendt Fejl",
+
+    "userName": "Navn",
+    "userEmail": "Email",
+    "userPassword": "Kodeord",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Log på",
+    "loginLanguage": "Sprog",
+    "loginRegister": "Registrer",
+    "loginLogin": "Log på",
+    "loginFailed": "Fejl i email adresse eller kodeord",
+    "loginCreated": "Ny bruger er registreret",
+    "loginLogout": "Log af",
+
+    "deviceDialog": "Enhed",
+    "deviceTitle": "Enheder",
+    "deviceName": "Navn",
+    "deviceIdentifier": "Imei nr",
+    "deviceCommand": "Kommando",
+
+    "settingsTitle": "Indstillinger",
+    "settingsUser": "Konto",
+    "settingsServer": "Server",
+    "settingsUsers": "Brugere",
+    "settingsDistanceUnit": "Distance",
+    "settingsSpeedUnit": "Hastighed",
+
+    "reportTitle": "Rapporter",
+    "reportDevice": "Enhed",
+    "reportFrom": "Fra",
+    "reportTo": "Til",
+    "reportShow": "Vis",
+    "reportClear": "Ryd",
+
+    "positionFixTime": "Tid",
+    "positionValid": "Valid",
+    "positionLatitude": ">Breddegrad",
+    "positionLongitude": "Længdegrad",
+    "positionAltitude": "Højde",
+    "positionSpeed": "Hastighed",
+    "positionCourse": "Kurs",
+    "positionAddress": "Addresse",
+    "positionProtocol": "Protocol",
+
+    "serverTitle": "Server indstillinger",
+    "serverZoom": "Zoom",
+    "serverRegistration": "Registrering",
+
+    "mapTitle": "Kort",
+    "mapLayer": "Kort opsætning",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "Status",
+    "stateName": "Parameter",
+    "stateValue": "Værdi",
+
+    "commandTitle": "Kommando",
+    "commandSend": "Send",
+    "commandType": "Type",
+    "commandPositionPeriodic": "Periodisk Rapportering",
+    "commandPositionStop": "Stop Rapportering",
+    "commandEngineStop": "Stop motor",
+    "commandEngineResume": "Genstart motor",
+    "commandFrequency": "Frekvens",
+    "commandUnit": "Enhed"
+}
diff --git a/web/l10n/el.js b/web/l10n/el.js
deleted file mode 100755
index 249871826..000000000
--- a/web/l10n/el.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var strings = {
-    sharedLoading: 'Φόρτωση...',
-    sharedSave: 'Αποθήκευση',
-    sharedCancel: 'Άκυρον',
-    sharedAdd: 'Προσθήκη',
-    sharedEdit: 'Επεξεργασία',
-    sharedRemove: 'Διαγραφή',
-    sharedRemoveConfirm: 'Διαγραφη στοιχείου;',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Ώρα',
-    sharedMinute: 'Λεπτά',
-    sharedSecond: 'Δευτερόλεπτα',
-
-    errorTitle: 'Σφάλμα',
-    errorUnknown: 'Άνωστο σφάλμα',
-
-    userName: 'Όνομα',
-    userEmail: 'Email',
-    userPassword: 'Συνθηματικό',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Σύνδεση',
-    loginLanguage: 'Γλώσσα',
-    loginRegister: 'Εγγραφή',
-    loginLogin: 'Σύνδεση',
-    loginFailed: 'Εσφαλμένη διεύθυνση ή εσφαλμένο συνθηματικό',
-    loginCreated: 'Ο νέος χρήστης καταχωρήθηκε.',
-    loginLogout: 'Αποσύνδεση',
-
-    deviceDialog: 'Συσκευή',
-    deviceTitle: 'Συσκευές',
-    deviceName: 'Όνομα',
-    deviceIdentifier: 'Αναγνωριστικό',
-    deviceCommand: 'Εντολή',
-
-    settingsTitle: 'Ρυθμίσεις',
-    settingsUser: 'Λογαριασμός',
-    settingsServer: 'Εξυπηρετητής',
-    settingsUsers: 'Χρήστες',
-    settingsDistanceUnit: 'Απόσταση',
-    settingsSpeedUnit: 'Ταχύτητα',
-
-    reportTitle: 'Αναφορές',
-    reportDevice: 'Συσκευή',
-    reportFrom: 'Από',
-    reportTo: 'Έως',
-    reportShow: 'Προβολή',
-    reportClear: 'Καθαρισμός',
-
-    positionFixTime: 'Χρόνος',
-    positionValid: 'Έγκυρο',
-    positionLatitude: 'Γ. πλάτος',
-    positionLongitude: 'Γ. μήκος',
-    positionAltitude: 'Υψόμετρο',
-    positionSpeed: 'Ταχύτητα',
-    positionCourse: 'Πορεία',
-    positionAddress: 'Διεύθυνση',
-    positionProtocol: 'Πρωτόκολλο',
-
-    serverTitle: 'Ρυθμίσεις εξυπηρετητή',
-    serverZoom: 'Εστίαση',
-    serverRegistration: 'Εγγραφή',
-
-    mapTitle: 'Χάρτης',
-    mapLayer: 'Επιλογή χάρτη',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'Κατάσταση',
-    stateName: 'Παράμετρος',
-    stateValue: 'Τιμή',
-
-    commandTitle: 'Εντολή',
-    commandSend: 'Αποστολή',
-    commandType: 'Τύπος',
-    commandPositionPeriodic: 'Περιοδικές αναφορές',
-    commandPositionStop: 'Λήξη αναφορών',
-    commandEngineStop: 'Κλείσιμο',
-    commandEngineResume: 'Επανεκκίνηση',
-    commandFrequency: 'Συχνότητα',
-    commandUnit: 'Μονάδα'
-};
diff --git a/web/l10n/el.json b/web/l10n/el.json
new file mode 100644
index 000000000..b016392d5
--- /dev/null
+++ b/web/l10n/el.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Φόρτωση...",
+    "sharedSave": "Αποθήκευση",
+    "sharedCancel": "Άκυρον",
+    "sharedAdd": "Προσθήκη",
+    "sharedEdit": "Επεξεργασία",
+    "sharedRemove": "Διαγραφή",
+    "sharedRemoveConfirm": "Διαγραφη στοιχείου;",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Ώρα",
+    "sharedMinute": "Λεπτά",
+    "sharedSecond": "Δευτερόλεπτα",
+
+    "errorTitle": "Σφάλμα",
+    "errorUnknown": "Άνωστο σφάλμα",
+
+    "userName": "Όνομα",
+    "userEmail": "Email",
+    "userPassword": "Συνθηματικό",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Σύνδεση",
+    "loginLanguage": "Γλώσσα",
+    "loginRegister": "Εγγραφή",
+    "loginLogin": "Σύνδεση",
+    "loginFailed": "Εσφαλμένη διεύθυνση ή εσφαλμένο συνθηματικό",
+    "loginCreated": "Ο νέος χρήστης καταχωρήθηκε.",
+    "loginLogout": "Αποσύνδεση",
+
+    "deviceDialog": "Συσκευή",
+    "deviceTitle": "Συσκευές",
+    "deviceName": "Όνομα",
+    "deviceIdentifier": "Αναγνωριστικό",
+    "deviceCommand": "Εντολή",
+
+    "settingsTitle": "Ρυθμίσεις",
+    "settingsUser": "Λογαριασμός",
+    "settingsServer": "Εξυπηρετητής",
+    "settingsUsers": "Χρήστες",
+    "settingsDistanceUnit": "Απόσταση",
+    "settingsSpeedUnit": "Ταχύτητα",
+
+    "reportTitle": "Αναφορές",
+    "reportDevice": "Συσκευή",
+    "reportFrom": "Από",
+    "reportTo": "Έως",
+    "reportShow": "Προβολή",
+    "reportClear": "Καθαρισμός",
+
+    "positionFixTime": "Χρόνος",
+    "positionValid": "Έγκυρο",
+    "positionLatitude": "Γ. πλάτος",
+    "positionLongitude": "Γ. μήκος",
+    "positionAltitude": "Υψόμετρο",
+    "positionSpeed": "Ταχύτητα",
+    "positionCourse": "Πορεία",
+    "positionAddress": "Διεύθυνση",
+    "positionProtocol": "Πρωτόκολλο",
+
+    "serverTitle": "Ρυθμίσεις εξυπηρετητή",
+    "serverZoom": "Εστίαση",
+    "serverRegistration": "Εγγραφή",
+
+    "mapTitle": "Χάρτης",
+    "mapLayer": "Επιλογή χάρτη",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "Κατάσταση",
+    "stateName": "Παράμετρος",
+    "stateValue": "Τιμή",
+
+    "commandTitle": "Εντολή",
+    "commandSend": "Αποστολή",
+    "commandType": "Τύπος",
+    "commandPositionPeriodic": "Περιοδικές αναφορές",
+    "commandPositionStop": "Λήξη αναφορών",
+    "commandEngineStop": "Κλείσιμο",
+    "commandEngineResume": "Επανεκκίνηση",
+    "commandFrequency": "Συχνότητα",
+    "commandUnit": "Μονάδα"
+}
diff --git a/web/l10n/en.js b/web/l10n/en.js
deleted file mode 100644
index fdf5e49c7..000000000
--- a/web/l10n/en.js
+++ /dev/null
@@ -1,90 +0,0 @@
-var Strings = {
-    sharedLoading: 'Loading...',
-    sharedSave: 'Save',
-    sharedCancel: 'Cancel',
-    sharedAdd: 'Add',
-    sharedEdit: 'Edit',
-    sharedRemove: 'Remove',
-    sharedRemoveConfirm: 'Remove item?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Hour',
-    sharedMinute: 'Minute',
-    sharedSecond: 'Second',
-
-    errorTitle: 'Error',
-    errorUnknown: 'Unknown error',
-    errorConnection: 'Connection error',
-
-    userName: 'Name',
-    userEmail: 'Email',
-    userPassword: 'Password',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Login',
-    loginLanguage: 'Language',
-    loginRegister: 'Register',
-    loginLogin: 'Login',
-    loginFailed: 'Incorrect email address or password',
-    loginCreated: 'New user has been registered',
-    loginLogout: 'Logout',
-
-    deviceDialog: 'Device',
-    deviceTitle: 'Devices',
-    deviceName: 'Name',
-    deviceIdentifier: 'Identifier',
-    deviceCommand: 'Command',
-
-    settingsTitle: 'Settings',
-    settingsUser: 'Account',
-    settingsServer: 'Server',
-    settingsUsers: 'Users',
-    settingsDistanceUnit: 'Distance',
-    settingsSpeedUnit: 'Speed',
-
-    reportTitle: 'Reports',
-    reportDevice: 'Device',
-    reportFrom: 'From',
-    reportTo: 'To',
-    reportShow: 'Show',
-    reportClear: 'Clear',
-
-    positionFixTime: 'Time',
-    positionValid: 'Valid',
-    positionLatitude: 'Latitude',
-    positionLongitude: 'Longitude',
-    positionAltitude: 'Altitude',
-    positionSpeed: 'Speed',
-    positionCourse: 'Course',
-    positionAddress: 'Address',
-    positionProtocol: 'Protocol',
-
-    serverTitle: 'Server Settings',
-    serverZoom: 'Zoom',
-    serverRegistration: 'Registration',
-
-    mapTitle: 'Map',
-    mapLayer: 'Map Layer',
-    mapCustom: 'Custom Map',
-    mapOsm: 'Open Street Map',
-    mapBingKey: 'Bing Maps Key',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'State',
-    stateName: 'Attribute',
-    stateValue: 'Value',
-
-    commandTitle: 'Command',
-    commandSend: 'Send',
-    commandType: 'Type',
-    commandSent: 'Command has been sent',
-    commandPositionPeriodic: 'Periodic Reporting',
-    commandPositionStop: 'Stop Reporting',
-    commandEngineStop: 'Engine Stop',
-    commandEngineResume: 'Engine Resume',
-    commandFrequency: 'Frequency',
-    commandUnit: 'Unit'
-};
diff --git a/web/l10n/en.json b/web/l10n/en.json
new file mode 100644
index 000000000..d131fa808
--- /dev/null
+++ b/web/l10n/en.json
@@ -0,0 +1,90 @@
+{
+    "sharedLoading": "Loading...",
+    "sharedSave": "Save",
+    "sharedCancel": "Cancel",
+    "sharedAdd": "Add",
+    "sharedEdit": "Edit",
+    "sharedRemove": "Remove",
+    "sharedRemoveConfirm": "Remove item?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Hour",
+    "sharedMinute": "Minute",
+    "sharedSecond": "Second",
+
+    "errorTitle": "Error",
+    "errorUnknown": "Unknown error",
+    "errorConnection": "Connection error",
+
+    "userName": "Name",
+    "userEmail": "Email",
+    "userPassword": "Password",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Login",
+    "loginLanguage": "Language",
+    "loginRegister": "Register",
+    "loginLogin": "Login",
+    "loginFailed": "Incorrect email address or password",
+    "loginCreated": "New user has been registered",
+    "loginLogout": "Logout",
+
+    "deviceDialog": "Device",
+    "deviceTitle": "Devices",
+    "deviceName": "Name",
+    "deviceIdentifier": "Identifier",
+    "deviceCommand": "Command",
+
+    "settingsTitle": "Settings",
+    "settingsUser": "Account",
+    "settingsServer": "Server",
+    "settingsUsers": "Users",
+    "settingsDistanceUnit": "Distance",
+    "settingsSpeedUnit": "Speed",
+
+    "reportTitle": "Reports",
+    "reportDevice": "Device",
+    "reportFrom": "From",
+    "reportTo": "To",
+    "reportShow": "Show",
+    "reportClear": "Clear",
+
+    "positionFixTime": "Time",
+    "positionValid": "Valid",
+    "positionLatitude": "Latitude",
+    "positionLongitude": "Longitude",
+    "positionAltitude": "Altitude",
+    "positionSpeed": "Speed",
+    "positionCourse": "Course",
+    "positionAddress": "Address",
+    "positionProtocol": "Protocol",
+
+    "serverTitle": "Server Settings",
+    "serverZoom": "Zoom",
+    "serverRegistration": "Registration",
+
+    "mapTitle": "Map",
+    "mapLayer": "Map Layer",
+    "mapCustom": "Custom Map",
+    "mapOsm": "Open Street Map",
+    "mapBingKey": "Bing Maps Key",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "State",
+    "stateName": "Attribute",
+    "stateValue": "Value",
+
+    "commandTitle": "Command",
+    "commandSend": "Send",
+    "commandType": "Type",
+    "commandSent": "Command has been sent",
+    "commandPositionPeriodic": "Periodic Reporting",
+    "commandPositionStop": "Stop Reporting",
+    "commandEngineStop": "Engine Stop",
+    "commandEngineResume": "Engine Resume",
+    "commandFrequency": "Frequency",
+    "commandUnit": "Unit"
+}
diff --git a/web/l10n/es.js b/web/l10n/es.js
deleted file mode 100644
index 9e96dd368..000000000
--- a/web/l10n/es.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Cargando...',
-    sharedSave: 'Grabar',
-    sharedCancel: 'Cancelar',
-    sharedAdd: 'Agregar',
-    sharedEdit: 'Editar',
-    sharedRemove: 'Borrar',
-    sharedRemoveConfirm: 'Borrar elemento?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Hora',
-    sharedMinute: 'Minuto',
-    sharedSecond: 'Segundos',
-
-    errorTitle: 'Error',
-    errorUnknown: 'Error Desconocido',
-
-    userName: 'Nombre',
-    userEmail: 'Email',
-    userPassword: 'Contraseña',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Ingresar',
-    loginLanguage: 'Lenguaje',
-    loginRegister: 'Registrar',
-    loginLogin: 'Ingresar',
-    loginFailed: 'Direccion de correo o Contraseña Incorrecta',
-    loginCreated: 'Nuevo usuario ha sido registrado',
-    loginLogout: 'Salir',
-
-    deviceDialog: 'Dispositivo',
-    deviceTitle: 'Dispositivos',
-    deviceName: 'Nombre',
-    deviceIdentifier: 'Identificador',
-    deviceCommand: 'Comando',
-
-    settingsTitle: 'Preferencias',
-    settingsUser: 'Cuenta',
-    settingsServer: 'Servidor',
-    settingsUsers: 'Usuarios',
-    settingsDistanceUnit: 'Distancia',
-    settingsSpeedUnit: 'Velocidad',
-
-    reportTitle: 'Reportes',
-    reportDevice: 'Dispositivos',
-    reportFrom: 'Desde',
-    reportTo: 'Hasta',
-    reportShow: 'Mostrar',
-    reportClear: 'Limpiar',
-
-    positionFixTime: 'Hora',
-    positionValid: 'Valida',
-    positionLatitude: 'Latitud',
-    positionLongitude: 'Longitud',
-    positionAltitude: 'Altitud',
-    positionSpeed: 'Velocidad',
-    positionCourse: 'Curso',
-    positionAddress: 'Direccion',
-    positionProtocol: 'Protocolo',
-
-    serverTitle: 'Preferencias Servidor',
-    serverZoom: 'Zoom',
-    serverRegistration: 'Registrar',
-
-    mapTitle: 'Mapa',
-    mapLayer: 'Capa de Mapa',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps - Carretera',
-    mapBingAerial: 'Bing Maps - Aereo',
-
-    stateTitle: 'Estado',
-    stateName: 'Parametro',
-    stateValue: 'Valor',
-
-    commandTitle: 'Comando',
-    commandSend: 'Enviar',
-    commandType: 'Tipo',
-    commandPositionPeriodic: 'Frecuencia de posiciones',
-    commandPositionStop: 'Detener reporte de posiciones',
-    commandEngineStop: 'Apagar motor',
-    commandEngineResume: 'Desbloquear encendido de motor',
-    commandFrequency: 'Frequencia',
-    commandUnit: 'Unidad'
-};
diff --git a/web/l10n/es.json b/web/l10n/es.json
new file mode 100644
index 000000000..3dc8a26bb
--- /dev/null
+++ b/web/l10n/es.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Cargando...",
+    "sharedSave": "Grabar",
+    "sharedCancel": "Cancelar",
+    "sharedAdd": "Agregar",
+    "sharedEdit": "Editar",
+    "sharedRemove": "Borrar",
+    "sharedRemoveConfirm": "Borrar elemento?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Hora",
+    "sharedMinute": "Minuto",
+    "sharedSecond": "Segundos",
+
+    "errorTitle": "Error",
+    "errorUnknown": "Error Desconocido",
+
+    "userName": "Nombre",
+    "userEmail": "Email",
+    "userPassword": "Contraseña",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Ingresar",
+    "loginLanguage": "Lenguaje",
+    "loginRegister": "Registrar",
+    "loginLogin": "Ingresar",
+    "loginFailed": "Direccion de correo o Contraseña Incorrecta",
+    "loginCreated": "Nuevo usuario ha sido registrado",
+    "loginLogout": "Salir",
+
+    "deviceDialog": "Dispositivo",
+    "deviceTitle": "Dispositivos",
+    "deviceName": "Nombre",
+    "deviceIdentifier": "Identificador",
+    "deviceCommand": "Comando",
+
+    "settingsTitle": "Preferencias",
+    "settingsUser": "Cuenta",
+    "settingsServer": "Servidor",
+    "settingsUsers": "Usuarios",
+    "settingsDistanceUnit": "Distancia",
+    "settingsSpeedUnit": "Velocidad",
+
+    "reportTitle": "Reportes",
+    "reportDevice": "Dispositivos",
+    "reportFrom": "Desde",
+    "reportTo": "Hasta",
+    "reportShow": "Mostrar",
+    "reportClear": "Limpiar",
+
+    "positionFixTime": "Hora",
+    "positionValid": "Valida",
+    "positionLatitude": "Latitud",
+    "positionLongitude": "Longitud",
+    "positionAltitude": "Altitud",
+    "positionSpeed": "Velocidad",
+    "positionCourse": "Curso",
+    "positionAddress": "Direccion",
+    "positionProtocol": "Protocolo",
+
+    "serverTitle": "Preferencias Servidor",
+    "serverZoom": "Zoom",
+    "serverRegistration": "Registrar",
+
+    "mapTitle": "Mapa",
+    "mapLayer": "Capa de Mapa",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps - Carretera",
+    "mapBingAerial": "Bing Maps - Aereo",
+
+    "stateTitle": "Estado",
+    "stateName": "Parametro",
+    "stateValue": "Valor",
+
+    "commandTitle": "Comando",
+    "commandSend": "Enviar",
+    "commandType": "Tipo",
+    "commandPositionPeriodic": "Frecuencia de posiciones",
+    "commandPositionStop": "Detener reporte de posiciones",
+    "commandEngineStop": "Apagar motor",
+    "commandEngineResume": "Desbloquear encendido de motor",
+    "commandFrequency": "Frequencia",
+    "commandUnit": "Unidad"
+}
diff --git a/web/l10n/fr.js b/web/l10n/fr.js
deleted file mode 100644
index c91d7574f..000000000
--- a/web/l10n/fr.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Chargement...',
-    sharedSave: 'Enregistrer',
-    sharedCancel: 'Annuler',
-    sharedAdd: 'Ajouter',
-    sharedEdit: 'Editer',
-    sharedRemove: 'Effacer',
-    sharedRemoveConfirm: 'Effacer item?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Heure',
-    sharedMinute: 'Minute',
-    sharedSecond: 'Seconde',
-
-    errorTitle: 'Erreur',
-    errorUnknown: 'Erreur inconnue',
-
-    userName: 'Nom',
-    userEmail: 'Email',
-    userPassword: 'Mot de Passe',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Identification',
-    loginLanguage: 'Langue',
-    loginRegister: 'Inscription',
-    loginLogin: 'Se connecter',
-    loginFailed: 'Adresse email ou mot de passe incorrect',
-    loginCreated: 'New user has been registered',
-    loginLogout: 'Déconnection',
-
-    deviceDialog: 'Dispositif',
-    deviceTitle: 'Dispositifs',
-    deviceName: 'Nom',
-    deviceIdentifier: 'Identifiant',
-    deviceCommand: 'Commande',
-
-    settingsTitle: 'Configurations',
-    settingsUser: 'Compte',
-    settingsServer: 'Serveur',
-    settingsUsers: 'Utilisateurs',
-    settingsDistanceUnit: 'Distance',
-    settingsSpeedUnit: 'Vitesse',
-
-    reportTitle: 'Rapports',
-    reportDevice: 'Dispositif',
-    reportFrom: 'De',
-    reportTo: 'A',
-    reportShow: 'Afficher',
-    reportClear: 'Effacer',
-
-    positionFixTime: 'Heure',
-    positionValid: 'Valide',
-    positionLatitude: 'Latitude',
-    positionLongitude: 'Longitude',
-    positionAltitude: 'Altitude',
-    positionSpeed: 'Vitesse',
-    positionCourse: 'Sense',
-    positionAddress: 'Adresse',
-    positionProtocol: 'Protocole',
-
-    serverTitle: 'Configurations du Serveur Settings',
-    serverZoom: 'Zoom',
-    serverRegistration: 'Inscription',
-
-    mapTitle: 'Carte',
-    mapLayer: 'Cartes',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'Etat',
-    stateName: 'Paramètre',
-    stateValue: 'Valeur',
-
-    commandTitle: 'Commande',
-    commandSend: 'Envoyer',
-    commandType: 'Type',
-    commandPositionPeriodic: 'Périodicité du rapport de position',
-    commandPositionStop: 'Arrêt du rapport de position',
-    commandEngineStop: 'Moteur arrêter',
-    commandEngineResume: 'Moteur démarrer',
-    commandFrequency: 'Fréquence',
-    commandUnit: 'Unité'
-};
diff --git a/web/l10n/fr.json b/web/l10n/fr.json
new file mode 100644
index 000000000..6dbb335c3
--- /dev/null
+++ b/web/l10n/fr.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Chargement...",
+    "sharedSave": "Enregistrer",
+    "sharedCancel": "Annuler",
+    "sharedAdd": "Ajouter",
+    "sharedEdit": "Editer",
+    "sharedRemove": "Effacer",
+    "sharedRemoveConfirm": "Effacer item?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Heure",
+    "sharedMinute": "Minute",
+    "sharedSecond": "Seconde",
+
+    "errorTitle": "Erreur",
+    "errorUnknown": "Erreur inconnue",
+
+    "userName": "Nom",
+    "userEmail": "Email",
+    "userPassword": "Mot de Passe",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Identification",
+    "loginLanguage": "Langue",
+    "loginRegister": "Inscription",
+    "loginLogin": "Se connecter",
+    "loginFailed": "Adresse email ou mot de passe incorrect",
+    "loginCreated": "New user has been registered",
+    "loginLogout": "Déconnection",
+
+    "deviceDialog": "Dispositif",
+    "deviceTitle": "Dispositifs",
+    "deviceName": "Nom",
+    "deviceIdentifier": "Identifiant",
+    "deviceCommand": "Commande",
+
+    "settingsTitle": "Configurations",
+    "settingsUser": "Compte",
+    "settingsServer": "Serveur",
+    "settingsUsers": "Utilisateurs",
+    "settingsDistanceUnit": "Distance",
+    "settingsSpeedUnit": "Vitesse",
+
+    "reportTitle": "Rapports",
+    "reportDevice": "Dispositif",
+    "reportFrom": "De",
+    "reportTo": "A",
+    "reportShow": "Afficher",
+    "reportClear": "Effacer",
+
+    "positionFixTime": "Heure",
+    "positionValid": "Valide",
+    "positionLatitude": "Latitude",
+    "positionLongitude": "Longitude",
+    "positionAltitude": "Altitude",
+    "positionSpeed": "Vitesse",
+    "positionCourse": "Sense",
+    "positionAddress": "Adresse",
+    "positionProtocol": "Protocole",
+
+    "serverTitle": "Configurations du Serveur Settings",
+    "serverZoom": "Zoom",
+    "serverRegistration": "Inscription",
+
+    "mapTitle": "Carte",
+    "mapLayer": "Cartes",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "Etat",
+    "stateName": "Paramètre",
+    "stateValue": "Valeur",
+
+    "commandTitle": "Commande",
+    "commandSend": "Envoyer",
+    "commandType": "Type",
+    "commandPositionPeriodic": "Périodicité du rapport de position",
+    "commandPositionStop": "Arrêt du rapport de position",
+    "commandEngineStop": "Moteur arrêter",
+    "commandEngineResume": "Moteur démarrer",
+    "commandFrequency": "Fréquence",
+    "commandUnit": "Unité"
+}
diff --git a/web/l10n/hu.js b/web/l10n/hu.js
deleted file mode 100755
index 44a02562d..000000000
--- a/web/l10n/hu.js
+++ /dev/null
@@ -1,87 +0,0 @@
-var strings = {
-    sharedLoading: 'Betöltés...',
-    sharedSave: 'Mentés',
-    sharedCancel: 'Mégse',
-    sharedAdd: 'Hozzáadás',
-    sharedEdit: 'Szerkesztés',
-    sharedRemove: 'Törlés',
-    sharedRemoveConfirm: 'Biztosan törli?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Óra',
-    sharedMinute: 'Perc',
-    sharedSecond: 'Másodperc',
-
-    errorTitle: 'Hiba',
-    errorUnknown: 'Ismeretlen hiba.',
-
-    userName: 'Név',
-    userEmail: 'Email',
-    userPassword: 'Jelszó',
-    userAdmin: 'Adminisztrátor',
-
-    loginTitle: 'Bejelentkezés',
-    loginLanguage: 'Nyelv',
-    loginRegister: 'Regisztráció',
-    loginLogin: 'Bejelentkezés',
-    loginFailed: 'Hibás email vagy jelszó',
-    loginCreated: 'Az új felhasználó sikeresen létrehozva',
-    loginLogout: 'Kilépés',
-
-    deviceDialog: 'Eszköz',
-    deviceTitle: 'Eszközök',
-    deviceName: 'Eszköznév',
-    deviceIdentifier: 'Azonosító',
-    deviceCommand: 'Parancs',
-
-    settingsTitle: 'Beállítások',
-    settingsUser: 'Fiók',
-    settingsServer: 'Szerver',
-    settingsUsers: 'Felhasználók',
-    settingsDistanceUnit: 'Távolság',
-    settingsSpeedUnit: 'Sebesség',
-
-    reportTitle: 'Jelentések',
-    reportDevice: 'Eszköz',
-    reportFrom: 'Kezdő dátum:',
-    reportTo: 'Végső dátum:',
-    reportShow: 'Mutat',
-    reportClear: 'Töröl',
-
-    positionFixTime: 'Idő',
-    positionValid: 'Valós',
-    positionLatitude: 'Szélességi fok',
-    positionLongitude: 'Hosszúsági fok',
-    positionAltitude: 'Magasság',
-    positionSpeed: 'Sebesség',
-    positionCourse: 'Irány',
-    positionAddress: 'Cím',
-    positionProtocol: 'Protokoll',
-
-    serverTitle: 'Szerver beállítások',
-    serverZoom: 'Nagyítás',
-    serverRegistration: 'Regisztráció',
-
-    mapTitle: 'Térkép',
-    mapLayer: 'Térkép réteg',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'Helyzet',
-    stateName: 'Paraméter',
-    stateValue: 'Érték',
-
-    commandTitle: 'Parancs',
-    commandSend: 'Küld',
-    commandType: 'Típus',
-    commandSent: 'A parancs elküldve',
-    commandPositionPeriodic: 'Pozició küldés',
-    commandPositionStop: 'Pozició küldés vége',
-    commandEngineStop: 'Motor letiltás',
-    commandEngineResume: 'Motor engedélyezés',
-    commandFrequency: 'Frekvencia',
-    commandUnit: 'Egység'
-};
diff --git a/web/l10n/hu.json b/web/l10n/hu.json
new file mode 100644
index 000000000..a457e1399
--- /dev/null
+++ b/web/l10n/hu.json
@@ -0,0 +1,87 @@
+{
+    "sharedLoading": "Betöltés...",
+    "sharedSave": "Mentés",
+    "sharedCancel": "Mégse",
+    "sharedAdd": "Hozzáadás",
+    "sharedEdit": "Szerkesztés",
+    "sharedRemove": "Törlés",
+    "sharedRemoveConfirm": "Biztosan törli?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Óra",
+    "sharedMinute": "Perc",
+    "sharedSecond": "Másodperc",
+
+    "errorTitle": "Hiba",
+    "errorUnknown": "Ismeretlen hiba.",
+
+    "userName": "Név",
+    "userEmail": "Email",
+    "userPassword": "Jelszó",
+    "userAdmin": "Adminisztrátor",
+
+    "loginTitle": "Bejelentkezés",
+    "loginLanguage": "Nyelv",
+    "loginRegister": "Regisztráció",
+    "loginLogin": "Bejelentkezés",
+    "loginFailed": "Hibás email vagy jelszó",
+    "loginCreated": "Az új felhasználó sikeresen létrehozva",
+    "loginLogout": "Kilépés",
+
+    "deviceDialog": "Eszköz",
+    "deviceTitle": "Eszközök",
+    "deviceName": "Eszköznév",
+    "deviceIdentifier": "Azonosító",
+    "deviceCommand": "Parancs",
+
+    "settingsTitle": "Beállítások",
+    "settingsUser": "Fiók",
+    "settingsServer": "Szerver",
+    "settingsUsers": "Felhasználók",
+    "settingsDistanceUnit": "Távolság",
+    "settingsSpeedUnit": "Sebesség",
+
+    "reportTitle": "Jelentések",
+    "reportDevice": "Eszköz",
+    "reportFrom": "Kezdő dátum:",
+    "reportTo": "Végső dátum:",
+    "reportShow": "Mutat",
+    "reportClear": "Töröl",
+
+    "positionFixTime": "Idő",
+    "positionValid": "Valós",
+    "positionLatitude": "Szélességi fok",
+    "positionLongitude": "Hosszúsági fok",
+    "positionAltitude": "Magasság",
+    "positionSpeed": "Sebesség",
+    "positionCourse": "Irány",
+    "positionAddress": "Cím",
+    "positionProtocol": "Protokoll",
+
+    "serverTitle": "Szerver beállítások",
+    "serverZoom": "Nagyítás",
+    "serverRegistration": "Regisztráció",
+
+    "mapTitle": "Térkép",
+    "mapLayer": "Térkép réteg",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "Helyzet",
+    "stateName": "Paraméter",
+    "stateValue": "Érték",
+
+    "commandTitle": "Parancs",
+    "commandSend": "Küld",
+    "commandType": "Típus",
+    "commandSent": "A parancs elküldve",
+    "commandPositionPeriodic": "Pozició küldés",
+    "commandPositionStop": "Pozició küldés vége",
+    "commandEngineStop": "Motor letiltás",
+    "commandEngineResume": "Motor engedélyezés",
+    "commandFrequency": "Frekvencia",
+    "commandUnit": "Egység"
+}
diff --git a/web/l10n/lt.js b/web/l10n/lt.js
deleted file mode 100644
index 8bedf2ac6..000000000
--- a/web/l10n/lt.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Kraunasi..',
-    sharedSave: 'Išsaugoti',
-    sharedCancel: 'Atšaukti',
-    sharedAdd: 'Pridėti',
-    sharedEdit: 'Redaguoti',
-    sharedRemove: 'Ištrinti',
-    sharedRemoveConfirm: 'Ar tikrais norite ištrinti?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Valanda(-os)',
-    sharedMinute: 'Minutė(-es)',
-    sharedSecond: 'Sekundė(-es)',
-
-    errorTitle: 'Klaida',
-    errorUnknown: 'Nenumatyta klaida',
-
-    userName: 'Prisijungimo vardas',
-    userEmail: 'Vartotojo vardas',
-    userPassword: 'Slaptažodis',
-    userAdmin: 'Administratorius',
-
-    loginTitle: 'Prisijungimas',
-    loginLanguage: 'Kalba',
-    loginRegister: 'Registruotis',
-    loginLogin: 'Prisijungti',
-    loginFailed: 'Neteisingas el.paštas ir/ar slaptažodis',
-    loginCreated: 'Registracija sėmkinga',
-    loginLogout: 'Atsijungti',
-
-    deviceDialog: 'Prietaisas',
-    deviceTitle: 'Prietaisai',
-    deviceName: 'Pavadinimas',
-    deviceIdentifier: 'Identifikacinis kodas',
-    deviceCommand: 'Komanda',
-
-    settingsTitle: 'Nustatymai',
-    settingsUser: 'Paskyra',
-    settingsServer: 'Serveris',
-    settingsUsers: 'Vartotojai',
-    settingsDistanceUnit: 'Atstumas',
-    settingsSpeedUnit: 'Greitis',
-
-    reportTitle: 'Ataskaita',
-    reportDevice: 'Prietaisas',
-    reportFrom: 'Nuo',
-    reportTo: 'Iki',
-    reportShow: 'Rodyti',
-    reportClear: 'Valyti',
-
-    positionFixTime: 'Laikas',
-    positionValid: 'Galimas',
-    positionLatitude: 'Platuma',
-    positionLongitude: 'Ilguma',
-    positionAltitude: 'Aukštis',
-    positionSpeed: 'Greitis',
-    positionCourse: 'Eiga',
-    positionAddress: 'Adresas',
-    positionProtocol: 'Protokolas',
-
-    serverTitle: 'Serverio nustatymai',
-    serverZoom: 'Priartinimas',
-    serverRegistration: 'Registracija',
-
-    mapTitle: 'Žemėlapis',
-    mapLayer: 'Žemėlapio sluoksnis',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'Statusas',
-    stateName: 'Parametras',
-    stateValue: 'Reikšmė',
-
-    commandTitle: 'Komanda',
-    commandSend: 'Siūsti',
-    commandType: 'Tipas',
-    commandPositionPeriodic: 'Periodinis reportavimas',
-    commandPositionStop: 'Stabdyti reportavimą',
-    commandEngineStop: 'Stabdyti variklį',
-    commandEngineResume: 'Paleisti variklį',
-    commandFrequency: 'Dažnis',
-    commandUnit: 'Vienetai'
-};
diff --git a/web/l10n/lt.json b/web/l10n/lt.json
new file mode 100644
index 000000000..5965be128
--- /dev/null
+++ b/web/l10n/lt.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Kraunasi..",
+    "sharedSave": "Išsaugoti",
+    "sharedCancel": "Atšaukti",
+    "sharedAdd": "Pridėti",
+    "sharedEdit": "Redaguoti",
+    "sharedRemove": "Ištrinti",
+    "sharedRemoveConfirm": "Ar tikrais norite ištrinti?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Valanda(-os)",
+    "sharedMinute": "Minutė(-es)",
+    "sharedSecond": "Sekundė(-es)",
+
+    "errorTitle": "Klaida",
+    "errorUnknown": "Nenumatyta klaida",
+
+    "userName": "Prisijungimo vardas",
+    "userEmail": "Vartotojo vardas",
+    "userPassword": "Slaptažodis",
+    "userAdmin": "Administratorius",
+
+    "loginTitle": "Prisijungimas",
+    "loginLanguage": "Kalba",
+    "loginRegister": "Registruotis",
+    "loginLogin": "Prisijungti",
+    "loginFailed": "Neteisingas el.paštas ir/ar slaptažodis",
+    "loginCreated": "Registracija sėmkinga",
+    "loginLogout": "Atsijungti",
+
+    "deviceDialog": "Prietaisas",
+    "deviceTitle": "Prietaisai",
+    "deviceName": "Pavadinimas",
+    "deviceIdentifier": "Identifikacinis kodas",
+    "deviceCommand": "Komanda",
+
+    "settingsTitle": "Nustatymai",
+    "settingsUser": "Paskyra",
+    "settingsServer": "Serveris",
+    "settingsUsers": "Vartotojai",
+    "settingsDistanceUnit": "Atstumas",
+    "settingsSpeedUnit": "Greitis",
+
+    "reportTitle": "Ataskaita",
+    "reportDevice": "Prietaisas",
+    "reportFrom": "Nuo",
+    "reportTo": "Iki",
+    "reportShow": "Rodyti",
+    "reportClear": "Valyti",
+
+    "positionFixTime": "Laikas",
+    "positionValid": "Galimas",
+    "positionLatitude": "Platuma",
+    "positionLongitude": "Ilguma",
+    "positionAltitude": "Aukštis",
+    "positionSpeed": "Greitis",
+    "positionCourse": "Eiga",
+    "positionAddress": "Adresas",
+    "positionProtocol": "Protokolas",
+
+    "serverTitle": "Serverio nustatymai",
+    "serverZoom": "Priartinimas",
+    "serverRegistration": "Registracija",
+
+    "mapTitle": "Žemėlapis",
+    "mapLayer": "Žemėlapio sluoksnis",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "Statusas",
+    "stateName": "Parametras",
+    "stateValue": "Reikšmė",
+
+    "commandTitle": "Komanda",
+    "commandSend": "Siūsti",
+    "commandType": "Tipas",
+    "commandPositionPeriodic": "Periodinis reportavimas",
+    "commandPositionStop": "Stabdyti reportavimą",
+    "commandEngineStop": "Stabdyti variklį",
+    "commandEngineResume": "Paleisti variklį",
+    "commandFrequency": "Dažnis",
+    "commandUnit": "Vienetai"
+}
diff --git a/web/l10n/nl.js b/web/l10n/nl.js
deleted file mode 100644
index ee9d2c367..000000000
--- a/web/l10n/nl.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Laden...',
-    sharedSave: 'Opslaan',
-    sharedCancel: 'Annuleren',
-    sharedAdd: 'Toevoegen',
-    sharedEdit: 'Bewerken',
-    sharedRemove: 'Verwijderen',
-    sharedRemoveConfirm: 'Verwijder item?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Uur',
-    sharedMinute: 'Minuut',
-    sharedSecond: 'Seconde',
-
-    errorTitle: 'Fout',
-    errorUnknown: 'Onbekende fout',
-
-    userName: 'Gebruikersnaam',
-    userEmail: 'Email',
-    userPassword: 'WachtwoordPassword',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Inloggen',
-    loginLanguage: 'Taal',
-    loginRegister: 'Registeren',
-    loginLogin: 'Inloggen',
-    loginFailed: 'Onjuiste emailadres of wachtwoord',
-    loginCreated: 'Nieuwe gebruiker is geregistreerd',
-    loginLogout: 'Uitloggen',
-
-    deviceDialog: 'Apparaat',
-    deviceTitle: 'Apparaten',
-    deviceName: 'Naam',
-    deviceIdentifier: 'Identifier',
-    deviceCommand: 'Commando',
-
-    settingsTitle: 'Instellingen',
-    settingsUser: 'Account',
-    settingsServer: 'Server',
-    settingsUsers: 'Gebruikers',
-    settingsDistanceUnit: 'Afstand',
-    settingsSpeedUnit: 'Snelheid',
-
-    reportTitle: 'Reports',
-    reportDevice: 'Apparaat',
-    reportFrom: 'Van',
-    reportTo: 'Naar',
-    reportShow: 'Laten zien',
-    reportClear: 'Leegmaken',
-
-    positionFixTime: 'Tijd',
-    positionValid: 'Geldig',
-    positionLatitude: 'Latitude',
-    positionLongitude: 'Longitude',
-    positionAltitude: 'Altitude',
-    positionSpeed: 'Snelheid',
-    positionCourse: 'Koers',
-    positionAddress: 'Adres',
-    positionProtocol: 'Protocol',
-
-    serverTitle: 'Server Instellingen',
-    serverZoom: 'Zoom',
-    serverRegistration: 'Registratie',
-
-    mapTitle: 'Kaart',
-    mapLayer: 'Kaart laag',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Wegen',
-    mapBingAerial: 'Bing Maps Luchtfoto',
-
-    stateTitle: 'Status',
-    stateName: 'Parameter',
-    stateValue: 'Waarde',
-
-    commandTitle: 'Commando',
-    commandSend: 'Verstuur',
-    commandType: 'Type',
-    commandPositionPeriodic: 'Periodic Reporting',
-    commandPositionStop: 'Stop Reporting',
-    commandEngineStop: 'Engine Stop',
-    commandEngineResume: 'Engine Resume',
-    commandFrequency: 'Frequentie',
-    commandUnit: 'Eenheid'
-};
diff --git a/web/l10n/nl.json b/web/l10n/nl.json
new file mode 100644
index 000000000..d1aa6cdbf
--- /dev/null
+++ b/web/l10n/nl.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Laden...",
+    "sharedSave": "Opslaan",
+    "sharedCancel": "Annuleren",
+    "sharedAdd": "Toevoegen",
+    "sharedEdit": "Bewerken",
+    "sharedRemove": "Verwijderen",
+    "sharedRemoveConfirm": "Verwijder item?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Uur",
+    "sharedMinute": "Minuut",
+    "sharedSecond": "Seconde",
+
+    "errorTitle": "Fout",
+    "errorUnknown": "Onbekende fout",
+
+    "userName": "Gebruikersnaam",
+    "userEmail": "Email",
+    "userPassword": "WachtwoordPassword",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Inloggen",
+    "loginLanguage": "Taal",
+    "loginRegister": "Registeren",
+    "loginLogin": "Inloggen",
+    "loginFailed": "Onjuiste emailadres of wachtwoord",
+    "loginCreated": "Nieuwe gebruiker is geregistreerd",
+    "loginLogout": "Uitloggen",
+
+    "deviceDialog": "Apparaat",
+    "deviceTitle": "Apparaten",
+    "deviceName": "Naam",
+    "deviceIdentifier": "Identifier",
+    "deviceCommand": "Commando",
+
+    "settingsTitle": "Instellingen",
+    "settingsUser": "Account",
+    "settingsServer": "Server",
+    "settingsUsers": "Gebruikers",
+    "settingsDistanceUnit": "Afstand",
+    "settingsSpeedUnit": "Snelheid",
+
+    "reportTitle": "Reports",
+    "reportDevice": "Apparaat",
+    "reportFrom": "Van",
+    "reportTo": "Naar",
+    "reportShow": "Laten zien",
+    "reportClear": "Leegmaken",
+
+    "positionFixTime": "Tijd",
+    "positionValid": "Geldig",
+    "positionLatitude": "Latitude",
+    "positionLongitude": "Longitude",
+    "positionAltitude": "Altitude",
+    "positionSpeed": "Snelheid",
+    "positionCourse": "Koers",
+    "positionAddress": "Adres",
+    "positionProtocol": "Protocol",
+
+    "serverTitle": "Server Instellingen",
+    "serverZoom": "Zoom",
+    "serverRegistration": "Registratie",
+
+    "mapTitle": "Kaart",
+    "mapLayer": "Kaart laag",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Wegen",
+    "mapBingAerial": "Bing Maps Luchtfoto",
+
+    "stateTitle": "Status",
+    "stateName": "Parameter",
+    "stateValue": "Waarde",
+
+    "commandTitle": "Commando",
+    "commandSend": "Verstuur",
+    "commandType": "Type",
+    "commandPositionPeriodic": "Periodic Reporting",
+    "commandPositionStop": "Stop Reporting",
+    "commandEngineStop": "Engine Stop",
+    "commandEngineResume": "Engine Resume",
+    "commandFrequency": "Frequentie",
+    "commandUnit": "Eenheid"
+}
diff --git a/web/l10n/pl.js b/web/l10n/pl.js
deleted file mode 100644
index ec50bbdb5..000000000
--- a/web/l10n/pl.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Wczytywanie...',
-    sharedSave: 'Zapisz',
-    sharedCancel: 'Anuluj',
-    sharedAdd: 'Dodaj',
-    sharedEdit: 'Edytuj',
-    sharedRemove: 'Usuń',
-    sharedRemoveConfirm: 'Usuń obiekt?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Godzina',
-    sharedMinute: 'Minuta',
-    sharedSecond: 'Sekunda',
-
-    errorTitle: 'Bląd',
-    errorUnknown: 'Nieznany błąd',
-
-    userName: 'Nazwa',
-    userEmail: 'Email',
-    userPassword: 'Hasło',
-    userAdmin: 'Administrator',
-
-    loginTitle: 'Logowanie',
-    loginLanguage: 'Język',
-    loginRegister: 'Rejestracja',
-    loginLogin: 'Zaloguj',
-    loginFailed: 'Nieprawidłowy adres e-mail lub hasło',
-    loginCreated: 'Nowy użytkownik został zarejestrowany',
-    loginLogout: 'Wyloguj',
-
-    deviceDialog: 'Urządzenie',
-    deviceTitle: 'Urządzenia',
-    deviceName: 'Nazwa',
-    deviceIdentifier: 'Identyfikator',
-    deviceCommand: 'Zdarzenie',
-
-    settingsTitle: 'Ustawienia',
-    settingsUser: 'Konto',
-    settingsServer: 'Serwer',
-    settingsUsers: 'Użytkownicy',
-    settingsDistanceUnit: 'Dystans',
-    settingsSpeedUnit: 'Prędkość',
-
-    reportTitle: 'Raporty',
-    reportDevice: 'Urządzenie',
-    reportFrom: 'Z',
-    reportTo: 'Do',
-    reportShow: 'Wczytaj',
-    reportClear: 'Wyczyść',
-
-    positionFixTime: 'Czas',
-    positionValid: 'Aktywny',
-    positionLatitude: 'Szerokość',
-    positionLongitude: 'Długość',
-    positionAltitude: 'Wysokość',
-    positionSpeed: 'Prędkość',
-    positionCourse: 'Kurs',
-    positionAddress: 'Adres',
-    positionProtocol: 'Protokół',
-
-    serverTitle: 'Ustawienia serwera',
-    serverZoom: 'Powiększenie',
-    serverRegistration: 'Rejestracja',
-
-    mapTitle: 'Mapa',
-    mapLayer: 'Mapa',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'Lokalizacja',
-    stateName: 'Właściwości',
-    stateValue: 'Wartość',
-
-    commandTitle: 'Zdarzenie',
-    commandSend: 'Wyślij',
-    commandType: 'Typ',
-    commandPositionPeriodic: 'Pozycja - Fix',
-    commandPositionStop: 'Pozycja - Stop',
-    commandEngineStop: 'Silnik - Stop',
-    commandEngineResume: 'Silnik - Praca',
-    commandFrequency: 'Częstotliwość',
-    commandUnit: 'Jednostka'
-};
diff --git a/web/l10n/pl.json b/web/l10n/pl.json
new file mode 100644
index 000000000..4aa949b5b
--- /dev/null
+++ b/web/l10n/pl.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Wczytywanie...",
+    "sharedSave": "Zapisz",
+    "sharedCancel": "Anuluj",
+    "sharedAdd": "Dodaj",
+    "sharedEdit": "Edytuj",
+    "sharedRemove": "Usuń",
+    "sharedRemoveConfirm": "Usuń obiekt?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Godzina",
+    "sharedMinute": "Minuta",
+    "sharedSecond": "Sekunda",
+
+    "errorTitle": "Bląd",
+    "errorUnknown": "Nieznany błąd",
+
+    "userName": "Nazwa",
+    "userEmail": "Email",
+    "userPassword": "Hasło",
+    "userAdmin": "Administrator",
+
+    "loginTitle": "Logowanie",
+    "loginLanguage": "Język",
+    "loginRegister": "Rejestracja",
+    "loginLogin": "Zaloguj",
+    "loginFailed": "Nieprawidłowy adres e-mail lub hasło",
+    "loginCreated": "Nowy użytkownik został zarejestrowany",
+    "loginLogout": "Wyloguj",
+
+    "deviceDialog": "Urządzenie",
+    "deviceTitle": "Urządzenia",
+    "deviceName": "Nazwa",
+    "deviceIdentifier": "Identyfikator",
+    "deviceCommand": "Zdarzenie",
+
+    "settingsTitle": "Ustawienia",
+    "settingsUser": "Konto",
+    "settingsServer": "Serwer",
+    "settingsUsers": "Użytkownicy",
+    "settingsDistanceUnit": "Dystans",
+    "settingsSpeedUnit": "Prędkość",
+
+    "reportTitle": "Raporty",
+    "reportDevice": "Urządzenie",
+    "reportFrom": "Z",
+    "reportTo": "Do",
+    "reportShow": "Wczytaj",
+    "reportClear": "Wyczyść",
+
+    "positionFixTime": "Czas",
+    "positionValid": "Aktywny",
+    "positionLatitude": "Szerokość",
+    "positionLongitude": "Długość",
+    "positionAltitude": "Wysokość",
+    "positionSpeed": "Prędkość",
+    "positionCourse": "Kurs",
+    "positionAddress": "Adres",
+    "positionProtocol": "Protokół",
+
+    "serverTitle": "Ustawienia serwera",
+    "serverZoom": "Powiększenie",
+    "serverRegistration": "Rejestracja",
+
+    "mapTitle": "Mapa",
+    "mapLayer": "Mapa",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "Lokalizacja",
+    "stateName": "Właściwości",
+    "stateValue": "Wartość",
+
+    "commandTitle": "Zdarzenie",
+    "commandSend": "Wyślij",
+    "commandType": "Typ",
+    "commandPositionPeriodic": "Pozycja - Fix",
+    "commandPositionStop": "Pozycja - Stop",
+    "commandEngineStop": "Silnik - Stop",
+    "commandEngineResume": "Silnik - Praca",
+    "commandFrequency": "Częstotliwość",
+    "commandUnit": "Jednostka"
+}
diff --git a/web/l10n/pt.js b/web/l10n/pt.js
deleted file mode 100644
index aaf613adc..000000000
--- a/web/l10n/pt.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Carregando ...',
-    sharedSave: 'Salvar',
-    sharedCancel: 'Cancelar',
-    sharedAdd: 'Adicionar',
-    sharedEdit: 'Editar',
-    sharedRemove: 'Remover',
-    sharedRemoveConfirm: 'Remove item?',
-    sharedKm: 'Km',
-    sharedMi: 'mi',
-    sharedKmh: 'Km/h',
-    sharedMph: 'Mph',
-    sharedHour: 'Hora',
-    sharedMinute: 'Minuto',
-    sharedSecond: 'Segundo',
-
-    errorTitle: 'Erro',
-    errorUnknown: 'Erro desconhecido',
-
-    userName: 'Nome',
-    userEmail: 'E-mail',
-    userPassword: 'Senha',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Entrar',
-    loginLanguage: 'Idioma',
-    loginRegister: 'Registrar',
-    loginLogin: 'Entrar',
-    loginFailed: 'Endereço de e-mail ou senha incorreta',
-    loginCreated: 'Novo usuário foi registrado',
-    loginLogout: 'Sair',
-
-    deviceDialog: 'Dispositivo',
-    deviceTitle: 'Devices',
-    deviceName: 'Nome',
-    deviceIdentifier: 'Identificador',
-    deviceCommand: 'Comando',
-
-    settingsTitle: 'Configurações',
-    settingsUser: 'Conta',
-    settingsServer: 'Servidor',
-    settingsUsers: 'Usuário',
-    settingsDistanceUnit: 'Distância',
-    settingsSpeedUnit: 'Velocidade',
-
-    reportTitle: 'Relatórios',
-    reportDevice: 'Dispositivo',
-    reportFrom: 'De',
-    reportTo: 'Para',
-    reportShow: 'Mostrar',
-    reportClear: 'Limpar',
-
-    positionFixTime: 'Tempo',
-    positionValid: 'Válido',
-    positionLatitude: 'Latitude',
-    positionLongitude: 'Longitude',
-    positionAltitude: 'Altitude',
-    positionSpeed: 'Velocidade',
-    positionCourse: 'Course',
-    positionAddress: 'Endereço',
-    positionProtocol: 'protocolo',
-
-    serverTitle: 'Configurações do Servidor',
-    serverZoom: 'Zoom',
-    serverRegistration: 'Registro',
-
-    mapTitle: 'Mapa',
-    mapLayer: 'Camada Mapa',
-    mapOsm: 'Open Street Mapa',
-    mapBingRoad: 'Bing Mapas Estrada',
-    mapBingAerial: 'Bing Mapas Aérea',
-
-    stateTitle: 'Estado',
-    stateName: 'Parâmetro',
-    stateValue: 'Valor',
-
-    commandTitle: 'Comando',
-    commandSend: 'Enviar',
-    commandType: 'Tipo',
-    commandPositionPeriodic: 'Posição Tempo',
-    commandPositionStop: 'Parar Posição',
-    commandEngineStop: 'Bloqueio Veículo',
-    commandEngineResume: 'Desbloqueio Veículo',
-    commandFrequency: 'Frequência',
-    commandUnit: 'Unidade'
-};
diff --git a/web/l10n/pt.json b/web/l10n/pt.json
new file mode 100644
index 000000000..ad01d4649
--- /dev/null
+++ b/web/l10n/pt.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Carregando ...",
+    "sharedSave": "Salvar",
+    "sharedCancel": "Cancelar",
+    "sharedAdd": "Adicionar",
+    "sharedEdit": "Editar",
+    "sharedRemove": "Remover",
+    "sharedRemoveConfirm": "Remove item?",
+    "sharedKm": "Km",
+    "sharedMi": "mi",
+    "sharedKmh": "Km/h",
+    "sharedMph": "Mph",
+    "sharedHour": "Hora",
+    "sharedMinute": "Minuto",
+    "sharedSecond": "Segundo",
+
+    "errorTitle": "Erro",
+    "errorUnknown": "Erro desconhecido",
+
+    "userName": "Nome",
+    "userEmail": "E-mail",
+    "userPassword": "Senha",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Entrar",
+    "loginLanguage": "Idioma",
+    "loginRegister": "Registrar",
+    "loginLogin": "Entrar",
+    "loginFailed": "Endereço de e-mail ou senha incorreta",
+    "loginCreated": "Novo usuário foi registrado",
+    "loginLogout": "Sair",
+
+    "deviceDialog": "Dispositivo",
+    "deviceTitle": "Devices",
+    "deviceName": "Nome",
+    "deviceIdentifier": "Identificador",
+    "deviceCommand": "Comando",
+
+    "settingsTitle": "Configurações",
+    "settingsUser": "Conta",
+    "settingsServer": "Servidor",
+    "settingsUsers": "Usuário",
+    "settingsDistanceUnit": "Distância",
+    "settingsSpeedUnit": "Velocidade",
+
+    "reportTitle": "Relatórios",
+    "reportDevice": "Dispositivo",
+    "reportFrom": "De",
+    "reportTo": "Para",
+    "reportShow": "Mostrar",
+    "reportClear": "Limpar",
+
+    "positionFixTime": "Tempo",
+    "positionValid": "Válido",
+    "positionLatitude": "Latitude",
+    "positionLongitude": "Longitude",
+    "positionAltitude": "Altitude",
+    "positionSpeed": "Velocidade",
+    "positionCourse": "Course",
+    "positionAddress": "Endereço",
+    "positionProtocol": "protocolo",
+
+    "serverTitle": "Configurações do Servidor",
+    "serverZoom": "Zoom",
+    "serverRegistration": "Registro",
+
+    "mapTitle": "Mapa",
+    "mapLayer": "Camada Mapa",
+    "mapOsm": "Open Street Mapa",
+    "mapBingRoad": "Bing Mapas Estrada",
+    "mapBingAerial": "Bing Mapas Aérea",
+
+    "stateTitle": "Estado",
+    "stateName": "Parâmetro",
+    "stateValue": "Valor",
+
+    "commandTitle": "Comando",
+    "commandSend": "Enviar",
+    "commandType": "Tipo",
+    "commandPositionPeriodic": "Posição Tempo",
+    "commandPositionStop": "Parar Posição",
+    "commandEngineStop": "Bloqueio Veículo",
+    "commandEngineResume": "Desbloqueio Veículo",
+    "commandFrequency": "Frequência",
+    "commandUnit": "Unidade"
+}
diff --git a/web/l10n/ru.js b/web/l10n/ru.js
deleted file mode 100644
index 4536a1082..000000000
--- a/web/l10n/ru.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Загрузка...',
-    sharedSave: 'Сохранить',
-    sharedCancel: 'Отмена',
-    sharedAdd: 'Добавить',
-    sharedEdit: 'Редактировать',
-    sharedRemove: 'Удалить',
-    sharedRemoveConfirm: 'Удалить элемент?',
-    sharedKm: 'км',
-    sharedMi: 'мили',
-    sharedKmh: 'км/ч',
-    sharedMph: 'миль/ч',
-    sharedHour: 'Часы',
-    sharedMinute: 'Минуты',
-    sharedSecond: 'Секунды',
-
-    errorTitle: 'Ошибка',
-    errorUnknown: 'Неизвестная ошибка',
-
-    userName: 'Имя',
-    userEmail: 'Email',
-    userPassword: 'Пароль',
-    userAdmin: 'Администратор',
-
-    loginTitle: 'Вход',
-    loginLanguage: 'Язык',
-    loginRegister: 'Регистрация',
-    loginLogin: 'Вход',
-    loginFailed: 'Неправильный email адрес или пароль',
-    loginCreated: 'Новый пользователь зарегистрирован',
-    loginLogout: 'Выход',
-
-    deviceDialog: 'Устройство',
-    deviceTitle: 'Устройства',
-    deviceName: 'Название',
-    deviceIdentifier: 'Идентификатор',
-    deviceCommand: 'Команда',
-
-    settingsTitle: 'Настройки',
-    settingsUser: 'Аккаунт',
-    settingsServer: 'Сервер',
-    settingsUsers: 'Пользователи',
-    settingsDistanceUnit: 'Расстояние',
-    settingsSpeedUnit: 'Скорость',
-
-    reportTitle: 'Отчеты',
-    reportDevice: 'Устройство',
-    reportFrom: 'С',
-    reportTo: 'По',
-    reportShow: 'Показать',
-    reportClear: 'Очистить',
-
-    positionFixTime: 'Время',
-    positionValid: 'Корректность',
-    positionLatitude: 'Широта',
-    positionLongitude: 'Долгота',
-    positionAltitude: 'Высота',
-    positionSpeed: 'Скорость',
-    positionCourse: 'Курс',
-    positionAddress: 'Адрес',
-    positionProtocol: 'Протокол',
-
-    serverTitle: 'Настройки Сервера',
-    serverZoom: 'Приближение',
-    serverRegistration: 'Регистрация',
-
-    mapTitle: 'Карта',
-    mapLayer: 'Слой Карты',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Дороги',
-    mapBingAerial: 'Bing Maps Спутник',
-
-    stateTitle: 'Состояние',
-    stateName: 'Параметр',
-    stateValue: 'Значение',
-
-    commandTitle: 'Команда',
-    commandSend: 'Отправить',
-    commandType: 'Тип',
-    commandPositionPeriodic: 'Начать Отслеживание',
-    commandPositionStop: 'Отменить Отслеживание',
-    commandEngineStop: 'Заблокировать Двигатель',
-    commandEngineResume: 'Разблокировать Двигатель',
-    commandFrequency: 'Частота',
-    commandUnit: 'Единицы'
-};
diff --git a/web/l10n/ru.json b/web/l10n/ru.json
new file mode 100644
index 000000000..6dd47d2f1
--- /dev/null
+++ b/web/l10n/ru.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Загрузка...",
+    "sharedSave": "Сохранить",
+    "sharedCancel": "Отмена",
+    "sharedAdd": "Добавить",
+    "sharedEdit": "Редактировать",
+    "sharedRemove": "Удалить",
+    "sharedRemoveConfirm": "Удалить элемент?",
+    "sharedKm": "км",
+    "sharedMi": "мили",
+    "sharedKmh": "км/ч",
+    "sharedMph": "миль/ч",
+    "sharedHour": "Часы",
+    "sharedMinute": "Минуты",
+    "sharedSecond": "Секунды",
+
+    "errorTitle": "Ошибка",
+    "errorUnknown": "Неизвестная ошибка",
+
+    "userName": "Имя",
+    "userEmail": "Email",
+    "userPassword": "Пароль",
+    "userAdmin": "Администратор",
+
+    "loginTitle": "Вход",
+    "loginLanguage": "Язык",
+    "loginRegister": "Регистрация",
+    "loginLogin": "Вход",
+    "loginFailed": "Неправильный email адрес или пароль",
+    "loginCreated": "Новый пользователь зарегистрирован",
+    "loginLogout": "Выход",
+
+    "deviceDialog": "Устройство",
+    "deviceTitle": "Устройства",
+    "deviceName": "Название",
+    "deviceIdentifier": "Идентификатор",
+    "deviceCommand": "Команда",
+
+    "settingsTitle": "Настройки",
+    "settingsUser": "Аккаунт",
+    "settingsServer": "Сервер",
+    "settingsUsers": "Пользователи",
+    "settingsDistanceUnit": "Расстояние",
+    "settingsSpeedUnit": "Скорость",
+
+    "reportTitle": "Отчеты",
+    "reportDevice": "Устройство",
+    "reportFrom": "С",
+    "reportTo": "По",
+    "reportShow": "Показать",
+    "reportClear": "Очистить",
+
+    "positionFixTime": "Время",
+    "positionValid": "Корректность",
+    "positionLatitude": "Широта",
+    "positionLongitude": "Долгота",
+    "positionAltitude": "Высота",
+    "positionSpeed": "Скорость",
+    "positionCourse": "Курс",
+    "positionAddress": "Адрес",
+    "positionProtocol": "Протокол",
+
+    "serverTitle": "Настройки Сервера",
+    "serverZoom": "Приближение",
+    "serverRegistration": "Регистрация",
+
+    "mapTitle": "Карта",
+    "mapLayer": "Слой Карты",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Дороги",
+    "mapBingAerial": "Bing Maps Спутник",
+
+    "stateTitle": "Состояние",
+    "stateName": "Параметр",
+    "stateValue": "Значение",
+
+    "commandTitle": "Команда",
+    "commandSend": "Отправить",
+    "commandType": "Тип",
+    "commandPositionPeriodic": "Начать Отслеживание",
+    "commandPositionStop": "Отменить Отслеживание",
+    "commandEngineStop": "Заблокировать Двигатель",
+    "commandEngineResume": "Разблокировать Двигатель",
+    "commandFrequency": "Частота",
+    "commandUnit": "Единицы"
+}
diff --git a/web/l10n/si.js b/web/l10n/si.js
deleted file mode 100755
index c3d4dc679..000000000
--- a/web/l10n/si.js
+++ /dev/null
@@ -1,88 +0,0 @@
-var Strings = {
-    sharedLoading: 'පූරණය ...',
-    sharedSave: 'සුරකින්න',
-    sharedCancel: 'අවලංගු කරන්න',
-    sharedAdd: 'එක් කරන්න',
-    sharedEdit: 'සංස්කරණය කරන්න',
-    sharedRemove: 'ඉවත් කරන්න',
-    sharedRemoveConfirm: 'අයිතමය ඉවත් කරන්න ද?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'පැය',
-    sharedMinute: 'මිනිත්තු',
-    sharedSecond: 'තත්පර',
-
-    errorTitle: 'දෝෂයක්',
-    errorUnknown: 'නොදන්නා දෝෂයක්',
-
-    userName: 'නම',
-    userEmail: 'විද්යුත් තැපෑල',
-    userPassword: 'මුරපදය',
-    userAdmin: 'පරිපාලක',
-
-    loginTitle: 'පිවිසුම',
-    loginLanguage: 'භාෂාව',
-    loginRegister: 'ලියාපදිංචි කරන්න',
-    loginLogin: 'පිවිසුම',
-    loginFailed: 'ඊ-මේල් ලිපිනය හෝ මුරපදය වැරදිය',
-    loginCreated: 'නව පරිශීලක ලියාපදිංචි කරන ලදි ',
-    loginLogout: 'ඉවත්වන්න',
-
-    deviceDialog: 'උපාංගය',
-    deviceTitle: 'උපාංග',
-    deviceName: 'නම',
-    deviceIdentifier: 'හඳුනාගැනීමේ කේතය',
-    deviceCommand: 'විධානය',
-
-    settingsTitle: 'සැකසුම්',
-    settingsUser: 'ගිණුම',
-    settingsServer: 'සේවාදායකය',
-    settingsUsers: 'පරිශීලකයන්',
-    settingsDistanceUnit: 'දුර',
-    settingsSpeedUnit: 'වේගය',
-
-    reportTitle: 'වාර්තා',
-    reportDevice: 'උපාංගය',
-    reportFrom: 'සිට',
-    reportTo: 'දක්වා',
-    reportShow: 'පෙන්වන්න',
-    reportClear: 'ඉවත් කරන්න',
-
-    positionFixTime: 'කාලය',
-    positionValid: 'වලංගු',
-    positionLatitude: 'අක්ෂාංශ',
-    positionLongitude: 'දේශාංශ',
-    positionAltitude: 'උන්නතාංශය',
-    positionSpeed: 'වේගය',
-    positionCourse: 'දිගංශය',
-    positionAddress: 'ලිපිනය',
-    positionProtocol: 'ප්රොටොකෝලය',
-
-    serverTitle: 'සේවාදායකයේ සැකසුම්',
-    serverZoom: 'විශාලනය',
-    serverRegistration: 'ලියාපදිංචි කිරීම',
-
-    mapTitle: 'සිතියම',
-    mapLayer: 'සිතියම් ස්තරය',
-    mapCustom: 'අභිරුචි සිතියම',
-    mapOsm: 'Open Street Map',
-    mapBingKey: 'Bing Maps Key',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'තත්වය',
-    stateName: 'පරාමිතිය',
-    stateValue: 'අගය',
-
-    commandTitle: 'විධානය',
-    commandSend: 'යවන්න',
-    commandType: 'වර්ගය',
-    commandPositionPeriodic: 'ආවර්තිතව වාර්තා කරන්න',
-    commandPositionStop: 'වාර්තා කිරීම නවත්වන්න',
-    commandEngineStop: 'එන්ජිම නවත්වන්න',
-    commandEngineResume: 'එන්ජිම නැවත ආරම්භ කරන්න',
-    commandFrequency: 'සංඛ්යාතය',
-    commandUnit: 'ඒකකය'
-};
diff --git a/web/l10n/si.json b/web/l10n/si.json
new file mode 100644
index 000000000..711fd1799
--- /dev/null
+++ b/web/l10n/si.json
@@ -0,0 +1,88 @@
+{
+    "sharedLoading": "පූරණය ...",
+    "sharedSave": "සුරකින්න",
+    "sharedCancel": "අවලංගු කරන්න",
+    "sharedAdd": "එක් කරන්න",
+    "sharedEdit": "සංස්කරණය කරන්න",
+    "sharedRemove": "ඉවත් කරන්න",
+    "sharedRemoveConfirm": "අයිතමය ඉවත් කරන්න ද?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "පැය",
+    "sharedMinute": "මිනිත්තු",
+    "sharedSecond": "තත්පර",
+
+    "errorTitle": "දෝෂයක්",
+    "errorUnknown": "නොදන්නා දෝෂයක්",
+
+    "userName": "නම",
+    "userEmail": "විද්යුත් තැපෑල",
+    "userPassword": "මුරපදය",
+    "userAdmin": "පරිපාලක",
+
+    "loginTitle": "පිවිසුම",
+    "loginLanguage": "භාෂාව",
+    "loginRegister": "ලියාපදිංචි කරන්න",
+    "loginLogin": "පිවිසුම",
+    "loginFailed": "ඊ-මේල් ලිපිනය හෝ මුරපදය වැරදිය",
+    "loginCreated": "නව පරිශීලක ලියාපදිංචි කරන ලදි ",
+    "loginLogout": "ඉවත්වන්න",
+
+    "deviceDialog": "උපාංගය",
+    "deviceTitle": "උපාංග",
+    "deviceName": "නම",
+    "deviceIdentifier": "හඳුනාගැනීමේ කේතය",
+    "deviceCommand": "විධානය",
+
+    "settingsTitle": "සැකසුම්",
+    "settingsUser": "ගිණුම",
+    "settingsServer": "සේවාදායකය",
+    "settingsUsers": "පරිශීලකයන්",
+    "settingsDistanceUnit": "දුර",
+    "settingsSpeedUnit": "වේගය",
+
+    "reportTitle": "වාර්තා",
+    "reportDevice": "උපාංගය",
+    "reportFrom": "සිට",
+    "reportTo": "දක්වා",
+    "reportShow": "පෙන්වන්න",
+    "reportClear": "ඉවත් කරන්න",
+
+    "positionFixTime": "කාලය",
+    "positionValid": "වලංගු",
+    "positionLatitude": "අක්ෂාංශ",
+    "positionLongitude": "දේශාංශ",
+    "positionAltitude": "උන්නතාංශය",
+    "positionSpeed": "වේගය",
+    "positionCourse": "දිගංශය",
+    "positionAddress": "ලිපිනය",
+    "positionProtocol": "ප්රොටොකෝලය",
+
+    "serverTitle": "සේවාදායකයේ සැකසුම්",
+    "serverZoom": "විශාලනය",
+    "serverRegistration": "ලියාපදිංචි කිරීම",
+
+    "mapTitle": "සිතියම",
+    "mapLayer": "සිතියම් ස්තරය",
+    "mapCustom": "අභිරුචි සිතියම",
+    "mapOsm": "Open Street Map",
+    "mapBingKey": "Bing Maps Key",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "තත්වය",
+    "stateName": "පරාමිතිය",
+    "stateValue": "අගය",
+
+    "commandTitle": "විධානය",
+    "commandSend": "යවන්න",
+    "commandType": "වර්ගය",
+    "commandPositionPeriodic": "ආවර්තිතව වාර්තා කරන්න",
+    "commandPositionStop": "වාර්තා කිරීම නවත්වන්න",
+    "commandEngineStop": "එන්ජිම නවත්වන්න",
+    "commandEngineResume": "එන්ජිම නැවත ආරම්භ කරන්න",
+    "commandFrequency": "සංඛ්යාතය",
+    "commandUnit": "ඒකකය"
+}
diff --git a/web/l10n/sk.js b/web/l10n/sk.js
deleted file mode 100644
index e54a491ee..000000000
--- a/web/l10n/sk.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Načítava...',
-    sharedSave: 'Uloženie',
-    sharedCancel: 'Zrušenie',
-    sharedAdd: 'Pridať',
-    sharedEdit: 'Úprava',
-    sharedRemove: 'Odstrániť',
-    sharedRemoveConfirm: 'Odstrániť položku?',
-    sharedKm: 'Km',
-    sharedMi: 'mi',
-    sharedKmh: 'Km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Hodina',
-    sharedMinute: 'Minúta',
-    sharedSecond: 'Druhý',
-
-    errorTitle: 'Chyba',
-    errorUnknown: 'Neznáma chyba',
-
-    userName: 'Meno',
-    userEmail: 'E-mail',
-    userPassword: 'Heslo',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Prihlásenie',
-    loginLanguage: 'Jazyk',
-    loginRegister: 'Registrovať',
-    loginLogin: 'Prihlásenie',
-    loginFailed: 'Nesprávna e-mailová adresa alebo heslo',
-    loginCreated: 'Nový užívateľ sa zaregistroval',
-    loginLogout: 'Odhlásiť',
-
-    deviceDialog: 'Zariadenie',
-    deviceTitle: 'Zariadena',
-    deviceName: 'Meno',
-    deviceIdentifier: 'Identifikátor',
-    deviceCommand: 'Príkaz',
-
-    settingsTitle: 'Nastavenia',
-    settingsUser: 'Účet',
-    settingsServer: 'Server',
-    settingsUsers: 'Užívatelia',
-    settingsDistanceUnit: 'Vzdialenosť',
-    settingsSpeedUnit: 'Rýchlosť jazdy',
-
-    reportTitle: 'Správy',
-    reportDevice: 'Zariadenie',
-    reportFrom: 'Z',
-    reportTo: 'do',
-    reportShow: 'Zobraziť',
-    reportClear: 'Vyčistiť',
-
-    positionFixTime: 'Čas',
-    positionValid: 'Platný',
-    positionLatitude: 'Šírka',
-    positionLongitude: 'Dĺžka',
-    positionAltitude: 'Výška',
-    positionSpeed: 'Rýchlosť jazdy',
-    positionCourse: 'Kurz',
-    positionAddress: 'Adresa',
-    positionProtocol: 'Protokol',
-
-    serverTitle: 'Nastavenie servera',
-    serverZoom: 'Zoom',
-    serverRegistration: 'Registrácia',
-
-    mapTitle: 'Mapa',
-    mapLayer: 'Mapové vrstvy',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Arial',
-
-    stateTitle: 'Štát',
-    stateName: 'Parameter',
-    stateValue: 'Hodnota',
-
-    commandTitle: 'Príkaz',
-    commandSend: 'Odoslať',
-    commandType: 'Typ',
-    commandPositionPeriodic: 'Pravidelné podávanie správ',
-    commandPositionStop: 'Zastavte podávanie správ',
-    commandEngineStop: 'Zastavenie motora',
-    commandEngineResume: 'Spustenie motora',
-    commandFrequency: 'Frekvencia',
-    commandUnit: 'Unit'
-};
diff --git a/web/l10n/sk.json b/web/l10n/sk.json
new file mode 100644
index 000000000..dbbe0f52b
--- /dev/null
+++ b/web/l10n/sk.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Načítava...",
+    "sharedSave": "Uloženie",
+    "sharedCancel": "Zrušenie",
+    "sharedAdd": "Pridať",
+    "sharedEdit": "Úprava",
+    "sharedRemove": "Odstrániť",
+    "sharedRemoveConfirm": "Odstrániť položku?",
+    "sharedKm": "Km",
+    "sharedMi": "mi",
+    "sharedKmh": "Km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Hodina",
+    "sharedMinute": "Minúta",
+    "sharedSecond": "Druhý",
+
+    "errorTitle": "Chyba",
+    "errorUnknown": "Neznáma chyba",
+
+    "userName": "Meno",
+    "userEmail": "E-mail",
+    "userPassword": "Heslo",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Prihlásenie",
+    "loginLanguage": "Jazyk",
+    "loginRegister": "Registrovať",
+    "loginLogin": "Prihlásenie",
+    "loginFailed": "Nesprávna e-mailová adresa alebo heslo",
+    "loginCreated": "Nový užívateľ sa zaregistroval",
+    "loginLogout": "Odhlásiť",
+
+    "deviceDialog": "Zariadenie",
+    "deviceTitle": "Zariadena",
+    "deviceName": "Meno",
+    "deviceIdentifier": "Identifikátor",
+    "deviceCommand": "Príkaz",
+
+    "settingsTitle": "Nastavenia",
+    "settingsUser": "Účet",
+    "settingsServer": "Server",
+    "settingsUsers": "Užívatelia",
+    "settingsDistanceUnit": "Vzdialenosť",
+    "settingsSpeedUnit": "Rýchlosť jazdy",
+
+    "reportTitle": "Správy",
+    "reportDevice": "Zariadenie",
+    "reportFrom": "Z",
+    "reportTo": "do",
+    "reportShow": "Zobraziť",
+    "reportClear": "Vyčistiť",
+
+    "positionFixTime": "Čas",
+    "positionValid": "Platný",
+    "positionLatitude": "Šírka",
+    "positionLongitude": "Dĺžka",
+    "positionAltitude": "Výška",
+    "positionSpeed": "Rýchlosť jazdy",
+    "positionCourse": "Kurz",
+    "positionAddress": "Adresa",
+    "positionProtocol": "Protokol",
+
+    "serverTitle": "Nastavenie servera",
+    "serverZoom": "Zoom",
+    "serverRegistration": "Registrácia",
+
+    "mapTitle": "Mapa",
+    "mapLayer": "Mapové vrstvy",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Arial",
+
+    "stateTitle": "Štát",
+    "stateName": "Parameter",
+    "stateValue": "Hodnota",
+
+    "commandTitle": "Príkaz",
+    "commandSend": "Odoslať",
+    "commandType": "Typ",
+    "commandPositionPeriodic": "Pravidelné podávanie správ",
+    "commandPositionStop": "Zastavte podávanie správ",
+    "commandEngineStop": "Zastavenie motora",
+    "commandEngineResume": "Spustenie motora",
+    "commandFrequency": "Frekvencia",
+    "commandUnit": "Unit"
+}
diff --git a/web/l10n/sl.js b/web/l10n/sl.js
deleted file mode 100644
index 4819b03a4..000000000
--- a/web/l10n/sl.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var strings = {
-    sharedLoading: 'Nalagam...',
-    sharedSave: 'Shrani',
-    sharedCancel: 'Prekini',
-    sharedAdd: 'Dodaj',
-    sharedEdit: 'Uredi',
-    sharedRemove: 'Odstrani',
-    sharedRemoveConfirm: 'Odstranim zapis?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Ura',
-    sharedMinute: 'Minuta',
-    sharedSecond: 'Sekunda',
-
-    errorTitle: 'Napaka',
-    errorUnknown: 'Neznana napaka',
-
-    userName: 'Ime',
-    userEmail: 'E-Pošta',
-    userPassword: 'Geslo',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Prijava',
-    loginLanguage: 'Jezik',
-    loginRegister: 'Registracija',
-    loginLogin: 'Prijava',
-    loginFailed: 'Nepravilna e-pošta ali geslo',
-    loginCreated: 'Nov uporabnik je registriran',
-    loginLogout: 'Odjava',
-
-    deviceDialog: 'Naprave',
-    deviceTitle: 'Naprave',
-    deviceName: 'Naziv',
-    deviceIdentifier: 'Identifikacija',
-    deviceCommand: 'Ukaz',
-
-    settingsTitle: 'Nastavitve',
-    settingsUser: 'Račun',
-    settingsServer: 'Strežnik',
-    settingsUsers: 'Uporabniki',
-    settingsDistanceUnit: 'Razdalja',
-    settingsSpeedUnit: 'Hitrost',
-
-    reportTitle: 'Poročila',
-    reportDevice: 'Naprava',
-    reportFrom: 'Od',
-    reportTo: 'Do',
-    reportShow: 'Prikaži',
-    reportClear: 'Očisti',
-
-    positionFixTime: 'Čas',
-    positionValid: 'Veljavnost',
-    positionLatitude: 'Širina',
-    positionLongitude: 'Dolžina',
-    positionAltitude: 'Višina',
-    positionSpeed: 'Hitrost',
-    positionCourse: 'Smer',
-    positionAddress: 'Naslov',
-    positionProtocol: 'Protokol',
-
-    serverTitle: 'Nastavitve strežnika',
-    serverZoom: 'Povečava',
-    serverRegistration: 'Registracija',
-
-    mapTitle: 'Karta',
-    mapLayer: 'Zemljevidi',
-    mapOsm: 'Open Street Karta',
-    mapBingRoad: 'Bing Maps Ceste',
-    mapBingAerial: 'Bing Maps Satelit',
-
-    stateTitle: 'Stanje',
-    stateName: 'Parameter',
-    stateValue: 'Vrednost',
-
-    commandTitle: 'Ukaz',
-    commandSend: 'Pošlji',
-    commandType: 'Tip',
-    commandPositionPeriodic: 'Periodično poročanje',
-    commandPositionStop: 'Ustavi poročanje',
-    commandEngineStop: 'Ugasni motor',
-    commandEngineResume: 'Prižgi motor',
-    commandFrequency: 'Frekvenca',
-    commandUnit: 'Naprava'
-};
diff --git a/web/l10n/sl.json b/web/l10n/sl.json
new file mode 100644
index 000000000..5aa490336
--- /dev/null
+++ b/web/l10n/sl.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Nalagam...",
+    "sharedSave": "Shrani",
+    "sharedCancel": "Prekini",
+    "sharedAdd": "Dodaj",
+    "sharedEdit": "Uredi",
+    "sharedRemove": "Odstrani",
+    "sharedRemoveConfirm": "Odstranim zapis?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Ura",
+    "sharedMinute": "Minuta",
+    "sharedSecond": "Sekunda",
+
+    "errorTitle": "Napaka",
+    "errorUnknown": "Neznana napaka",
+
+    "userName": "Ime",
+    "userEmail": "E-Pošta",
+    "userPassword": "Geslo",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Prijava",
+    "loginLanguage": "Jezik",
+    "loginRegister": "Registracija",
+    "loginLogin": "Prijava",
+    "loginFailed": "Nepravilna e-pošta ali geslo",
+    "loginCreated": "Nov uporabnik je registriran",
+    "loginLogout": "Odjava",
+
+    "deviceDialog": "Naprave",
+    "deviceTitle": "Naprave",
+    "deviceName": "Naziv",
+    "deviceIdentifier": "Identifikacija",
+    "deviceCommand": "Ukaz",
+
+    "settingsTitle": "Nastavitve",
+    "settingsUser": "Račun",
+    "settingsServer": "Strežnik",
+    "settingsUsers": "Uporabniki",
+    "settingsDistanceUnit": "Razdalja",
+    "settingsSpeedUnit": "Hitrost",
+
+    "reportTitle": "Poročila",
+    "reportDevice": "Naprava",
+    "reportFrom": "Od",
+    "reportTo": "Do",
+    "reportShow": "Prikaži",
+    "reportClear": "Očisti",
+
+    "positionFixTime": "Čas",
+    "positionValid": "Veljavnost",
+    "positionLatitude": "Širina",
+    "positionLongitude": "Dolžina",
+    "positionAltitude": "Višina",
+    "positionSpeed": "Hitrost",
+    "positionCourse": "Smer",
+    "positionAddress": "Naslov",
+    "positionProtocol": "Protokol",
+
+    "serverTitle": "Nastavitve strežnika",
+    "serverZoom": "Povečava",
+    "serverRegistration": "Registracija",
+
+    "mapTitle": "Karta",
+    "mapLayer": "Zemljevidi",
+    "mapOsm": "Open Street Karta",
+    "mapBingRoad": "Bing Maps Ceste",
+    "mapBingAerial": "Bing Maps Satelit",
+
+    "stateTitle": "Stanje",
+    "stateName": "Parameter",
+    "stateValue": "Vrednost",
+
+    "commandTitle": "Ukaz",
+    "commandSend": "Pošlji",
+    "commandType": "Tip",
+    "commandPositionPeriodic": "Periodično poročanje",
+    "commandPositionStop": "Ustavi poročanje",
+    "commandEngineStop": "Ugasni motor",
+    "commandEngineResume": "Prižgi motor",
+    "commandFrequency": "Frekvenca",
+    "commandUnit": "Naprava"
+}
diff --git a/web/l10n/sr.js b/web/l10n/sr.js
deleted file mode 100644
index d4975a339..000000000
--- a/web/l10n/sr.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'Učitava...',
-    sharedSave: 'Sačuvaj',
-    sharedCancel: 'Odustani',
-    sharedAdd: 'Dodaj',
-    sharedEdit: 'Podesi',
-    sharedRemove: 'Ukloni',
-    sharedRemoveConfirm: 'Ukloniti jedinicu?',
-    sharedKm: 'km',
-    sharedMi: 'mi',
-    sharedKmh: 'km/h',
-    sharedMph: 'mph',
-    sharedHour: 'Čas',
-    sharedMinute: 'Minut',
-    sharedSecond: 'Sekunda',
-
-    errorTitle: 'Greška',
-    errorUnknown: 'Nepoznata greška',
-
-    userName: 'Ime',
-    userEmail: 'Email',
-    userPassword: 'Lozinka',
-    userAdmin: 'Admin',
-
-    loginTitle: 'Prijava',
-    loginLanguage: 'Jezik',
-    loginRegister: 'Registruj se',
-    loginLogin: 'Prijava',
-    loginFailed: 'Neispravna email adresa ili lozinka',
-    loginCreated: 'Novi korisnik je registrovan',
-    loginLogout: 'Odjava',
-
-    deviceDialog: 'Uređaj',
-    deviceTitle: 'Uređaji',
-    deviceName: 'Ime',
-    deviceIdentifier: 'Identifikator',
-    deviceCommand: 'Komanda',
-
-    settingsTitle: 'Podešavanja',
-    settingsUser: 'Nalog',
-    settingsServer: 'Server',
-    settingsUsers: 'Korisnici',
-    settingsDistanceUnit: 'Udaljenost',
-    settingsSpeedUnit: 'Brzina',
-
-    reportTitle: 'Izveštaji',
-    reportDevice: 'Uređaj',
-    reportFrom: 'Od',
-    reportTo: 'Do',
-    reportShow: 'Prikaži',
-    reportClear: 'Izbriši',
-
-    positionFixTime: 'Vreme',
-    positionValid: 'Ispravno',
-    positionLatitude: 'Geografska širina',
-    positionLongitude: 'Geografska dužina',
-    positionAltitude: 'Visina',
-    positionSpeed: 'Brzina',
-    positionCourse: 'Pravac',
-    positionAddress: 'Adresa',
-    positionProtocol: 'Protokol',
-
-    serverTitle: 'Podešavanja Servera',
-    serverZoom: 'Zumiranje',
-    serverRegistration: 'Registracija',
-
-    mapTitle: 'Mapa',
-    mapLayer: 'Vrsta Mape',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps Road',
-    mapBingAerial: 'Bing Maps Aerial',
-
-    stateTitle: 'Stanje',
-    stateName: 'Parametar',
-    stateValue: 'Vrednost',
-
-    commandTitle: 'Komanda',
-    commandSend: 'Pošalji',
-    commandType: 'Tip',
-    commandPositionPeriodic: 'Periodično izveštavanje',
-    commandPositionStop: 'Prekini izveštavanja',
-    commandEngineStop: 'Zaustavi motor',
-    commandEngineResume: 'Pokreni motor',
-    commandFrequency: 'Frekvencija',
-    commandUnit: 'Jedinica'
-};
diff --git a/web/l10n/sr.json b/web/l10n/sr.json
new file mode 100644
index 000000000..a4b22a5aa
--- /dev/null
+++ b/web/l10n/sr.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "Učitava...",
+    "sharedSave": "Sačuvaj",
+    "sharedCancel": "Odustani",
+    "sharedAdd": "Dodaj",
+    "sharedEdit": "Podesi",
+    "sharedRemove": "Ukloni",
+    "sharedRemoveConfirm": "Ukloniti jedinicu?",
+    "sharedKm": "km",
+    "sharedMi": "mi",
+    "sharedKmh": "km/h",
+    "sharedMph": "mph",
+    "sharedHour": "Čas",
+    "sharedMinute": "Minut",
+    "sharedSecond": "Sekunda",
+
+    "errorTitle": "Greška",
+    "errorUnknown": "Nepoznata greška",
+
+    "userName": "Ime",
+    "userEmail": "Email",
+    "userPassword": "Lozinka",
+    "userAdmin": "Admin",
+
+    "loginTitle": "Prijava",
+    "loginLanguage": "Jezik",
+    "loginRegister": "Registruj se",
+    "loginLogin": "Prijava",
+    "loginFailed": "Neispravna email adresa ili lozinka",
+    "loginCreated": "Novi korisnik je registrovan",
+    "loginLogout": "Odjava",
+
+    "deviceDialog": "Uređaj",
+    "deviceTitle": "Uređaji",
+    "deviceName": "Ime",
+    "deviceIdentifier": "Identifikator",
+    "deviceCommand": "Komanda",
+
+    "settingsTitle": "Podešavanja",
+    "settingsUser": "Nalog",
+    "settingsServer": "Server",
+    "settingsUsers": "Korisnici",
+    "settingsDistanceUnit": "Udaljenost",
+    "settingsSpeedUnit": "Brzina",
+
+    "reportTitle": "Izveštaji",
+    "reportDevice": "Uređaj",
+    "reportFrom": "Od",
+    "reportTo": "Do",
+    "reportShow": "Prikaži",
+    "reportClear": "Izbriši",
+
+    "positionFixTime": "Vreme",
+    "positionValid": "Ispravno",
+    "positionLatitude": "Geografska širina",
+    "positionLongitude": "Geografska dužina",
+    "positionAltitude": "Visina",
+    "positionSpeed": "Brzina",
+    "positionCourse": "Pravac",
+    "positionAddress": "Adresa",
+    "positionProtocol": "Protokol",
+
+    "serverTitle": "Podešavanja Servera",
+    "serverZoom": "Zumiranje",
+    "serverRegistration": "Registracija",
+
+    "mapTitle": "Mapa",
+    "mapLayer": "Vrsta Mape",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps Road",
+    "mapBingAerial": "Bing Maps Aerial",
+
+    "stateTitle": "Stanje",
+    "stateName": "Parametar",
+    "stateValue": "Vrednost",
+
+    "commandTitle": "Komanda",
+    "commandSend": "Pošalji",
+    "commandType": "Tip",
+    "commandPositionPeriodic": "Periodično izveštavanje",
+    "commandPositionStop": "Prekini izveštavanja",
+    "commandEngineStop": "Zaustavi motor",
+    "commandEngineResume": "Pokreni motor",
+    "commandFrequency": "Frekvencija",
+    "commandUnit": "Jedinica"
+}
diff --git a/web/l10n/th.js b/web/l10n/th.js
deleted file mode 100644
index c4c32c2e1..000000000
--- a/web/l10n/th.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: 'โหลด',
-    sharedSave: 'เก็บ (แฟ้มข้อมูล)',
-    sharedCancel: 'ยกเลิก',
-    sharedAdd: 'เพิ่ม',
-    sharedEdit: 'ตรวจแก้ ปรับเปลี่ยนข้อมูล',
-    sharedRemove: 'ย้ายออก',
-    sharedRemoveConfirm: 'ลบรายการ',
-    sharedKm: 'กม.',
-    sharedMi: 'ไมล์',
-    sharedKmh: 'กม. / ชม',
-    sharedMph: 'ไมล์ต่อชั่วโมง',
-    sharedHour: 'ชั่วโมง',
-    sharedMinute: 'นาที',
-    sharedSecond: 'วินาที',
-
-    errorTitle: 'ผิดพลาด',
-    errorUnknown: 'ข้อผิดพลาดที่ไม่รู้จัก',
-
-    userName: 'ชื่อ',
-    userEmail: 'อีเมล',
-    userPassword: 'รหัสผ่าน',
-    userAdmin: 'ผู้ดูแลระบบ',
-
-    loginTitle: 'เข้าสู่ระบบ',
-    loginLanguage: 'ภาษา',
-    loginRegister: 'ลงทะเบียน',
-    loginLogin: 'เข้าสู่ระบบ',
-    loginFailed: 'ที่อยู่อีเมลหรือรหัสผ่านไม่ถูกต้อง',
-    loginCreated: 'ผู้ใช้ใหม่ ได้รับการจดทะเบียน',
-    loginLogout: 'ออกจากระบบ',
-
-    deviceDialog: 'เครื่อง/อุปกรณ์',
-    deviceTitle: 'เครื่อง/อุปกรณ์',
-    deviceName: 'ชื่อ',
-    deviceIdentifier: 'ระบุ',
-    deviceCommand: 'คำสั่ง',
-
-    settingsTitle: 'การตั้งค่า',
-    settingsUser: 'บัญชี',
-    settingsServer: 'ผู้ให้บริการ',
-    settingsUsers: 'ผู้ใช้งาน',
-    settingsDistanceUnit: 'ระยะทาง',
-    settingsSpeedUnit: 'ความเร็ว',
-
-    reportTitle: 'รายงาน',
-    reportDevice: 'เครื่อง/อุปกรณ์',
-    reportFrom: 'จาก',
-    reportTo: 'ไปถึง',
-    reportShow: 'แสดง',
-    reportClear: 'ขจัด',
-
-    positionFixTime: 'เวลา',
-    positionValid: 'ถูกต้อง',
-    positionLatitude: 'ละติจูด',
-    positionLongitude: 'ลองจิจูด',
-    positionAltitude: 'ระดับความสูง',
-    positionSpeed: 'ความเร็ว',
-    positionCourse: 'แนวทางเดิน',
-    positionAddress: 'ที่อยู่',
-    positionProtocol: 'โปรโตคอล',
-
-    serverTitle: 'การตั้งค่าเซิร์ฟเวอ',
-    serverZoom: 'เลื่อนใกล้/ไกล',
-    serverRegistration: 'ลงทะเบียน',
-
-    mapTitle: 'แผนที่',
-    mapLayer: 'ชั้น แผนที่',
-    mapOsm: 'Open Street Map',
-    mapBingRoad: 'Bing Maps ถนน',
-    mapBingAerial: 'Bing Maps อากาศ',
-
-    stateTitle: 'สถานะ',
-    stateName: 'พารามิเตอร์',
-    stateValue: 'มูลค่า',
-
-    commandTitle: 'คำสั่ง',
-    commandSend: 'ส่ง',
-    commandType: 'ชนิด',
-    commandPositionPeriodic: 'แก้ไขตำแหน่ง',
-    commandPositionStop: 'ตำแหน่ง หยุด',
-    commandEngineStop: 'หยุดเครื่องยนต์',
-    commandEngineResume: 'เริ่มครื่องยนต์ใหม่',
-    commandFrequency: 'ความถี่',
-    commandUnit: 'หน่วย'
-};
diff --git a/web/l10n/th.json b/web/l10n/th.json
new file mode 100644
index 000000000..8f03b7156
--- /dev/null
+++ b/web/l10n/th.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "โหลด",
+    "sharedSave": "เก็บ (แฟ้มข้อมูล)",
+    "sharedCancel": "ยกเลิก",
+    "sharedAdd": "เพิ่ม",
+    "sharedEdit": "ตรวจแก้ ปรับเปลี่ยนข้อมูล",
+    "sharedRemove": "ย้ายออก",
+    "sharedRemoveConfirm": "ลบรายการ",
+    "sharedKm": "กม.",
+    "sharedMi": "ไมล์",
+    "sharedKmh": "กม. / ชม",
+    "sharedMph": "ไมล์ต่อชั่วโมง",
+    "sharedHour": "ชั่วโมง",
+    "sharedMinute": "นาที",
+    "sharedSecond": "วินาที",
+
+    "errorTitle": "ผิดพลาด",
+    "errorUnknown": "ข้อผิดพลาดที่ไม่รู้จัก",
+
+    "userName": "ชื่อ",
+    "userEmail": "อีเมล",
+    "userPassword": "รหัสผ่าน",
+    "userAdmin": "ผู้ดูแลระบบ",
+
+    "loginTitle": "เข้าสู่ระบบ",
+    "loginLanguage": "ภาษา",
+    "loginRegister": "ลงทะเบียน",
+    "loginLogin": "เข้าสู่ระบบ",
+    "loginFailed": "ที่อยู่อีเมลหรือรหัสผ่านไม่ถูกต้อง",
+    "loginCreated": "ผู้ใช้ใหม่ ได้รับการจดทะเบียน",
+    "loginLogout": "ออกจากระบบ",
+
+    "deviceDialog": "เครื่อง/อุปกรณ์",
+    "deviceTitle": "เครื่อง/อุปกรณ์",
+    "deviceName": "ชื่อ",
+    "deviceIdentifier": "ระบุ",
+    "deviceCommand": "คำสั่ง",
+
+    "settingsTitle": "การตั้งค่า",
+    "settingsUser": "บัญชี",
+    "settingsServer": "ผู้ให้บริการ",
+    "settingsUsers": "ผู้ใช้งาน",
+    "settingsDistanceUnit": "ระยะทาง",
+    "settingsSpeedUnit": "ความเร็ว",
+
+    "reportTitle": "รายงาน",
+    "reportDevice": "เครื่อง/อุปกรณ์",
+    "reportFrom": "จาก",
+    "reportTo": "ไปถึง",
+    "reportShow": "แสดง",
+    "reportClear": "ขจัด",
+
+    "positionFixTime": "เวลา",
+    "positionValid": "ถูกต้อง",
+    "positionLatitude": "ละติจูด",
+    "positionLongitude": "ลองจิจูด",
+    "positionAltitude": "ระดับความสูง",
+    "positionSpeed": "ความเร็ว",
+    "positionCourse": "แนวทางเดิน",
+    "positionAddress": "ที่อยู่",
+    "positionProtocol": "โปรโตคอล",
+
+    "serverTitle": "การตั้งค่าเซิร์ฟเวอ",
+    "serverZoom": "เลื่อนใกล้/ไกล",
+    "serverRegistration": "ลงทะเบียน",
+
+    "mapTitle": "แผนที่",
+    "mapLayer": "ชั้น แผนที่",
+    "mapOsm": "Open Street Map",
+    "mapBingRoad": "Bing Maps ถนน",
+    "mapBingAerial": "Bing Maps อากาศ",
+
+    "stateTitle": "สถานะ",
+    "stateName": "พารามิเตอร์",
+    "stateValue": "มูลค่า",
+
+    "commandTitle": "คำสั่ง",
+    "commandSend": "ส่ง",
+    "commandType": "ชนิด",
+    "commandPositionPeriodic": "แก้ไขตำแหน่ง",
+    "commandPositionStop": "ตำแหน่ง หยุด",
+    "commandEngineStop": "หยุดเครื่องยนต์",
+    "commandEngineResume": "เริ่มครื่องยนต์ใหม่",
+    "commandFrequency": "ความถี่",
+    "commandUnit": "หน่วย"
+}
diff --git a/web/l10n/zh.js b/web/l10n/zh.js
deleted file mode 100644
index 1b16967ac..000000000
--- a/web/l10n/zh.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var Strings = {
-    sharedLoading: '加载',
-    sharedSave: '保存',
-    sharedCancel: '取消',
-    sharedAdd: '新建',
-    sharedEdit: '编辑',
-    sharedRemove: '移除',
-    sharedRemoveConfirm: '要移除选项吗？',
-    sharedKm: '千米',
-    sharedMi: '海里',
-    sharedKmh: '千米/小时',
-    sharedMph: '每小时英里数',
-    sharedHour: '小时',
-    sharedMinute: '分钟',
-    sharedSecond: '秒',
-
-    errorTitle: '错误',
-    errorUnknown: '未知错误',
-
-    userName: '名字',
-    userEmail: '邮箱',
-    userPassword: '密码',
-    userAdmin: '管理员',
-
-    loginTitle: '登录',
-    loginLanguage: '语言',
-    loginRegister: '注册',
-    loginLogin: '登录',
-    loginFailed: '邮箱地址或密码不对',
-    loginCreated: '新用户已经被注册了',
-    loginLogout: '登出',
-
-    deviceDialog: '设备',
-    deviceTitle: '设备',
-    deviceName: '名字',
-    deviceIdentifier: '标识符',
-    deviceCommand: '指令',
-
-    settingsTitle: '设置',
-    settingsUser: '账户',
-    settingsServer: '服务器',
-    settingsUsers: '用户',
-    settingsDistanceUnit: '距离',
-    settingsSpeedUnit: '速度',
-
-    reportTitle: '报表',
-    reportDevice: '设备',
-    reportFrom: '开始',
-    reportTo: '结束',
-    reportShow: '显示',
-    reportClear: '清空',
-
-    positionFixTime: '时间',
-    positionValid: '有效',
-    positionLatitude: '纬度',
-    positionLongitude: '经度',
-    positionAltitude: '海拔',
-    positionSpeed: '速度',
-    positionCourse: '航向',
-    positionAddress: '地址',
-    positionProtocol: '协议',
-
-    serverTitle: '服务器设置',
-    serverZoom: '缩放',
-    serverRegistration: '注册',
-
-    mapTitle: '地图',
-    mapLayer: '地图图层',
-    mapOsm: 'OpenStreetMap 地图',
-    mapBingRoad: 'Bing 公路线路地图',
-    mapBingAerial: 'Bing 航测地图',
-
-    stateTitle: '状态',
-    stateName: '参数',
-    stateValue: '数值',
-
-    commandTitle: '命令',
-    commandSend: '发送',
-    commandType: '类型',
-    commandPositionPeriodic: '位置获取',
-    commandPositionStop: '位置停止',
-    commandEngineStop: '引擎熄火',
-    commandEngineResume: '引擎启动',
-    commandFrequency: '频率',
-    commandUnit: '单位'
-};
diff --git a/web/l10n/zh.json b/web/l10n/zh.json
new file mode 100644
index 000000000..58c0278db
--- /dev/null
+++ b/web/l10n/zh.json
@@ -0,0 +1,86 @@
+{
+    "sharedLoading": "加载",
+    "sharedSave": "保存",
+    "sharedCancel": "取消",
+    "sharedAdd": "新建",
+    "sharedEdit": "编辑",
+    "sharedRemove": "移除",
+    "sharedRemoveConfirm": "要移除选项吗？",
+    "sharedKm": "千米",
+    "sharedMi": "海里",
+    "sharedKmh": "千米/小时",
+    "sharedMph": "每小时英里数",
+    "sharedHour": "小时",
+    "sharedMinute": "分钟",
+    "sharedSecond": "秒",
+
+    "errorTitle": "错误",
+    "errorUnknown": "未知错误",
+
+    "userName": "名字",
+    "userEmail": "邮箱",
+    "userPassword": "密码",
+    "userAdmin": "管理员",
+
+    "loginTitle": "登录",
+    "loginLanguage": "语言",
+    "loginRegister": "注册",
+    "loginLogin": "登录",
+    "loginFailed": "邮箱地址或密码不对",
+    "loginCreated": "新用户已经被注册了",
+    "loginLogout": "登出",
+
+    "deviceDialog": "设备",
+    "deviceTitle": "设备",
+    "deviceName": "名字",
+    "deviceIdentifier": "标识符",
+    "deviceCommand": "指令",
+
+    "settingsTitle": "设置",
+    "settingsUser": "账户",
+    "settingsServer": "服务器",
+    "settingsUsers": "用户",
+    "settingsDistanceUnit": "距离",
+    "settingsSpeedUnit": "速度",
+
+    "reportTitle": "报表",
+    "reportDevice": "设备",
+    "reportFrom": "开始",
+    "reportTo": "结束",
+    "reportShow": "显示",
+    "reportClear": "清空",
+
+    "positionFixTime": "时间",
+    "positionValid": "有效",
+    "positionLatitude": "纬度",
+    "positionLongitude": "经度",
+    "positionAltitude": "海拔",
+    "positionSpeed": "速度",
+    "positionCourse": "航向",
+    "positionAddress": "地址",
+    "positionProtocol": "协议",
+
+    "serverTitle": "服务器设置",
+    "serverZoom": "缩放",
+    "serverRegistration": "注册",
+
+    "mapTitle": "地图",
+    "mapLayer": "地图图层",
+    "mapOsm": "OpenStreetMap 地图",
+    "mapBingRoad": "Bing 公路线路地图",
+    "mapBingAerial": "Bing 航测地图",
+
+    "stateTitle": "状态",
+    "stateName": "参数",
+    "stateValue": "数值",
+
+    "commandTitle": "命令",
+    "commandSend": "发送",
+    "commandType": "类型",
+    "commandPositionPeriodic": "位置获取",
+    "commandPositionStop": "位置停止",
+    "commandEngineStop": "引擎熄火",
+    "commandEngineResume": "引擎启动",
+    "commandFrequency": "频率",
+    "commandUnit": "单位"
+}
diff --git a/web/locale.js b/web/locale.js
index ff07bf166..c794564dd 100644
--- a/web/locale.js
+++ b/web/locale.js
@@ -53,5 +53,11 @@ if (!(Locale.language in Locale.languages)) {
     Locale.language = 'en'; // default
 }
 
-Ext.Loader.loadScript('/l10n/' + Locale.language + '.js');
+Ext.Ajax.request({
+    url: '/l10n/' + Locale.language + '.json',
+    callback: function (options, success, response) {
+        Strings = Ext.decode(response.responseText);
+    }
+});
+
 Ext.Loader.loadScript('//cdnjs.cloudflare.com/ajax/libs/extjs/6.0.0/classic/locale/locale-' + Locale.languages[Locale.language].code + '.js');