[PATCH] [Wok 0/2] Remove Kimchi references from Wok
Aline Manera (2): Fix issue #40: Improve WOKAUTH0002E error message and remove references to Kimchi Remove spice-html5 references from Wok build configure.ac | 11 +---------- po/de_DE.po | 33 ++++++++++++++++----------------- po/en_US.po | 29 ++++++++++++++--------------- po/es_ES.po | 33 ++++++++++++++++----------------- po/fr_FR.po | 33 ++++++++++++++++----------------- po/it_IT.po | 33 ++++++++++++++++----------------- po/ja_JP.po | 33 ++++++++++++++++----------------- po/ko_KR.po | 33 ++++++++++++++++----------------- po/pt_BR.po | 33 ++++++++++++++++----------------- po/ru_RU.po | 33 ++++++++++++++++----------------- po/wok.pot | 27 +++++++++++++-------------- po/zh_CN.po | 33 ++++++++++++++++----------------- po/zh_TW.po | 33 ++++++++++++++++----------------- src/wok/Makefile.am | 11 ++--------- src/wok/i18n.py | 6 +++--- 15 files changed, 193 insertions(+), 221 deletions(-) -- 2.7.4
Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- po/de_DE.po | 33 ++++++++++++++++----------------- po/en_US.po | 29 ++++++++++++++--------------- po/es_ES.po | 33 ++++++++++++++++----------------- po/fr_FR.po | 33 ++++++++++++++++----------------- po/it_IT.po | 33 ++++++++++++++++----------------- po/ja_JP.po | 33 ++++++++++++++++----------------- po/ko_KR.po | 33 ++++++++++++++++----------------- po/pt_BR.po | 33 ++++++++++++++++----------------- po/ru_RU.po | 33 ++++++++++++++++----------------- po/wok.pot | 27 +++++++++++++-------------- po/zh_CN.po | 33 ++++++++++++++++----------------- po/zh_TW.po | 33 ++++++++++++++++----------------- src/wok/i18n.py | 6 +++--- 13 files changed, 190 insertions(+), 202 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index 0539fc3..32f221a 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -1,11 +1,11 @@ # German translations for Wok package. -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac@linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -62,12 +62,12 @@ msgstr "" "Authentifizierung für Benutzer '%(username)s' fehlgeschlagen. [Fehlercode: " "%(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "Sie sind nicht berechtigt, auf Kimchi zuzugreifen" +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "Geben Sie %(item)s an, um sich bei Kimchi anzumelden" +msgid "Specify %(item)s to login into Wok." +msgstr "Geben Sie %(item)s an, um sich bei Wok anzumelden" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -108,10 +108,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -145,12 +141,6 @@ msgstr "STACK" msgid "Go to Homepage" msgstr "Gehe zu Homepage" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -221,7 +211,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -278,9 +268,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/en_US.po b/po/en_US.po index 130006e..d4a21d2 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1,12 +1,12 @@ # English translations for Wok package. -# Copyright IBM Corp, 2013-2016 +# Copyright IBM Corp, 2013-2017 # Adam Litke <agl@us.ibm.com>, 2013. # msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac@linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" -msgid "You are not authorized to access Kimchi" +msgid "You are not authorized to access Wok. Please, login first." msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" +msgid "Specify %(item)s to login into Wok." msgstr "" #, python-format @@ -105,10 +105,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -142,12 +138,6 @@ msgstr "" msgid "Go to Homepage" msgstr "" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -216,7 +206,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -273,9 +263,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 06eba26..72a749e 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1,11 +1,11 @@ # Spanish translations for Wok package. -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac@linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -62,12 +62,12 @@ msgstr "" "La autenticación ha fallado para el usuario '%(username)s'. [Código de " "error: %(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "No tiene autorización para acceder a Kimchi" +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "Especifique %(item)s para iniciar la sesión en Kimchi" +msgid "Specify %(item)s to login into Wok." +msgstr "Especifique %(item)s para iniciar la sesión en Wok" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -108,10 +108,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -145,12 +141,6 @@ msgstr "PILA" msgid "Go to Homepage" msgstr "Ir a la página inicial" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -222,7 +212,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -279,9 +269,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/fr_FR.po b/po/fr_FR.po index 12d99d2..12bbba3 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1,11 +1,11 @@ # French translations for Wok package. -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2014-08-27 21:30+0000\n" "Last-Translator: BobSynfig\n" "Language-Team: French (http://www.transifex.com/projects/p/kimchi/language/" @@ -65,12 +65,12 @@ msgstr "" "L'authentification a échoué pour l'utilisateur '%(username)s'. [Code " "d'Erreur: %(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "Vous n'êtes pas autorisé à accéder à Kimchi" +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "Spécifiez %(item)s pour vous logguer dans Kimchi" +msgid "Specify %(item)s to login into Wok." +msgstr "Spécifiez %(item)s pour vous logguer dans Wok" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -111,10 +111,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -148,12 +144,6 @@ msgstr "STACK" msgid "Go to Homepage" msgstr "Aller à la page d'accueil" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -225,7 +215,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -282,9 +272,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/it_IT.po b/po/it_IT.po index 352c570..045bb81 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -1,11 +1,11 @@ # Italian translations for Wok package. -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac@linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -62,12 +62,12 @@ msgstr "" "Autenticazione non riuscita per l'utente '%(username)s'. [Codice di errore: " "%(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "Non si dispone dell'autorizzazione ad accedere a Kimchi" +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "Specificare %(item)s per accedere a Kimchi" +msgid "Specify %(item)s to login into Wok." +msgstr "Specificare %(item)s per accedere a Wok." #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -108,10 +108,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -145,12 +141,6 @@ msgstr "STACK" msgid "Go to Homepage" msgstr "Vai alla home page" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -222,7 +212,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -279,9 +269,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/ja_JP.po b/po/ja_JP.po index ff47455..ce3bb31 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -1,11 +1,11 @@ # Japonese translations for Wok package. -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac@linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -61,12 +61,12 @@ msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" "ユーザー「%(username)s」の認証に失敗しました。[エラー・コード: %(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "Kimchi へのアクセスを許可されていません" +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "Kimchi にログインするには、%(item)s を指定します" +msgid "Specify %(item)s to login into Wok." +msgstr "Wok にログインするには、%(item)s を指定します" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -107,10 +107,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -144,12 +140,6 @@ msgstr "スタック" msgid "Go to Homepage" msgstr "ホーム・ページに移動する" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -220,7 +210,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -277,9 +267,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/ko_KR.po b/po/ko_KR.po index 7e9c1bf..8c08c57 100644 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -1,11 +1,11 @@ # Korean translations for Wok package. -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac@linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -60,12 +60,12 @@ msgstr "" msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "사용자 '%(username)s'의 인증이 실패했습니다. [오류 코드: %(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "Kimchi에 액세스할 권한이 없습니다." +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "Kimchi에 로그인하려면 %(item)s을(를) 지정하십시오." +msgid "Specify %(item)s to login into Wok." +msgstr "Wok에 로그인하려면 %(item)s을(를) 지정하십시오." #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -104,10 +104,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -141,12 +137,6 @@ msgstr "스택" msgid "Go to Homepage" msgstr "홈 페이지로 이동" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -217,7 +207,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -274,9 +264,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 429ed72..8bc8d1a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,5 +1,5 @@ # Portuguese (pt_BR) translations for Wok package. -# Copyright IBM Corp, 2013-2016 +# Copyright IBM Corp, 2013-2017 # ShaoHe Feng <shaohef@linux.vnet.ibm.com>, 2013-04-18. # # This library is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2015-03-23 12:57+0000\n" "Last-Translator: Crístian Deives dos Santos Viana <cristiandeives@gmail." "com>\n" @@ -79,12 +79,12 @@ msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" "Autenticação falhou para o usuário '%(username)s'. [Código de erro: %(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "Você não está autorizado para acessar o Kimchi" +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "Especifique %(item)s para autenticar no Kimchi" +msgid "Specify %(item)s to login into Wok." +msgstr "Especifique %(item)s para autenticar no Wok" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -124,10 +124,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "Unidade inválida '%(unit)s'" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -161,12 +157,6 @@ msgstr "PILHA" msgid "Go to Homepage" msgstr "Ir para a Página Inicial" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -238,7 +228,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -295,9 +285,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/ru_RU.po b/po/ru_RU.po index 27ff9f7..3a28074 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1,11 +1,11 @@ # Russian translations for Wok package. -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2014-08-28 17:32+0000\n" "Last-Translator: Aline Manera <aline.manera@gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/kimchi/language/" @@ -61,12 +61,12 @@ msgstr "" msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "Сбой идентификации пользователя %(username)s. [Код ошибки: %(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "Нет прав доступа к Kimchi" +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "Укажите %(item)s для входа в Kimchi" +msgid "Specify %(item)s to login into Wok." +msgstr "Укажите %(item)s для входа в Wok" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -105,10 +105,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -142,12 +138,6 @@ msgstr "Стек" msgid "Go to Homepage" msgstr "Перейти на главную страницу" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -218,7 +208,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -275,9 +265,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/wok.pot b/po/wok.pot index c29623c..67b9d76 100755 --- a/po/wok.pot +++ b/po/wok.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -61,11 +61,11 @@ msgstr "" msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "" -msgid "You are not authorized to access Kimchi" +msgid "You are not authorized to access Wok. Please, login first." msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" +msgid "Specify %(item)s to login into Wok." msgstr "" #, python-format @@ -105,10 +105,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -142,12 +138,6 @@ msgstr "" msgid "Go to Homepage" msgstr "" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -216,7 +206,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -273,9 +263,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index bc6a9c2..ade155b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,5 +1,5 @@ # Chinese (zh_CN) translations for Wok package. -# Copyright IBM Corp, 2013-2016 +# Copyright IBM Corp, 2013-2017 # ShaoHe Feng <shaohef@linux.vnet.ibm.com>, 2013-04-18. # # This library is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef@linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef@linux.vnet.ibm.com>\n" @@ -77,12 +77,12 @@ msgstr "" msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "用户'%(username)s'身份验证失败.[错误代码：%(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "您没有被授权访问Kimchi" +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "指定登录Kimchi的%(item)s" +msgid "Specify %(item)s to login into Wok." +msgstr "指定登录Wok的%(item)s" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -121,10 +121,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -158,12 +154,6 @@ msgstr "调用栈" msgid "Go to Homepage" msgstr "返回主页" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -233,7 +223,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -290,9 +280,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0e8443f..400089e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,11 +1,11 @@ # Chinese (zh_TW) translations for kimchi package. -# Copyright IBM Corp, 2014-2016 +# Copyright IBM Corp, 2014-2017 # msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-29 11:57-0300\n" +"POT-Creation-Date: 2017-01-05 15:36-0200\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac@linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -60,12 +60,12 @@ msgstr "" msgid "Authentication failed for user '%(username)s'. [Error code: %(code)s]" msgstr "使用者 '%(username)s' 的鑑別失敗。[錯誤碼：%(code)s]" -msgid "You are not authorized to access Kimchi" -msgstr "您未獲授權來存取 Kimchi" +msgid "You are not authorized to access Wok. Please, login first." +msgstr "" #, python-format -msgid "Specify %(item)s to login into Kimchi" -msgstr "指定 %(item)s 以登入 Kimchi" +msgid "Specify %(item)s to login into Wok." +msgstr "指定 %(item)s 以登入 Wok" #, python-format msgid "Invalid LDAP configuration: %(item)s : %(value)s" @@ -104,10 +104,6 @@ msgid "Invalid data unit '%(unit)s'" msgstr "" #, python-format -msgid "Unable to (re)start system's nginx.service. Details: '%(error)s'" -msgstr "" - -#, python-format msgid "Successfully completed task '%(target_uri)s'" msgstr "" @@ -141,12 +137,6 @@ msgstr "堆疊" msgid "Go to Homepage" msgstr "跳至首頁" -msgid "Host" -msgstr "" - -msgid "Virtualization" -msgstr "" - msgid "Wok" msgstr "" @@ -217,7 +207,7 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Timezone" +msgid "Zone" msgstr "" msgid "IP Address" @@ -274,9 +264,18 @@ msgstr "" msgid "Your session will expire on: 30s. Do you want to renew it?" msgstr "" +msgid "Renew" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Powered by" msgstr "" +msgid "Wok Version" +msgstr "" + msgid "User Activity Log" msgstr "" diff --git a/src/wok/i18n.py b/src/wok/i18n.py index cbc37cf..e454e31 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -39,8 +39,8 @@ messages = { "WOKASYNC0004E": _("Unable to kill task due error: %(err)s"), "WOKAUTH0001E": _("Authentication failed for user '%(username)s'. [Error code: %(code)s]"), - "WOKAUTH0002E": _("You are not authorized to access Kimchi"), - "WOKAUTH0003E": _("Specify %(item)s to login into Kimchi"), + "WOKAUTH0002E": _("You are not authorized to access Wok. Please, login first."), + "WOKAUTH0003E": _("Specify %(item)s to login into Wok."), "WOKAUTH0005E": _("Invalid LDAP configuration: %(item)s : %(value)s"), "WOKLOG0001E": _("Invalid filter parameter. Filter parameters allowed: %(filters)s"), -- 2.7.4
spice-html5 is a Kimchi dependency and not needed by Wok. So remove references to it. Signed-off-by: Aline Manera <alinefm@linux.vnet.ibm.com> --- configure.ac | 11 +---------- src/wok/Makefile.am | 11 ++--------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index fbc531b..2f8d13a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2013-2016 +# Copyright IBM Corp, 2013-2017 # # Code derived from Project Kimchi # @@ -61,15 +61,6 @@ if test "x$with_systemdsystemunitdir" != xno; then AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) fi -AC_ARG_WITH( - [spice-html5], - [AS_HELP_STRING([--with-spice-html5], - [Build Kimchi with spice-html5 @<:@default=no@:>@])], - , - [with_spice_html5="no"] -) -AM_CONDITIONAL([WITH_SPICE], [test "x$with_spice_html5" = xyes]) - AC_CONFIG_FILES([ po/Makefile.in po/gen-pot diff --git a/src/wok/Makefile.am b/src/wok/Makefile.am index 9a2481f..081f143 100644 --- a/src/wok/Makefile.am +++ b/src/wok/Makefile.am @@ -1,7 +1,7 @@ # # Project Wok # -# Copyright IBM Corp, 2015-2016 +# Copyright IBM Corp, 2015-2017 # # Code derived from Project Kimchi # @@ -29,12 +29,6 @@ EXTRA_DIST = \ API.json \ config.py.in -if WITH_SPICE -WITH_SPICE=yes -else -WITH_SPICE=no -endif - wokdir = $(pythondir)/wok install-data-local: @@ -52,8 +46,7 @@ do_substitution = \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ -e 's,[@]wokdir[@],$(wokdir),g' \ -e 's,[@]wokversion[@],$(PACKAGE_VERSION),g' \ - -e 's,[@]wokrelease[@],$(PACKAGE_RELEASE),g' \ - -e 's,[@]withspice[@],$(WITH_SPICE),g' + -e 's,[@]wokrelease[@],$(PACKAGE_RELEASE),g' config.py: config.py.in Makefile -- 2.7.4
Reviewed-By: Lucio Correia <luciojhc@linux.vnet.ibm.com> On 05/01/2017 17:32, Aline Manera wrote:
Aline Manera (2): Fix issue #40: Improve WOKAUTH0002E error message and remove references to Kimchi Remove spice-html5 references from Wok build
configure.ac | 11 +---------- po/de_DE.po | 33 ++++++++++++++++----------------- po/en_US.po | 29 ++++++++++++++--------------- po/es_ES.po | 33 ++++++++++++++++----------------- po/fr_FR.po | 33 ++++++++++++++++----------------- po/it_IT.po | 33 ++++++++++++++++----------------- po/ja_JP.po | 33 ++++++++++++++++----------------- po/ko_KR.po | 33 ++++++++++++++++----------------- po/pt_BR.po | 33 ++++++++++++++++----------------- po/ru_RU.po | 33 ++++++++++++++++----------------- po/wok.pot | 27 +++++++++++++-------------- po/zh_CN.po | 33 ++++++++++++++++----------------- po/zh_TW.po | 33 ++++++++++++++++----------------- src/wok/Makefile.am | 11 ++--------- src/wok/i18n.py | 6 +++--- 15 files changed, 193 insertions(+), 221 deletions(-)
-- Lucio Correia
Reviewed-by: Daniel Barboza <danielhb@linux.vnet.ibm.com> Tested-by: Daniel Barboza <danielhb@linux.vnet.ibm.com> On 01/05/2017 05:32 PM, Aline Manera wrote:
Aline Manera (2): Fix issue #40: Improve WOKAUTH0002E error message and remove references to Kimchi Remove spice-html5 references from Wok build
configure.ac | 11 +---------- po/de_DE.po | 33 ++++++++++++++++----------------- po/en_US.po | 29 ++++++++++++++--------------- po/es_ES.po | 33 ++++++++++++++++----------------- po/fr_FR.po | 33 ++++++++++++++++----------------- po/it_IT.po | 33 ++++++++++++++++----------------- po/ja_JP.po | 33 ++++++++++++++++----------------- po/ko_KR.po | 33 ++++++++++++++++----------------- po/pt_BR.po | 33 ++++++++++++++++----------------- po/ru_RU.po | 33 ++++++++++++++++----------------- po/wok.pot | 27 +++++++++++++-------------- po/zh_CN.po | 33 ++++++++++++++++----------------- po/zh_TW.po | 33 ++++++++++++++++----------------- src/wok/Makefile.am | 11 ++--------- src/wok/i18n.py | 6 +++--- 15 files changed, 193 insertions(+), 221 deletions(-)
participants (3)
-
Aline Manera -
Daniel Henrique Barboza -
Lucio Correia