10 Commits

Author SHA1 Message Date
Samuel Mannehed 463c39e4af noVNC 1.3.0 2021-10-22 10:40:13 +02:00
Samuel Mannehed 6f0eb2b01a Remove inactive maintainers from package.json 2021-10-22 10:39:26 +02:00
Samuel Mannehed 22fe8e383f Update json files for new translations 2021-10-22 10:36:07 +02:00
Samuel Mannehed 264a6d82ea Stop chained builds of .po and .json files
The way we work with these translation files means that we only care
about one step at a time, we don't want to update the .po files when
building the 'update-js' target.

Also, always force rebuilds of the .po and .json files.
2021-10-22 09:42:17 +02:00
Pierre Ossman a85c85fb5f Follow API changes in commander 7.0.0+
Options now have to be exlicitly requested.
2021-09-28 10:46:41 +02:00
Samuel Mannehed d971c0fe55 Merge pull request #1582 from CendioOssman/preload
Preload status bar images
2021-09-24 16:45:11 +02:00
Pierre Ossman ff077f4656 Preload status bar images
These are used via CSS, which means the browser doesn't load them until
an element actually gets those CSS rules. There can be some delay to
this loading which causes visual glitches. By preloading we can make
sure those images are cached and ready when the status bar appears.
2021-09-24 16:15:31 +02:00
Nia Remez bfefd81d4c Fix typos in Russian translation 2021-09-09 12:46:22 +02:00
Samuel Mannehed 0fd0d57fcd Fix snapcraft publish step
A typo caused it to use the incorrect path
2021-09-09 11:27:51 +02:00
Nia Remez a98d72e2e9 Update Russian translation 2021-09-09 11:25:43 +02:00
9 changed files with 216 additions and 143 deletions
+2 -2
View File
@@ -45,12 +45,12 @@ jobs:
- uses: snapcore/action-publish@v1
with:
store_login: ${{ secrets.SNAPCRAFT_LOGIN }}
snap: ${{ steps.build.outputs.snap }}
snap: ${{ steps.snapcraft.outputs.snap }}
release: stable
if: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
- uses: snapcore/action-publish@v1
with:
store_login: ${{ secrets.SNAPCRAFT_LOGIN }}
snap: ${{ steps.build.outputs.snap }}
snap: ${{ steps.snapcraft.outputs.snap }}
release: beta
if: ${{ github.event_name == 'release' && github.event.release.prerelease }}
+11 -11
View File
@@ -4,9 +4,9 @@
"Connected (unencrypted) to ": "Conectado (sin encriptación) a",
"Disconnecting...": "Desconectando...",
"Disconnected": "Desconectado",
"Must set host": "Debes configurar el host",
"Must set host": "Se debe configurar el host",
"Reconnecting...": "Reconectando...",
"Password is required": "Contraseña es obligatoria",
"Password is required": "La contraseña es obligatoria",
"Disconnect timeout": "Tiempo de desconexión agotado",
"noVNC encountered an error:": "noVNC ha encontrado un error:",
"Hide/Show the control bar": "Ocultar/Mostrar la barra de control",
@@ -41,6 +41,7 @@
"Clear": "Vaciar",
"Fullscreen": "Pantalla Completa",
"Settings": "Configuraciones",
"Encrypt": "Encriptar",
"Shared Mode": "Modo Compartido",
"View Only": "Solo visualización",
"Clip to Window": "Recortar al tamaño de la ventana",
@@ -51,18 +52,17 @@
"Remote Resizing": "Cambio de tamaño remoto",
"Advanced": "Avanzado",
"Local Cursor": "Cursor Local",
"Repeater ID:": "ID del Repetidor",
"Repeater ID:": "ID del Repetidor:",
"WebSocket": "WebSocket",
"Encrypt": "",
"Host:": "Host",
"Port:": "Puesto",
"Path:": "Ruta",
"Host:": "Host:",
"Port:": "Puerto:",
"Path:": "Ruta:",
"Automatic Reconnect": "Reconexión automática",
"Reconnect Delay (ms):": "Retraso en la reconexión (ms)",
"Logging:": "Logging",
"Reconnect Delay (ms):": "Retraso en la reconexión (ms):",
"Logging:": "Registrando:",
"Disconnect": "Desconectar",
"Connect": "Conectar",
"Password:": "Contraseña",
"Password:": "Contraseña:",
"Cancel": "Cancelar",
"Canvas not supported.": "Canvas no está soportado"
"Canvas not supported.": "Canvas no soportado."
}
+72
View File
@@ -0,0 +1,72 @@
{
"Connecting...": "En cours de connexion...",
"Disconnecting...": "Déconnexion en cours...",
"Reconnecting...": "Reconnexion en cours...",
"Internal error": "Erreur interne",
"Must set host": "Doit définir l'hôte",
"Connected (encrypted) to ": "Connecté (crypté) à ",
"Connected (unencrypted) to ": "Connecté (non crypté) à ",
"Something went wrong, connection is closed": "Quelque chose est arrivé, la connexion est fermée",
"Failed to connect to server": "Échec de connexion au serveur",
"Disconnected": "Déconnecté",
"New connection has been rejected with reason: ": "Une nouvelle connexion a été rejetée avec raison: ",
"New connection has been rejected": "Une nouvelle connexion a été rejetée",
"Credentials are required": "Les identifiants sont requis",
"noVNC encountered an error:": "noVNC a rencontré une erreur:",
"Hide/Show the control bar": "Masquer/Afficher la barre de contrôle",
"Drag": "Faire glisser",
"Move/Drag Viewport": "Déplacer/faire glisser Viewport",
"Keyboard": "Clavier",
"Show Keyboard": "Afficher le clavier",
"Extra keys": "Touches supplémentaires",
"Show Extra Keys": "Afficher les touches supplémentaires",
"Ctrl": "Ctrl",
"Toggle Ctrl": "Basculer Ctrl",
"Alt": "Alt",
"Toggle Alt": "Basculer Alt",
"Toggle Windows": "Basculer Windows",
"Windows": "Windows",
"Send Tab": "Envoyer l'onglet",
"Tab": "l'onglet",
"Esc": "Esc",
"Send Escape": "Envoyer Escape",
"Ctrl+Alt+Del": "Ctrl+Alt+Del",
"Send Ctrl-Alt-Del": "Envoyer Ctrl-Alt-Del",
"Shutdown/Reboot": "Arrêter/Redémarrer",
"Shutdown/Reboot...": "Arrêter/Redémarrer...",
"Power": "Alimentation",
"Shutdown": "Arrêter",
"Reboot": "Redémarrer",
"Reset": "Réinitialiser",
"Clipboard": "Presse-papiers",
"Clear": "Effacer",
"Fullscreen": "Plein écran",
"Settings": "Paramètres",
"Shared Mode": "Mode partagé",
"View Only": "Afficher uniquement",
"Clip to Window": "Clip à fenêtre",
"Scaling Mode:": "Mode mise à l'échelle:",
"None": "Aucun",
"Local Scaling": "Mise à l'échelle locale",
"Remote Resizing": "Redimensionnement à distance",
"Advanced": "Avancé",
"Quality:": "Qualité:",
"Compression level:": "Niveau de compression:",
"Repeater ID:": "ID Répéteur:",
"WebSocket": "WebSocket",
"Encrypt": "Crypter",
"Host:": "Hôte:",
"Port:": "Port:",
"Path:": "Chemin:",
"Automatic Reconnect": "Reconnecter automatiquemen",
"Reconnect Delay (ms):": "Délai de reconnexion (ms):",
"Show Dot when No Cursor": "Afficher le point lorsqu'il n'y a pas de curseur",
"Logging:": "Se connecter:",
"Version:": "Version:",
"Disconnect": "Déconnecter",
"Connect": "Connecter",
"Username:": "Nom d'utilisateur:",
"Password:": "Mot de passe:",
"Send Credentials": "Envoyer les identifiants",
"Cancel": "Annuler"
}
+15 -16
View File
@@ -9,26 +9,21 @@
"Something went wrong, connection is closed": "Что-то пошло не так, подключение разорвано",
"Failed to connect to server": "Ошибка подключения к серверу",
"Disconnected": "Отключено",
"New connection has been rejected with reason: ": "Подключиться не удалось: ",
"New connection has been rejected": "Подключиться не удалось",
"Password is required": "Требуется пароль",
"New connection has been rejected with reason: ": "Новое соединение отклонено по причине: ",
"New connection has been rejected": "Новое соединение отклонено",
"Credentials are required": "Требуются учетные данные",
"noVNC encountered an error:": "Ошибка noVNC: ",
"Hide/Show the control bar": "Скрыть/Показать контрольную панель",
"Drag": "Переместить",
"Move/Drag Viewport": "Переместить окно",
"viewport drag": "Переместить окно",
"Active Mouse Button": "Активировать кнопки мыши",
"No mousebutton": "Отключить кнопки мыши",
"Left mousebutton": "Левая кнопка мыши",
"Middle mousebutton": "Средняя кнопка мыши",
"Right mousebutton": "Правая кнопка мыши",
"Keyboard": "Клавиатура",
"Show Keyboard": "Показать клавиатуру",
"Extra keys": "Доп. кнопки",
"Show Extra Keys": "Показать дополнительные кнопки",
"Extra keys": "Дополнительные Кнопки",
"Show Extra Keys": "Показать Дополнительные Кнопки",
"Ctrl": "Ctrl",
"Toggle Ctrl": "Передать нажатие Ctrl",
"Toggle Ctrl": "Переключение нажатия Ctrl",
"Alt": "Alt",
"Toggle Alt": "Передать нажатие Alt",
"Toggle Alt": "Переключение нажатия Alt",
"Toggle Windows": "Переключение вкладок",
"Windows": "Вкладка",
"Send Tab": "Передать нажатие Tab",
@@ -48,13 +43,15 @@
"Fullscreen": "Во весь экран",
"Settings": "Настройки",
"Shared Mode": "Общий режим",
"View Only": "Просмотр",
"View Only": "Только Просмотр",
"Clip to Window": "В окно",
"Scaling Mode:": "Масштаб:",
"None": "Нет",
"Local Scaling": "Локльный масштаб",
"Remote Resizing": "Удаленный масштаб",
"Remote Resizing": "Удаленная перенастройка размера",
"Advanced": "Дополнительно",
"Quality:": "Качество",
"Compression level:": "Уровень Сжатия",
"Repeater ID:": "Идентификатор ID:",
"WebSocket": "WebSocket",
"Encrypt": "Шифрование",
@@ -65,9 +62,11 @@
"Reconnect Delay (ms):": "Задержка переподключения (мс):",
"Show Dot when No Cursor": "Показать точку вместо курсора",
"Logging:": "Лог:",
"Version:": "Версия",
"Disconnect": "Отключение",
"Connect": "Подключение",
"Username:": "Имя Пользователя",
"Password:": "Пароль:",
"Send Password": "Пароль: ",
"Send Credentials": "Передача Учетных Данных",
"Cancel": "Выход"
}
+1 -3
View File
@@ -1,6 +1,6 @@
{
"name": "@novnc/novnc",
"version": "1.3.0-beta",
"version": "1.3.0",
"description": "An HTML5 VNC client",
"browser": "lib/rfb",
"directories": {
@@ -29,8 +29,6 @@
},
"author": "Joel Martin <github@martintribe.org> (https://github.com/kanaka)",
"contributors": [
"Solly Ross <sross@redhat.com> (https://github.com/directxman12)",
"Peter Åstrand <astrand@cendio.se> (https://github.com/astrand)",
"Samuel Mannehed <samuel@cendio.se> (https://github.com/samhed)",
"Pierre Ossman <ossman@cendio.se> (https://github.com/CendioOssman)"
],
+5 -4
View File
@@ -1,5 +1,6 @@
all:
.PHONY: update-po update-js update-pot
.PHONY: FORCE
LINGUAS := cs de el es fr ja ko nl pl pt_BR ru sv tr zh_CN zh_TW
@@ -11,10 +12,10 @@ JSONFILES := $(addprefix ../app/locale/,$(addsuffix .json,$(LINGUAS)))
update-po: $(POFILES)
update-js: $(JSONFILES)
%.po: noVNC.pot
msgmerge --update --lang=$* $@ $<
../app/locale/%.json: %.po
./po2js $< $@
%.po: FORCE
msgmerge --update --lang=$* $@ noVNC.pot
../app/locale/%.json: FORCE
./po2js $*.po $@
update-pot:
xgettext --output=noVNC.js.pot \
+101 -105
View File
@@ -6,11 +6,11 @@
#
msgid ""
msgstr ""
"Project-Id-Version: noVNC 1.1.0\n"
"Project-Id-Version: noVNC 1.3.0\n"
"Report-Msgid-Bugs-To: novnc@googlegroups.com\n"
"POT-Creation-Date: 2019-02-26 14:53+0400\n"
"PO-Revision-Date: 2019-02-17 17:29+0400\n"
"Last-Translator: Dmitriy Shweew <shweew@it-advisor.ru>\n"
"POT-Creation-Date: 2021-08-27 16:03+0200\n"
"PO-Revision-Date: 2021-09-09 10:29+0400\n"
"Last-Translator: Nia Remez <nia.remez@cendio.com>\n"
"Language-Team: Russian\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -21,286 +21,282 @@ msgstr ""
"X-Generator: Poedit 2.2.1\n"
"X-Poedit-Flags-xgettext: --add-comments\n"
#: ../app/ui.js:387
#: ../app/ui.js:400
msgid "Connecting..."
msgstr "Подключение..."
#: ../app/ui.js:394
#: ../app/ui.js:407
msgid "Disconnecting..."
msgstr "Отключение..."
#: ../app/ui.js:400
#: ../app/ui.js:413
msgid "Reconnecting..."
msgstr "Переподключение..."
#: ../app/ui.js:405
#: ../app/ui.js:418
msgid "Internal error"
msgstr "Внутренняя ошибка"
#: ../app/ui.js:995
#: ../app/ui.js:1009
msgid "Must set host"
msgstr "Задайте имя сервера или IP"
#: ../app/ui.js:1077
#: ../app/ui.js:1091
msgid "Connected (encrypted) to "
msgstr "Подключено (с шифрованием) к "
#: ../app/ui.js:1079
#: ../app/ui.js:1093
msgid "Connected (unencrypted) to "
msgstr "Подключено (без шифрования) к "
#: ../app/ui.js:1102
#: ../app/ui.js:1116
msgid "Something went wrong, connection is closed"
msgstr "Что-то пошло не так, подключение разорвано"
#: ../app/ui.js:1105
#: ../app/ui.js:1119
msgid "Failed to connect to server"
msgstr "Ошибка подключения к серверу"
#: ../app/ui.js:1115
#: ../app/ui.js:1129
msgid "Disconnected"
msgstr "Отключено"
#: ../app/ui.js:1128
#: ../app/ui.js:1144
msgid "New connection has been rejected with reason: "
msgstr "Подключиться не удалось: "
msgstr "Новое соединение отклонено по причине: "
#: ../app/ui.js:1131
#: ../app/ui.js:1147
msgid "New connection has been rejected"
msgstr "Подключиться не удалось"
msgstr "Новое соединение отклонено"
#: ../app/ui.js:1151
msgid "Password is required"
msgstr "Требуется пароль"
#: ../app/ui.js:1182
msgid "Credentials are required"
msgstr "Требуются учетные данные"
#: ../vnc.html:84
#: ../vnc.html:61
msgid "noVNC encountered an error:"
msgstr "Ошибка noVNC: "
#: ../vnc.html:94
#: ../vnc.html:71
msgid "Hide/Show the control bar"
msgstr "Скрыть/Показать контрольную панель"
#: ../vnc.html:101
#: ../vnc.html:78
msgid "Drag"
msgstr "Переместить"
#: ../vnc.html:78
msgid "Move/Drag Viewport"
msgstr "Переместить окно"
#: ../vnc.html:101
msgid "viewport drag"
msgstr "Переместить окно"
#: ../vnc.html:107 ../vnc.html:110 ../vnc.html:113 ../vnc.html:116
msgid "Active Mouse Button"
msgstr "Активировать кнопки мыши"
#: ../vnc.html:107
msgid "No mousebutton"
msgstr "Отключить кнопки мыши"
#: ../vnc.html:110
msgid "Left mousebutton"
msgstr "Левая кнопка мыши"
#: ../vnc.html:113
msgid "Middle mousebutton"
msgstr "Средняя кнопка мыши"
#: ../vnc.html:116
msgid "Right mousebutton"
msgstr "Правая кнопка мыши"
#: ../vnc.html:119
#: ../vnc.html:84
msgid "Keyboard"
msgstr "Клавиатура"
#: ../vnc.html:119
#: ../vnc.html:84
msgid "Show Keyboard"
msgstr "Показать клавиатуру"
#: ../vnc.html:126
#: ../vnc.html:89
msgid "Extra keys"
msgstr "Доп. кнопки"
msgstr "Дополнительные Кнопки"
#: ../vnc.html:126
#: ../vnc.html:89
msgid "Show Extra Keys"
msgstr "Показать дополнительные кнопки"
msgstr "Показать Дополнительные Кнопки"
#: ../vnc.html:131
#: ../vnc.html:94
msgid "Ctrl"
msgstr "Ctrl"
#: ../vnc.html:131
#: ../vnc.html:94
msgid "Toggle Ctrl"
msgstr "Передать нажатие Ctrl"
msgstr "Переключение нажатия Ctrl"
#: ../vnc.html:134
#: ../vnc.html:97
msgid "Alt"
msgstr "Alt"
#: ../vnc.html:134
#: ../vnc.html:97
msgid "Toggle Alt"
msgstr "Передать нажатие Alt"
msgstr "Переключение нажатия Alt"
#: ../vnc.html:137
#: ../vnc.html:100
msgid "Toggle Windows"
msgstr "Переключение вкладок"
#: ../vnc.html:137
#: ../vnc.html:100
msgid "Windows"
msgstr "Вкладка"
#: ../vnc.html:140
#: ../vnc.html:103
msgid "Send Tab"
msgstr "Передать нажатие Tab"
#: ../vnc.html:140
#: ../vnc.html:103
msgid "Tab"
msgstr "Tab"
#: ../vnc.html:143
#: ../vnc.html:106
msgid "Esc"
msgstr "Esc"
#: ../vnc.html:143
#: ../vnc.html:106
msgid "Send Escape"
msgstr "Передать нажатие Escape"
#: ../vnc.html:146
#: ../vnc.html:109
msgid "Ctrl+Alt+Del"
msgstr "Ctrl+Alt+Del"
#: ../vnc.html:146
#: ../vnc.html:109
msgid "Send Ctrl-Alt-Del"
msgstr "Передать нажатие Ctrl-Alt-Del"
#: ../vnc.html:154
#: ../vnc.html:116
msgid "Shutdown/Reboot"
msgstr "Выключить/Перезагрузить"
#: ../vnc.html:154
#: ../vnc.html:116
msgid "Shutdown/Reboot..."
msgstr "Выключить/Перезагрузить..."
#: ../vnc.html:160
#: ../vnc.html:122
msgid "Power"
msgstr "Питание"
#: ../vnc.html:162
#: ../vnc.html:124
msgid "Shutdown"
msgstr "Выключить"
#: ../vnc.html:163
#: ../vnc.html:125
msgid "Reboot"
msgstr "Перезагрузить"
#: ../vnc.html:164
#: ../vnc.html:126
msgid "Reset"
msgstr "Сброс"
#: ../vnc.html:169 ../vnc.html:175
#: ../vnc.html:131 ../vnc.html:137
msgid "Clipboard"
msgstr "Буфер обмена"
#: ../vnc.html:179
#: ../vnc.html:141
msgid "Clear"
msgstr "Очистить"
#: ../vnc.html:185
#: ../vnc.html:147
msgid "Fullscreen"
msgstr "Во весь экран"
#: ../vnc.html:190 ../vnc.html:197
#: ../vnc.html:152 ../vnc.html:159
msgid "Settings"
msgstr "Настройки"
#: ../vnc.html:200
#: ../vnc.html:162
msgid "Shared Mode"
msgstr "Общий режим"
#: ../vnc.html:203
#: ../vnc.html:165
msgid "View Only"
msgstr "Просмотр"
msgstr "Только Просмотр"
#: ../vnc.html:207
#: ../vnc.html:169
msgid "Clip to Window"
msgstr "В окно"
#: ../vnc.html:210
#: ../vnc.html:172
msgid "Scaling Mode:"
msgstr "Масштаб:"
#: ../vnc.html:212
#: ../vnc.html:174
msgid "None"
msgstr "Нет"
#: ../vnc.html:213
#: ../vnc.html:175
msgid "Local Scaling"
msgstr "Локльный масштаб"
#: ../vnc.html:214
#: ../vnc.html:176
msgid "Remote Resizing"
msgstr "Удаленный масштаб"
msgstr "Удаленная перенастройка размера"
#: ../vnc.html:219
#: ../vnc.html:181
msgid "Advanced"
msgstr "Дополнительно"
#: ../vnc.html:222
#: ../vnc.html:184
msgid "Quality:"
msgstr "Качество"
#: ../vnc.html:188
msgid "Compression level:"
msgstr "Уровень Сжатия"
#: ../vnc.html:193
msgid "Repeater ID:"
msgstr "Идентификатор ID:"
#: ../vnc.html:226
#: ../vnc.html:197
msgid "WebSocket"
msgstr "WebSocket"
#: ../vnc.html:229
#: ../vnc.html:200
msgid "Encrypt"
msgstr "Шифрование"
#: ../vnc.html:232
#: ../vnc.html:203
msgid "Host:"
msgstr "Сервер:"
#: ../vnc.html:236
#: ../vnc.html:207
msgid "Port:"
msgstr "Порт:"
#: ../vnc.html:240
#: ../vnc.html:211
msgid "Path:"
msgstr "Путь:"
#: ../vnc.html:247
#: ../vnc.html:218
msgid "Automatic Reconnect"
msgstr "Автоматическое переподключение"
#: ../vnc.html:250
#: ../vnc.html:221
msgid "Reconnect Delay (ms):"
msgstr "Задержка переподключения (мс):"
#: ../vnc.html:255
#: ../vnc.html:226
msgid "Show Dot when No Cursor"
msgstr "Показать точку вместо курсора"
#: ../vnc.html:260
#: ../vnc.html:231
msgid "Logging:"
msgstr "Лог:"
#: ../vnc.html:272
#: ../vnc.html:240
msgid "Version:"
msgstr "Версия"
#: ../vnc.html:248
msgid "Disconnect"
msgstr "Отключение"
#: ../vnc.html:291
#: ../vnc.html:267
msgid "Connect"
msgstr "Подключение"
#: ../vnc.html:301
#: ../vnc.html:277
msgid "Username:"
msgstr "Имя Пользователя"
#: ../vnc.html:281
msgid "Password:"
msgstr "Пароль:"
#: ../vnc.html:305
msgid "Send Password"
msgstr "Пароль: "
#: ../vnc.html:285
msgid "Send Credentials"
msgstr "Передача Учетных Данных"
#: ../vnc.html:315
#: ../vnc.html:295
msgid "Cancel"
msgstr "Выход"
+4 -2
View File
@@ -130,9 +130,11 @@ function makeLibFiles(sourceMaps) {
});
}
if (program.clean) {
let options = program.opts();
if (options.clean) {
console.log(`Removing ${paths.libDirBase}`);
fse.removeSync(paths.libDirBase);
}
makeLibFiles(program.withSourceMaps);
makeLibFiles(options.withSourceMaps);
+5
View File
@@ -50,6 +50,11 @@
<!-- Stylesheets -->
<link rel="stylesheet" href="app/styles/base.css">
<!-- Images that will later appear via CSS -->
<link rel="preload" as="image" href="app/images/info.svg">
<link rel="preload" as="image" href="app/images/error.svg">
<link rel="preload" as="image" href="app/images/warning.svg">
<script src="app/error-handler.js"></script>
<script type="module" crossorigin="anonymous" src="app/ui.js"></script>
</head>