From 68bc4cef4671ad0e7ae9e00cd98b7348f1bcfcbf Mon Sep 17 00:00:00 2001 From: ShyPike Date: Sun, 5 Sep 2010 23:48:00 +0200 Subject: [PATCH] Fix bad quote in French installer text (fr.po). Fix bad sequence in database.py error text. --- po/main/SABnzbd.pot | 5 +---- po/main/da.po | 7 ++----- po/main/de.po | 7 ++----- po/main/fr.po | 7 ++----- po/main/nl.po | 7 ++----- po/main/no.po | 7 ++----- po/main/sv.po | 7 ++----- po/nsis/fr.po | 2 +- sabnzbd/database.py | 5 ++--- 9 files changed, 16 insertions(+), 38 deletions(-) diff --git a/po/main/SABnzbd.pot b/po/main/SABnzbd.pot index f5ddd66..2f11217 100644 --- a/po/main/SABnzbd.pot +++ b/po/main/SABnzbd.pot @@ -310,11 +310,8 @@ msgid "Failed to close database, see log" msgstr "" #: sabnzbd/database.py:355 -msgid "Invalid stage logging in history for %s (\\
)" -msgstr "" - #: sabnzbd/database.py:373 -msgid "Invalid stage logging in history for %s (;)" +msgid "Invalid stage logging in history for %s" msgstr "" #: sabnzbd/decoder.py:96 diff --git a/po/main/da.po b/po/main/da.po index 2ad5c77..b124317 100644 --- a/po/main/da.po +++ b/po/main/da.po @@ -311,12 +311,9 @@ msgid "Failed to close database, see log" msgstr "Det lykkedes ikke at lukke databasen, se logg" #: sabnzbd/database.py:355 -msgid "Invalid stage logging in history for %s (\\
)" -msgstr "" - #: sabnzbd/database.py:373 -msgid "Invalid stage logging in history for %s (;)" -msgstr "Forkert loggning i historiken av %s (;)" +msgid "Invalid stage logging in history for %s" +msgstr "" #: sabnzbd/decoder.py:96 msgid "Decoding %s failed" diff --git a/po/main/de.po b/po/main/de.po index 639e752..73e9680 100644 --- a/po/main/de.po +++ b/po/main/de.po @@ -311,12 +311,9 @@ msgid "Failed to close database, see log" msgstr "Fehler beim Schliessen der Datenbank. Beachten Sie das Nachrichtenprotokoll." #: sabnzbd/database.py:355 -msgid "Invalid stage logging in history for %s (\\
)" -msgstr "" - #: sabnzbd/database.py:373 -msgid "Invalid stage logging in history for %s (;)" -msgstr "Ungültiges Stufen-Protokoll im Verlauf für %s (;)" +msgid "Invalid stage logging in history for %s" +msgstr "" #: sabnzbd/decoder.py:96 msgid "Decoding %s failed" diff --git a/po/main/fr.po b/po/main/fr.po index 7e91ac6..99c194a 100644 --- a/po/main/fr.po +++ b/po/main/fr.po @@ -311,12 +311,9 @@ msgid "Failed to close database, see log" msgstr "Echec de fermeture de base de données, voir log" #: sabnzbd/database.py:355 -msgid "Invalid stage logging in history for %s (\\
)" -msgstr "" - #: sabnzbd/database.py:373 -msgid "Invalid stage logging in history for %s (;)" -msgstr "Etape de log incorrect dans l'historique pour %s (;)" +msgid "Invalid stage logging in history for %s" +msgstr "" #: sabnzbd/decoder.py:96 msgid "Decoding %s failed" diff --git a/po/main/nl.po b/po/main/nl.po index 9e77f5d..3ad01cb 100644 --- a/po/main/nl.po +++ b/po/main/nl.po @@ -311,12 +311,9 @@ msgid "Failed to close database, see log" msgstr "Het lukt niet om de database te sluiten, zie log bestand" #: sabnzbd/database.py:355 -msgid "Invalid stage logging in history for %s (\\
)" -msgstr "" - #: sabnzbd/database.py:373 -msgid "Invalid stage logging in history for %s (;)" -msgstr "Foutieve fase logging in geschiedenis voor %s (;)" +msgid "Invalid stage logging in history for %s" +msgstr "" #: sabnzbd/decoder.py:96 msgid "Decoding %s failed" diff --git a/po/main/no.po b/po/main/no.po index bf4c3bf..8c99187 100644 --- a/po/main/no.po +++ b/po/main/no.po @@ -311,12 +311,9 @@ msgid "Failed to close database, see log" msgstr "Kunne ikke stenge databasen, se logg" #: sabnzbd/database.py:355 -msgid "Invalid stage logging in history for %s (\\
)" -msgstr "" - #: sabnzbd/database.py:373 -msgid "Invalid stage logging in history for %s (;)" -msgstr "Feil i historikken av %s (;)" +msgid "Invalid stage logging in history for %s" +msgstr "" #: sabnzbd/decoder.py:96 msgid "Decoding %s failed" diff --git a/po/main/sv.po b/po/main/sv.po index 3e682c1..f38fc0f 100644 --- a/po/main/sv.po +++ b/po/main/sv.po @@ -311,12 +311,9 @@ msgid "Failed to close database, see log" msgstr "Det gick inte att stänga databasen, se logg" #: sabnzbd/database.py:355 -msgid "Invalid stage logging in history for %s (\\
)" -msgstr "" - #: sabnzbd/database.py:373 -msgid "Invalid stage logging in history for %s (;)" -msgstr "Felaktig loggning i historiken av %s (;)" +msgid "Invalid stage logging in history for %s" +msgstr "" #: sabnzbd/decoder.py:96 msgid "Decoding %s failed" diff --git a/po/nsis/fr.po b/po/nsis/fr.po index 0a16485..05a6f49 100644 --- a/po/nsis/fr.po +++ b/po/nsis/fr.po @@ -27,7 +27,7 @@ msgstr "Supportez le projet, faites un don !" #: NSIS_Installer.nsi:344 msgid "Please close \"SABnzbd.exe\" first" -msgstr "Quittez \"SABnzbd.exe\" avant l\'installation, SVP" +msgstr "Quittez \"SABnzbd.exe\" avant l'installation, SVP" #: NSIS_Installer.nsi:351 msgid " >>>> WARNING <<<<\r\n\r\nIf not empty, download your current queue with the old program.\r\nThe new program will ignore your current queue!" diff --git a/sabnzbd/database.py b/sabnzbd/database.py index 46e11bb..1d80e2d 100644 --- a/sabnzbd/database.py +++ b/sabnzbd/database.py @@ -352,8 +352,7 @@ def unpack_history_info(item): try: lines = item['stage_log'].split('\r\n') except: - logging.error(T('Invalid stage logging in history for %s (\ -\
)'), unicoder(item['name'])) + logging.error(T('Invalid stage logging in history for %s') + ' (\\r\\n)', unicoder(item['name'])) logging.debug('Lines: %s', item['stage_log']) lines = [] item['stage_log'] = [] @@ -370,7 +369,7 @@ def unpack_history_info(item): try: logs = logs.split(';') except: - logging.error(T('Invalid stage logging in history for %s (;)'), unicoder(item['name'])) + logging.error(T('Invalid stage logging in history for %s') + ' (;)', unicoder(item['name'])) logging.debug('Logs: %s', logs) logs = [] for log in logs: