aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIrving Gonzalez <ialexis93@gmail.com>2015-07-27 23:05:36 -0600
committerIrving Gonzalez <ialexis93@gmail.com>2015-07-27 23:05:36 -0600
commit76b883fcb008bffea756be80b301cd6934b122ac (patch)
tree6a7d6bb9a66d86804a1db667ae5f1d4988911fcd
parent23785ccc618d65ea197ed9e081bf033ea8d64a7e (diff)
parent326b666573a3ca0bbe0f219f3dfe60417d630c44 (diff)
downloadtrackermap-server-76b883fcb008bffea756be80b301cd6934b122ac.tar.gz
trackermap-server-76b883fcb008bffea756be80b301cd6934b122ac.tar.bz2
trackermap-server-76b883fcb008bffea756be80b301cd6934b122ac.zip
Merge branch 'master' of https://github.com/tananaev/traccar
-rw-r--r--web/l10n/cn.js32
-rw-r--r--web/l10n/ru.js48
2 files changed, 40 insertions, 40 deletions
diff --git a/web/l10n/cn.js b/web/l10n/cn.js
index 02f4c2914..78f364b86 100644
--- a/web/l10n/cn.js
+++ b/web/l10n/cn.js
@@ -10,9 +10,9 @@ var strings = {
shared_mi: '海里',
shared_kph: '千米/小时',
shared_mph: '每小时英里数',
- shared_hour: 'Hour (*)',
- shared_minute: 'Minute (*)',
- shared_second: 'Second (*)',
+ shared_hour: '小时',
+ shared_minute: '分钟',
+ shared_second: '秒',
error_title: '错误',
error_unknown: '未知错误',
@@ -23,7 +23,7 @@ var strings = {
user_admin: '管理员',
login_title: '登录',
- login_language: 'Language (*)',
+ login_language: '语言',
login_register: '注册',
login_login: '登录',
login_failed: '邮箱地址或密码不对',
@@ -34,7 +34,7 @@ var strings = {
device_title: '设备',
device_name: '名字',
device_identifier: '标识符',
- device_command: 'Command (*)',
+ device_command: '指令',
settings_title: '设置',
settings_user: '账户',
@@ -67,20 +67,20 @@ var strings = {
map_title: '地图',
map_layer: '地图图层',
map_osm: 'OpenStreetMap 地图',
- map_bing_road: 'Bing Maps Road (*)',
- map_bing_aerial: 'Bing Maps Aerial (*)',
+ map_bing_road: 'Bing 公路线路地图',
+ map_bing_aerial: 'Bing 航测地图',
state_title: '状态',
state_name: '参数',
state_value: '数值',
- command_title: 'Command (*)',
- command_send: 'Send (*)',
- command_type: 'Type (*)',
- command_position_stop: 'Position Stop (*)',
- command_position_fix: 'Position Fix (*)',
- command_engine_stop: 'Engine Stop (*)',
- command_engine_resume: 'Engine Resume (*)',
- command_frequency: 'Frequency (*)',
- command_unit: 'Unit (*)'
+ command_title: '命令',
+ command_send: '发送',
+ command_type: '类型',
+ command_position_stop: '位置停止',
+ command_position_fix: '位置获取',
+ command_engine_stop: '引擎熄火',
+ command_engine_resume: '引擎启动',
+ command_frequency: '频率',
+ command_unit: '单位'
};
diff --git a/web/l10n/ru.js b/web/l10n/ru.js
index c3c0404ce..481aa2cac 100644
--- a/web/l10n/ru.js
+++ b/web/l10n/ru.js
@@ -6,13 +6,13 @@ var strings = {
shared_edit: 'Редактировать',
shared_remove: 'Удалить',
shared_remove_confirm: 'Удалить элемент?',
- shared_km: 'km (*)',
- shared_mi: 'mi (*)',
- shared_kph: 'km/h (*)',
- shared_mph: 'mph (*)',
- shared_hour: 'Hour (*)',
- shared_minute: 'Minute (*)',
- shared_second: 'Second (*)',
+ shared_km: 'км',
+ shared_mi: 'мили',
+ shared_kph: 'км/ч',
+ shared_mph: 'миль/ч',
+ shared_hour: 'Часы',
+ shared_minute: 'Минуты',
+ shared_second: 'Секунды',
error_title: 'Ошибка',
error_unknown: 'Неизвестная ошибка',
@@ -23,7 +23,7 @@ var strings = {
user_admin: 'Администратор',
login_title: 'Вход',
- login_language: 'Language (*)',
+ login_language: 'Язык',
login_register: 'Регистрация',
login_login: 'Вход',
login_failed: 'Неправильный email адрес или пароль',
@@ -34,14 +34,14 @@ var strings = {
device_title: 'Устройства',
device_name: 'Название',
device_identifier: 'Идентификатор',
- device_command: 'Command (*)',
+ device_command: 'Команда',
settings_title: 'Настройки',
settings_user: 'Аккаунт',
settings_server: 'Сервер',
settings_users: 'Пользователи',
- settings_distance_unit: 'Distance (*)',
- settings_speed_unit: 'Speed (*)',
+ settings_distance_unit: 'Расстояние',
+ settings_speed_unit: 'Скорость',
report_title: 'Отчеты',
report_device: 'Устройтво',
@@ -65,22 +65,22 @@ var strings = {
server_registration: 'Регистрация',
map_title: 'Карта',
- map_layer: 'Map Layer (*)',
- map_osm: 'Open Street Map (*)',
- map_bing_road: 'Bing Maps Road (*)',
- map_bing_aerial: 'Bing Maps Aerial (*)',
+ map_layer: 'Слой Карты',
+ map_osm: 'Open Street Map',
+ map_bing_road: 'Bing Maps Дороги',
+ map_bing_aerial: 'Bing Maps Спутник',
state_title: 'Состояние',
state_name: 'Параметр',
state_value: 'Значение',
- command_title: 'Command (*)',
- command_send: 'Send (*)',
- command_type: 'Type (*)',
- command_position_stop: 'Position Stop (*)',
- command_position_fix: 'Position Fix (*)',
- command_engine_stop: 'Engine Stop (*)',
- command_engine_resume: 'Engine Resume (*)',
- command_frequency: 'Frequency (*)',
- command_unit: 'Unit (*)'
+ command_title: 'Команда',
+ command_send: 'Отправить',
+ command_type: 'Тип',
+ command_position_stop: 'Отменить Отслеживание',
+ command_position_fix: 'Начать Отслеживание',
+ command_engine_stop: 'Заблокировать Двигатель',
+ command_engine_resume: 'Разблокировать Двигатель',
+ command_frequency: 'Частота',
+ command_unit: 'Единицы'
};