You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/01/29 19:48:37 UTC

[1/2] incubator-guacamole-client git commit: GUACAMOLE-135: Add Swiss-French keyboard layout option for RDP.

Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master 72a605559 -> 8462d6ba0


GUACAMOLE-135: Add Swiss-French keyboard layout option for RDP.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/94681636
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/94681636
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/94681636

Branch: refs/heads/master
Commit: 946816363e97567719c9acac780084e26dd6466a
Parents: 0d65003
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jan 28 13:46:11 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Jan 28 13:47:59 2017 -0800

----------------------------------------------------------------------
 .../src/main/resources/org/apache/guacamole/protocols/rdp.json      | 1 +
 guacamole/src/main/webapp/translations/en.json                      | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94681636/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
----------------------------------------------------------------------
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
index cfe51d6..ac6f863 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
@@ -67,6 +67,7 @@
                         "",
                         "en-us-qwerty",
                         "fr-fr-azerty",
+                        "fr-ch-qwertz",
                         "de-de-qwertz",
                         "it-it-qwerty",
                         "ja-jp-qwerty",

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/94681636/guacamole/src/main/webapp/translations/en.json
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index 48dbeab..c78fd0b 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -372,6 +372,7 @@
         "FIELD_OPTION_SERVER_LAYOUT_EMPTY"        : "",
         "FIELD_OPTION_SERVER_LAYOUT_EN_US_QWERTY" : "US English (Qwerty)",
         "FIELD_OPTION_SERVER_LAYOUT_FAILSAFE"     : "Unicode",
+        "FIELD_OPTION_SERVER_LAYOUT_FR_CH_QWERTZ" : "Swiss French (Qwertz)",
         "FIELD_OPTION_SERVER_LAYOUT_FR_FR_AZERTY" : "French (Azerty)",
         "FIELD_OPTION_SERVER_LAYOUT_IT_IT_QWERTY" : "Italian (Qwerty)",
         "FIELD_OPTION_SERVER_LAYOUT_JA_JP_QWERTY" : "Japanese (Qwerty)",


[2/2] incubator-guacamole-client git commit: GUACAMOLE-135: Merge Swiss-French keyboard layout.

Posted by jm...@apache.org.
GUACAMOLE-135: Merge Swiss-French keyboard layout.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/8462d6ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/8462d6ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/8462d6ba

Branch: refs/heads/master
Commit: 8462d6ba0bfaef84a20f003e4918720c1262b519
Parents: 72a6055 9468163
Author: James Muehlner <ja...@guac-dev.org>
Authored: Sun Jan 29 11:47:58 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Sun Jan 29 11:47:58 2017 -0800

----------------------------------------------------------------------
 .../src/main/resources/org/apache/guacamole/protocols/rdp.json      | 1 +
 guacamole/src/main/webapp/translations/en.json                      | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------