diff --git a/oslo.concurrency/locale/en_GB/LC_MESSAGES/oslo.concurrency-log-error.po b/oslo.concurrency/locale/en_GB/LC_MESSAGES/oslo.concurrency-log-error.po deleted file mode 100644 index b4fe8e1..0000000 --- a/oslo.concurrency/locale/en_GB/LC_MESSAGES/oslo.concurrency-log-error.po +++ /dev/null @@ -1,42 +0,0 @@ -# Translations template for oslo.concurrency. -# Copyright (C) 2014 ORGANIZATION -# This file is distributed under the same license as the oslo.concurrency -# project. -# -# Translators: -# Andi Chandler , 2014 -msgid "" -msgstr "" -"Project-Id-Version: oslo.concurrency\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-10-22 06:14+0000\n" -"PO-Revision-Date: 2014-09-21 21:05+0000\n" -"Last-Translator: openstackjenkins \n" -"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" -"osloconcurrency/language/en_GB/)\n" -"Language: en_GB\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: oslo/concurrency/lockutils.py:126 -#, python-format -msgid "Could not unlock the acquired lock `%s`" -msgstr "" - -#: oslo/concurrency/lockutils.py:132 -#, python-format -msgid "Could not close the acquired file handle `%s`" -msgstr "" - -#: oslo/concurrency/openstack/common/excutils.py:76 -#, python-format -msgid "Original exception being dropped: %s" -msgstr "Original exception being dropped: %s" - -#: oslo/concurrency/openstack/common/excutils.py:105 -#, python-format -msgid "Unexpected exception occurred %d time(s)... retrying." -msgstr "Unexpected exception occurred %d time(s)... retrying." diff --git a/oslo.concurrency/locale/en_GB/LC_MESSAGES/oslo.concurrency.po b/oslo.concurrency/locale/en_GB/LC_MESSAGES/oslo.concurrency.po index 05cb1dd..88bee5d 100644 --- a/oslo.concurrency/locale/en_GB/LC_MESSAGES/oslo.concurrency.po +++ b/oslo.concurrency/locale/en_GB/LC_MESSAGES/oslo.concurrency.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: oslo.concurrency\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-09-11 06:10+0000\n" -"PO-Revision-Date: 2014-09-09 18:03+0000\n" +"POT-Creation-Date: 2014-10-25 06:11+0000\n" +"PO-Revision-Date: 2014-10-25 02:29+0000\n" "Last-Translator: openstackjenkins \n" "Language-Team: English (United Kingdom) " "(http://www.transifex.com/projects/p/osloconcurrency/language/en_GB/)\n" @@ -20,17 +20,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: oslo/concurrency/lockutils.py:106 -#: oslo/concurrency/openstack/common/lockutils.py:101 +#: oslo/concurrency/lockutils.py:115 #, python-format msgid "Unable to acquire lock on `%(filename)s` due to %(exception)s" msgstr "Unable to acquire lock on `%(filename)s` due to %(exception)s" -#: oslo/concurrency/processutils.py:58 +#: oslo/concurrency/processutils.py:69 msgid "Unexpected error while running command." msgstr "Unexpected error while running command." -#: oslo/concurrency/processutils.py:61 +#: oslo/concurrency/processutils.py:72 #, python-format msgid "" "%(description)s\n" @@ -45,26 +44,26 @@ msgstr "" "Stdout: %(stdout)r\n" "Stderr: %(stderr)r" -#: oslo/concurrency/processutils.py:160 +#: oslo/concurrency/processutils.py:171 #, python-format msgid "Got unknown keyword args: %r" msgstr "Got unknown keyword args: %r" -#: oslo/concurrency/processutils.py:163 +#: oslo/concurrency/processutils.py:174 #, python-format msgid "Got invalid arg log_errors: %r" msgstr "" -#: oslo/concurrency/processutils.py:169 +#: oslo/concurrency/processutils.py:180 msgid "Command requested root, but did not specify a root helper." msgstr "Command requested root, but did not specify a root helper." -#: oslo/concurrency/processutils.py:179 +#: oslo/concurrency/processutils.py:191 #, python-format msgid "Running cmd (subprocess): %s" msgstr "Running cmd (subprocess): %s" -#: oslo/concurrency/processutils.py:219 +#: oslo/concurrency/processutils.py:233 #, python-format msgid "" "%(desc)r\n" @@ -74,7 +73,7 @@ msgid "" "stderr: %(stderr)r" msgstr "" -#: oslo/concurrency/processutils.py:228 +#: oslo/concurrency/processutils.py:242 #, python-format msgid "" "Got an OSError\n" @@ -82,68 +81,21 @@ msgid "" "errno: %(errno)r" msgstr "" -#: oslo/concurrency/processutils.py:234 +#: oslo/concurrency/processutils.py:248 #, python-format msgid "%r failed. Not Retrying." msgstr "" -#: oslo/concurrency/processutils.py:238 +#: oslo/concurrency/processutils.py:252 #, python-format msgid "%r failed. Retrying." msgstr "%r failed. Retrying." -#: oslo/concurrency/processutils.py:281 +#: oslo/concurrency/processutils.py:299 msgid "Environment not supported over SSH" msgstr "Environment not supported over SSH" -#: oslo/concurrency/processutils.py:285 +#: oslo/concurrency/processutils.py:303 msgid "process_input not supported over SSH" msgstr "process_input not supported over SSH" -#: oslo/concurrency/openstack/common/gettextutils.py:301 -msgid "Message objects do not support addition." -msgstr "Message objects do not support addition." - -#: oslo/concurrency/openstack/common/gettextutils.py:311 -msgid "" -"Message objects do not support str() because they may contain non-ascii " -"characters. Please use unicode() or translate() instead." -msgstr "" -"Message objects do not support str() because they may contain non-ascii " -"characters. Please use unicode() or translate() instead." - -#: oslo/concurrency/openstack/common/log.py:287 -#, python-format -msgid "Deprecated: %s" -msgstr "Deprecated: %s" - -#: oslo/concurrency/openstack/common/log.py:396 -#, python-format -msgid "Error loading logging config %(log_config)s: %(err_msg)s" -msgstr "Error loading logging config %(log_config)s: %(err_msg)s" - -#: oslo/concurrency/openstack/common/log.py:457 -#, python-format -msgid "syslog facility must be one of: %s" -msgstr "syslog facility must be one of: %s" - -#: oslo/concurrency/openstack/common/log.py:700 -#, python-format -msgid "Fatal call to deprecated config: %(msg)s" -msgstr "Fatal call to deprecated config: %(msg)s" - -#: oslo/concurrency/openstack/common/strutils.py:114 -#, python-format -msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" -msgstr "Unrecognised value '%(val)s', acceptable values are: %(acceptable)s" - -#: oslo/concurrency/openstack/common/strutils.py:219 -#, python-format -msgid "Invalid unit system: \"%s\"" -msgstr "Invalid unit system: \"%s\"" - -#: oslo/concurrency/openstack/common/strutils.py:228 -#, python-format -msgid "Invalid string format: %s" -msgstr "Invalid string format: %s" - diff --git a/oslo.concurrency/locale/oslo.concurrency-log-error.pot b/oslo.concurrency/locale/oslo.concurrency-log-error.pot index b10d266..f4889db 100644 --- a/oslo.concurrency/locale/oslo.concurrency-log-error.pot +++ b/oslo.concurrency/locale/oslo.concurrency-log-error.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.concurrency 4e9c2e2\n" +"Project-Id-Version: oslo.concurrency 0.1.0.4.g6c5f5bf\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-09-22 06:07+0000\n" +"POT-Creation-Date: 2014-10-25 06:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,23 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: oslo/concurrency/lockutils.py:123 +#: oslo/concurrency/lockutils.py:132 #, python-format msgid "Could not unlock the acquired lock `%s`" msgstr "" -#: oslo/concurrency/lockutils.py:129 +#: oslo/concurrency/lockutils.py:138 #, python-format msgid "Could not close the acquired file handle `%s`" msgstr "" -#: oslo/concurrency/openstack/common/excutils.py:76 -#, python-format -msgid "Original exception being dropped: %s" -msgstr "" - -#: oslo/concurrency/openstack/common/excutils.py:105 -#, python-format -msgid "Unexpected exception occurred %d time(s)... retrying." -msgstr "" - diff --git a/oslo.concurrency/locale/oslo.concurrency.pot b/oslo.concurrency/locale/oslo.concurrency.pot index c85a053..8d38800 100644 --- a/oslo.concurrency/locale/oslo.concurrency.pot +++ b/oslo.concurrency/locale/oslo.concurrency.pot @@ -7,9 +7,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: oslo.concurrency 1a50071\n" +"Project-Id-Version: oslo.concurrency 0.1.0.4.g6c5f5bf\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2014-09-11 06:10+0000\n" +"POT-Creation-Date: 2014-10-25 06:11+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,17 +18,16 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 1.3\n" -#: oslo/concurrency/lockutils.py:106 -#: oslo/concurrency/openstack/common/lockutils.py:101 +#: oslo/concurrency/lockutils.py:115 #, python-format msgid "Unable to acquire lock on `%(filename)s` due to %(exception)s" msgstr "" -#: oslo/concurrency/processutils.py:58 +#: oslo/concurrency/processutils.py:69 msgid "Unexpected error while running command." msgstr "" -#: oslo/concurrency/processutils.py:61 +#: oslo/concurrency/processutils.py:72 #, python-format msgid "" "%(description)s\n" @@ -38,26 +37,26 @@ msgid "" "Stderr: %(stderr)r" msgstr "" -#: oslo/concurrency/processutils.py:160 +#: oslo/concurrency/processutils.py:171 #, python-format msgid "Got unknown keyword args: %r" msgstr "" -#: oslo/concurrency/processutils.py:163 +#: oslo/concurrency/processutils.py:174 #, python-format msgid "Got invalid arg log_errors: %r" msgstr "" -#: oslo/concurrency/processutils.py:169 +#: oslo/concurrency/processutils.py:180 msgid "Command requested root, but did not specify a root helper." msgstr "" -#: oslo/concurrency/processutils.py:179 +#: oslo/concurrency/processutils.py:191 #, python-format msgid "Running cmd (subprocess): %s" msgstr "" -#: oslo/concurrency/processutils.py:219 +#: oslo/concurrency/processutils.py:233 #, python-format msgid "" "%(desc)r\n" @@ -67,7 +66,7 @@ msgid "" "stderr: %(stderr)r" msgstr "" -#: oslo/concurrency/processutils.py:228 +#: oslo/concurrency/processutils.py:242 #, python-format msgid "" "Got an OSError\n" @@ -75,66 +74,21 @@ msgid "" "errno: %(errno)r" msgstr "" -#: oslo/concurrency/processutils.py:234 +#: oslo/concurrency/processutils.py:248 #, python-format msgid "%r failed. Not Retrying." msgstr "" -#: oslo/concurrency/processutils.py:238 +#: oslo/concurrency/processutils.py:252 #, python-format msgid "%r failed. Retrying." msgstr "" -#: oslo/concurrency/processutils.py:281 +#: oslo/concurrency/processutils.py:299 msgid "Environment not supported over SSH" msgstr "" -#: oslo/concurrency/processutils.py:285 +#: oslo/concurrency/processutils.py:303 msgid "process_input not supported over SSH" msgstr "" -#: oslo/concurrency/openstack/common/gettextutils.py:301 -msgid "Message objects do not support addition." -msgstr "" - -#: oslo/concurrency/openstack/common/gettextutils.py:311 -msgid "" -"Message objects do not support str() because they may contain non-ascii " -"characters. Please use unicode() or translate() instead." -msgstr "" - -#: oslo/concurrency/openstack/common/log.py:287 -#, python-format -msgid "Deprecated: %s" -msgstr "" - -#: oslo/concurrency/openstack/common/log.py:396 -#, python-format -msgid "Error loading logging config %(log_config)s: %(err_msg)s" -msgstr "" - -#: oslo/concurrency/openstack/common/log.py:457 -#, python-format -msgid "syslog facility must be one of: %s" -msgstr "" - -#: oslo/concurrency/openstack/common/log.py:700 -#, python-format -msgid "Fatal call to deprecated config: %(msg)s" -msgstr "" - -#: oslo/concurrency/openstack/common/strutils.py:114 -#, python-format -msgid "Unrecognized value '%(val)s', acceptable values are: %(acceptable)s" -msgstr "" - -#: oslo/concurrency/openstack/common/strutils.py:219 -#, python-format -msgid "Invalid unit system: \"%s\"" -msgstr "" - -#: oslo/concurrency/openstack/common/strutils.py:228 -#, python-format -msgid "Invalid string format: %s" -msgstr "" -