Bugfixing

git-svn-id: http://svn.brehm-online.com/svn/my-stuff/python/PyLogrotate/trunk@300 ec8d2aa5-1599-4edb-8739-2b3a1bc399aa

diff --git a/LogRotate/Config.py b/LogRotate/Config.py
index 907d10327e81e6465e089f08152f8c046f9195a6..2fe765eda1962f6a8718cb13975680e0cb3b7e93 100755 (executable)
--- 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 6d299f3c8907b047861bec5bd2f72710f7690e22..5a4410cce68ad1ab8a55d807ee8ac620cd3fbb6f 100644 (file)
--- 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 <frank@brehm-online.com>\n"
 "Language-Team: de <LL@li.org>\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 727fee47c3e03e78b469857b858e3426ae38589f..62d84bc925dd882794974f35f6b7f40f19256c5f 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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