3 files changed, 22 insertions, 22 deletions

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'
     }]