From 02ffe81f2c70cbf2a0252cf89f8451303a19ce49 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 7 Jun 2015 12:00:03 -0700 Subject: [PATCH] GUAC-1176: Bring up-to-date with changes from GUAC-1217. --- .../src/main/resources/translations/fr.json | 13 +++++++++++++ .../resources/translations/{ru_RU.json => ru.json} | 0 .../src/main/resources/guac-manifest.json | 5 +++-- .../src/main/resources/guac-manifest.json | 5 +++-- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/fr.json rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/{ru_RU.json => ru.json} (100%) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/fr.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/fr.json new file mode 100644 index 000000000..5369d51b2 --- /dev/null +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/fr.json @@ -0,0 +1,13 @@ +{ + + "LOGIN" : { + + "ERROR_PASSWORD_BLANK" : "@:APP.ERROR_PASSWORD_BLANK", + "ERROR_PASSWORD_MISMATCH" : "@:APP.ERROR_PASSWORD_MISMATCH", + + "FIELD_HEADER_NEW_PASSWORD" : "Mot de passe", + "FIELD_HEADER_CONFIRM_NEW_PASSWORD" : "Répéter mot de passe" + + } + +} diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru_RU.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json similarity index 100% rename from extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru_RU.json rename to extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/ru.json diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json index 93d2a5bfe..0ca039a5e 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json @@ -10,8 +10,9 @@ ], "translations" : [ - "translations/en_US.json", - "translations/ru_RU.json" + "translations/en.json", + "translations/fr.json", + "translations/ru.json" ] } diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json index e838ac7d9..18f97e207 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json @@ -10,8 +10,9 @@ ], "translations" : [ - "translations/en_US.json", - "translations/ru_RU.json" + "translations/en.json", + "translations/fr.json", + "translations/ru.json" ] }