You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2026/06/19 16:53:44 UTC

(guacamole-client) branch patch updated (850bafba0 -> 3b9f73b3d)

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a change to branch patch
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git


    from 850bafba0 Merge changes from 1.6.1 branch back to patch.
     add 290805384 GUACAMOLE-2220: Kubernetes: add support for terminal-type.
     add 6d37d6788 GUACAMOLE-2220: Merge add K8s support for terminal-type.
     add 505b195ff GUACAMOLE-2034: Update fr.json (rebase and complete)
     add 9a6cd5d58 GUACAMOLE-2034: Treat review commits. Use nnbsp and no space after trailing colon are requested in #1118
     add 3c6b46234 GUACAMOLE-2034: Merge update French translations
     new 3b9f73b3d Merge 1.6.1 changes to patch branch.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/resources/translations/fr.json        |   5 +
 .../resources/translations/{tr.json => fr.json}    |   2 +-
 .../src/main/resources/translations/fr.json        |  67 +++
 .../src/main/resources/translations/fr.json        |  10 +
 .../src/main/resources/translations/fr.json        |  14 +
 .../resources/translations/{en.json => fr.json}    |   2 +-
 .../src/main/resources/translations/fr.json        |  25 +
 .../main/java/org/apache/guacamole/form/Field.java |  47 ++
 .../org/apache/guacamole/protocols/kubernetes.json |  10 +
 .../frontend/src/app/form/directives/formField.js  |  54 +-
 .../main/frontend/src/app/form/templates/form.html |   3 +-
 .../src/main/frontend/src/translations/en.json     |  10 +
 .../src/main/frontend/src/translations/fr.json     | 614 +++++++++++----------
 13 files changed, 541 insertions(+), 322 deletions(-)
 create mode 100644 extensions/guacamole-auth-ban/src/main/resources/translations/fr.json
 copy extensions/guacamole-auth-radius/src/main/resources/translations/{tr.json => fr.json} (51%)
 create mode 100644 extensions/guacamole-auth-restrict/src/main/resources/translations/fr.json
 create mode 100644 extensions/guacamole-display-statistics/src/main/resources/translations/fr.json
 create mode 100644 extensions/guacamole-history-recording-storage/src/main/resources/translations/fr.json
 copy extensions/guacamole-vault/modules/guacamole-vault-base/src/main/resources/translations/{en.json => fr.json} (53%)
 create mode 100644 extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/resources/translations/fr.json


(guacamole-client) 01/01: Merge 1.6.1 changes to patch branch.

Posted by vn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch patch
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git

commit 3b9f73b3df54bce8e3bb2f55d399666ef3432ea5
Merge: 850bafba0 3c6b46234
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Fri Jun 19 12:53:21 2026 -0400

    Merge 1.6.1 changes to patch branch.

 .../src/main/resources/translations/fr.json        |   5 +
 .../src/main/resources/translations/fr.json        |   7 +
 .../src/main/resources/translations/fr.json        |  67 +++
 .../src/main/resources/translations/fr.json        |  10 +
 .../src/main/resources/translations/fr.json        |  14 +
 .../src/main/resources/translations/fr.json        |   7 +
 .../src/main/resources/translations/fr.json        |  25 +
 .../main/java/org/apache/guacamole/form/Field.java |  47 ++
 .../org/apache/guacamole/protocols/kubernetes.json |  10 +
 .../frontend/src/app/form/directives/formField.js  |  54 +-
 .../main/frontend/src/app/form/templates/form.html |   3 +-
 .../src/main/frontend/src/translations/en.json     |  10 +
 .../src/main/frontend/src/translations/fr.json     | 614 +++++++++++----------
 13 files changed, 553 insertions(+), 320 deletions(-)