Rename string properties

32 files changed, 778 insertions, 778 deletions

diff --git a/web/app/ErrorManager.js b/web/app/ErrorManager.js
index 341432e7b..e55719571 100644
--- a/web/app/ErrorManager.js
+++ b/web/app/ErrorManager.js
@@ -23,17 +23,17 @@ Ext.define('Traccar.ErrorManager', {
             if (result.success || result.error === undefined) {
                 return true;
             } else {
-                Ext.Msg.alert(strings.error_title, result.error);
+                Ext.Msg.alert(strings.errorTitle, result.error);
                 return false;
             }
         } else {
-            Ext.Msg.alert(strings.error_title, response.statusText);
+            Ext.Msg.alert(strings.errorTitle, response.statusText);
             return false;
         }
     },
 
     error: function(message) {
-        Ext.Msg.alert(strings.error_title, message);
+        Ext.Msg.alert(strings.errorTitle, message);
     }
 
 });
diff --git a/web/app/store/CommandTypes.js b/web/app/store/CommandTypes.js
index f646424bf..6ce247b30 100644
--- a/web/app/store/CommandTypes.js
+++ b/web/app/store/CommandTypes.js
@@ -18,9 +18,9 @@ Ext.define('Traccar.store.CommandTypes', {
     extend: 'Ext.data.Store',
     fields: ['key', 'name'],
     data: [
-        {'key': 'positionPeriodic', 'name': strings.command_position_periodic},
-        {'key': 'positionStop', 'name': strings.command_position_stop},
-        {'key': 'engineStop', 'name': strings.command_engine_stop},
-        {'key': 'engineResume', 'name': strings.command_engine_resume}
+        {'key': 'positionPeriodic', 'name': strings.commandPositionPeriodic},
+        {'key': 'positionStop', 'name': strings.commandPositionStop},
+        {'key': 'engineStop', 'name': strings.commandEngineStop},
+        {'key': 'engineResume', 'name': strings.commandEngineResume}
     ]
 });
diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js
index be17466ec..506f1077c 100644
--- a/web/app/store/DistanceUnits.js
+++ b/web/app/store/DistanceUnits.js
@@ -18,7 +18,7 @@ Ext.define('Traccar.store.DistanceUnits', {
     extend: 'Ext.data.Store',
     fields: ['key', 'name'],
     data: [
-        {'key': 'km', 'name': strings.shared_km},
-        {'key': 'mi', 'name': strings.shared_mi}
+        {'key': 'km', 'name': strings.sharedKm},
+        {'key': 'mi', 'name': strings.sharedMi}
     ]
 });
diff --git a/web/app/store/MapTypes.js b/web/app/store/MapTypes.js
index 4d37e133d..ebc45cc8d 100644
--- a/web/app/store/MapTypes.js
+++ b/web/app/store/MapTypes.js
@@ -18,8 +18,8 @@ Ext.define('Traccar.store.MapTypes', {
     extend: 'Ext.data.Store',
     fields: ['key', 'name'],
     data: [
-        {'key': 'osm', 'name': strings.map_osm},
-        {'key': 'bingRoad', 'name': strings.map_bing_road},
-        {'key': 'bingAerial', 'name': strings.map_bing_aerial}
+        {'key': 'osm', 'name': strings.mapOsm},
+        {'key': 'bingRoad', 'name': strings.mapBingRoad},
+        {'key': 'bingAerial', 'name': strings.mapBingAerial}
     ]
 });
diff --git a/web/app/store/SpeedUnits.js b/web/app/store/SpeedUnits.js
index 450716039..78686fbb9 100644
--- a/web/app/store/SpeedUnits.js
+++ b/web/app/store/SpeedUnits.js
@@ -18,8 +18,8 @@ Ext.define('Traccar.store.SpeedUnits', {
     extend: 'Ext.data.Store',
     fields: ['key', 'name'],
     data: [
-        {'key': 'kmh', 'name': strings.shared_kmh},
-        {'key': 'mph', 'name': strings.shared_mph}
+        {'key': 'kmh', 'name': strings.sharedKmh},
+        {'key': 'mph', 'name': strings.sharedMph}
     ],
 
     convert: function(value, unit) {
diff --git a/web/app/store/TimeUnits.js b/web/app/store/TimeUnits.js
index f41ee5e2f..5d96f3b8b 100644
--- a/web/app/store/TimeUnits.js
+++ b/web/app/store/TimeUnits.js
@@ -18,8 +18,8 @@ Ext.define('Traccar.store.TimeUnits', {
     extend: 'Ext.data.Store',
     fields: ['multiplier', 'name'],
     data: [
-        {'multiplier': 1, 'name': strings.shared_second},
-        {'multiplier': 60, 'name': strings.shared_minute},
-        {'multiplier': 3600, 'name': strings.shared_hour}
+        {'multiplier': 1, 'name': strings.sharedSecond},
+        {'multiplier': 60, 'name': strings.sharedMinute},
+        {'multiplier': 3600, 'name': strings.sharedHour}
     ]
 });
diff --git a/web/app/view/admin/ServerDialog.js b/web/app/view/admin/ServerDialog.js
index de3efd6fa..9357f8874 100644
--- a/web/app/view/admin/ServerDialog.js
+++ b/web/app/view/admin/ServerDialog.js
@@ -25,7 +25,7 @@ Ext.define('Traccar.view.admin.ServerDialog', {
     controller: 'serverdialog',
     
     bodyPadding: styles.panel_padding,
-    title: strings.server_title,
+    title: strings.serverTitle,
     resizable: false,
     modal: true,
     
@@ -34,49 +34,49 @@ Ext.define('Traccar.view.admin.ServerDialog', {
         items: [{
             xtype: 'checkboxfield',
             name: 'registration',
-            fieldLabel: strings.server_registration,
+            fieldLabel: strings.serverRegistration,
             allowBlank: false
         }, {
             xtype: 'combobox',
             name: 'map',
-            fieldLabel: strings.map_layer,
+            fieldLabel: strings.mapLayer,
             store: 'MapTypes',
             displayField: 'name',
             valueField: 'key'
         }, {
             xtype: 'combobox',
             name: 'distanceUnit',
-            fieldLabel: strings.settings_distance_unit,
+            fieldLabel: strings.settingsDistanceUnit,
             store: 'DistanceUnits',
             displayField: 'name',
             valueField: 'key'
         }, {
             xtype: 'combobox',
             name: 'speedUnit',
-            fieldLabel: strings.settings_speed_unit,
+            fieldLabel: strings.settingsSpeedUnit,
             store: 'SpeedUnits',
             displayField: 'name',
             valueField: 'key'
         }, {
             xtype: 'numberfield',
             name: 'latitude',
-            fieldLabel: strings.position_latitude
+            fieldLabel: strings.positionLatitude
         }, {
             xtype: 'numberfield',
             name: 'longitude',
-            fieldLabel: strings.position_longitude
+            fieldLabel: strings.positionLongitude
         }, {
             xtype: 'numberfield',
             name: 'zoom',
-            fieldLabel: strings.server_zoom
+            fieldLabel: strings.serverZoom
         }]
     },
 
     buttons: [{
-        text: strings.shared_save,
+        text: strings.sharedSave,
         handler: 'onSaveClick'
     }, {
-        text: strings.shared_cancel,
+        text: strings.sharedCancel,
         handler: 'onCancelClick'
     }]
 
diff --git a/web/app/view/command/CommandDialog.js b/web/app/view/command/CommandDialog.js
index a8da68380..ae88add21 100644
--- a/web/app/view/command/CommandDialog.js
+++ b/web/app/view/command/CommandDialog.js
@@ -25,7 +25,7 @@ Ext.define('Traccar.view.command.CommandDialog', {
     controller: 'commanddialog',
     
     bodyPadding: styles.panel_padding,
-    title: strings.command_title,
+    title: strings.commandTitle,
     resizable: false,
     modal: true,
     
@@ -34,7 +34,7 @@ Ext.define('Traccar.view.command.CommandDialog', {
         items: [{
             xtype: 'combobox',
             name: 'type',
-            fieldLabel: strings.command_type,
+            fieldLabel: strings.commandType,
             store: 'CommandTypes',
             displayField: 'name',
             valueField: 'key',
@@ -49,11 +49,11 @@ Ext.define('Traccar.view.command.CommandDialog', {
 
             items: [{
                 xtype: 'numberfield',
-                fieldLabel: strings.command_frequency,
+                fieldLabel: strings.commandFrequency,
                 name: 'frequency'
             }, {
                 xtype: 'combobox',
-                fieldLabel: strings.command_unit,
+                fieldLabel: strings.commandUnit,
                 name: 'unit',
                 store: 'TimeUnits',
                 displayField: 'name',
@@ -63,10 +63,10 @@ Ext.define('Traccar.view.command.CommandDialog', {
     },
 
     buttons: [{
-        text: strings.command_send,
+        text: strings.commandSend,
         handler: 'onSendClick'
     }, {
-        text: strings.shared_cancel,
+        text: strings.sharedCancel,
         handler: 'onCancelClick'
     }]
 
diff --git a/web/app/view/command/CommandDialogController.js b/web/app/view/command/CommandDialogController.js
index c5e98450f..84004e2aa 100644
--- a/web/app/view/command/CommandDialogController.js
+++ b/web/app/view/command/CommandDialogController.js
@@ -50,7 +50,7 @@ Ext.define('Traccar.view.command.CommandDialogController', {
     onSendReturn: function(options, success, response) {
         if (Traccar.ErrorManager.check(success, response)) {
             this.closeView();
-            //TODO toast Ext.toast(strings.login_created);
+            //TODO toast Ext.toast(strings.loginCreated);
         }
     },
 
diff --git a/web/app/view/device/Device.js b/web/app/view/device/Device.js
index ef225ff31..1435dcaf1 100644
--- a/web/app/view/device/Device.js
+++ b/web/app/view/device/Device.js
@@ -25,56 +25,56 @@ Ext.define('Traccar.view.device.Device', {
     controller: 'device',
     store: 'Devices',
 
-    title: strings.device_title,
+    title: strings.deviceTitle,
     selType: 'rowmodel',
     
     tbar: [{
         handler: 'onAddClick',
         reference: 'deviceAddButton',
         glyph: 'xf067@FontAwesome',
-        tooltip: strings.shared_add,
+        tooltip: strings.sharedAdd,
         tooltipType: 'title'
     }, {
         disabled: true,
         handler: 'onEditClick',
         reference: 'deviceEditButton',
         glyph: 'xf040@FontAwesome',
-        tooltip: strings.shared_edit,
+        tooltip: strings.sharedEdit,
         tooltipType: 'title'
     }, {
         disabled: true,
         handler: 'onRemoveClick',
         reference: 'deviceRemoveButton',
         glyph: 'xf00d@FontAwesome',
-        tooltip: strings.shared_remove,
+        tooltip: strings.sharedRemove,
         tooltipType: 'title'
     }, {
         disabled: true,
         handler: 'onCommandClick',
         reference: 'deviceCommandButton',
         glyph: 'xf093@FontAwesome',
-        tooltip: strings.device_command,
+        tooltip: strings.deviceCommand,
         tooltipType: 'title'
     }, {
         xtype: 'tbfill'
     }, {
-        text: strings.settings_title,
+        text: strings.settingsTitle,
         menu: [{
-            text: strings.settings_user,
+            text: strings.settingsUser,
             handler: 'onUserClick'
         }, {
-            text: strings.settings_server,
+            text: strings.settingsServer,
             disabled: true,
             handler: 'onServerClick',
             reference: 'settingsServerButton'
         }, {
-            text: strings.settings_users,
+            text: strings.settingsUsers,
             disabled: true,
             handler: 'onUsersClick',
             reference: 'settingsUsersButton'
         }]
     }, {
-        text: strings.login_logout,
+        text: strings.loginLogout,
         handler: 'onLogoutClick'
     }],
 
@@ -83,8 +83,8 @@ Ext.define('Traccar.view.device.Device', {
     },
     
     columns: [
-        { text: strings.device_name, dataIndex: 'name', flex: 1 },
-        { text: strings.device_identifier, dataIndex: 'uniqueId', flex: 1 }
+        { text: strings.deviceName, dataIndex: 'name', flex: 1 },
+        { text: strings.deviceIdentifier, dataIndex: 'uniqueId', flex: 1 }
     ]
 
 });
diff --git a/web/app/view/device/DeviceController.js b/web/app/view/device/DeviceController.js
index f5577f156..ae4abf4a7 100644
--- a/web/app/view/device/DeviceController.js
+++ b/web/app/view/device/DeviceController.js
@@ -64,12 +64,12 @@ Ext.define('Traccar.view.device.DeviceController', {
     onRemoveClick: function() {
         var device = this.getView().getSelectionModel().getSelection()[0];
         Ext.Msg.show({
-            title: strings.device_dialog,
-            message: strings.shared_remove_confirm,
+            title: strings.deviceDialog,
+            message: strings.sharedRemoveConfirm,
             buttons: Ext.Msg.YESNO,
             buttonText: {
-                yes: strings.shared_remove,
-                no: strings.shared_cancel
+                yes: strings.sharedRemove,
+                no: strings.sharedCancel
             },
             fn: function(btn) {
                 if (btn === 'yes') {
@@ -116,7 +116,7 @@ Ext.define('Traccar.view.device.DeviceController', {
 
     onUsersClick: function() {
         Ext.create('Ext.window.Window', {
-            title: strings.settings_users,
+            title: strings.settingsUsers,
             width: styles.window_width,
             height: styles.window_height,
             layout: 'fit',
diff --git a/web/app/view/device/DeviceDialog.js b/web/app/view/device/DeviceDialog.js
index 5d2b30ddc..b5f29782b 100644
--- a/web/app/view/device/DeviceDialog.js
+++ b/web/app/view/device/DeviceDialog.js
@@ -25,7 +25,7 @@ Ext.define('Traccar.view.device.DeviceDialog', {
     controller: 'devicedialog',
     
     bodyPadding: styles.panel_padding,
-    title: strings.device_dialog,
+    title: strings.deviceDialog,
     resizable: false,
     modal: true,
     
@@ -34,21 +34,21 @@ Ext.define('Traccar.view.device.DeviceDialog', {
         items: [{
             xtype: 'textfield',
             name: 'name',
-            fieldLabel: strings.device_name,
+            fieldLabel: strings.deviceName,
             allowBlank: false
         }, {
             xtype: 'textfield',
             name: 'uniqueId',
-            fieldLabel: strings.device_identifier,
+            fieldLabel: strings.deviceIdentifier,
             allowBlank: false
         }]
     },
 
     buttons: [{
-        text: strings.shared_save,
+        text: strings.sharedSave,
         handler: 'onSaveClick'
     }, {
-        text: strings.shared_cancel,
+        text: strings.sharedCancel,
         handler: 'onCancelClick'
     }]
 
diff --git a/web/app/view/login/Login.js b/web/app/view/login/Login.js
index f49857644..f468edaa0 100644
--- a/web/app/view/login/Login.js
+++ b/web/app/view/login/Login.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.login.Login', {
     controller: 'login',
 
     bodyPadding: styles.panel_padding,
-    title: strings.login_title,
+    title: strings.loginTitle,
     closable: false,
     resizable: false,
 
@@ -35,7 +35,7 @@ Ext.define('Traccar.view.login.Login', {
         items: [{
             xtype: 'combobox',
             name: 'language',
-            fieldLabel: strings.login_language,
+            fieldLabel: strings.loginLanguage,
             store: 'Languages',
             displayField: 'name',
             valueField: 'code',
@@ -47,7 +47,7 @@ Ext.define('Traccar.view.login.Login', {
         }, {
             xtype: 'textfield',
             name: 'email',
-            fieldLabel: strings.user_email,
+            fieldLabel: strings.userEmail,
             allowBlank: false,
             enableKeyEvents: true,
             listeners: {
@@ -57,7 +57,7 @@ Ext.define('Traccar.view.login.Login', {
         }, {
             xtype: 'textfield',
             name: 'password',
-            fieldLabel: strings.user_password,
+            fieldLabel: strings.userPassword,
             inputType: 'password',
             allowBlank: false,
             enableKeyEvents: true,
@@ -68,11 +68,11 @@ Ext.define('Traccar.view.login.Login', {
     },
 
     buttons: [{
-        text: strings.login_register,
+        text: strings.loginRegister,
         handler: 'onRegisterClick',
         reference: 'registerButton'
     }, {
-        text: strings.login_login,
+        text: strings.loginLogin,
         handler: 'onLoginClick'
     }]
 
diff --git a/web/app/view/login/LoginController.js b/web/app/view/login/LoginController.js
index 95b5900c9..2cc72caf2 100644
--- a/web/app/view/login/LoginController.js
+++ b/web/app/view/login/LoginController.js
@@ -67,7 +67,7 @@ Ext.define('Traccar.view.login.LoginController', {
     doLogin: function() {
         var form = this.lookupReference('form');
         if (form.isValid()) {
-            Ext.getBody().mask(strings.shared_loading);
+            Ext.getBody().mask(strings.sharedLoading);
             
             Traccar.LoginManager.login({
                 data: form.getValues(),
@@ -82,7 +82,7 @@ Ext.define('Traccar.view.login.LoginController', {
         if (success) {
             this.fireViewEvent('login');
         } else {
-            Traccar.ErrorManager.error(strings.login_failed);
+            Traccar.ErrorManager.error(strings.loginFailed);
         }
     },
     
diff --git a/web/app/view/login/Register.js b/web/app/view/login/Register.js
index 909ed2fba..9be588be1 100644
--- a/web/app/view/login/Register.js
+++ b/web/app/view/login/Register.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.login.Register', {
     controller: 'register',
 
     bodyPadding: styles.panel_padding,
-    title: strings.login_register,
+    title: strings.loginRegister,
     resizable: false,
     modal: true,
     
@@ -36,28 +36,28 @@ Ext.define('Traccar.view.login.Register', {
         items: [{
             xtype: 'textfield',
             name: 'name',
-            fieldLabel: strings.user_name,
+            fieldLabel: strings.userName,
             allowBlank: false
         }, {
             xtype: 'textfield',
             name: 'email',
-            fieldLabel: strings.user_email,
+            fieldLabel: strings.userEmail,
             vtype: 'email',
             allowBlank: false
         }, {
             xtype: 'textfield',
             name: 'password',
-            fieldLabel: strings.user_password,
+            fieldLabel: strings.userPassword,
             inputType: 'password',
             allowBlank: false
         }]
     },
 
     buttons: [{
-        text: strings.shared_save,
+        text: strings.sharedSave,
         handler: 'onCreateClick'
     }, {
-        text: strings.shared_cancel,
+        text: strings.sharedCancel,
         handler: 'closeView'
     }]
 
diff --git a/web/app/view/login/RegisterController.js b/web/app/view/login/RegisterController.js
index e690b56e8..b1957ba8f 100644
--- a/web/app/view/login/RegisterController.js
+++ b/web/app/view/login/RegisterController.js
@@ -33,7 +33,7 @@ Ext.define('Traccar.view.login.RegisterController', {
     onCreateReturn: function(options, success, response) {
         if (Traccar.ErrorManager.check(success, response)) {
             this.closeView();
-            Ext.toast(strings.login_created);
+            Ext.toast(strings.loginCreated);
         }
     }
 
diff --git a/web/app/view/map/Map.js b/web/app/view/map/Map.js
index 57ecebe7d..00daa774c 100644
--- a/web/app/view/map/Map.js
+++ b/web/app/view/map/Map.js
@@ -24,7 +24,7 @@ Ext.define('Traccar.view.map.Map', {
 
     controller: 'map',
 
-    title: strings.map_title,
+    title: strings.mapTitle,
     layout: 'fit',
 
     listeners: {
diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js
index 320d336fa..8e6fe0397 100644
--- a/web/app/view/report/Report.js
+++ b/web/app/view/report/Report.js
@@ -25,11 +25,11 @@ Ext.define('Traccar.view.report.Report', {
     controller: 'report',
     store: 'Positions',
 
-    title: strings.report_title,
+    title: strings.reportTitle,
 
     tbar: [{
         xtype: 'tbtext',
-        html: strings.report_device
+        html: strings.reportDevice
     }, {
         xtype: 'combobox',
         reference: 'deviceField',
@@ -40,7 +40,7 @@ Ext.define('Traccar.view.report.Report', {
         queryMode: 'local'
     }, '-', {
         xtype: 'tbtext',
-        html: strings.report_from
+        html: strings.reportFrom
     }, {
         xtype: 'datefield',
         reference: 'fromDateField',
@@ -52,7 +52,7 @@ Ext.define('Traccar.view.report.Report', {
         value: new Date()
     }, '-', {
         xtype: 'tbtext',
-        html: strings.report_to
+        html: strings.reportTo
     }, {
         xtype: 'datefield',
         reference: 'toDateField',
@@ -63,10 +63,10 @@ Ext.define('Traccar.view.report.Report', {
         maxWidth: styles.report_time,
         value: new Date()
     }, '-', {
-        text: strings.report_show,
+        text: strings.reportShow,
         handler: 'onShowClick'
     }, {
-        text: strings.report_clear,
+        text: strings.reportClear,
         handler: 'onClearClick'
     }],
 
@@ -75,13 +75,13 @@ Ext.define('Traccar.view.report.Report', {
     },
 
     columns: [
-        { text: strings.position_valid, dataIndex: 'valid', flex: 1 },
-        { text: strings.position_time, dataIndex: 'fixTime', flex: 1, xtype: 'datecolumn', format: styles.report_format },
-        { text: strings.position_latitude, dataIndex: 'latitude', flex: 1 },
-        { text: strings.position_longitude, dataIndex: 'longitude', flex: 1 },
-        { text: strings.position_altitude, dataIndex: 'altitude', flex: 1 },
+        { text: strings.positionValid, dataIndex: 'valid', flex: 1 },
+        { text: strings.positionTime, dataIndex: 'fixTime', flex: 1, xtype: 'datecolumn', format: styles.report_format },
+        { text: strings.positionLatitude, dataIndex: 'latitude', flex: 1 },
+        { text: strings.positionLongitude, dataIndex: 'longitude', flex: 1 },
+        { text: strings.positionAltitude, dataIndex: 'altitude', flex: 1 },
         {
-            text: strings.position_speed,
+            text: strings.positionSpeed,
             dataIndex: 'speed',
             flex: 1,
             renderer: function(value) {
@@ -90,8 +90,8 @@ Ext.define('Traccar.view.report.Report', {
                 return speedUnits.convert(value, unit) + ' ' + speedUnits.getUnitName(unit);
             }
         },
-        { text: strings.position_course, dataIndex: 'course', flex: 1 },
-        { text: strings.position_address, dataIndex: 'address', flex: 1 }
+        { text: strings.positionCourse, dataIndex: 'course', flex: 1 },
+        { text: strings.positionAddress, dataIndex: 'address', flex: 1 }
     ]
 
 });
diff --git a/web/app/view/state/State.js b/web/app/view/state/State.js
index 595d845a2..39460dc52 100644
--- a/web/app/view/state/State.js
+++ b/web/app/view/state/State.js
@@ -25,11 +25,11 @@ Ext.define('Traccar.view.state.State', {
     controller: 'state',
     store: 'Parameters',
 
-    title: strings.state_title,
+    title: strings.stateTitle,
 
     columns: [
-        { text: strings.state_name, dataIndex: 'name', flex: 1 },
-        { text: strings.state_value, dataIndex: 'value', flex: 1 }
+        { text: strings.stateName, dataIndex: 'name', flex: 1 },
+        { text: strings.stateValue, dataIndex: 'value', flex: 1 }
     ]
 
 });
diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js
index 66b1c48ac..58b63120b 100644
--- a/web/app/view/state/StateController.js
+++ b/web/app/view/state/StateController.js
@@ -37,39 +37,39 @@ Ext.define('Traccar.view.state.StateController', {
     keys: {
         'fixTime': {
             priority: 1,
-            name: strings.position_time
+            name: strings.positionTime
         },
         'latitude': {
             priority: 2,
-            name: strings.position_latitude
+            name: strings.positionLatitude
         },
         'longitude': {
             priority: 3,
-            name: strings.position_longitude
+            name: strings.positionLongitude
         },
         'valid': {
             priority: 4,
-            name: strings.position_valid
+            name: strings.positionValid
         },
         'altitude': {
             priority: 5,
-            name: strings.position_altitude
+            name: strings.positionAltitude
         },
         'speed': {
             priority: 6,
-            name: strings.position_speed
+            name: strings.positionSpeed
         },
         'course': {
             priority: 7,
-            name: strings.position_course
+            name: strings.positionCourse
         },
         'address': {
             priority: 8,
-            name: strings.position_address
+            name: strings.positionAddress
         },
         'protocol': {
             priority: 9,
-            name: strings.position_protocol
+            name: strings.positionProtocol
         }
     },
 
diff --git a/web/app/view/user/User.js b/web/app/view/user/User.js
index 76779ef79..a355bbe2f 100644
--- a/web/app/view/user/User.js
+++ b/web/app/view/user/User.js
@@ -28,16 +28,16 @@ Ext.define('Traccar.view.user.User', {
     selType: 'rowmodel',
     
     tbar: [{
-        text: strings.shared_add,
+        text: strings.sharedAdd,
         handler: 'onAddClick',
         reference: 'deviceAddButton'
     }, {
-        text: strings.shared_edit,
+        text: strings.sharedEdit,
         disabled: true,
         handler: 'onEditClick',
         reference: 'userEditButton'
     }, {
-        text: strings.shared_remove,
+        text: strings.sharedRemove,
         disabled: true,
         handler: 'onRemoveClick',
         reference: 'userRemoveButton'
@@ -48,9 +48,9 @@ Ext.define('Traccar.view.user.User', {
     },
 
     columns: [
-        { text: strings.user_name, dataIndex: 'name', flex: 1 },
-        { text: strings.user_email, dataIndex: 'email', flex: 1 },
-        { text: strings.user_admin, dataIndex: 'admin', flex: 1 }
+        { text: strings.userName, dataIndex: 'name', flex: 1 },
+        { text: strings.userEmail, dataIndex: 'email', flex: 1 },
+        { text: strings.userAdmin, dataIndex: 'admin', flex: 1 }
     ]
 
 });
diff --git a/web/app/view/user/UserController.js b/web/app/view/user/UserController.js
index 510a7d6c8..c4fa04ff3 100644
--- a/web/app/view/user/UserController.js
+++ b/web/app/view/user/UserController.js
@@ -47,12 +47,12 @@ Ext.define('Traccar.view.user.UserController', {
     onRemoveClick: function() {
         var user = this.getView().getSelectionModel().getSelection()[0];
         Ext.Msg.show({
-            title: strings.settings_user,
-            message: strings.shared_remove_confirm,
+            title: strings.settingsUser,
+            message: strings.sharedRemoveConfirm,
             buttons: Ext.Msg.YESNO,
             buttonText: {
-                yes: strings.shared_remove,
-                no: strings.shared_cancel
+                yes: strings.sharedRemove,
+                no: strings.sharedCancel
             },
             fn: function(btn) {
                 if (btn === 'yes') {
diff --git a/web/app/view/user/UserDialog.js b/web/app/view/user/UserDialog.js
index 67bf2ccf1..ff624f9bb 100644
--- a/web/app/view/user/UserDialog.js
+++ b/web/app/view/user/UserDialog.js
@@ -25,7 +25,7 @@ Ext.define('Traccar.view.user.UserDialog', {
     controller: 'userdialog',
     
     bodyPadding: styles.panel_padding,
-    title: strings.settings_user,
+    title: strings.settingsUser,
     resizable: false,
     modal: true,
     
@@ -34,66 +34,66 @@ Ext.define('Traccar.view.user.UserDialog', {
         items: [{
             xtype: 'textfield',
             name: 'name',
-            fieldLabel: strings.user_name
+            fieldLabel: strings.userName
         }, {
             xtype: 'textfield',
             name: 'email',
-            fieldLabel: strings.user_email,
+            fieldLabel: strings.userEmail,
             allowBlank: false
         }, {
             xtype: 'textfield',
             name: 'password',
-            fieldLabel: strings.user_password,
+            fieldLabel: strings.userPassword,
             inputType: 'password',
             allowBlank: false
         }, {
             xtype: 'checkboxfield',
             name: 'admin',
-            fieldLabel: strings.user_admin,
+            fieldLabel: strings.userAdmin,
             allowBlank: false,
             disabled: true,
             reference: 'adminField'
         }, {
             xtype: 'combobox',
             name: 'map',
-            fieldLabel: strings.map_layer,
+            fieldLabel: strings.mapLayer,
             store: 'MapTypes',
             displayField: 'name',
             valueField: 'key'
         }, {
             xtype: 'combobox',
             name: 'distanceUnit',
-            fieldLabel: strings.settings_distance_unit,
+            fieldLabel: strings.settingsDistanceUnit,
             store: 'DistanceUnits',
             displayField: 'name',
             valueField: 'key'
         }, {
             xtype: 'combobox',
             name: 'speedUnit',
-            fieldLabel: strings.settings_speed_unit,
+            fieldLabel: strings.settingsSpeedUnit,
             store: 'SpeedUnits',
             displayField: 'name',
             valueField: 'key'
         }, {
             xtype: 'numberfield',
             name: 'latitude',
-            fieldLabel: strings.position_latitude
+            fieldLabel: strings.positionLatitude
         }, {
             xtype: 'numberfield',
             name: 'longitude',
-            fieldLabel: strings.position_longitude
+            fieldLabel: strings.positionLongitude
         }, {
             xtype: 'numberfield',
             name: 'zoom',
-            fieldLabel: strings.server_zoom
+            fieldLabel: strings.serverZoom
         }]
     },
 
     buttons: [{
-        text: strings.shared_save,
+        text: strings.sharedSave,
         handler: 'onSaveClick'
     }, {
-        text: strings.shared_cancel,
+        text: strings.sharedCancel,
         handler: 'onCancelClick'
     }]
 
diff --git a/web/l10n/de.js b/web/l10n/de.js
index 4554cad62..7ce62f7cb 100644
--- a/web/l10n/de.js
+++ b/web/l10n/de.js
@@ -1,86 +1,86 @@
 var strings = {
-    shared_loading: 'Lade...',
-    shared_save: 'Speichern',
-    shared_cancel: 'Abbrechen',
-    shared_add: 'Hinzufügen',
-    shared_edit: 'Bearbeiten',
-    shared_remove: 'Entfernen',
-    shared_remove_confirm: 'Objekt entfernen?',
-    shared_km: 'km',
-    shared_mi: 'mi',
-    shared_kmh: 'km/h',
-    shared_mph: 'mph',
-    shared_hour: 'Stunde',
-    shared_minute: 'Minute',
-    shared_second: 'Sekunde',
+    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',
 
-    error_title: 'Fehler',
-    error_unknown: 'Unbekannter Fehler',
+    errorTitle: 'Fehler',
+    errorUnknown: 'Unbekannter Fehler',
 
-    user_name: 'Name',
-    user_email: 'Email',
-    user_password: 'Passwort',
-    user_admin: 'Admin',
+    userName: 'Name',
+    userEmail: 'Email',
+    userPassword: 'Passwort',
+    userAdmin: 'Admin',
 
-    login_title: 'Anmeldung',
-    login_language: 'Sprache',
-    login_register: 'Registrieren',
-    login_login: 'Anmelden',
-    login_failed: 'Falsche Emailadresse oder Passwort',
-    login_created: 'Neuer Benutzer wurde registriert',
-    login_logout: 'Abmelden',
+    loginTitle: 'Anmeldung',
+    loginLanguage: 'Sprache',
+    loginRegister: 'Registrieren',
+    loginLogin: 'Anmelden',
+    loginFailed: 'Falsche Emailadresse oder Passwort',
+    loginCreated: 'Neuer Benutzer wurde registriert',
+    loginLogout: 'Abmelden',
 
-    device_dialog: 'Gerät',
-    device_title: 'Geräte',
-    device_name: 'Name',
-    device_identifier: 'Kennung',
-    device_command: 'Befehl',
+    deviceDialog: 'Gerät',
+    deviceTitle: 'Geräte',
+    deviceName: 'Name',
+    deviceIdentifier: 'Kennung',
+    deviceCommand: 'Befehl',
 
-    settings_title: 'Einstellungen',
-    settings_user: 'Benutzerkonto',
-    settings_server: 'Server',
-    settings_users: 'Benutzer',
-    settings_distance_unit: 'Entfernung',
-    settings_speed_unit: 'Geschwindigkeit',
+    settingsTitle: 'Einstellungen',
+    settingsUser: 'Benutzerkonto',
+    settingsServer: 'Server',
+    settingsUsers: 'Benutzer',
+    settingsDistanceUnit: 'Entfernung',
+    settingsSpeedUnit: 'Geschwindigkeit',
 
-    report_title: 'Berichte',
-    report_device: 'Gerät',
-    report_from: 'Von',
-    report_to: 'Bis',
-    report_show: 'Anzeigen',
-    report_clear: 'Leeren',
+    reportTitle: 'Berichte',
+    reportDevice: 'Gerät',
+    reportFrom: 'Von',
+    reportTo: 'Bis',
+    reportShow: 'Anzeigen',
+    reportClear: 'Leeren',
 
-    position_time: 'Zeit',
-    position_valid: 'Gültig',
-    position_latitude: 'Latitude',
-    position_longitude: 'Longitude',
-    position_altitude: 'Altitude',
-    position_speed: 'Geschwindigkeit',
-    position_course: 'Richtung',
-    position_address: 'Adresse',
-    position_protocol: 'Protokoll',
+    positionTime: 'Zeit',
+    positionValid: 'Gültig',
+    positionLatitude: 'Latitude',
+    positionLongitude: 'Longitude',
+    positionAltitude: 'Altitude',
+    positionSpeed: 'Geschwindigkeit',
+    positionCourse: 'Richtung',
+    positionAddress: 'Adresse',
+    positionProtocol: 'Protokoll',
 
-    server_title: 'Server Einstellungen',
-    server_zoom: 'Zoomen',
-    server_registration: 'Registrierung zulassen',
+    serverTitle: 'Server Einstellungen',
+    serverZoom: 'Zoomen',
+    serverRegistration: 'Registrierung zulassen',
 
-    map_title: 'Karte',
-    map_layer: 'Karten Layer',
-    map_osm: 'Open Street Map',
-    map_bing_road: 'Bing Strassenkarte',
-    map_bing_aerial: 'Bing Luftbilder',
+    mapTitle: 'Karte',
+    mapLayer: 'Karten Layer',
+    mapOsm: 'Open Street Map',
+    mapBingRoad: 'Bing Strassenkarte',
+    mapBingAerial: 'Bing Luftbilder',
 
-    state_title: 'Status',
-    state_name: 'Parameter',
-    state_value: 'Wert',
+    stateTitle: 'Status',
+    stateName: 'Parameter',
+    stateValue: 'Wert',
 
-    command_title: 'Befehl',
-    command_send: 'Senden',
-    command_type: 'Typ',
-    command_position_periodic: 'Position Fix',
-    command_position_stop: 'Position Stop',
-    command_engine_stop: 'Motor Stop',
-    command_engine_resume: 'Motor fortsetzen',
-    command_frequency: 'Frequenz',
-    command_unit: 'Einheit'
+    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/en.js b/web/l10n/en.js
index 2a6ca666e..33c494a54 100644
--- a/web/l10n/en.js
+++ b/web/l10n/en.js
@@ -1,86 +1,86 @@
 var strings = {
-    shared_loading: 'Loading...',
-    shared_save: 'Save',
-    shared_cancel: 'Cancel',
-    shared_add: 'Add',
-    shared_edit: 'Edit',
-    shared_remove: 'Remove',
-    shared_remove_confirm: 'Remove item?',
-    shared_km: 'km',
-    shared_mi: 'mi',
-    shared_kmh: 'km/h',
-    shared_mph: 'mph',
-    shared_hour: 'Hour',
-    shared_minute: 'Minute',
-    shared_second: 'Second',
+    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',
 
-    error_title: 'Error',
-    error_unknown: 'Unknown error',
+    errorTitle: 'Error',
+    errorUnknown: 'Unknown error',
 
-    user_name: 'Name',
-    user_email: 'Email',
-    user_password: 'Password',
-    user_admin: 'Admin',
+    userName: 'Name',
+    userEmail: 'Email',
+    userPassword: 'Password',
+    userAdmin: 'Admin',
 
-    login_title: 'Login',
-    login_language: 'Language',
-    login_register: 'Register',
-    login_login: 'Login',
-    login_failed: 'Incorrect email address or password',
-    login_created: 'New user has been registered',
-    login_logout: 'Logout',
+    loginTitle: 'Login',
+    loginLanguage: 'Language',
+    loginRegister: 'Register',
+    loginLogin: 'Login',
+    loginFailed: 'Incorrect email address or password',
+    loginCreated: 'New user has been registered',
+    loginLogout: 'Logout',
 
-    device_dialog: 'Device',
-    device_title: 'Devices',
-    device_name: 'Name',
-    device_identifier: 'Identifier',
-    device_command: 'Command',
+    deviceDialog: 'Device',
+    deviceTitle: 'Devices',
+    deviceName: 'Name',
+    deviceIdentifier: 'Identifier',
+    deviceCommand: 'Command',
 
-    settings_title: 'Settings',
-    settings_user: 'Account',
-    settings_server: 'Server',
-    settings_users: 'Users',
-    settings_distance_unit: 'Distance',
-    settings_speed_unit: 'Speed',
+    settingsTitle: 'Settings',
+    settingsUser: 'Account',
+    settingsServer: 'Server',
+    settingsUsers: 'Users',
+    settingsDistanceUnit: 'Distance',
+    settingsSpeedUnit: 'Speed',
 
-    report_title: 'Reports',
-    report_device: 'Device',
-    report_from: 'From',
-    report_to: 'To',
-    report_show: 'Show',
-    report_clear: 'Clear',
+    reportTitle: 'Reports',
+    reportDevice: 'Device',
+    reportFrom: 'From',
+    reportTo: 'To',
+    reportShow: 'Show',
+    reportClear: 'Clear',
 
-    position_time: 'Time',
-    position_valid: 'Valid',
-    position_latitude: 'Latitude',
-    position_longitude: 'Longitude',
-    position_altitude: 'Altitude',
-    position_speed: 'Speed',
-    position_course: 'Course',
-    position_address: 'Address',
-    position_protocol: 'Protocol',
+    positionTime: 'Time',
+    positionValid: 'Valid',
+    positionLatitude: 'Latitude',
+    positionLongitude: 'Longitude',
+    positionAltitude: 'Altitude',
+    positionSpeed: 'Speed',
+    positionCourse: 'Course',
+    positionAddress: 'Address',
+    positionProtocol: 'Protocol',
 
-    server_title: 'Server Settings',
-    server_zoom: 'Zoom',
-    server_registration: 'Registration',
+    serverTitle: 'Server Settings',
+    serverZoom: 'Zoom',
+    serverRegistration: 'Registration',
 
-    map_title: 'Map',
-    map_layer: 'Map Layer',
-    map_osm: 'Open Street Map',
-    map_bing_road: 'Bing Maps Road',
-    map_bing_aerial: 'Bing Maps Aerial',
+    mapTitle: 'Map',
+    mapLayer: 'Map Layer',
+    mapOsm: 'Open Street Map',
+    mapBingRoad: 'Bing Maps Road',
+    mapBingAerial: 'Bing Maps Aerial',
 
-    state_title: 'State',
-    state_name: 'Parameter',
-    state_value: 'Value',
+    stateTitle: 'State',
+    stateName: 'Parameter',
+    stateValue: 'Value',
 
-    command_title: 'Command',
-    command_send: 'Send',
-    command_type: 'Type',
-    command_position_periodic: 'Periodic Reporting',
-    command_position_stop: 'Stop Reporting',
-    command_engine_stop: 'Engine Stop',
-    command_engine_resume: 'Engine Resume',
-    command_frequency: 'Frequency',
-    command_unit: 'Unit'
+    commandTitle: 'Command',
+    commandSend: 'Send',
+    commandType: 'Type',
+    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
index 81fb2a662..ef7f47fee 100644
--- a/web/l10n/es.js
+++ b/web/l10n/es.js
@@ -1,86 +1,86 @@
 var strings = {
-    shared_loading: 'Cargando...',
-    shared_save: 'Grabar',
-    shared_cancel: 'Cancelar',
-    shared_add: 'Agregar',
-    shared_edit: 'Editar',
-    shared_remove: 'Borrar',
-    shared_remove_confirm: 'Borrar elemento?',
-    shared_km: 'km',
-    shared_mi: 'mi',
-    shared_kmh: 'km/h',
-    shared_mph: 'mph',
-    shared_hour: 'Hora',
-    shared_minute: 'Minuto',
-    shared_second: 'Segundos',
+    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',
 
-    error_title: 'Error',
-    error_unknown: 'Error Desconocido',
+    errorTitle: 'Error',
+    errorUnknown: 'Error Desconocido',
 
-    user_name: 'Nombre',
-    user_email: 'Email',
-    user_password: 'Contraseña',
-    user_admin: 'Admin',
+    userName: 'Nombre',
+    userEmail: 'Email',
+    userPassword: 'Contraseña',
+    userAdmin: 'Admin',
 
-    login_title: 'Ingresar',
-    login_language: 'Lenguaje',
-    login_register: 'Registrar',
-    login_login: 'Ingresar',
-    login_failed: 'Direccion de correo o Contraseña Incorrecta',
-    login_created: 'Nuevo usuario ha sido registrado',
-    login_logout: 'Salir',
+    loginTitle: 'Ingresar',
+    loginLanguage: 'Lenguaje',
+    loginRegister: 'Registrar',
+    loginLogin: 'Ingresar',
+    loginFailed: 'Direccion de correo o Contraseña Incorrecta',
+    loginCreated: 'Nuevo usuario ha sido registrado',
+    loginLogout: 'Salir',
 
-    device_dialog: 'Dispositivo',
-    device_title: 'Dispositivos',
-    device_name: 'Nombre',
-    device_identifier: 'Identificador',
-    device_command: 'Comando',
+    deviceDialog: 'Dispositivo',
+    deviceTitle: 'Dispositivos',
+    deviceName: 'Nombre',
+    deviceIdentifier: 'Identificador',
+    deviceCommand: 'Comando',
 
-    settings_title: 'Preferencias',
-    settings_user: 'Cuenta',
-    settings_server: 'Servidor',
-    settings_users: 'Usuarios',
-    settings_distance_unit: 'Distancia',
-    settings_speed_unit: 'Velocidad',
+    settingsTitle: 'Preferencias',
+    settingsUser: 'Cuenta',
+    settingsServer: 'Servidor',
+    settingsUsers: 'Usuarios',
+    settingsDistanceUnit: 'Distancia',
+    settingsSpeedUnit: 'Velocidad',
 
-    report_title: 'Reportes',
-    report_device: 'Dispositivos',
-    report_from: 'Desde',
-    report_to: 'Hasta',
-    report_show: 'Mostrar',
-    report_clear: 'Limpiar',
+    reportTitle: 'Reportes',
+    reportDevice: 'Dispositivos',
+    reportFrom: 'Desde',
+    reportTo: 'Hasta',
+    reportShow: 'Mostrar',
+    reportClear: 'Limpiar',
 
-    position_time: 'Hora',
-    position_valid: 'Valida',
-    position_latitude: 'Latitud',
-    position_longitude: 'Longitud',
-    position_altitude: 'Altitud',
-    position_speed: 'Velocidad',
-    position_course: 'Curso',
-    position_address: 'Direccion',
-    position_protocol: 'Protocolo',
+    positionTime: 'Hora',
+    positionValid: 'Valida',
+    positionLatitude: 'Latitud',
+    positionLongitude: 'Longitud',
+    positionAltitude: 'Altitud',
+    positionSpeed: 'Velocidad',
+    positionCourse: 'Curso',
+    positionAddress: 'Direccion',
+    positionProtocol: 'Protocolo',
 
-    server_title: 'Preferencias Servidor',
-    server_zoom: 'Zoom',
-    server_registration: 'Registrar',
+    serverTitle: 'Preferencias Servidor',
+    serverZoom: 'Zoom',
+    serverRegistration: 'Registrar',
 
-    map_title: 'Mapa',
-    map_layer: 'Capa de Mapa',
-    map_osm: 'Open Street Map',
-    map_bing_road: 'Bing Maps - Carretera',
-    map_bing_aerial: 'Bing Maps - Aereo',
+    mapTitle: 'Mapa',
+    mapLayer: 'Capa de Mapa',
+    mapOsm: 'Open Street Map',
+    mapBingRoad: 'Bing Maps - Carretera',
+    mapBingAerial: 'Bing Maps - Aereo',
 
-    state_title: 'Estado',
-    state_name: 'Parametro',
-    state_value: 'Valor',
+    stateTitle: 'Estado',
+    stateName: 'Parametro',
+    stateValue: 'Valor',
 
-    command_title: 'Comando',
-    command_send: 'Enviar',
-    command_type: 'Tipo',
-    command_position_periodic: 'Frecuencia de posiciones',
-    command_position_stop: 'Detener reporte de posiciones',
-    command_engine_stop: 'Apagar motor',
-    command_engine_resume: 'Desbloquear encendido de motor',
-    command_frequency: 'Frequencia',
-    command_unit: 'Unidad'
+    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
index 1d33c0063..f3f13fc41 100644
--- a/web/l10n/fr.js
+++ b/web/l10n/fr.js
@@ -1,86 +1,86 @@
 var strings = {
-    shared_loading: 'Chargement...',
-    shared_save: 'Enregistrer',
-    shared_cancel: 'Annuler',
-    shared_add: 'Ajouter',
-    shared_edit: 'Editer',
-    shared_remove: 'Effacer',
-    shared_remove_confirm: 'Effacer item?',
-    shared_km: 'km',
-    shared_mi: 'mi',
-    shared_kmh: 'km/h',
-    shared_mph: 'mph',
-    shared_hour: 'Heure',
-    shared_minute: 'Minute',
-    shared_second: 'Seconde',
+    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',
 
-    error_title: 'Erreur',
-    error_unknown: 'Erreur inconnue',
+    errorTitle: 'Erreur',
+    errorUnknown: 'Erreur inconnue',
 
-    user_name: 'Nom',
-    user_email: 'Email',
-    user_password: 'Mot de Passe',
-    user_admin: 'Admin',
+    userName: 'Nom',
+    userEmail: 'Email',
+    userPassword: 'Mot de Passe',
+    userAdmin: 'Admin',
 
-    login_title: 'Identification',
-    login_language: 'Langue',
-    login_register: 'Inscription',
-    login_login: 'Se connecter',
-    login_failed: 'Adresse email ou mot de passe incorrect',
-    login_created: 'New user has been registered',
-    login_logout: 'Déconnection',
+    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',
 
-    device_dialog: 'Dispositif',
-    device_title: 'Dispositifs',
-    device_name: 'Nom',
-    device_identifier: 'Identifiant',
-    device_command: 'Commande',
+    deviceDialog: 'Dispositif',
+    deviceTitle: 'Dispositifs',
+    deviceName: 'Nom',
+    deviceIdentifier: 'Identifiant',
+    deviceCommand: 'Commande',
 
-    settings_title: 'Configurations',
-    settings_user: 'Compte',
-    settings_server: 'Serveur',
-    settings_users: 'Utilisateurs',
-    settings_distance_unit: 'Distance',
-    settings_speed_unit: 'Vitesse',
+    settingsTitle: 'Configurations',
+    settingsUser: 'Compte',
+    settingsServer: 'Serveur',
+    settingsUsers: 'Utilisateurs',
+    settingsDistanceUnit: 'Distance',
+    settingsSpeedUnit: 'Vitesse',
 
-    report_title: 'Rapports',
-    report_device: 'Dispositif',
-    report_from: 'De',
-    report_to: 'A',
-    report_show: 'Afficher',
-    report_clear: 'Effacer',
+    reportTitle: 'Rapports',
+    reportDevice: 'Dispositif',
+    reportFrom: 'De',
+    reportTo: 'A',
+    reportShow: 'Afficher',
+    reportClear: 'Effacer',
 
-    position_time: 'Heure',
-    position_valid: 'Valide',
-    position_latitude: 'Latitude',
-    position_longitude: 'Longitude',
-    position_altitude: 'Altitude',
-    position_speed: 'Vitesse',
-    position_course: 'Sense',
-    position_address: 'Adresse',
-    position_protocol: 'Protocole',
+    positionTime: 'Heure',
+    positionValid: 'Valide',
+    positionLatitude: 'Latitude',
+    positionLongitude: 'Longitude',
+    positionAltitude: 'Altitude',
+    positionSpeed: 'Vitesse',
+    positionCourse: 'Sense',
+    positionAddress: 'Adresse',
+    positionProtocol: 'Protocole',
 
-    server_title: 'Configurations du Serveur Settings',
-    server_zoom: 'Zoom',
-    server_registration: 'Inscription',
+    serverTitle: 'Configurations du Serveur Settings',
+    serverZoom: 'Zoom',
+    serverRegistration: 'Inscription',
 
-    map_title: 'Carte',
-    map_layer: 'Cartes',
-    map_osm: 'Open Street Map',
-    map_bing_road: 'Bing Maps Road',
-    map_bing_aerial: 'Bing Maps Aerial',
+    mapTitle: 'Carte',
+    mapLayer: 'Cartes',
+    mapOsm: 'Open Street Map',
+    mapBingRoad: 'Bing Maps Road',
+    mapBingAerial: 'Bing Maps Aerial',
 
-    state_title: 'Etat',
-    state_name: 'Paramètre',
-    state_value: 'Valeur',
+    stateTitle: 'Etat',
+    stateName: 'Paramètre',
+    stateValue: 'Valeur',
 
-    command_title: 'Commande',
-    command_send: 'Envoyer',
-    command_type: 'Type',
-    command_position_periodic: 'Périodicité du rapport de position',
-    command_position_stop: 'Arrêt du rapport de position',
-    command_engine_stop: 'Moteur arrêter',
-    command_engine_resume: 'Moteur démarrer',
-    command_frequency: 'Fréquence',
-    command_unit: 'Unité'
+    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/pl.js b/web/l10n/pl.js
index 815cde2f2..c513cc15f 100644
--- a/web/l10n/pl.js
+++ b/web/l10n/pl.js
@@ -1,86 +1,86 @@
 var strings = {
-    shared_loading: 'Wczytywanie...',
-    shared_save: 'Zapisz',
-    shared_cancel: 'Anuluj',
-    shared_add: 'Dodaj',
-    shared_edit: 'Edytuj',
-    shared_remove: 'Usuń',
-    shared_remove_confirm: 'Usuń obiekt?',
-    shared_km: 'km',
-    shared_mi: 'mi',
-    shared_kmh: 'km/h',
-    shared_mph: 'mph',
-    shared_hour: 'Godzina',
-    shared_minute: 'Minuta',
-    shared_second: 'Sekunda',
+    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',
 
-    error_title: 'Bląd',
-    error_unknown: 'Nieznany błąd',
+    errorTitle: 'Bląd',
+    errorUnknown: 'Nieznany błąd',
 
-    user_name: 'Nazwa',
-    user_email: 'Email',
-    user_password: 'Hasło',
-    user_admin: 'Administrator',
+    userName: 'Nazwa',
+    userEmail: 'Email',
+    userPassword: 'Hasło',
+    userAdmin: 'Administrator',
 
-    login_title: 'Logowanie',
-    login_language: 'Język',
-    login_register: 'Rejestracja',
-    login_login: 'Zaloguj',
-    login_failed: 'Nieprawidłowy adres e-mail lub hasło',
-    login_created: 'Nowy użytkownik został zarejestrowany',
-    login_logout: 'Wyloguj',
+    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',
 
-    device_dialog: 'Urządzenie',
-    device_title: 'Urządzenia',
-    device_name: 'Nazwa',
-    device_identifier: 'Identyfikator',
-    device_command: 'Zdarzenie',
+    deviceDialog: 'Urządzenie',
+    deviceTitle: 'Urządzenia',
+    deviceName: 'Nazwa',
+    deviceIdentifier: 'Identyfikator',
+    deviceCommand: 'Zdarzenie',
 
-    settings_title: 'Ustawienia',
-    settings_user: 'Konto',
-    settings_server: 'Serwer',
-    settings_users: 'Użytkownicy',
-    settings_distance_unit: 'Dystans',
-    settings_speed_unit: 'Prędkość',
+    settingsTitle: 'Ustawienia',
+    settingsUser: 'Konto',
+    settingsServer: 'Serwer',
+    settingsUsers: 'Użytkownicy',
+    settingsDistanceUnit: 'Dystans',
+    settingsSpeedUnit: 'Prędkość',
 
-    report_title: 'Raporty',
-    report_device: 'Urządzenie',
-    report_from: 'Z',
-    report_to: 'Do',
-    report_show: 'Wczytaj',
-    report_clear: 'Wyczyść',
+    reportTitle: 'Raporty',
+    reportDevice: 'Urządzenie',
+    reportFrom: 'Z',
+    reportTo: 'Do',
+    reportShow: 'Wczytaj',
+    reportClear: 'Wyczyść',
 
-    position_time: 'Czas',
-    position_valid: 'Aktywny',
-    position_latitude: 'Szerokość',
-    position_longitude: 'Długość',
-    position_altitude: 'Wysokość',
-    position_speed: 'Prędkość',
-    position_course: 'Kurs',
-    position_address: 'Adres',
-    position_protocol: 'Protokół',
+    positionTime: 'Czas',
+    positionValid: 'Aktywny',
+    positionLatitude: 'Szerokość',
+    positionLongitude: 'Długość',
+    positionAltitude: 'Wysokość',
+    positionSpeed: 'Prędkość',
+    positionCourse: 'Kurs',
+    positionAddress: 'Adres',
+    positionProtocol: 'Protokół',
 
-    server_title: 'Ustawienia serwera',
-    server_zoom: 'Powiększenie',
-    server_registration: 'Rejestracja',
+    serverTitle: 'Ustawienia serwera',
+    serverZoom: 'Powiększenie',
+    serverRegistration: 'Rejestracja',
 
-    map_title: 'Mapa',
-    map_layer: 'Map Layer',
-    map_osm: 'Open Street Map',
-    map_bing_road: 'Bing Maps Road',
-    map_bing_aerial: 'Bing Maps Aerial',
+    mapTitle: 'Mapa',
+    mapLayer: 'Map Layer',
+    mapOsm: 'Open Street Map',
+    mapBingRoad: 'Bing Maps Road',
+    mapBingAerial: 'Bing Maps Aerial',
 
-    state_title: 'Lokalizacja',
-    state_name: 'Właściwości',
-    state_value: 'Wartość',
+    stateTitle: 'Lokalizacja',
+    stateName: 'Właściwości',
+    stateValue: 'Wartość',
 
-    command_title: 'Zdarzenie',
-    command_send: 'Wyślij',
-    command_type: 'Typ',
-    command_position_periodic: 'Pozycja - Fix',
-    command_position_stop: 'Pozycja - Stop',
-    command_engine_stop: 'Silnik - Stop',
-    command_engine_resume: 'Silnik - Praca',
-    command_frequency: 'Częstotliwość',
-    command_unit: 'Jednostka'
+    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
index 2ddf2b11f..4a422849d 100644
--- a/web/l10n/pt.js
+++ b/web/l10n/pt.js
@@ -1,86 +1,86 @@
 var strings = {
-    shared_loading: 'Carregando ...',
-    shared_save: 'Salvar',
-    shared_cancel: 'Cancelar',
-    shared_add: 'Adicionar',
-    shared_edit: 'Editar',
-    shared_remove: 'Remover',
-    shared_remove_confirm: 'Remove item?',
-    shared_km: 'Km',
-    shared_mi: 'mi',
-    shared_kmh: 'Km/h',
-    shared_mph: 'Mph',
-    shared_hour: 'Hora',
-    shared_minute: 'Minuto',
-    shared_second: 'Segundo',
+    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',
 
-    error_title: 'Erro',
-    error_unknown: 'Erro desconhecido',
+    errorTitle: 'Erro',
+    errorUnknown: 'Erro desconhecido',
 
-    user_name: 'Nome',
-    user_email: 'E-mail',
-    user_password: 'Senha',
-    user_admin: 'Admin',
+    userName: 'Nome',
+    userEmail: 'E-mail',
+    userPassword: 'Senha',
+    userAdmin: 'Admin',
 
-    login_title: 'Entrar',
-    login_language: 'Idioma',
-    login_register: 'Registrar',
-    login_login: 'Entrar',
-    login_failed: 'Endereço de e-mail ou senha incorreta',
-    login_created: 'Novo usuário foi registrado',
-    login_logout: 'Sair',
+    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',
 
-    device_dialog: 'Dispositivo',
-    device_title: 'Devices',
-    device_name: 'Nome',
-    device_identifier: 'Identificador',
-    device_command: 'Comando',
+    deviceDialog: 'Dispositivo',
+    deviceTitle: 'Devices',
+    deviceName: 'Nome',
+    deviceIdentifier: 'Identificador',
+    deviceCommand: 'Comando',
 
-    settings_title: 'Configurações',
-    settings_user: 'Conta',
-    settings_server: 'Servidor',
-    settings_users: 'Usuário',
-    settings_distance_unit: 'Distância',
-    settings_speed_unit: 'Velocidade',
+    settingsTitle: 'Configurações',
+    settingsUser: 'Conta',
+    settingsServer: 'Servidor',
+    settingsUsers: 'Usuário',
+    settingsDistanceUnit: 'Distância',
+    settingsSpeedUnit: 'Velocidade',
 
-    report_title: 'Relatórios',
-    report_device: 'Dispositivo',
-    report_from: 'De',
-    report_to: 'Para',
-    report_show: 'Mostrar',
-    report_clear: 'Limpar',
+    reportTitle: 'Relatórios',
+    reportDevice: 'Dispositivo',
+    reportFrom: 'De',
+    reportTo: 'Para',
+    reportShow: 'Mostrar',
+    reportClear: 'Limpar',
 
-    position_time: 'Tempo',
-    position_valid: 'Válido',
-    position_latitude: 'Latitude',
-    position_longitude: 'Longitude',
-    position_altitude: 'Altitude',
-    position_speed: 'Velocidade',
-    position_course: 'Course',
-    position_address: 'Endereço',
-    position_protocol: 'protocolo',
+    positionTime: 'Tempo',
+    positionValid: 'Válido',
+    positionLatitude: 'Latitude',
+    positionLongitude: 'Longitude',
+    positionAltitude: 'Altitude',
+    positionSpeed: 'Velocidade',
+    positionCourse: 'Course',
+    positionAddress: 'Endereço',
+    positionProtocol: 'protocolo',
 
-    server_title: 'Configurações do Servidor',
-    server_zoom: 'Zoom',
-    server_registration: 'Registro',
+    serverTitle: 'Configurações do Servidor',
+    serverZoom: 'Zoom',
+    serverRegistration: 'Registro',
 
-    map_title: 'Mapa',
-    map_layer: 'Camada Mapa',
-    map_osm: 'Open Street Mapa',
-    map_bing_road: 'Bing Mapas Estrada',
-    map_bing_aerial: 'Bing Mapas Aérea',
+    mapTitle: 'Mapa',
+    mapLayer: 'Camada Mapa',
+    mapOsm: 'Open Street Mapa',
+    mapBingRoad: 'Bing Mapas Estrada',
+    mapBingAerial: 'Bing Mapas Aérea',
 
-    state_title: 'Estado',
-    state_name: 'Parâmetro',
-    state_value: 'Valor',
+    stateTitle: 'Estado',
+    stateName: 'Parâmetro',
+    stateValue: 'Valor',
 
-    command_title: 'Comando',
-    command_send: 'Enviar',
-    command_type: 'Tipo',
-    command_position_periodic: 'Posição Tempo',
-    command_position_stop: 'Parar Posição',
-    command_engine_stop: 'Bloqueio Veículo',
-    command_engine_resume: 'Desbloqueio Veículo',
-    command_frequency: 'Frequência',
-    command_unit: 'Unidade'
+    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
index adb67c958..ae61ef1db 100644
--- a/web/l10n/ru.js
+++ b/web/l10n/ru.js
@@ -1,86 +1,86 @@
 var strings = {
-    shared_loading: 'Загрузка...',
-    shared_save: 'Сохранить',
-    shared_cancel: 'Отмена',
-    shared_add: 'Добавить',
-    shared_edit: 'Редактировать',
-    shared_remove: 'Удалить',
-    shared_remove_confirm: 'Удалить элемент?',
-    shared_km: 'км',
-    shared_mi: 'мили',
-    shared_kmh: 'км/ч',
-    shared_mph: 'миль/ч',
-    shared_hour: 'Часы',
-    shared_minute: 'Минуты',
-    shared_second: 'Секунды',
+    sharedLoading: 'Загрузка...',
+    sharedSave: 'Сохранить',
+    sharedCancel: 'Отмена',
+    sharedAdd: 'Добавить',
+    sharedEdit: 'Редактировать',
+    sharedRemove: 'Удалить',
+    sharedRemoveConfirm: 'Удалить элемент?',
+    sharedKm: 'км',
+    sharedMi: 'мили',
+    sharedKmh: 'км/ч',
+    sharedMph: 'миль/ч',
+    sharedHour: 'Часы',
+    sharedMinute: 'Минуты',
+    sharedSecond: 'Секунды',
 
-    error_title: 'Ошибка',
-    error_unknown: 'Неизвестная ошибка',
+    errorTitle: 'Ошибка',
+    errorUnknown: 'Неизвестная ошибка',
 
-    user_name: 'Имя',
-    user_email: 'Email',
-    user_password: 'Пароль',
-    user_admin: 'Администратор',
+    userName: 'Имя',
+    userEmail: 'Email',
+    userPassword: 'Пароль',
+    userAdmin: 'Администратор',
 
-    login_title: 'Вход',
-    login_language: 'Язык',
-    login_register: 'Регистрация',
-    login_login: 'Вход',
-    login_failed: 'Неправильный email адрес или пароль',
-    login_created: 'Новый пользователь зарегистрирован',
-    login_logout: 'Выход',
+    loginTitle: 'Вход',
+    loginLanguage: 'Язык',
+    loginRegister: 'Регистрация',
+    loginLogin: 'Вход',
+    loginFailed: 'Неправильный email адрес или пароль',
+    loginCreated: 'Новый пользователь зарегистрирован',
+    loginLogout: 'Выход',
 
-    device_dialog: 'Устройство',
-    device_title: 'Устройства',
-    device_name: 'Название',
-    device_identifier: 'Идентификатор',
-    device_command: 'Команда',
+    deviceDialog: 'Устройство',
+    deviceTitle: 'Устройства',
+    deviceName: 'Название',
+    deviceIdentifier: 'Идентификатор',
+    deviceCommand: 'Команда',
 
-    settings_title: 'Настройки',
-    settings_user: 'Аккаунт',
-    settings_server: 'Сервер',
-    settings_users: 'Пользователи',
-    settings_distance_unit: 'Расстояние',
-    settings_speed_unit: 'Скорость',
+    settingsTitle: 'Настройки',
+    settingsUser: 'Аккаунт',
+    settingsServer: 'Сервер',
+    settingsUsers: 'Пользователи',
+    settingsDistanceUnit: 'Расстояние',
+    settingsSpeedUnit: 'Скорость',
 
-    report_title: 'Отчеты',
-    report_device: 'Устройтво',
-    report_from: 'С',
-    report_to: 'По',
-    report_show: 'Показать',
-    report_clear: 'Очистить',
+    reportTitle: 'Отчеты',
+    reportDevice: 'Устройтво',
+    reportFrom: 'С',
+    reportTo: 'По',
+    reportShow: 'Показать',
+    reportClear: 'Очистить',
 
-    position_time: 'Время',
-    position_valid: 'Корректность',
-    position_latitude: 'Широта',
-    position_longitude: 'Долгота',
-    position_altitude: 'Высота',
-    position_speed: 'Скорость',
-    position_course: 'Курс',
-    position_address: 'Адрес',
-    position_protocol: 'Протокол',
+    positionTime: 'Время',
+    positionValid: 'Корректность',
+    positionLatitude: 'Широта',
+    positionLongitude: 'Долгота',
+    positionAltitude: 'Высота',
+    positionSpeed: 'Скорость',
+    positionCourse: 'Курс',
+    positionAddress: 'Адрес',
+    positionProtocol: 'Протокол',
 
-    server_title: 'Настройки Сервера',
-    server_zoom: 'Приближение',
-    server_registration: 'Регистрация',
+    serverTitle: 'Настройки Сервера',
+    serverZoom: 'Приближение',
+    serverRegistration: 'Регистрация',
 
-    map_title: 'Карта',
-    map_layer: 'Слой Карты',
-    map_osm: 'Open Street Map',
-    map_bing_road: 'Bing Maps Дороги',
-    map_bing_aerial: 'Bing Maps Спутник',
+    mapTitle: 'Карта',
+    mapLayer: 'Слой Карты',
+    mapOsm: 'Open Street Map',
+    mapBingRoad: 'Bing Maps Дороги',
+    mapBingAerial: 'Bing Maps Спутник',
 
-    state_title: 'Состояние',
-    state_name: 'Параметр',
-    state_value: 'Значение',
+    stateTitle: 'Состояние',
+    stateName: 'Параметр',
+    stateValue: 'Значение',
 
-    command_title: 'Команда',
-    command_send: 'Отправить',
-    command_type: 'Тип',
-    command_position_periodic: 'Начать Отслеживание',
-    command_position_stop: 'Отменить Отслеживание',
-    command_engine_stop: 'Заблокировать Двигатель',
-    command_engine_resume: 'Разблокировать Двигатель',
-    command_frequency: 'Частота',
-    command_unit: 'Единицы'
+    commandTitle: 'Команда',
+    commandSend: 'Отправить',
+    commandType: 'Тип',
+    commandPositionPeriodic: 'Начать Отслеживание',
+    commandPositionStop: 'Отменить Отслеживание',
+    commandEngineStop: 'Заблокировать Двигатель',
+    commandEngineResume: 'Разблокировать Двигатель',
+    commandFrequency: 'Частота',
+    commandUnit: 'Единицы'
 };
diff --git a/web/l10n/th.js b/web/l10n/th.js
index 751689b16..0f3518cb5 100644
--- a/web/l10n/th.js
+++ b/web/l10n/th.js
@@ -1,86 +1,86 @@
 var strings = {
-    shared_loading: 'โหลด',
-    shared_save: 'เก็บ (แฟ้มข้อมูล)',
-    shared_cancel: 'ยกเลิก',
-    shared_add: 'เพิ่ม',
-    shared_edit: 'ตรวจแก้ ปรับเปลี่ยนข้อมูล',
-    shared_remove: 'ย้ายออก',
-    shared_remove_confirm: 'ลบรายการ',
-    shared_km: 'กม.',
-    shared_mi: 'ไมล์',
-    shared_kmh: 'กม. / ชม',
-    shared_mph: 'ไมล์ต่อชั่วโมง',
-    shared_hour: 'ชั่วโมง',
-    shared_minute: 'นาที',
-    shared_second: 'วินาที',
+    sharedLoading: 'โหลด',
+    sharedSave: 'เก็บ (แฟ้มข้อมูล)',
+    sharedCancel: 'ยกเลิก',
+    sharedAdd: 'เพิ่ม',
+    sharedEdit: 'ตรวจแก้ ปรับเปลี่ยนข้อมูล',
+    sharedRemove: 'ย้ายออก',
+    sharedRemoveConfirm: 'ลบรายการ',
+    sharedKm: 'กม.',
+    sharedMi: 'ไมล์',
+    sharedKmh: 'กม. / ชม',
+    sharedMph: 'ไมล์ต่อชั่วโมง',
+    sharedHour: 'ชั่วโมง',
+    sharedMinute: 'นาที',
+    sharedSecond: 'วินาที',
 
-    error_title: 'ผิดพลาด',
-    error_unknown: 'ข้อผิดพลาดที่ไม่รู้จัก',
+    errorTitle: 'ผิดพลาด',
+    errorUnknown: 'ข้อผิดพลาดที่ไม่รู้จัก',
 
-    user_name: 'ชื่อ',
-    user_email: 'อีเมล',
-    user_password: 'รหัสผ่าน',
-    user_admin: 'ผู้ดูแลระบบ',
+    userName: 'ชื่อ',
+    userEmail: 'อีเมล',
+    userPassword: 'รหัสผ่าน',
+    userAdmin: 'ผู้ดูแลระบบ',
 
-    login_title: 'เข้าสู่ระบบ',
-    login_language: 'ภาษา',
-    login_register: 'ลงทะเบียน',
-    login_login: 'เข้าสู่ระบบ',
-    login_failed: 'ที่อยู่อีเมลหรือรหัสผ่านไม่ถูกต้อง',
-    login_created: 'ผู้ใช้ใหม่ ได้รับการจดทะเบียน',
-    login_logout: 'ออกจากระบบ',
+    loginTitle: 'เข้าสู่ระบบ',
+    loginLanguage: 'ภาษา',
+    loginRegister: 'ลงทะเบียน',
+    loginLogin: 'เข้าสู่ระบบ',
+    loginFailed: 'ที่อยู่อีเมลหรือรหัสผ่านไม่ถูกต้อง',
+    loginCreated: 'ผู้ใช้ใหม่ ได้รับการจดทะเบียน',
+    loginLogout: 'ออกจากระบบ',
 
-    device_dialog: 'เครื่อง/อุปกรณ์',
-    device_title: 'เครื่อง/อุปกรณ์',
-    device_name: 'ชื่อ',
-    device_identifier: 'ระบุ',
-    device_command: 'คำสั่ง',
+    deviceDialog: 'เครื่อง/อุปกรณ์',
+    deviceTitle: 'เครื่อง/อุปกรณ์',
+    deviceName: 'ชื่อ',
+    deviceIdentifier: 'ระบุ',
+    deviceCommand: 'คำสั่ง',
 
-    settings_title: 'การตั้งค่า',
-    settings_user: 'บัญชี',
-    settings_server: 'ผู้ให้บริการ',
-    settings_users: 'ผู้ใช้งาน',
-    settings_distance_unit: 'ระยะทาง',
-    settings_speed_unit: 'ความเร็ว',
+    settingsTitle: 'การตั้งค่า',
+    settingsUser: 'บัญชี',
+    settingsServer: 'ผู้ให้บริการ',
+    settingsUsers: 'ผู้ใช้งาน',
+    settingsDistanceUnit: 'ระยะทาง',
+    settingsSpeedUnit: 'ความเร็ว',
 
-    report_title: 'รายงาน',
-    report_device: 'เครื่อง/อุปกรณ์',
-    report_from: 'จาก',
-    report_to: 'ไปถึง',
-    report_show: 'แสดง',
-    report_clear: 'ขจัด',
+    reportTitle: 'รายงาน',
+    reportDevice: 'เครื่อง/อุปกรณ์',
+    reportFrom: 'จาก',
+    reportTo: 'ไปถึง',
+    reportShow: 'แสดง',
+    reportClear: 'ขจัด',
 
-    position_time: 'เวลา',
-    position_valid: 'ถูกต้อง',
-    position_latitude: 'ละติจูด',
-    position_longitude: 'ลองจิจูด',
-    position_altitude: 'ระดับความสูง',
-    position_speed: 'ความเร็ว',
-    position_course: 'แนวทางเดิน',
-    position_address: 'ที่อยู่',
-    position_protocol: 'โปรโตคอล',
+    positionTime: 'เวลา',
+    positionValid: 'ถูกต้อง',
+    positionLatitude: 'ละติจูด',
+    positionLongitude: 'ลองจิจูด',
+    positionAltitude: 'ระดับความสูง',
+    positionSpeed: 'ความเร็ว',
+    positionCourse: 'แนวทางเดิน',
+    positionAddress: 'ที่อยู่',
+    positionProtocol: 'โปรโตคอล',
 
-    server_title: 'การตั้งค่าเซิร์ฟเวอ',
-    server_zoom: 'เลื่อนใกล้/ไกล',
-    server_registration: 'ลงทะเบียน',
+    serverTitle: 'การตั้งค่าเซิร์ฟเวอ',
+    serverZoom: 'เลื่อนใกล้/ไกล',
+    serverRegistration: 'ลงทะเบียน',
 
-    map_title: 'แผนที่',
-    map_layer: 'ชั้น แผนที่',
-    map_osm: 'Open Street Map',
-    map_bing_road: 'Bing Maps ถนน',
-    map_bing_aerial: 'Bing Maps อากาศ',
+    mapTitle: 'แผนที่',
+    mapLayer: 'ชั้น แผนที่',
+    mapOsm: 'Open Street Map',
+    mapBingRoad: 'Bing Maps ถนน',
+    mapBingAerial: 'Bing Maps อากาศ',
 
-    state_title: 'สถานะ',
-    state_name: 'พารามิเตอร์',
-    state_value: 'มูลค่า',
+    stateTitle: 'สถานะ',
+    stateName: 'พารามิเตอร์',
+    stateValue: 'มูลค่า',
 
-    command_title: 'คำสั่ง',
-    command_send: 'ส่ง',
-    command_type: 'ชนิด',
-    command_position_periodic: 'แก้ไขตำแหน่ง',
-    command_position_stop: 'ตำแหน่ง หยุด',
-    command_engine_stop: 'หยุดเครื่องยนต์',
-    command_engine_resume: 'เริ่มครื่องยนต์ใหม่',
-    command_frequency: 'ความถี่',
-    command_unit: 'หน่วย'
+    commandTitle: 'คำสั่ง',
+    commandSend: 'ส่ง',
+    commandType: 'ชนิด',
+    commandPositionPeriodic: 'แก้ไขตำแหน่ง',
+    commandPositionStop: 'ตำแหน่ง หยุด',
+    commandEngineStop: 'หยุดเครื่องยนต์',
+    commandEngineResume: 'เริ่มครื่องยนต์ใหม่',
+    commandFrequency: 'ความถี่',
+    commandUnit: 'หน่วย'
 };
diff --git a/web/l10n/zh.js b/web/l10n/zh.js
index 49f8c8600..185294a3f 100644
--- a/web/l10n/zh.js
+++ b/web/l10n/zh.js
@@ -1,86 +1,86 @@
 var strings = {
-    shared_loading: '加载',
-    shared_save: '保存',
-    shared_cancel: '取消',
-    shared_add: '新建',
-    shared_edit: '编辑',
-    shared_remove: '移除',
-    shared_remove_confirm: '要移除选项吗？',
-    shared_km: '千米',
-    shared_mi: '海里',
-    shared_kmh: '千米/小时',
-    shared_mph: '每小时英里数',
-    shared_hour: '小时',
-    shared_minute: '分钟',
-    shared_second: '秒',
+    sharedLoading: '加载',
+    sharedSave: '保存',
+    sharedCancel: '取消',
+    sharedAdd: '新建',
+    sharedEdit: '编辑',
+    sharedRemove: '移除',
+    sharedRemoveConfirm: '要移除选项吗？',
+    sharedKm: '千米',
+    sharedMi: '海里',
+    sharedKmh: '千米/小时',
+    sharedMph: '每小时英里数',
+    sharedHour: '小时',
+    sharedMinute: '分钟',
+    sharedSecond: '秒',
 
-    error_title: '错误',
-    error_unknown: '未知错误',
+    errorTitle: '错误',
+    errorUnknown: '未知错误',
 
-    user_name: '名字',
-    user_email: '邮箱',
-    user_password: '密码',
-    user_admin: '管理员',
+    userName: '名字',
+    userEmail: '邮箱',
+    userPassword: '密码',
+    userAdmin: '管理员',
 
-    login_title: '登录',
-    login_language: '语言',
-    login_register: '注册',
-    login_login: '登录',
-    login_failed: '邮箱地址或密码不对',
-    login_created: '新用户已经被注册了',
-    login_logout: '登出',
+    loginTitle: '登录',
+    loginLanguage: '语言',
+    loginRegister: '注册',
+    loginLogin: '登录',
+    loginFailed: '邮箱地址或密码不对',
+    loginCreated: '新用户已经被注册了',
+    loginLogout: '登出',
 
-    device_dialog: '设备',
-    device_title: '设备',
-    device_name: '名字',
-    device_identifier: '标识符',
-    device_command: '指令',
+    deviceDialog: '设备',
+    deviceTitle: '设备',
+    deviceName: '名字',
+    deviceIdentifier: '标识符',
+    deviceCommand: '指令',
 
-    settings_title: '设置',
-    settings_user: '账户',
-    settings_server: '服务器',
-    settings_users: '用户',
-    settings_distance_unit: '距离',
-    settings_speed_unit: '速度',
+    settingsTitle: '设置',
+    settingsUser: '账户',
+    settingsServer: '服务器',
+    settingsUsers: '用户',
+    settingsDistanceUnit: '距离',
+    settingsSpeedUnit: '速度',
 
-    report_title: '报表',
-    report_device: '设备',
-    report_from: '开始',
-    report_to: '结束',
-    report_show: '显示',
-    report_clear: '清空',
+    reportTitle: '报表',
+    reportDevice: '设备',
+    reportFrom: '开始',
+    reportTo: '结束',
+    reportShow: '显示',
+    reportClear: '清空',
 
-    position_time: '时间',
-    position_valid: '有效',
-    position_latitude: '纬度',
-    position_longitude: '经度',
-    position_altitude: '海拔',
-    position_speed: '速度',
-    position_course: '航向',
-    position_address: '地址',
-    position_protocol: '协议',
+    positionTime: '时间',
+    positionValid: '有效',
+    positionLatitude: '纬度',
+    positionLongitude: '经度',
+    positionAltitude: '海拔',
+    positionSpeed: '速度',
+    positionCourse: '航向',
+    positionAddress: '地址',
+    positionProtocol: '协议',
 
-    server_title: '服务器设置',
-    server_zoom: '缩放',
-    server_registration: '注册',
+    serverTitle: '服务器设置',
+    serverZoom: '缩放',
+    serverRegistration: '注册',
 
-    map_title: '地图',
-    map_layer: '地图图层',
-    map_osm: 'OpenStreetMap 地图',
-    map_bing_road: 'Bing 公路线路地图',
-    map_bing_aerial: 'Bing 航测地图',
+    mapTitle: '地图',
+    mapLayer: '地图图层',
+    mapOsm: 'OpenStreetMap 地图',
+    mapBingRoad: 'Bing 公路线路地图',
+    mapBingAerial: 'Bing 航测地图',
 
-    state_title: '状态',
-    state_name: '参数',
-    state_value: '数值',
+    stateTitle: '状态',
+    stateName: '参数',
+    stateValue: '数值',
 
-    command_title: '命令',
-    command_send: '发送',
-    command_type: '类型',
-    command_position_periodic: '位置获取',
-    command_position_stop: '位置停止',
-    command_engine_stop: '引擎熄火',
-    command_engine_resume: '引擎启动',
-    command_frequency: '频率',
-    command_unit: '单位'
+    commandTitle: '命令',
+    commandSend: '发送',
+    commandType: '类型',
+    commandPositionPeriodic: '位置获取',
+    commandPositionStop: '位置停止',
+    commandEngineStop: '引擎熄火',
+    commandEngineResume: '引擎启动',
+    commandFrequency: '频率',
+    commandUnit: '单位'
 };