From 9c3cd233b2ab18ec6f99889f9f8abde0062b59ac Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 15 Jul 2011 20:54:42 +0000 Subject: [PATCH] Bugfixing git-svn-id: http://svn.brehm-online.com/svn/my-stuff/python/PyLogrotate/trunk@300 ec8d2aa5-1599-4edb-8739-2b3a1bc399aa --- LogRotate/Config.py | 8 ++++---- po/de/LC_MESSAGES/pylogrotate.po | 10 +++++----- po/pylogrotate.pot | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/LogRotate/Config.py b/LogRotate/Config.py index 907d103..2fe765e 100755 --- a/LogRotate/Config.py +++ b/LogRotate/Config.py @@ -1086,14 +1086,14 @@ class LogrotateConfigurationReader(object): directive[key] = option_value if key == 'copy' and option_value: if directive['copytruncate']: - msg = (_("Option '%(by)s' disables option '%(what)'.") + msg = (_("Option '%(by)s' disables option '%(what)s'.") % {'by': 'copy', 'what': 'copytruncate'}) msg += " " + ( _("(file '%(file)s', line %(lnr)s)") % {'file': filename, 'lnr': linenr}) self.logger.warning(msg) directive['copytruncate'] = False if directive['create']['enabled']: - msg = (_("Option '%(by)s' disables option '%(what)'.") + msg = (_("Option '%(by)s' disables option '%(what)s'.") % {'by': 'copy', 'what': 'create'}) msg += " " + ( _("(file '%(file)s', line %(lnr)s)") % {'file': filename, 'lnr': linenr}) @@ -1101,14 +1101,14 @@ class LogrotateConfigurationReader(object): directive['create']['enabled'] = False elif key == 'copytruncate' and option_value: if directive['copy']: - msg = (_("Option '%(by)s' disables option '%(what)'.") + msg = (_("Option '%(by)s' disables option '%(what)s'.") % {'by': 'copytruncate', 'what': 'copy'}) msg += " " + ( _("(file '%(file)s', line %(lnr)s)") % {'file': filename, 'lnr': linenr}) self.logger.warning(msg) directive['copy'] = False if directive['create']['enabled']: - msg = (_("Option '%(by)s' disables option '%(what)'.") + msg = (_("Option '%(by)s' disables option '%(what)s'.") % {'by': 'copytruncate', 'what': 'create'}) msg += " " + ( _("(file '%(file)s', line %(lnr)s)") % {'file': filename, 'lnr': linenr}) diff --git a/po/de/LC_MESSAGES/pylogrotate.po b/po/de/LC_MESSAGES/pylogrotate.po index 6d299f3..5a4410c 100644 --- a/po/de/LC_MESSAGES/pylogrotate.po +++ b/po/de/LC_MESSAGES/pylogrotate.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: pylogrotate 0.6.0\n" "Report-Msgid-Bugs-To: frank@brehm-online.com\n" -"POT-Creation-Date: 2011-07-15 22:00+0200\n" -"PO-Revision-Date: 2011-07-15 22:20+0200\n" +"POT-Creation-Date: 2011-07-15 22:52+0200\n" +"PO-Revision-Date: 2011-07-15 22:56+0200\n" "Last-Translator: Frank Brehm \n" "Language-Team: de \n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" @@ -1222,9 +1222,9 @@ msgstr "Öffne Statusdatei »%s« zum Schreiben ..." #: LogRotate/Config.py:1089 LogRotate/Config.py:1096 LogRotate/Config.py:1104 #: LogRotate/Config.py:1111 -#, python-format -msgid "Option '%(by)s' disables option '%(what)'." -msgstr "Die Option »%(by)s« setzt Option »%(what)« außer Kraft." +#, python-format +msgid "Option '%(by)s' disables option '%(what)s'." +msgstr "Die Option »%(by)s« setzt Option »%(what)s« außer Kraft." #: LogRotate/Config.py:1138 #, python-format diff --git a/po/pylogrotate.pot b/po/pylogrotate.pot index 727fee4..62d84bc 100644 --- a/po/pylogrotate.pot +++ b/po/pylogrotate.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: pylogrotate 0.6.0\n" "Report-Msgid-Bugs-To: frank@brehm-online.com\n" -"POT-Creation-Date: 2011-07-15 22:00+0200\n" +"POT-Creation-Date: 2011-07-15 22:52+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1168,7 +1168,7 @@ msgstr "" #: LogRotate/Config.py:1089 LogRotate/Config.py:1096 LogRotate/Config.py:1104 #: LogRotate/Config.py:1111 #, python-format -msgid "Option '%(by)s' disables option '%(what)'." +msgid "Option '%(by)s' disables option '%(what)s'." msgstr "" #: LogRotate/Config.py:1138 -- 2.39.5