From c7cc62803b710ac1a3cbb24905b32c7def145521 Mon Sep 17 00:00:00 2001 From: darksimpson Date: Wed, 29 Apr 2020 02:53:35 +0300 Subject: [PATCH] GUACAMOLE-1054: Fixed some minor translation issues like removal of empty and not-really-translated strings. --- .../src/main/resources/translations/ru.json | 1 - .../src/main/resources/translations/ru.json | 1 - .../src/main/resources/translations/ru.json | 1 - .../src/main/resources/translations/ru.json | 1 - .../src/main/resources/translations/ru.json | 4 +- .../src/main/resources/translations/ru.json | 4 -- .../src/main/webapp/translations/ru.json | 63 +------------------ 7 files changed, 4 insertions(+), 71 deletions(-) diff --git a/extensions/guacamole-auth-cas/src/main/resources/translations/ru.json b/extensions/guacamole-auth-cas/src/main/resources/translations/ru.json index d1f740db2..9604b6f0f 100644 --- a/extensions/guacamole-auth-cas/src/main/resources/translations/ru.json +++ b/extensions/guacamole-auth-cas/src/main/resources/translations/ru.json @@ -5,7 +5,6 @@ }, "LOGIN" : { - "FIELD_HEADER_TICKET" : "", "INFO_CAS_REDIRECT_PENDING" : "Пожалуйста, подождите. Переадресую на страницу аутентификации CAS..." } diff --git a/extensions/guacamole-auth-duo/src/main/resources/translations/ru.json b/extensions/guacamole-auth-duo/src/main/resources/translations/ru.json index 30ab55cd1..d493e715d 100644 --- a/extensions/guacamole-auth-duo/src/main/resources/translations/ru.json +++ b/extensions/guacamole-auth-duo/src/main/resources/translations/ru.json @@ -5,7 +5,6 @@ }, "LOGIN" : { - "FIELD_HEADER_GUAC_DUO_SIGNED_RESPONSE" : "", "INFO_DUO_VALIDATION_CODE_INCORRECT" : "Неверный код валидации Duo.", "INFO_DUO_AUTH_REQUIRED" : "Пожалуйста, аутентифицируйтесь в Duo для продолжения." } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json index 61a656ef0..e4a38044d 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json @@ -27,7 +27,6 @@ "FIELD_HEADER_GUACD_ENCRYPTION" : "Шифрование:", "FIELD_HEADER_GUACD_PORT" : "Порт:", - "FIELD_OPTION_GUACD_ENCRYPTION_EMPTY" : "", "FIELD_OPTION_GUACD_ENCRYPTION_NONE" : "Нет (не зашифровано)", "FIELD_OPTION_GUACD_ENCRYPTION_SSL" : "SSL/TLS", diff --git a/extensions/guacamole-auth-openid/src/main/resources/translations/ru.json b/extensions/guacamole-auth-openid/src/main/resources/translations/ru.json index 6080965a1..4b5c0610a 100644 --- a/extensions/guacamole-auth-openid/src/main/resources/translations/ru.json +++ b/extensions/guacamole-auth-openid/src/main/resources/translations/ru.json @@ -5,7 +5,6 @@ }, "LOGIN" : { - "FIELD_HEADER_ID_TOKEN" : "", "INFO_REDIRECT_PENDING" : "Пожалуйста, подождите. Переадресую на страницу аутентификации..." } diff --git a/extensions/guacamole-auth-radius/src/main/resources/translations/ru.json b/extensions/guacamole-auth-radius/src/main/resources/translations/ru.json index d82356714..eab9d5416 100644 --- a/extensions/guacamole-auth-radius/src/main/resources/translations/ru.json +++ b/extensions/guacamole-auth-radius/src/main/resources/translations/ru.json @@ -5,9 +5,7 @@ }, "LOGIN" : { - "FIELD_HEADER_GUAC_RADIUS_CHALLENGE_RESPONSE" : "", - "FIELD_HEADER_GUAC_RADIUS_STATE" : "", - "INFO_RADIUS_ADDL_REQUIRED" : "Требуются дополнительные данные доступа." + "INFO_RADIUS_ADDL_REQUIRED" : "Требуются дополнительные данные доступа." } } diff --git a/extensions/guacamole-auth-totp/src/main/resources/translations/ru.json b/extensions/guacamole-auth-totp/src/main/resources/translations/ru.json index 7966f5f83..3a5d97357 100644 --- a/extensions/guacamole-auth-totp/src/main/resources/translations/ru.json +++ b/extensions/guacamole-auth-totp/src/main/resources/translations/ru.json @@ -4,10 +4,6 @@ "NAME" : "Бэкенд TOTP TFA" }, - "LOGIN" : { - "FIELD_HEADER_GUAC_TOTP" : "" - }, - "TOTP" : { "ACTION_HIDE_DETAILS" : "Спрятать", diff --git a/guacamole/src/main/webapp/translations/ru.json b/guacamole/src/main/webapp/translations/ru.json index 35765a624..48cd3df5d 100644 --- a/guacamole/src/main/webapp/translations/ru.json +++ b/guacamole/src/main/webapp/translations/ru.json @@ -118,10 +118,6 @@ "NAME_INPUT_METHOD_NONE" : "Нет", "NAME_INPUT_METHOD_OSK" : "Экранная клавиатура", "NAME_INPUT_METHOD_TEXT" : "Ввод текста", - "NAME_KEY_CTRL" : "Ctrl", - "NAME_KEY_ALT" : "Alt", - "NAME_KEY_ESC" : "Esc", - "NAME_KEY_TAB" : "Tab", "NAME_MOUSE_MODE_ABSOLUTE" : "Тачскрин", "NAME_MOUSE_MODE_RELATIVE" : "Тачпад", @@ -404,12 +400,7 @@ "FIELD_HEADER_TYPESCRIPT_PATH" : "Путь typescript:", "FIELD_HEADER_USE_SSL" : "Использовать SSL/TLS", - "FIELD_OPTION_BACKSPACE_EMPTY" : "", - "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", - "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", - "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Черное на белом", - "FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", "FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Серое на черном", "FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Зеленое на черном", "FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Белое на черном", @@ -499,22 +490,15 @@ "FIELD_OPTION_COLOR_DEPTH_24" : "True color (24-бит)", "FIELD_OPTION_COLOR_DEPTH_32" : "True color (32-бит)", "FIELD_OPTION_COLOR_DEPTH_8" : "256 цветов", - "FIELD_OPTION_COLOR_DEPTH_EMPTY" : "", "FIELD_OPTION_RESIZE_METHOD_DISPLAY_UPDATE" : "Виртуальный канал \"Display Update\" (RDP 8.1+)", - "FIELD_OPTION_RESIZE_METHOD_EMPTY" : "", "FIELD_OPTION_RESIZE_METHOD_RECONNECT" : "Переподключение", "FIELD_OPTION_SECURITY_ANY" : "Любой", - "FIELD_OPTION_SECURITY_EMPTY" : "", "FIELD_OPTION_SECURITY_NLA" : "NLA (аутентификация уровня сети)", "FIELD_OPTION_SECURITY_RDP" : "RDP-шифрование", "FIELD_OPTION_SECURITY_TLS" : "TLS-шифрование", - "FIELD_OPTION_SERVER_LAYOUT_RU_RU_QWERTY_LAT" : "Русская+Lat (Qwerty)", - - "NAME" : "RDP", - "SECTION_HEADER_AUTHENTICATION" : "Аутентификация", "SECTION_HEADER_BASIC_PARAMETERS" : "Основные настройки", "SECTION_HEADER_DEVICE_REDIRECTION" : "Перенаправление устройств", @@ -524,9 +508,7 @@ "SECTION_HEADER_NETWORK" : "Сеть", "SECTION_HEADER_PERFORMANCE" : "Производительность", "SECTION_HEADER_PRECONNECTION_PDU" : "Предварительные данные подключения (Hyper-V)", - "SECTION_HEADER_RECORDING" : "Запись экрана", - "SECTION_HEADER_REMOTEAPP" : "RemoteApp", - "SECTION_HEADER_SFTP" : "SFTP" + "SECTION_HEADER_RECORDING" : "Запись экрана" }, @@ -562,34 +544,18 @@ "FIELD_HEADER_TYPESCRIPT_NAME" : "Название typescript:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Путь typescript:", - "FIELD_OPTION_BACKSPACE_EMPTY" : "", - "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", - "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", - "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Черное на белом", - "FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", "FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Серое на черном", "FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Зеленое на черном", "FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Белое на черном", - "FIELD_OPTION_TERMINAL_TYPE_ANSI" : "ansi", - "FIELD_OPTION_TERMINAL_TYPE_EMPTY" : "", - "FIELD_OPTION_TERMINAL_TYPE_LINUX" : "linux", - "FIELD_OPTION_TERMINAL_TYPE_VT100" : "vt100", - "FIELD_OPTION_TERMINAL_TYPE_VT220" : "vt220", - "FIELD_OPTION_TERMINAL_TYPE_XTERM" : "xterm", - "FIELD_OPTION_TERMINAL_TYPE_XTERM_256COLOR" : "xterm-256color", - - "NAME" : "SSH", - "SECTION_HEADER_AUTHENTICATION" : "Аутентификация", "SECTION_HEADER_BEHAVIOR" : "Поведение терминала", "SECTION_HEADER_DISPLAY" : "Экран", "SECTION_HEADER_NETWORK" : "Сеть", "SECTION_HEADER_RECORDING" : "Запись экрана", "SECTION_HEADER_SESSION" : "Сессия / среда:", - "SECTION_HEADER_TYPESCRIPT" : "Typescript (запись текстовой сессии)", - "SECTION_HEADER_SFTP" : "SFTP" + "SECTION_HEADER_TYPESCRIPT" : "Typescript (запись текстовой сессии)" }, @@ -620,26 +586,11 @@ "FIELD_HEADER_TYPESCRIPT_NAME" : "Название typescript:", "FIELD_HEADER_TYPESCRIPT_PATH" : "Путь typescript:", - "FIELD_OPTION_BACKSPACE_EMPTY" : "", - "FIELD_OPTION_BACKSPACE_8" : "Backspace (Ctrl-H)", - "FIELD_OPTION_BACKSPACE_127" : "Delete (Ctrl-?)", - "FIELD_OPTION_COLOR_SCHEME_BLACK_WHITE" : "Черное на белом", - "FIELD_OPTION_COLOR_SCHEME_EMPTY" : "", "FIELD_OPTION_COLOR_SCHEME_GRAY_BLACK" : "Серое на черном", "FIELD_OPTION_COLOR_SCHEME_GREEN_BLACK" : "Зеленое на черном", "FIELD_OPTION_COLOR_SCHEME_WHITE_BLACK" : "Белое на черном", - "FIELD_OPTION_TERMINAL_TYPE_ANSI" : "ansi", - "FIELD_OPTION_TERMINAL_TYPE_EMPTY" : "", - "FIELD_OPTION_TERMINAL_TYPE_LINUX" : "linux", - "FIELD_OPTION_TERMINAL_TYPE_VT100" : "vt100", - "FIELD_OPTION_TERMINAL_TYPE_VT220" : "vt220", - "FIELD_OPTION_TERMINAL_TYPE_XTERM" : "xterm", - "FIELD_OPTION_TERMINAL_TYPE_XTERM_256COLOR" : "xterm-256color", - - "NAME" : "Telnet", - "SECTION_HEADER_AUTHENTICATION" : "Аутентификация", "SECTION_HEADER_BEHAVIOR" : "Поведение терминала", "SECTION_HEADER_DISPLAY" : "Экран", @@ -685,22 +636,16 @@ "FIELD_OPTION_COLOR_DEPTH_16" : "Low color (16-бит)", "FIELD_OPTION_COLOR_DEPTH_24" : "True color (24-бит)", "FIELD_OPTION_COLOR_DEPTH_32" : "True color (32-бит)", - "FIELD_OPTION_COLOR_DEPTH_EMPTY" : "", - "FIELD_OPTION_CURSOR_EMPTY" : "", "FIELD_OPTION_CURSOR_LOCAL" : "Локальный", "FIELD_OPTION_CURSOR_REMOTE" : "Удаленный", - "NAME" : "VNC", - "SECTION_HEADER_AUDIO" : "Аудио", "SECTION_HEADER_AUTHENTICATION" : "Аутентификация", "SECTION_HEADER_CLIPBOARD" : "Буфер обмена", "SECTION_HEADER_DISPLAY" : "Экран", "SECTION_HEADER_NETWORK" : "Сеть", - "SECTION_HEADER_RECORDING" : "Запись экрана", - "SECTION_HEADER_REPEATER" : "VNC Repeater", - "SECTION_HEADER_SFTP" : "SFTP" + "SECTION_HEADER_RECORDING" : "Запись экрана" }, @@ -717,8 +662,6 @@ "FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER", - "FILENAME_HISTORY_CSV" : "history.csv", - "FORMAT_DATE" : "@:APP.FORMAT_DATE_TIME_PRECISE", "HELP_CONNECTION_HISTORY" : "Здесь отображается журнал предыдущих подключений, который можно отсортировать, кликнув на заголовке колонки. Для поиска конкретных записей введите нужные данные и нажмите «Поиск». Тогда будут отображаться только записи, соответствующие данным для поиска.",