aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/protocol/H02ProtocolDecoder.java2
-rw-r--r--test/org/traccar/protocol/H02ProtocolDecoderTest.java3
-rwxr-xr-xtools/translate.py34
-rw-r--r--web/l10n/cn.js26
-rw-r--r--web/l10n/de.js27
-rw-r--r--web/l10n/es.js27
-rw-r--r--web/l10n/fr.js147
-rw-r--r--web/l10n/pl.js147
-rw-r--r--web/l10n/pt.js39
-rw-r--r--web/l10n/ru.js27
-rw-r--r--[-rwxr-xr-x]web/l10n/th.js147
11 files changed, 428 insertions, 198 deletions
diff --git a/src/org/traccar/protocol/H02ProtocolDecoder.java b/src/org/traccar/protocol/H02ProtocolDecoder.java
index e3130305b..9b58af854 100644
--- a/src/org/traccar/protocol/H02ProtocolDecoder.java
+++ b/src/org/traccar/protocol/H02ProtocolDecoder.java
@@ -83,7 +83,7 @@ public class H02ProtocolDecoder extends BaseProtocolDecoder {
// Location
double latitude = readCoordinate(buf, false);
- int x = buf.readByte(); // reserved
+ position.set(Event.KEY_POWER, buf.readByte());
double longitude = readCoordinate(buf, true);
int flags = buf.readUnsignedByte() & 0x0f;
position.setValid((flags & 0x02) != 0);
diff --git a/test/org/traccar/protocol/H02ProtocolDecoderTest.java b/test/org/traccar/protocol/H02ProtocolDecoderTest.java
index 18ae70f99..b7d356ff0 100644
--- a/test/org/traccar/protocol/H02ProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/H02ProtocolDecoderTest.java
@@ -96,6 +96,9 @@ public class H02ProtocolDecoderTest extends ProtocolDecoderTest {
verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
"24270517030820321418041423307879000463213792000056fffff9ffff0000"))));
+ verify(decoder.decode(null, null, ChannelBuffers.wrappedBuffer(ChannelBufferTools.convertHexString(
+ "2441091144271222470112142233983006114026520E000000FFFFFBFFFF0014060000000001CC00262B0F170A"))));
+
}
}
diff --git a/tools/translate.py b/tools/translate.py
new file mode 100755
index 000000000..69c55979b
--- /dev/null
+++ b/tools/translate.py
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+
+import re
+import os
+
+path = '../web/l10n/'
+
+files = [f for f in os.listdir(path) if os.path.isfile(path + f) and f.endswith('.js') and not f.endswith('en.js')]
+for f in files:
+ f = path + f
+
+ dict = {}
+
+ for line in open(f).read().splitlines():
+ match = re.search(" (\\w+): '(.+)'(,)?", line)
+ if match:
+ dict[match.group(1)] = match.group(2)
+
+ out = open(f, 'w')
+
+ for line in open(path + 'en.js').read().splitlines():
+ match = re.search(" (\\w+): '(.+)'(,)?", line)
+ if match:
+ if dict.has_key(match.group(1)):
+ value = dict[match.group(1)]
+ else:
+ value = match.group(2) + ' (*)'
+
+ out.write(' ' + match.group(1) + ": '" + value + "'")
+ if match.group(3) is not None:
+ out.write(',')
+ out.write('\n')
+ else:
+ out.write(line + '\n')
diff --git a/web/l10n/cn.js b/web/l10n/cn.js
index 926671608..02f4c2914 100644
--- a/web/l10n/cn.js
+++ b/web/l10n/cn.js
@@ -8,9 +8,12 @@ var strings = {
shared_remove_confirm: '要移除选项吗?',
shared_km: '千米',
shared_mi: '海里',
-
shared_kph: '千米/小时',
shared_mph: '每小时英里数',
+ shared_hour: 'Hour (*)',
+ shared_minute: 'Minute (*)',
+ shared_second: 'Second (*)',
+
error_title: '错误',
error_unknown: '未知错误',
@@ -20,16 +23,18 @@ var strings = {
user_admin: '管理员',
login_title: '登录',
+ login_language: 'Language (*)',
login_register: '注册',
login_login: '登录',
login_failed: '邮箱地址或密码不对',
-
login_created: '新用户已经被注册了',
login_logout: '登出',
+
device_dialog: '设备',
device_title: '设备',
device_name: '名字',
device_identifier: '标识符',
+ device_command: 'Command (*)',
settings_title: '设置',
settings_user: '账户',
@@ -54,6 +59,7 @@ var strings = {
position_course: '航向',
position_address: '地址',
position_protocol: '协议',
+
server_title: '服务器设置',
server_zoom: '缩放',
server_registration: '注册',
@@ -61,8 +67,20 @@ var strings = {
map_title: '地图',
map_layer: '地图图层',
map_osm: 'OpenStreetMap 地图',
- map_bing: 'Bing 地图',
+ map_bing_road: 'Bing Maps Road (*)',
+ map_bing_aerial: 'Bing Maps Aerial (*)',
+
state_title: '状态',
state_name: '参数',
- state_value: '数值'
+ 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 (*)'
};
diff --git a/web/l10n/de.js b/web/l10n/de.js
index 20a80cf7a..115d1957e 100644
--- a/web/l10n/de.js
+++ b/web/l10n/de.js
@@ -6,6 +6,13 @@ var strings = {
shared_edit: 'Bearbeiten',
shared_remove: 'Entfernen',
shared_remove_confirm: 'Objekt entfernen?',
+ shared_km: 'km (*)',
+ shared_mi: 'mi (*)',
+ shared_kph: 'km/h (*)',
+ shared_mph: 'mph (*)',
+ shared_hour: 'Hour (*)',
+ shared_minute: 'Minute (*)',
+ shared_second: 'Second (*)',
error_title: 'Fehler',
error_unknown: 'Unbekannter Fehler',
@@ -16,6 +23,7 @@ var strings = {
user_admin: 'Admin',
login_title: 'Anmeldung',
+ login_language: 'Language (*)',
login_register: 'Registrieren',
login_login: 'Anmelden',
login_failed: 'Falsche Emailadresse oder Passwort',
@@ -26,11 +34,14 @@ var strings = {
device_title: 'Geräte',
device_name: 'Name',
device_identifier: 'Kennung',
+ device_command: 'Command (*)',
settings_title: 'Einstellungen',
settings_user: 'Benutzerkonto',
settings_server: 'Server',
settings_users: 'Benutzer',
+ settings_distance_unit: 'Distance (*)',
+ settings_speed_unit: 'Speed (*)',
report_title: 'Berichte',
report_device: 'Gerät',
@@ -54,8 +65,22 @@ var strings = {
server_registration: 'Registrierung zulassen',
map_title: 'Karte',
+ map_layer: 'Map Layer (*)',
+ map_osm: 'Open Street Map (*)',
+ map_bing_road: 'Bing Maps Road (*)',
+ map_bing_aerial: 'Bing Maps Aerial (*)',
state_title: 'Status',
state_name: 'Parameter',
- state_value: 'Wert'
+ state_value: 'Wert',
+
+ 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 (*)'
};
diff --git a/web/l10n/es.js b/web/l10n/es.js
index 5c74cab30..0b7b434ba 100644
--- a/web/l10n/es.js
+++ b/web/l10n/es.js
@@ -6,6 +6,13 @@ var strings = {
shared_edit: 'Editar',
shared_remove: 'Borrar',
shared_remove_confirm: 'Borrar item?',
+ shared_km: 'km (*)',
+ shared_mi: 'mi (*)',
+ shared_kph: 'km/h (*)',
+ shared_mph: 'mph (*)',
+ shared_hour: 'Hour (*)',
+ shared_minute: 'Minute (*)',
+ shared_second: 'Second (*)',
error_title: 'Error',
error_unknown: 'Error Desconocido',
@@ -16,6 +23,7 @@ var strings = {
user_admin: 'Admin',
login_title: 'Ingresar',
+ login_language: 'Language (*)',
login_register: 'Registrar',
login_login: 'Ingresar',
login_failed: 'Direccion de correo o Contraseña Incorrecta',
@@ -26,11 +34,14 @@ var strings = {
device_title: 'Dispositivos',
device_name: 'Nombre',
device_identifier: 'Identificador',
+ device_command: 'Command (*)',
settings_title: 'Preferencias',
settings_user: 'Cuenta',
settings_server: 'Servidor',
settings_users: 'Usuarios',
+ settings_distance_unit: 'Distance (*)',
+ settings_speed_unit: 'Speed (*)',
report_title: 'Reportes',
report_device: 'Dispositivos',
@@ -54,8 +65,22 @@ var strings = {
server_registration: 'Registrar',
map_title: 'Mapa',
+ map_layer: 'Map Layer (*)',
+ map_osm: 'Open Street Map (*)',
+ map_bing_road: 'Bing Maps Road (*)',
+ map_bing_aerial: 'Bing Maps Aerial (*)',
state_title: 'Estado',
state_name: 'Parametro',
- state_value: 'Valor'
+ state_value: 'Valor',
+
+ 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 (*)'
};
diff --git a/web/l10n/fr.js b/web/l10n/fr.js
index 39efd8370..1061aa974 100644
--- a/web/l10n/fr.js
+++ b/web/l10n/fr.js
@@ -1,61 +1,86 @@
-var strings = {
- shared_loading: 'Chargement...',
- shared_save: 'Enregistrer',
- shared_cancel: 'Annuler',
- shared_add: 'Ajouter',
- shared_edit: 'Editer',
- shared_remove: 'Effacer',
- shared_remove_confirm: 'Effacer item?',
-
- error_title: 'Erreur',
- error_unknown: 'Erreur inconnue',
-
- user_name: 'Nom',
- user_email: 'Email',
- user_password: 'Mot de Passe',
- user_admin: 'Admin',
-
- login_title: 'Identification',
- login_register: 'Inscription',
- login_login: 'Se connecter',
- login_failed: 'Adresse email ou mot de passe incorrect',
- login_created: 'New user has been registered',
- login_logout: 'Déconnection',
-
- device_dialog: 'Dispositif',
- device_title: 'Dispositifs',
- device_name: 'Nom',
- device_identifier: 'Identifiant',
-
- settings_title: 'Configurations',
- settings_user: 'Compte',
- settings_server: 'Serveur',
- settings_users: 'Utilisateurs',
-
- report_title: 'Rapports',
- report_device: 'Dispositif',
- report_from: 'De',
- report_to: 'A',
- report_show: 'Afficher',
- report_clear: 'Effacer',
-
- position_time: 'Heure',
- position_valid: 'Valide',
- position_latitude: 'Latitude',
- position_longitude: 'Longitude',
- position_altitude: 'Altitude',
- position_speed: 'Vitesse',
- position_course: 'Sense',
- position_address: 'Adresse',
- position_protocol: 'Protocole',
-
- server_title: 'Configurations du Serveur Settings',
- server_zoom: 'Zoom',
- server_registration: 'Inscription',
-
- map_title: 'Carte',
-
- state_title: 'Etat',
- state_name: 'Paramètre',
- state_value: 'Valeur'
-};
+var strings = {
+ shared_loading: 'Chargement...',
+ shared_save: 'Enregistrer',
+ shared_cancel: 'Annuler',
+ shared_add: 'Ajouter',
+ shared_edit: 'Editer',
+ shared_remove: 'Effacer',
+ shared_remove_confirm: 'Effacer item?',
+ shared_km: 'km (*)',
+ shared_mi: 'mi (*)',
+ shared_kph: 'km/h (*)',
+ shared_mph: 'mph (*)',
+ shared_hour: 'Hour (*)',
+ shared_minute: 'Minute (*)',
+ shared_second: 'Second (*)',
+
+ error_title: 'Erreur',
+ error_unknown: 'Erreur inconnue',
+
+ user_name: 'Nom',
+ user_email: 'Email',
+ user_password: 'Mot de Passe',
+ user_admin: 'Admin',
+
+ login_title: 'Identification',
+ login_language: 'Language (*)',
+ login_register: 'Inscription',
+ login_login: 'Se connecter',
+ login_failed: 'Adresse email ou mot de passe incorrect',
+ login_created: 'New user has been registered',
+ login_logout: 'Déconnection',
+
+ device_dialog: 'Dispositif',
+ device_title: 'Dispositifs',
+ device_name: 'Nom',
+ device_identifier: 'Identifiant',
+ device_command: 'Command (*)',
+
+ settings_title: 'Configurations',
+ settings_user: 'Compte',
+ settings_server: 'Serveur',
+ settings_users: 'Utilisateurs',
+ settings_distance_unit: 'Distance (*)',
+ settings_speed_unit: 'Speed (*)',
+
+ report_title: 'Rapports',
+ report_device: 'Dispositif',
+ report_from: 'De',
+ report_to: 'A',
+ report_show: 'Afficher',
+ report_clear: 'Effacer',
+
+ position_time: 'Heure',
+ position_valid: 'Valide',
+ position_latitude: 'Latitude',
+ position_longitude: 'Longitude',
+ position_altitude: 'Altitude',
+ position_speed: 'Vitesse',
+ position_course: 'Sense',
+ position_address: 'Adresse',
+ position_protocol: 'Protocole',
+
+ server_title: 'Configurations du Serveur Settings',
+ server_zoom: 'Zoom',
+ server_registration: 'Inscription',
+
+ map_title: 'Carte',
+ map_layer: 'Map Layer (*)',
+ map_osm: 'Open Street Map (*)',
+ map_bing_road: 'Bing Maps Road (*)',
+ map_bing_aerial: 'Bing Maps Aerial (*)',
+
+ state_title: 'Etat',
+ state_name: 'Paramètre',
+ state_value: 'Valeur',
+
+ 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 (*)'
+};
diff --git a/web/l10n/pl.js b/web/l10n/pl.js
index 332406b6b..ebbe21151 100644
--- a/web/l10n/pl.js
+++ b/web/l10n/pl.js
@@ -1,61 +1,86 @@
-var strings = {
- shared_loading: 'Wczytywanie...',
- shared_save: 'Zapisz',
- shared_cancel: 'Anuluj',
- shared_add: 'Dodaj',
- shared_edit: 'Edytuj',
- shared_remove: 'Usuń',
- shared_remove_confirm: 'Usuń obiekt?',
-
- error_title: 'Bląd',
- error_unknown: 'Nieznany błąd',
-
- user_name: 'Nazwa',
- user_email: 'Email',
- user_password: 'Hasło',
- user_admin: 'Administrator',
-
- login_title: 'Logowanie',
- login_register: 'Rejestracja',
- login_login: 'Zaloguj',
- login_failed: 'Nieprawidłowy adres e-mail lub hasło',
- login_created: 'Nowy użytkownik został zarejestrowany',
- login_logout: 'Wyloguj',
-
- device_dialog: 'Urządzenie',
- device_title: 'Urządzenia',
- device_name: 'Nazwa',
- device_identifier: 'Identyfikator',
-
- settings_title: 'Ustawienia',
- settings_user: 'Konto',
- settings_server: 'Serwer',
- settings_users: 'Użytkownicy',
-
- report_title: 'Raporty',
- report_device: 'Urządzenie',
- report_from: 'Z',
- report_to: 'Do',
- report_show: 'Wczytaj',
- report_clear: 'Wyczyść',
-
- position_time: 'Czas',
- position_valid: 'Aktywny',
- position_latitude: 'Szerokość',
- position_longitude: 'Długość',
- position_altitude: 'Wysokość',
- position_speed: 'Prędkość',
- position_course: 'Kurs',
- position_address: 'Adres',
- position_protocol: 'Protokół',
-
- server_title: 'Ustawienia serwera',
- server_zoom: 'Powiększenie',
- server_registration: 'Rejestracja',
-
- map_title: 'Mapa',
-
- state_title: 'Lokalizacja',
- state_name: 'Właściwości',
- state_value: 'Wartość'
-};
+var strings = {
+ shared_loading: 'Wczytywanie...',
+ shared_save: 'Zapisz',
+ shared_cancel: 'Anuluj',
+ shared_add: 'Dodaj',
+ shared_edit: 'Edytuj',
+ shared_remove: 'Usuń',
+ shared_remove_confirm: 'Usuń obiekt?',
+ shared_km: 'km (*)',
+ shared_mi: 'mi (*)',
+ shared_kph: 'km/h (*)',
+ shared_mph: 'mph (*)',
+ shared_hour: 'Hour (*)',
+ shared_minute: 'Minute (*)',
+ shared_second: 'Second (*)',
+
+ error_title: 'Bląd',
+ error_unknown: 'Nieznany błąd',
+
+ user_name: 'Nazwa',
+ user_email: 'Email',
+ user_password: 'Hasło',
+ user_admin: 'Administrator',
+
+ login_title: 'Logowanie',
+ login_language: 'Language (*)',
+ login_register: 'Rejestracja',
+ login_login: 'Zaloguj',
+ login_failed: 'Nieprawidłowy adres e-mail lub hasło',
+ login_created: 'Nowy użytkownik został zarejestrowany',
+ login_logout: 'Wyloguj',
+
+ device_dialog: 'Urządzenie',
+ device_title: 'Urządzenia',
+ device_name: 'Nazwa',
+ device_identifier: 'Identyfikator',
+ device_command: 'Command (*)',
+
+ settings_title: 'Ustawienia',
+ settings_user: 'Konto',
+ settings_server: 'Serwer',
+ settings_users: 'Użytkownicy',
+ settings_distance_unit: 'Distance (*)',
+ settings_speed_unit: 'Speed (*)',
+
+ report_title: 'Raporty',
+ report_device: 'Urządzenie',
+ report_from: 'Z',
+ report_to: 'Do',
+ report_show: 'Wczytaj',
+ report_clear: 'Wyczyść',
+
+ position_time: 'Czas',
+ position_valid: 'Aktywny',
+ position_latitude: 'Szerokość',
+ position_longitude: 'Długość',
+ position_altitude: 'Wysokość',
+ position_speed: 'Prędkość',
+ position_course: 'Kurs',
+ position_address: 'Adres',
+ position_protocol: 'Protokół',
+
+ server_title: 'Ustawienia serwera',
+ server_zoom: 'Powiększenie',
+ server_registration: 'Rejestracja',
+
+ map_title: 'Mapa',
+ map_layer: 'Map Layer (*)',
+ map_osm: 'Open Street Map (*)',
+ map_bing_road: 'Bing Maps Road (*)',
+ map_bing_aerial: 'Bing Maps Aerial (*)',
+
+ state_title: 'Lokalizacja',
+ state_name: 'Właściwości',
+ state_value: 'Wartość',
+
+ 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 (*)'
+};
diff --git a/web/l10n/pt.js b/web/l10n/pt.js
index 72901f93c..436e20952 100644
--- a/web/l10n/pt.js
+++ b/web/l10n/pt.js
@@ -6,6 +6,13 @@ var strings = {
shared_edit: 'Editar',
shared_remove: 'Remover',
shared_remove_confirm: 'Remove item?',
+ shared_km: 'km (*)',
+ shared_mi: 'mi (*)',
+ shared_kph: 'km/h (*)',
+ shared_mph: 'mph (*)',
+ shared_hour: 'Hour (*)',
+ shared_minute: 'Minute (*)',
+ shared_second: 'Second (*)',
error_title: 'Erro',
error_unknown: 'Erro desconhecido',
@@ -15,22 +22,26 @@ var strings = {
user_password: 'Senha',
user_admin: 'Admin',
- login_title : 'Entre',
- login_register : 'Register',
- login_login : 'Entre',
- login_failed : 'Endereço de email ou senha incorreta',
- login_created : 'Novo usuário foi registrado',
- login_logout : 'Sair',
+ login_title: 'Login (*)',
+ login_language: 'Language (*)',
+ login_register: 'Register (*)',
+ login_login: 'Login (*)',
+ login_failed: 'Incorrect email address or password (*)',
+ login_created: 'New user has been registered (*)',
+ login_logout: 'Logout (*)',
device_dialog: 'Dispositivo',
device_title: 'Devices',
device_name: 'Nome',
device_identifier: 'Identificador',
+ device_command: 'Command (*)',
settings_title: 'Configurações',
settings_user: 'Conta',
settings_server: 'Servidor',
settings_users: 'Usuário',
+ settings_distance_unit: 'Distance (*)',
+ settings_speed_unit: 'Speed (*)',
report_title: 'Relatórios',
report_device: 'Dispositivo',
@@ -54,8 +65,22 @@ var strings = {
server_registration: 'Registro',
map_title: 'Map',
+ map_layer: 'Map Layer (*)',
+ map_osm: 'Open Street Map (*)',
+ map_bing_road: 'Bing Maps Road (*)',
+ map_bing_aerial: 'Bing Maps Aerial (*)',
state_title: 'Estado',
state_name: 'Parâmetro',
- state_value: 'Valor'
+ state_value: '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 (*)'
};
diff --git a/web/l10n/ru.js b/web/l10n/ru.js
index 56be7cf8d..c3c0404ce 100644
--- a/web/l10n/ru.js
+++ b/web/l10n/ru.js
@@ -6,6 +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 (*)',
error_title: 'Ошибка',
error_unknown: 'Неизвестная ошибка',
@@ -16,6 +23,7 @@ var strings = {
user_admin: 'Администратор',
login_title: 'Вход',
+ login_language: 'Language (*)',
login_register: 'Регистрация',
login_login: 'Вход',
login_failed: 'Неправильный email адрес или пароль',
@@ -26,11 +34,14 @@ var strings = {
device_title: 'Устройства',
device_name: 'Название',
device_identifier: 'Идентификатор',
+ device_command: 'Command (*)',
settings_title: 'Настройки',
settings_user: 'Аккаунт',
settings_server: 'Сервер',
settings_users: 'Пользователи',
+ settings_distance_unit: 'Distance (*)',
+ settings_speed_unit: 'Speed (*)',
report_title: 'Отчеты',
report_device: 'Устройтво',
@@ -54,8 +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 (*)',
state_title: 'Состояние',
state_name: 'Параметр',
- state_value: 'Значение'
+ 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 (*)'
};
diff --git a/web/l10n/th.js b/web/l10n/th.js
index 063bfea93..d3c46c8ee 100755..100644
--- a/web/l10n/th.js
+++ b/web/l10n/th.js
@@ -1,61 +1,86 @@
-var strings = {
- shared_loading: 'โหลด',
- shared_save: 'เก็บ (แฟ้มข้อมูล)',
- shared_cancel: 'ยกเลิก',
- shared_add: 'เพิ่ม',
- shared_edit: 'ตรวจแก้ ปรับเปลี่ยนข้อมูล',
- shared_remove: 'ย้ายออก',
- shared_remove_confirm: 'ลบรายการ',
-
- error_title: 'ผิดพลาด',
- error_unknown: 'ข้อผิดพลาดที่ไม่รู้จัก',
-
- user_name: 'ชื่อ',
- user_email: 'อีเมล',
- user_password: 'รหัสผ่าน',
- user_admin: 'ผู้ดูแลระบบ',
-
- login_title: 'เข้าสู่ระบบ',
- login_register: 'ลงทะเบียน',
- login_login: 'เข้าสู่ระบบ',
- login_failed: 'ที่อยู่อีเมลหรือรหัสผ่านไม่ถูกต้อง',
- 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: 'มูลค่า'
-};
+var strings = {
+ shared_loading: 'โหลด',
+ shared_save: 'เก็บ (แฟ้มข้อมูล)',
+ shared_cancel: 'ยกเลิก',
+ shared_add: 'เพิ่ม',
+ 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 (*)',
+
+ error_title: 'ผิดพลาด',
+ error_unknown: 'ข้อผิดพลาดที่ไม่รู้จัก',
+
+ user_name: 'ชื่อ',
+ user_email: 'อีเมล',
+ user_password: 'รหัสผ่าน',
+ user_admin: 'ผู้ดูแลระบบ',
+
+ login_title: 'เข้าสู่ระบบ',
+ login_language: 'Language (*)',
+ login_register: 'ลงทะเบียน',
+ login_login: 'เข้าสู่ระบบ',
+ login_failed: 'ที่อยู่อีเมลหรือรหัสผ่านไม่ถูกต้อง',
+ login_created: 'ผู้ใช้ใหม่ ได้รับการจดทะเบียน',
+ login_logout: 'ออกจากระบบ',
+
+ device_dialog: 'เครื่อง/อุปกรณ์',
+ device_title: 'เครื่อง/อุปกรณ์',
+ device_name: 'ชื่อ',
+ device_identifier: 'ระบุ',
+ device_command: 'Command (*)',
+
+ settings_title: 'การตั้งค่า',
+ settings_user: 'บัญชี',
+ settings_server: 'ผู้ให้บริการ',
+ settings_users: 'ผู้ใช้งาน',
+ settings_distance_unit: 'Distance (*)',
+ settings_speed_unit: 'Speed (*)',
+
+ 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: 'แผนที่',
+ map_layer: 'Map Layer (*)',
+ map_osm: 'Open Street Map (*)',
+ map_bing_road: 'Bing Maps Road (*)',
+ map_bing_aerial: 'Bing Maps Aerial (*)',
+
+ 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 (*)'
+};