Merge "Imported Translations from Transifex"

3 files changed, 16 insertions, 15 deletions

diff --git a/openstack_auth/locale/de/LC_MESSAGES/django.po b/openstack_auth/locale/de/LC_MESSAGES/django.po
index 9f1e7b1..ec486ea 100644
--- a/openstack_auth/locale/de/LC_MESSAGES/django.po
+++ b/openstack_auth/locale/de/LC_MESSAGES/django.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Horizon\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-26 06:03+0000\n"
-"PO-Revision-Date: 2015-03-25 17:08+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"POT-Creation-Date: 2015-03-27 06:04+0000\n"
+"PO-Revision-Date: 2015-03-26 13:01+0000\n"
+"Last-Translator: Robert Simai\n"
 "Language-Team: German "
 "(http://www.transifex.com/projects/p/horizon/language/de/)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -29,7 +29,7 @@ msgstr ""
 
 #: openstack_auth/backend.py:111
 msgid "Invalid credentials."
-msgstr ""
+msgstr "Unzureichende Berechtigung."
 
 #: openstack_auth/backend.py:114
 msgid "An error occurred authenticating. Please try again later."
@@ -110,6 +110,6 @@ msgstr "Die Regel erlaubt nicht die Ausführung von %s."
 #, python-format
 msgid "Rules must be an instance of dict or Rules, got %s instead"
 msgstr ""
-"Die Regeln müssen eine Instanz eines Verzeichnisses oder von Regeln sein,"
-" anstatt dessen wurde %s zurückgemeldet."
+"Die Regeln müssen im Regelverzeichnis vorkommen, anstatt dessen wurde %s "
+"zurückgemeldet"
 
diff --git a/openstack_auth/locale/en_GB/LC_MESSAGES/django.po b/openstack_auth/locale/en_GB/LC_MESSAGES/django.po
index 4f88515..3ae5d9d 100644
--- a/openstack_auth/locale/en_GB/LC_MESSAGES/django.po
+++ b/openstack_auth/locale/en_GB/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Horizon\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-26 06:03+0000\n"
-"PO-Revision-Date: 2015-03-25 17:08+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"POT-Creation-Date: 2015-03-27 06:04+0000\n"
+"PO-Revision-Date: 2015-03-26 23:50+0000\n"
+"Last-Translator: Rob Cresswell <robert.cresswell@outlook.com>\n"
 "Language-Team: English (United Kingdom) "
 "(http://www.transifex.com/projects/p/horizon/language/en_GB/)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -26,7 +26,7 @@ msgstr "The authentication token issued by the Identity service has expired."
 
 #: openstack_auth/backend.py:111
 msgid "Invalid credentials."
-msgstr ""
+msgstr "Invalid credentials."
 
 #: openstack_auth/backend.py:114
 msgid "An error occurred authenticating. Please try again later."
diff --git a/openstack_auth/locale/zh_TW/LC_MESSAGES/django.po b/openstack_auth/locale/zh_TW/LC_MESSAGES/django.po
index 2ccc8d5..ad2c52e 100644
--- a/openstack_auth/locale/zh_TW/LC_MESSAGES/django.po
+++ b/openstack_auth/locale/zh_TW/LC_MESSAGES/django.po
@@ -4,12 +4,13 @@
 # django_openstack_auth project.
 #
 # Translators:
+# Zhang Xiaowei <zero00072@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version:  Horizon\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-03-26 06:03+0000\n"
-"PO-Revision-Date: 2015-03-26 05:01+0000\n"
+"POT-Creation-Date: 2015-03-27 06:04+0000\n"
+"PO-Revision-Date: 2015-03-27 06:00+0000\n"
 "Last-Translator: Zhang Xiaowei <zero00072@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) "
 "(http://www.transifex.com/projects/p/horizon/language/zh_TW/)\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: openstack_auth/backend.py:53
 msgid "The authentication token issued by the Identity service has expired."
-msgstr "認證服務發佈的憑證已經過期。"
+msgstr "認證伺服器發佈的憑證已經過期。"
 
 #: openstack_auth/backend.py:111
 msgid "Invalid credentials."
@@ -67,7 +68,7 @@ msgstr "已淘汰：%s"
 #: openstack_auth/openstack/common/log.py:395
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
-msgstr "讀取紀錄設定 %(log_config)s 時出錯：%(err_msg)s"
+msgstr "讀取紀錄設定檔 %(log_config)s 時出錯：%(err_msg)s"
 
 #: openstack_auth/openstack/common/log.py:456
 #, python-format
@@ -77,7 +78,7 @@ msgstr "Syslog 機能必須是下列其中一項：%s"
 #: openstack_auth/openstack/common/log.py:702
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
-msgstr "呼叫已淘汰的配置時發生嚴重錯誤：%(msg)s"
+msgstr "呼叫已淘汰的設置時發生嚴重錯誤：%(msg)s"
 
 #: openstack_auth/openstack/common/policy.py:97
 msgid "The JSON file that defines policies."