Re-organize strings for localization

2 files changed, 86 insertions, 96 deletions

diff --git a/web/l10n/en.js b/web/l10n/en.js
index 78970b5b0..881eb9fc3 100644
--- a/web/l10n/en.js
+++ b/web/l10n/en.js
@@ -1,36 +1,36 @@
 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?',
 
     error_title: 'Error',
     error_unknown: 'Unknown error',
 
+    user_name: 'Name',
+    user_email: 'Email',
+    user_password: 'Password',
+    user_admin: 'Admin',
+
     login_title: 'Login',
-    login_user_title: 'User',
-    login_users_title: 'Users',
-    login_name: 'Name',
-    login_email: 'Email',
-    login_password: 'Password',
-    login_admin: 'Admin',
     login_register: 'Register',
     login_login: 'Login',
     login_failed: 'Incorrect email address or password',
     login_created: 'New user has been registered',
-
-    user_remove_confirm: 'Remove user?',
+    login_logout: 'Logout',
 
     device_dialog: 'Device',
     device_title: 'Devices',
     device_name: 'Name',
     device_identifier: 'Identifier',
-    device_remove_confirm: 'Remove device?',
-    device_add: 'Add',
-    device_edit: 'Edit',
-    device_remove: 'Remove',
-    device_logout: 'Logout',
-    device_settings: 'Settings',
-    device_settings_user: 'Account',
-    device_settings_server: 'Server',
-    device_settings_users: 'Users',
+
+    settings_title: 'Settings',
+    settings_user: 'Account',
+    settings_server: 'Server',
+    settings_users: 'Users',
 
     report_title: 'Reports',
     report_device: 'Device',
@@ -38,29 +38,24 @@ var strings =  {
     report_to: 'To',
     report_show: 'Show',
     report_clear: 'Clear',
-    report_time: 'Time',
-    report_valid: 'Valid',
-    report_latitude: 'Latitude',
-    report_longitude: 'Longitude',
-    report_altitude: 'Altitude',
-    report_speed: 'Speed',
-    report_course: 'Course',
-    report_address: 'Address',
 
-    server_title: 'Server settings',
-    server_latitude: 'Latitude',
-    server_longitude: 'Longitude',
+    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',
+
+    server_title: 'Server Settings',
     server_zoom: 'Zoom',
     server_registration: 'Registration',
 
-    dialog_save: 'Save',
-    dialog_delete: 'Delete',
-    dialog_cancel: 'Cancel',
-
     map_title: 'Map',
 
     state_title: 'State',
     state_name: 'Parameter',
-    state_value: 'Value',
-    state_protocol: 'Protocol'
+    state_value: 'Value'
 };
diff --git a/web/l10n/ru.js b/web/l10n/ru.js
index b678f2de1..4b599a36a 100644
--- a/web/l10n/ru.js
+++ b/web/l10n/ru.js
@@ -1,66 +1,61 @@
 var strings =  {
-    shared_loading: 'Loading...',
-
-    error_title: 'Error',
-    error_unknown: 'Unknown error',
-
-    login_title: 'Логин',
-    login_user_title: 'Пользователь',
-    login_users_title: 'Users',
-    login_name: 'Имя',
-    login_email: 'Email',
-    login_password: 'Пароль',
-    login_admin: 'Admin',
+    shared_loading: 'Загрузка...',
+    shared_save: 'Сохранить',
+    shared_cancel: 'Отмена',
+    shared_add: 'Добавить',
+    shared_edit: 'Редактировать',
+    shared_remove: 'Удалить',
+    shared_remove_confirm: 'Удалить элемент?',
+
+    error_title: 'Ошибка',
+    error_unknown: 'Неизвестная ошибка',
+
+    user_name: 'Имя',
+    user_email: 'Email',
+    user_password: 'Пароль',
+    user_admin: 'Администратор',
+
+    login_title: 'Вход',
     login_register: 'Регистрация',
     login_login: 'Вход',
-    login_failed: 'Incorrect email address or password',
-    login_created: 'New user has been registered',
-
-    user_remove_confirm: 'Remove user?',
-
-    device_dialog: 'Device',
-    device_title: 'Devices',
-    device_name: 'Name',
-    device_identifier: 'Identifier',
-    device_remove_confirm: 'Remove device?',
-    device_add: 'Add',
-    device_edit: 'Edit',
-    device_remove: 'Remove',
-    device_logout: 'Logout',
-    device_settings: 'Settings',
-    device_settings_user: 'Account',
-    device_settings_server: 'Server',
-    device_settings_users: 'Users',
-
-    report_title: 'Reports',
-    report_device: 'Device',
-    report_from: 'From',
-    report_to: 'To',
-    report_show: 'Show',
-    report_clear: 'Clear',
-    report_time: 'Time',
-    report_valid: 'Valid',
-    report_latitude: 'Latitude',
-    report_longitude: 'Longitude',
-    report_altitude: 'Altitude',
-    report_speed: 'Speed',
-    report_course: 'Course',
-    report_address: 'Address',
-
-    server_title: 'Server settings',
-    server_latitude: 'Latitude',
-    server_longitude: 'Longitude',
-    server_zoom: 'Zoom',
-    server_registration: 'Registration',
-
-    dialog_save: 'Save',
-    dialog_delete: 'Delete',
-    dialog_cancel: 'Cancel',
-
-    map_title: 'Map',
-
-    state_title: 'State',
-    state_name: 'Parameter',
-    state_value: 'Value',
-    state_protocol: 'Protocol'
+    login_failed: 'Неправильный email адрес или пароль',
+    login_created: 'Новый пользователь зарегистрирован',
+    login_logout: 'Выход',
+
+    device_dialog: 'Устройство',
+    device_title: 'Устройства',
+    device_name: 'Название',
+    device_identifier: 'Идентификатор',
+
+    settings_title: 'Настройки',
+    settings_user: 'Аккаунт',
+    settings_server: 'Сервер',
+    settings_users: 'Пользователи',
+
+    report_title: 'Отчеты',
+    report_device: 'Устройтво',
+    report_from: 'С',
+    report_to: 'По',
+    report_show: 'Показать',
+    report_clear: 'Очистить',
+
+    position_time: 'Время',
+    position_valid: 'Корректность',
+    position_latitude: 'Широта',
+    position_longitude: 'Долгота',
+    position_altitude: 'Высота',
+    position_speed: 'Скорость',
+    position_course: 'Курс',
+    position_address: 'Адрес',
+    position_protocol: 'Протокол',
+
+    server_title: 'Настройки Сервера',
+    server_zoom: 'Приближение',
+    server_registration: 'Регистрация',
+
+    map_title: 'Карта',
+
+    state_title: 'Состояние',
+    state_name: 'Параметр',
+    state_value: 'Значение'
 };