Re-organize strings for localization

3 files changed, 17 insertions, 17 deletions

diff --git a/web/app/view/user/User.js b/web/app/view/user/User.js
index fa9c9201a..76779ef79 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.device_add,
+        text: strings.shared_add,
         handler: 'onAddClick',
         reference: 'deviceAddButton'
     }, {
-        text: strings.device_edit,
+        text: strings.shared_edit,
         disabled: true,
         handler: 'onEditClick',
         reference: 'userEditButton'
     }, {
-        text: strings.device_remove,
+        text: strings.shared_remove,
         disabled: true,
         handler: 'onRemoveClick',
         reference: 'userRemoveButton'
@@ -48,9 +48,9 @@ Ext.define('Traccar.view.user.User', {
     },
 
     columns: [
-        { text: strings.login_name, dataIndex: 'name', flex: 1 },
-        { text: strings.login_email, dataIndex: 'email', flex: 1 },
-        { text: strings.login_admin, dataIndex: 'admin', flex: 1 }
+        { text: strings.user_name, dataIndex: 'name', flex: 1 },
+        { text: strings.user_email, dataIndex: 'email', flex: 1 },
+        { text: strings.user_admin, dataIndex: 'admin', flex: 1 }
     ]
 
 });
diff --git a/web/app/view/user/UserController.js b/web/app/view/user/UserController.js
index 2b587b3d3..510a7d6c8 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.login_user_title,
-            message: strings.user_remove_confirm,
+            title: strings.settings_user,
+            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') {
diff --git a/web/app/view/user/UserDialog.js b/web/app/view/user/UserDialog.js
index fba182eb1..3db21de6c 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.login_user_title,
+    title: strings.settings_user,
     resizable: false,
     modal: true,
     
@@ -34,22 +34,22 @@ Ext.define('Traccar.view.user.UserDialog', {
         items: [{
             xtype: 'textfield',
             name: 'name',
-            fieldLabel: strings.login_name
+            fieldLabel: strings.user_name
         }, {
             xtype: 'textfield',
             name: 'email',
-            fieldLabel: strings.login_email,
+            fieldLabel: strings.user_email,
             allowBlank: false
         }, {
             xtype: 'textfield',
             name: 'password',
-            fieldLabel: strings.login_password,
+            fieldLabel: strings.user_password,
             inputType: 'password',
             allowBlank: false
         }, {
             xtype: 'checkboxfield',
             name: 'admin',
-            fieldLabel: strings.login_admin,
+            fieldLabel: strings.user_admin,
             allowBlank: false,
             disabled: true,
             reference: 'adminField'
@@ -57,10 +57,10 @@ Ext.define('Traccar.view.user.UserDialog', {
     },
 
     buttons: [{
-        text: strings.dialog_save,
+        text: strings.shared_save,
         handler: 'onSaveClick'
     }, {
-        text: strings.dialog_cancel,
+        text: strings.shared_cancel,
         handler: 'onCancelClick'
     }]