Re-organize strings for localization

3 files changed, 18 insertions, 17 deletions

diff --git a/web/app/view/device/Device.js b/web/app/view/device/Device.js
index 25c067242..0f8cb876e 100644
--- a/web/app/view/device/Device.js
+++ b/web/app/view/device/Device.js
@@ -29,39 +29,40 @@ Ext.define('Traccar.view.device.Device', {
     selType: 'rowmodel',
     
     tbar: [{
-        text: strings.device_add,
+        text: strings.shared_add,
         handler: 'onAddClick',
-        reference: 'deviceAddButton'
+        reference: 'deviceAddButton',
+        glyph: 'xf067@FontAwesome'
     }, {
-        text: strings.device_edit,
         disabled: true,
         handler: 'onEditClick',
-        reference: 'deviceEditButton'
+        reference: 'deviceEditButton',
+        glyph: 'xf040@FontAwesome'
     }, {
-        text: strings.device_remove,
         disabled: true,
         handler: 'onRemoveClick',
-        reference: 'deviceRemoveButton'
+        reference: 'deviceRemoveButton',
+        glyph: 'xf00d@FontAwesome'
     }, {
         xtype: 'tbfill'
     }, {
-        text: strings.device_settings,
+        text: strings.settings_title,
         menu: [{
-            text: strings.device_settings_user,
+            text: strings.settings_user,
             handler: 'onUserClick'
         }, {
-            text: strings.device_settings_server,
+            text: strings.settings_server,
             disabled: true,
             handler: 'onServerClick',
             reference: 'settingsServerButton'
         }, {
-            text: strings.device_settings_users,
+            text: strings.settings_users,
             disabled: true,
             handler: 'onUsersClick',
             reference: 'settingsUsersButton'
         }]
     }, {
-        text: strings.device_logout,
+        text: strings.login_logout,
         handler: 'onLogoutClick'
     }],
 
diff --git a/web/app/view/device/DeviceController.js b/web/app/view/device/DeviceController.js
index ba9eabb5a..c85ac731a 100644
--- a/web/app/view/device/DeviceController.js
+++ b/web/app/view/device/DeviceController.js
@@ -64,11 +64,11 @@ Ext.define('Traccar.view.device.DeviceController', {
         var device = this.getView().getSelectionModel().getSelection()[0];
         Ext.Msg.show({
             title: strings.device_dialog,
-            message: strings.device_remove_confirm,
+            message: strings.shared_remove_confirm,
             buttons: Ext.Msg.YESNO,
             buttonText: {
-                yes: strings.dialog_delete,
-                no: strings.dialog_cancel
+                yes: strings.shared_remove,
+                no: strings.shared_cancel
             },
             fn: function(btn) {
                 if (btn === 'yes') {
@@ -105,7 +105,7 @@ Ext.define('Traccar.view.device.DeviceController', {
 
     onUsersClick: function() {
         Ext.create('Ext.window.Window', {
-            title: strings.login_users_title,
+            title: strings.settings_users,
             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 7a5a192bd..5d2b30ddc 100644
--- a/web/app/view/device/DeviceDialog.js
+++ b/web/app/view/device/DeviceDialog.js
@@ -45,10 +45,10 @@ Ext.define('Traccar.view.device.DeviceDialog', {
     },
 
     buttons: [{
-        text: strings.dialog_save,
+        text: strings.shared_save,
         handler: 'onSaveClick'
     }, {
-        text: strings.dialog_cancel,
+        text: strings.shared_cancel,
         handler: 'onCancelClick'
     }]