[Mpuls-commits] r4991 - in base/trunk: . mpulsweb/controllers mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue May 24 11:20:40 CEST 2011 

Author: ludwig
Date: 2011-05-24 11:20:39 +0200 (Tue, 24 May 2011)
New Revision: 4991

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/case.py
   base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
   base/trunk/mpulsweb/i18n/mpulsweb.pot
Log:
Small translation issues.

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-05-20 19:32:24 UTC (rev 4990)
+++ base/trunk/ChangeLog	2011-05-24 09:20:39 UTC (rev 4991)
@@ -1,3 +1,11 @@
+2011-05-24  Ludwig Reiter <ludwig.reiter at inteation.de>
+
+	* mpulsweb/i18n/mpulsweb.pot,
+	mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+	mpulsweb/controllers/case.py:
+	Small translation issues. Don't use newline at end of msgid.
+	Same python format tags in msgid and msgstr.
+
 2011-05-20  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/lib/helpers.py (get_db_selectionlist): Fix check for

Modified: base/trunk/mpulsweb/controllers/case.py
===================================================================
--- base/trunk/mpulsweb/controllers/case.py	2011-05-20 19:32:24 UTC (rev 4990)
+++ base/trunk/mpulsweb/controllers/case.py	2011-05-24 09:20:39 UTC (rev 4991)
@@ -45,8 +45,7 @@
 MARKANONYMIZE_FAILED_TEXT = _(u"""\
 To anonymise this case document was not possible, because of following 
 reason:</p><p><i>%s</i></p><p>Please click on OK to geht back to the overview.
-</p>
-""")
+</p>""")
 MARKANONYMIZE_SUCCESS = _(u"""Freed case document to anonymise.""")
 MARKANONYMIZE_SUCCESS_TEXT = _(u"""\
 The case document has been freed to be anonymised and has been given to

Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-05-20 19:32:24 UTC (rev 4990)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2011-05-24 09:20:39 UTC (rev 4991)
@@ -8,7 +8,7 @@
 "Project-Id-Version: mpulsweb 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
 "POT-Creation-Date: 2009-10-08 09:54+0200\n"
-"PO-Revision-Date: 2011-05-19 12:47+0200\n"
+"PO-Revision-Date: 2011-05-24 11:06+0200\n"
 "Last-Translator: Torsten Irländer <torsten.irlaender at intevation.de>\n"
 "Language-Team: de <LL at li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -322,17 +322,17 @@
 "To anonymise this case document was not possible, because of following \n"
 "reason:</p><p><i>%s</i></p><p>Please click on OK to geht back to the "
 "overview.\n"
-"</p>\n"
+"</p>"
 msgstr ""
 "<p>Eine Anonymisierung der Fallakte war aus folgendem Grund nicht "
 "möglich:</p><p><i>%s</i></p><p>Bitte klicken Sie auf \"OK\", um zur "
 "Fallaktenübersicht fortzufahren.</p>"
 
-#: mpulsweb/controllers/case.py:50
+#: mpulsweb/controllers/case.py:49
 msgid "Freed case document to anonymise."
 msgstr "Fallakte wurde zur Anonymisierung freigegeben!"
 
-#: mpulsweb/controllers/case.py:51
+#: mpulsweb/controllers/case.py:50
 msgid ""
 "The case document has been freed to be anonymised and has been given to\n"
 "the admininstration. Please click on OK, to get back to the overview."
@@ -341,7 +341,7 @@
 "Administration zur endgültigen Anonymisierung vor. Bitte klicken Sie auf "
 "\"OK\", um zur Fallaktenübersicht fortzufahren."
 
-#: mpulsweb/controllers/case.py:58 mpulsweb/controllers/case_bundle.py:290
+#: mpulsweb/controllers/case.py:57 mpulsweb/controllers/case_bundle.py:290
 #: mpulsweb/controllers/case_bundle.py:321
 #: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
 #: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:6
@@ -350,7 +350,7 @@
 msgstr[0] "Fallakte löschen?"
 msgstr[1] "Fallakten löschen?"
 
-#: mpulsweb/controllers/case.py:59
+#: mpulsweb/controllers/case.py:58
 msgid ""
 "Warning! On deleting the case all data will be erased\n"
 "irrecoverable!<br>Only delete the case if this case is <b>not needed for\n"
@@ -362,7 +362,7 @@
 "<em>für Auswertungen nicht mehr berücksichtigt</em>!<br><br>Die Akte "
 "jetzt vom Server löschen?"
 
-#: mpulsweb/controllers/case.py:63
+#: mpulsweb/controllers/case.py:62
 msgid ""
 "Do you really want to mark this case for deletion?\n"
 "The case will not be editable afterwards, and submited to the "
@@ -373,7 +373,7 @@
 "steht Ihnen danach nicht mehr zur Bearbeitung zur Verfügung und wird der "
 "Administration zum Löschen vorgelegt."
 
-#: mpulsweb/controllers/case.py:67
+#: mpulsweb/controllers/case.py:66
 #: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:6
 #: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:6
 #: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:6
@@ -381,22 +381,22 @@
 msgid "Case document deleted!"
 msgstr "Fallakte gelöscht!"
 
-#: mpulsweb/controllers/case.py:68
+#: mpulsweb/controllers/case.py:67
 msgid "The case document is given to the administrator for deletion."
 msgstr "Die Fallakte wurde zum Löschen an die Administration weitergeleitet."
 
-#: mpulsweb/controllers/case.py:69
+#: mpulsweb/controllers/case.py:68
 msgid "Click on OK to continue."
 msgstr "Bitte klicken Sie \"OK\", um fortzufahren."
 
-#: mpulsweb/controllers/case.py:74 mpulsweb/controllers/case_bundle.py:435
+#: mpulsweb/controllers/case.py:73 mpulsweb/controllers/case_bundle.py:435
 #: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
 msgid "Restore case?"
 msgid_plural "Restore cases?"
 msgstr[0] "Fallakte wiederherstellen?"
 msgstr[1] "Fallakten wiederherstellen?"
 
-#: mpulsweb/controllers/case.py:75
+#: mpulsweb/controllers/case.py:74
 msgid ""
 "Do you really want to restore the case? The case\n"
 "will be editable afterwards again for the users."
@@ -404,11 +404,11 @@
 "Wollen Sie wirklich die Fallakte wiederherstellen? Die Fallakte ist "
 "danach wieder für die Nutzer bearbeitbar."
 
-#: mpulsweb/controllers/case.py:78
+#: mpulsweb/controllers/case.py:77
 msgid "Case(s) imported!"
 msgstr "Fallakte(n) importiert!"
 
-#: mpulsweb/controllers/case.py:79
+#: mpulsweb/controllers/case.py:78
 msgid ""
 "The file was imported successfully.\n"
 "Click on \"OK\" to open the case overview."
@@ -416,11 +416,11 @@
 "Die Datei wurde erfolgreich importiert. Klicken Sie auf \"OK\", um die "
 "Fallaktenübersicht zu öffnen."
 
-#: mpulsweb/controllers/case.py:82
+#: mpulsweb/controllers/case.py:81
 msgid "Case(s) not imported!"
 msgstr "Fallakte(n) nicht importiert!"
 
-#: mpulsweb/controllers/case.py:83
+#: mpulsweb/controllers/case.py:82
 msgid ""
 "An error occurred during the import.\n"
 "Click 'OK' to return to the import dialog."
@@ -428,14 +428,14 @@
 "Bei dem Import ist ein Fehler aufgetreten. Klicken Sie auf \"OK\", um zu "
 "dem Importdialog zurückzukehren."
 
-#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1362
+#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1362
 #: mpulsweb/model/phase.py:299
 #: mpulsweb/templates/casemanagement/caselist.mako:152
 #: mpulsweb/templates/phase/phase.mako:51
 msgid "Running"
 msgstr "laufend"
 
-#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1364
+#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1364
 #: mpulsweb/model/phase.py:301
 #: mpulsweb/templates/casemanagement/caselist.mako:155
 #: mpulsweb/templates/phase/phase.mako:53
@@ -443,23 +443,23 @@
 msgid "Finished"
 msgstr "beendet"
 
-#: mpulsweb/controllers/case.py:273 mpulsweb/controllers/case_bundle.py:425
+#: mpulsweb/controllers/case.py:272 mpulsweb/controllers/case_bundle.py:425
 msgid "Case restored!"
 msgid_plural "Cases restored!"
 msgstr[0] "Fallakte wiederhergestellt!"
 msgstr[1] "Fallakten wiederhergestellt!"
 
-#: mpulsweb/controllers/case.py:274 mpulsweb/controllers/case_bundle.py:40
+#: mpulsweb/controllers/case.py:273 mpulsweb/controllers/case_bundle.py:40
 #: mpulsweb/controllers/casedocument.py:22 mpulsweb/controllers/document.py:43
 #: mpulsweb/controllers/usersettings.py:49
 msgid "Please click OK to continue."
 msgstr "Bitte klicken Sie auf OK, um fortzufahren."
 
-#: mpulsweb/controllers/case.py:443
+#: mpulsweb/controllers/case.py:442
 msgid "Case copied!"
 msgstr "Fallakte kopiert"
 
-#: mpulsweb/controllers/case.py:444
+#: mpulsweb/controllers/case.py:443
 msgid ""
 "The case was succussfully copied and is now available in the case "
 "overview. Click on \"OK\" to open the case overview."
@@ -468,11 +468,11 @@
 "Fallaktenübersicht zur Verfügung. Klicken Sie auf \"OK\", um die "
 "Fallaktenübersicht zu öffnen."
 
-#: mpulsweb/controllers/case.py:450
+#: mpulsweb/controllers/case.py:449
 msgid "Copy case?"
 msgstr "Fallakte kopieren?"
 
-#: mpulsweb/controllers/case.py:451
+#: mpulsweb/controllers/case.py:450
 msgid ""
 "Do you really want to copy this case? All data will be copied in the new "
 "case."
@@ -480,17 +480,17 @@
 "Wollen Sie wirklich die Fallakten kopieren? Sämtliche Daten der Fallakte "
 "werden dann in einer neuen Fallakte übernommen."
 
-#: mpulsweb/controllers/case.py:567 mpulsweb/controllers/case.py:587
+#: mpulsweb/controllers/case.py:566 mpulsweb/controllers/case.py:586
 msgid "Case storage extended"
 msgstr "Aufbewahrung verlängert"
 
-#: mpulsweb/controllers/case.py:568
+#: mpulsweb/controllers/case.py:567
 msgid "Please enter the reason for the case storage extension."
 msgstr ""
 "Bitte geben Sie hier den Grund für die Verlängerung der "
 "Aufbewahrungsfrist ein."
 
-#: mpulsweb/controllers/case.py:588
+#: mpulsweb/controllers/case.py:587
 msgid "The max case storage has been extended. Please click on OK to continue"
 msgstr ""
 "Die maximale Aufbewahrungsfirst wurde verlängert. Bitte klicken Sie auf "
@@ -731,8 +731,8 @@
 #, python-format
 msgid "%d Case was marked for %s"
 msgid_plural "%d Cases were marked for %s"
-msgstr[0] "%s Fallakte wurde für den '%s' markiert."
-msgstr[1] "%s Fallakten wurden für den '%s' markiert."
+msgstr[0] "%d Fallakte wurde für den '%s' markiert."
+msgstr[1] "%d Fallakten wurden für den '%s' markiert."
 
 #: mpulsweb/controllers/case_bundle.py:549
 #, python-format
@@ -1097,7 +1097,7 @@
 msgid "Table"
 msgstr "Tabelle"
 
-#: mpulsweb/lib/helpers.py:187
+#: mpulsweb/lib/helpers.py:188
 msgid "Userpersmissions"
 msgstr "Benutzerberechtigungen"
 
@@ -1852,16 +1852,17 @@
 msgid "Delete"
 msgstr "Löschen"
 
-#: mpulsweb/templates/administration/overview_usergroups.mako:25
-msgid "Groupname"
-msgstr "Benutzergruppenname"
-
+#: mpulsweb/templates/administration/overview_user.mako:60
 #: mpulsweb/templates/administration/overview_usergroups.mako:49
 #: mpulsweb/templates/casemanagement/caselist.mako:288
 #: mpulsweb/templates/evaluation/agencylist.mako:94
 msgid "No data found."
 msgstr "Es wurden keine Datensätze gefunden."
 
+#: mpulsweb/templates/administration/overview_usergroups.mako:25
+msgid "Groupname"
+msgstr "Benutzergruppenname"
+
 #: mpulsweb/templates/administration/reset_password.mako:9
 #: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:8
 msgid "Reset password"

Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-05-20 19:32:24 UTC (rev 4990)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot	2011-05-24 09:20:39 UTC (rev 4991)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: mpulsweb 2.0.0-pre\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-05-19 12:46+0200\n"
+"POT-Creation-Date: 2011-05-24 11:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -266,20 +266,20 @@
 "To anonymise this case document was not possible, because of following \n"
 "reason:</p><p><i>%s</i></p><p>Please click on OK to geht back to the "
 "overview.\n"
-"</p>\n"
+"</p>"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:50
+#: mpulsweb/controllers/case.py:49
 msgid "Freed case document to anonymise."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:51
+#: mpulsweb/controllers/case.py:50
 msgid ""
 "The case document has been freed to be anonymised and has been given to\n"
 "the admininstration. Please click on OK, to get back to the overview."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:58 mpulsweb/controllers/case_bundle.py:290
+#: mpulsweb/controllers/case.py:57 mpulsweb/controllers/case_bundle.py:290
 #: mpulsweb/controllers/case_bundle.py:321
 #: mpulsweb/templates/casemanagement/dialogs/confirm.mako:6
 #: mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako:6
@@ -288,7 +288,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case.py:59
+#: mpulsweb/controllers/case.py:58
 msgid ""
 "Warning! On deleting the case all data will be erased\n"
 "irrecoverable!<br>Only delete the case if this case is <b>not needed for\n"
@@ -296,14 +296,14 @@
 "server?"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:63
+#: mpulsweb/controllers/case.py:62
 msgid ""
 "Do you really want to mark this case for deletion?\n"
 "The case will not be editable afterwards, and submited to the administration\n"
 "for deletion."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:67
+#: mpulsweb/controllers/case.py:66
 #: mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako:6
 #: mpulsweb/templates/casebundle/dialogs/success_markdelete.mako:6
 #: mpulsweb/templates/casemanagement/dialogs/success_delete.mako:6
@@ -311,98 +311,98 @@
 msgid "Case document deleted!"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:68
+#: mpulsweb/controllers/case.py:67
 msgid "The case document is given to the administrator for deletion."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:69
+#: mpulsweb/controllers/case.py:68
 msgid "Click on OK to continue."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:74 mpulsweb/controllers/case_bundle.py:435
+#: mpulsweb/controllers/case.py:73 mpulsweb/controllers/case_bundle.py:435
 #: mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako:6
 msgid "Restore case?"
 msgid_plural "Restore cases?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case.py:75
+#: mpulsweb/controllers/case.py:74
 msgid ""
 "Do you really want to restore the case? The case\n"
 "will be editable afterwards again for the users."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:78
+#: mpulsweb/controllers/case.py:77
 msgid "Case(s) imported!"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:79
+#: mpulsweb/controllers/case.py:78
 msgid ""
 "The file was imported successfully.\n"
 "Click on \"OK\" to open the case overview."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:82
+#: mpulsweb/controllers/case.py:81
 msgid "Case(s) not imported!"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:83
+#: mpulsweb/controllers/case.py:82
 msgid ""
 "An error occurred during the import.\n"
 "Click 'OK' to return to the import dialog."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1362
+#: mpulsweb/controllers/case.py:218 mpulsweb/model/case.py:1362
 #: mpulsweb/model/phase.py:299 mpulsweb/templates/casemanagement/caselist.mako:152
 #: mpulsweb/templates/phase/phase.mako:51
 msgid "Running"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1364
+#: mpulsweb/controllers/case.py:220 mpulsweb/model/case.py:1364
 #: mpulsweb/model/phase.py:301 mpulsweb/templates/casemanagement/caselist.mako:155
 #: mpulsweb/templates/phase/phase.mako:53 mpulsweb/templates/phase/phase.mako:55
 msgid "Finished"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:273 mpulsweb/controllers/case_bundle.py:425
+#: mpulsweb/controllers/case.py:272 mpulsweb/controllers/case_bundle.py:425
 msgid "Case restored!"
 msgid_plural "Cases restored!"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case.py:274 mpulsweb/controllers/case_bundle.py:40
+#: mpulsweb/controllers/case.py:273 mpulsweb/controllers/case_bundle.py:40
 #: mpulsweb/controllers/casedocument.py:22 mpulsweb/controllers/document.py:43
 #: mpulsweb/controllers/usersettings.py:49
 msgid "Please click OK to continue."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:443
+#: mpulsweb/controllers/case.py:442
 msgid "Case copied!"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:444
+#: mpulsweb/controllers/case.py:443
 msgid ""
 "The case was succussfully copied and is now available in the case overview. "
 "Click on \"OK\" to open the case overview."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:450
+#: mpulsweb/controllers/case.py:449
 msgid "Copy case?"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:451
+#: mpulsweb/controllers/case.py:450
 msgid "Do you really want to copy this case? All data will be copied in the new case."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:567 mpulsweb/controllers/case.py:587
+#: mpulsweb/controllers/case.py:566 mpulsweb/controllers/case.py:586
 msgid "Case storage extended"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:568
+#: mpulsweb/controllers/case.py:567
 msgid "Please enter the reason for the case storage extension."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:588
+#: mpulsweb/controllers/case.py:587
 msgid "The max case storage has been extended. Please click on OK to continue"
 msgstr ""
 
@@ -908,7 +908,7 @@
 msgid "Table"
 msgstr ""
 
-#: mpulsweb/lib/helpers.py:187
+#: mpulsweb/lib/helpers.py:188
 msgid "Userpersmissions"
 msgstr ""
 
@@ -1633,16 +1633,17 @@
 msgid "Delete"
 msgstr ""
 
-#: mpulsweb/templates/administration/overview_usergroups.mako:25
-msgid "Groupname"
-msgstr ""
-
+#: mpulsweb/templates/administration/overview_user.mako:60
 #: mpulsweb/templates/administration/overview_usergroups.mako:49
 #: mpulsweb/templates/casemanagement/caselist.mako:288
 #: mpulsweb/templates/evaluation/agencylist.mako:94
 msgid "No data found."
 msgstr ""
 
+#: mpulsweb/templates/administration/overview_usergroups.mako:25
+msgid "Groupname"
+msgstr ""
+
 #: mpulsweb/templates/administration/reset_password.mako:9
 #: mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako:8
 msgid "Reset password"

More information about the Mpuls-commits mailing list