[Mpuls-commits] r5729 - in base/trunk/mpulsweb: i18n i18n/de/LC_MESSAGES templates/privacy/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Dec 22 09:32:23 CET 2011
Author: torsten
Date: 2011-12-22 09:32:20 +0100 (Thu, 22 Dec 2011)
New Revision: 5729
Modified:
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako
Log:
Issue2573: Changed text in dialogs.
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-12-20 13:27:13 UTC (rev 5728)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-12-22 08:32:20 UTC (rev 5729)
@@ -8,7 +8,7 @@
"Project-Id-Version: mpulsweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2011-09-15 17:48+0200\n"
-"PO-Revision-Date: 2011-12-20 14:22+0100\n"
+"PO-Revision-Date: 2011-12-22 09:28+0100\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"
@@ -347,14 +347,14 @@
msgid "Anonymising not possible."
msgstr "Anonymisierung nicht möglich."
-#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1463
+#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1481
#: mpulsweb/model/phase.py:312
#: mpulsweb/templates/casemanagement/caselist.mako:155
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr "laufend"
-#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1465
+#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1483
#: mpulsweb/model/phase.py:314
#: mpulsweb/templates/casemanagement/caselist.mako:158
#: mpulsweb/templates/phase/phase.mako:53
@@ -1352,7 +1352,7 @@
"Die Einwilligung zur Synchronisation der Daten mit der AiR-Akte wurde "
"erfolgreich zurückgezogen. Bereits übertragene Daten wurden gelöscht."
-#: mpulsweb/controllers/meta.py:201 mpulsweb/controllers/meta.py:232
+#: mpulsweb/controllers/meta.py:201 mpulsweb/controllers/meta.py:233
msgid "Error! Agreement for synchronisation not withdrawn."
msgstr "Fehler! Die Einwilligung zur Synchronisation wurde nicht zurückgezogen."
@@ -1371,11 +1371,11 @@
"gelöscht wird. Die Daten der AiR-Akte stehen danach niemandem mehr zur "
"Verfügung."
-#: mpulsweb/controllers/meta.py:221
+#: mpulsweb/controllers/meta.py:222
msgid "Agreement globally withdrawn."
msgstr "Einversändnis zurückgezogen."
-#: mpulsweb/controllers/meta.py:222
+#: mpulsweb/controllers/meta.py:223
msgid ""
"The agremment for sychronisation of data with the meta case has "
"succsessfully been withdrawn. Already transfered data has been deleted. "
@@ -1385,11 +1385,11 @@
"erfolgreich zurückgezogen. Bereits übertragene Daten wurden gelöscht. Die"
" AiR-Akte wurde schwebend gelöscht."
-#: mpulsweb/controllers/meta.py:284
+#: mpulsweb/controllers/meta.py:285
msgid "Meta user disabled!"
msgstr "AiR-Nutzer deaktiviert!"
-#: mpulsweb/controllers/meta.py:285
+#: mpulsweb/controllers/meta.py:286
msgid ""
"The meta user has been disabled to prevent misuse of the meta-search. "
"Connections to the meta-serve are not possible from now on. Please "
@@ -1399,15 +1399,15 @@
"vorzubeugen. Bitte kontaktieren Sie die Administration des AiR-Servers, "
"um den AiR-Nutzer wieder zu aktivieren."
-#: mpulsweb/controllers/meta.py:302
+#: mpulsweb/controllers/meta.py:303
msgid "Error while trying to search case"
msgstr "Fehler bei der Fallaktensuche"
-#: mpulsweb/controllers/meta.py:309
+#: mpulsweb/controllers/meta.py:310
msgid "Create new meta?"
msgstr "Neue AiR-Akte anlegen?"
-#: mpulsweb/controllers/meta.py:310
+#: mpulsweb/controllers/meta.py:311
#, python-format
msgid ""
"The new meta case will be created with the following data: %s Do you "
@@ -1416,43 +1416,43 @@
"Die neue AiR-Akte wird mit den folgenden Daten angelegt werden: %s Wollen"
" Sie wirklich eine neue AiR-Akte für diesen Fall anlegen?"
-#: mpulsweb/controllers/meta.py:336
+#: mpulsweb/controllers/meta.py:337
msgid "Meta case created."
msgstr "AiR-Akte angelegt."
-#: mpulsweb/controllers/meta.py:337
+#: mpulsweb/controllers/meta.py:338
msgid "The meta case was sucessfully created and linked with this case."
msgstr "Die AiR-Akte wurde erfolgreich angelegt und mit diesem Fall verknüpft."
-#: mpulsweb/controllers/meta.py:343
+#: mpulsweb/controllers/meta.py:344
msgid "Error! Meta case not created."
msgstr "Fehler! AiR-Akte wurde nicht angelegt."
-#: mpulsweb/controllers/meta.py:348
+#: mpulsweb/controllers/meta.py:349
msgid "Link with meta?"
msgstr "Mit der AiR-Akte verknüpfen?"
-#: mpulsweb/controllers/meta.py:349
+#: mpulsweb/controllers/meta.py:350
msgid "Do you really want to link this the case with the selected meta case?"
msgstr "Wollen Sie wirklich diesen Fall mit der ausgewählten AiR-Akte verknüpfen?"
-#: mpulsweb/controllers/meta.py:363
+#: mpulsweb/controllers/meta.py:364
msgid "Case linked."
msgstr "Fall wurde verknüpft."
-#: mpulsweb/controllers/meta.py:364
+#: mpulsweb/controllers/meta.py:365
msgid "The case was sucessfully link with the meta case."
msgstr "Der Fall wurde erfolgreich mit der AiR-Akte verknüpft."
-#: mpulsweb/controllers/meta.py:370
+#: mpulsweb/controllers/meta.py:371
msgid "Error! Case not linked."
msgstr "Fehler! Der Fall wurde nicht verknüpft."
-#: mpulsweb/controllers/meta.py:379
+#: mpulsweb/controllers/meta.py:380
msgid "Unlink from meta?"
msgstr "Verknüpfung zur AiR-Akte löschen?"
-#: mpulsweb/controllers/meta.py:380
+#: mpulsweb/controllers/meta.py:381
msgid ""
"Do you really want to unlink this the case from the meta case and delete "
"already stored data from this agency in the meta case?"
@@ -1460,11 +1460,11 @@
"Wollen Sie wirklich die Verknüpfung zur AiR-Akte löschen und damit "
"bereits gespeicherte Daten Ihrer Einrichtung aus der AiR-Akte entfernen?"
-#: mpulsweb/controllers/meta.py:389
+#: mpulsweb/controllers/meta.py:390
msgid "Case unlinked."
msgstr "Verknüpfung gelöscht."
-#: mpulsweb/controllers/meta.py:390
+#: mpulsweb/controllers/meta.py:391
msgid ""
"The case was sucessfully unlinked from the meta case. Already transfered "
"data has been deleted in meta case."
@@ -1472,29 +1472,29 @@
"Die Verknüpfung zur AiR-Akte sowie bereits übertragene Daten konnten "
"erfolgreich gelöscht werden."
-#: mpulsweb/controllers/meta.py:398
+#: mpulsweb/controllers/meta.py:399
msgid "Error! Case not unlinked."
msgstr "Fehler! Die Verknüpfung konnte nicht gelöscht werden."
-#: mpulsweb/controllers/meta.py:404
+#: mpulsweb/controllers/meta.py:405
msgid "Data uploaded."
msgstr "Daten hochgeladen."
-#: mpulsweb/controllers/meta.py:405
+#: mpulsweb/controllers/meta.py:406
msgid "The data was sucessfully uploaded to the meta case."
msgstr ""
"Die Daten der Fallakten konnten erfolgreich zur AiR-Akte hochgeladen "
"werden."
-#: mpulsweb/controllers/meta.py:411
+#: mpulsweb/controllers/meta.py:412
msgid "Error! Data not uploaded."
msgstr "Fehler! Daten nicht hochgeladen"
-#: mpulsweb/controllers/meta.py:433 mpulsweb/controllers/meta.py:447
+#: mpulsweb/controllers/meta.py:434 mpulsweb/controllers/meta.py:448
msgid "Error! Data not downloaded."
msgstr "Fehler! Daten nicht geladen."
-#: mpulsweb/controllers/meta.py:457
+#: mpulsweb/controllers/meta.py:458
msgid ""
"The meta server did not accept the request because of either disabled "
"user or missing or incorrect username or password. Please check whether "
@@ -1505,7 +1505,7 @@
"Deaktivierung des Nutzers auf dem AiR-Server. Bitte prüfen Sie, ob die "
"Angaben zum AiR-Server korrekt konfiguriert sind. "
-#: mpulsweb/controllers/meta.py:467
+#: mpulsweb/controllers/meta.py:468
msgid ""
"The meta case doesn't seem to exist (anymore) on the meta server. The "
"most likely reason for this is that the permission to store data on the "
@@ -1519,7 +1519,7 @@
"Verknüpfung mit der AiR-Akte aufgehoben und das Zurückziehen des "
"Einverständnisses auch in WASKU festgehalten."
-#: mpulsweb/controllers/meta.py:480
+#: mpulsweb/controllers/meta.py:481
msgid ""
"The meta-case has been anonymized. Please check whether the case has to "
"be anonymized as well. The information about the meta-case has been "
@@ -1530,7 +1530,7 @@
"Akte ist aufgehoben worden und das Einversändnis zur Synchronisation mit "
"dem AiR-Server ist zurückgezogen worden."
-#: mpulsweb/controllers/meta.py:490
+#: mpulsweb/controllers/meta.py:491
msgid ""
"The meta-case has been marked for deletion or anonymization. It is "
"possible that the case may be available for editing later, so you might "
@@ -1540,7 +1540,7 @@
"möglich ist, dass die Akte später wieder zur Verfügung steht, können Sie "
"eventuell Ihre Aktion später erfolgreich durchführen."
-#: mpulsweb/controllers/meta.py:501
+#: mpulsweb/controllers/meta.py:502
msgid ""
"The project part of the meta-case seems to be missing. Since the "
"information about the meta case seems to be outdated, the link to the "
@@ -1841,42 +1841,42 @@
"Phase \"%s\" ist derzeit noch nicht beendet. Bitte beenden Sie die Phase "
"und versuchen Sie erneut eine Anonymisierung.</p>"
-#: mpulsweb/model/case.py:1116
+#: mpulsweb/model/case.py:1130
msgid "Error on fetching data for formletter"
msgstr "Fehler beim Laden der Daten für Serienbrieffunktion"
-#: mpulsweb/model/case.py:1415 mpulsweb/model/case.py:1416
+#: mpulsweb/model/case.py:1433 mpulsweb/model/case.py:1434
#: mpulsweb/templates/casemanagement/caselist.mako:184
#: mpulsweb/templates/casemanagement/caselist.mako:185
#: mpulsweb/templates/search/search.mako:75
msgid "Editable"
msgstr "Bearbeitbar"
-#: mpulsweb/model/case.py:1417
+#: mpulsweb/model/case.py:1435
msgid "Outstanding deleted"
msgstr "Schwebend gelöscht"
-#: mpulsweb/model/case.py:1418
+#: mpulsweb/model/case.py:1436
msgid "Outstanding made anonymous"
msgstr "Schwebend anonymisiert"
-#: mpulsweb/model/case.py:1419
+#: mpulsweb/model/case.py:1437
msgid "Make anonymous"
msgstr "Anonymisiert"
-#: mpulsweb/model/case.py:1600
+#: mpulsweb/model/case.py:1618
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
"Der Fall mit der UUID '%s' konnte wegen Regelverletzungen nicht "
"importiert werden."
-#: mpulsweb/model/case.py:1634
+#: mpulsweb/model/case.py:1652
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr "Der Fall mit der UUID '%s' wurde bereits anonymisiert."
-#: mpulsweb/model/case.py:1637
+#: mpulsweb/model/case.py:1655
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
@@ -1885,7 +1885,7 @@
"Der Fall mit der UUID '%s' ist entweder schwebend anonymisiert oder "
"schwebend gelöscht."
-#: mpulsweb/model/case.py:1669
+#: mpulsweb/model/case.py:1687
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
@@ -1920,9 +1920,9 @@
msgid "Case is not linked"
msgstr "Der Fall ist nicht verknüpft."
-#: mpulsweb/model/meta.py:211 mpulsweb/model/meta.py:222
-#: mpulsweb/model/meta.py:247 mpulsweb/model/meta.py:258
-#: mpulsweb/model/meta.py:270
+#: mpulsweb/model/meta.py:211 mpulsweb/model/meta.py:218
+#: mpulsweb/model/meta.py:229 mpulsweb/model/meta.py:254
+#: mpulsweb/model/meta.py:265 mpulsweb/model/meta.py:277
msgid "Case is not linked with any meta case."
msgstr "Der Fall ist mit keiner AiR-Akte verknüpft."
@@ -1935,11 +1935,11 @@
"Die Phase '%s' ist nicht in einem konsistenten Zustand und hat nicht "
"ausgefüllte Pflichtfelder: %s"
-#: mpulsweb/model/phase.py:469
+#: mpulsweb/model/phase.py:470
msgid "Field is OK and requires no further editing"
msgstr "Dieses Feld ist OK und benötigt keine weitere Bearbeitung"
-#: mpulsweb/model/phase.py:472
+#: mpulsweb/model/phase.py:473
msgid "Field is not OK and requires further editing"
msgstr "Dieses Feld ist fehlerhaft und benötigt einer weiteren Bearbeitung"
@@ -3632,7 +3632,7 @@
#: mpulsweb/templates/dialogs/success.mako:8
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:20
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:26
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:32
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:30
msgid "OK"
msgstr "OK"
@@ -4568,20 +4568,15 @@
"fragen, ob er einer Synchronisation der Daten zustimmt, um die Fallakte "
"mit dem AiR-Server zu verknüpfen und Daten auszutauschen."
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:13
-msgid "Please notice that the sync permission needs to be written."
-msgstr ""
-"Bitte beachten Sie, dass es für die Einwilligung zur Synchronisation der "
-"Daten mit dem AiR-Server sowohl einer Einwilligungserklärung als auch "
-"einer Schweigepflichtsentbindung in schriftlichen Form bedarf."
-
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:16
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:15
msgid "<strong>Permission granted</strong>, when the permission is granted."
msgstr ""
-"<strong>Erlaubnis liegt vor</strong>, wenn die Erlaubnis Seitens des "
-"jungen Menschen vorliegt."
+"<strong>Erlaubnis liegt vor</strong>, wenn der jungen Mensch der "
+"Übermittlung von Daten mit dem Meta-Server grundsätzlich zustimmt. Die "
+"Einwilligung und Schweigepflichtsentindung können auf der Folgeseite "
+"separat gesetzt werden."
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:19
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:18
msgid ""
"<strong>Permission unclear</strong>, when the permission is unclear but "
"should be obtained later."
@@ -4589,7 +4584,7 @@
"<strong>Erlaubnis unklar</strong>, wenn die Erlaubnis des jungen Menschen"
" noch nicht vorliegt, aber noch eigeholt werden soll."
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:21
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:20
msgid ""
"<strong>Permission refused</strong>, when permission is refused and will "
"not be granted later."
@@ -4598,15 +4593,15 @@
"jungen Menschen nicht vorliegt, da der junge Mensch einer Synchronisation"
" nicht zustimmt."
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:26
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:24
msgid "Permission granted"
msgstr "Erlaubnis liegt vor"
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:27
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:25
msgid "Permission unclear"
msgstr "Erlaubnis unklar"
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:28
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:26
msgid "Permission refused"
msgstr "Erlaubnis liegt nicht vor"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-12-20 13:27:13 UTC (rev 5728)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-12-22 08:32:20 UTC (rev 5729)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 2.0.16\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-12-16 17:04+0100\n"
+"POT-Creation-Date: 2011-12-22 09:25+0100\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"
@@ -292,13 +292,13 @@
msgid "Anonymising not possible."
msgstr ""
-#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1463
+#: mpulsweb/controllers/case.py:219 mpulsweb/model/case.py:1481
#: mpulsweb/model/phase.py:312 mpulsweb/templates/casemanagement/caselist.mako:155
#: mpulsweb/templates/phase/phase.mako:51
msgid "Running"
msgstr ""
-#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1465
+#: mpulsweb/controllers/case.py:221 mpulsweb/model/case.py:1483
#: mpulsweb/model/phase.py:314 mpulsweb/templates/casemanagement/caselist.mako:158
#: mpulsweb/templates/phase/phase.mako:53 mpulsweb/templates/phase/phase.mako:55
msgid "Finished"
@@ -1093,7 +1093,7 @@
" been withdrawn. Already transfered data has been deleted."
msgstr ""
-#: mpulsweb/controllers/meta.py:201 mpulsweb/controllers/meta.py:232
+#: mpulsweb/controllers/meta.py:201 mpulsweb/controllers/meta.py:233
msgid "Error! Agreement for synchronisation not withdrawn."
msgstr ""
@@ -1108,123 +1108,123 @@
"the meta case will not be available to anybody anymore."
msgstr ""
-#: mpulsweb/controllers/meta.py:221
+#: mpulsweb/controllers/meta.py:222
msgid "Agreement globally withdrawn."
msgstr ""
-#: mpulsweb/controllers/meta.py:222
+#: mpulsweb/controllers/meta.py:223
msgid ""
"The agremment for sychronisation of data with the meta case has succsessfully"
" been withdrawn. Already transfered data has been deleted. Meta case has been"
" marked for deletion."
msgstr ""
-#: mpulsweb/controllers/meta.py:284
+#: mpulsweb/controllers/meta.py:285
msgid "Meta user disabled!"
msgstr ""
-#: mpulsweb/controllers/meta.py:285
+#: mpulsweb/controllers/meta.py:286
msgid ""
"The meta user has been disabled to prevent misuse of the meta-search. "
"Connections to the meta-serve are not possible from now on. Please contact "
"the administration of the meta-server to reactivate your account."
msgstr ""
-#: mpulsweb/controllers/meta.py:302
+#: mpulsweb/controllers/meta.py:303
msgid "Error while trying to search case"
msgstr ""
-#: mpulsweb/controllers/meta.py:309
+#: mpulsweb/controllers/meta.py:310
msgid "Create new meta?"
msgstr ""
-#: mpulsweb/controllers/meta.py:310
+#: mpulsweb/controllers/meta.py:311
#, python-format
msgid ""
"The new meta case will be created with the following data: %s Do you really "
"want to create a new meta case for this case?"
msgstr ""
-#: mpulsweb/controllers/meta.py:336
+#: mpulsweb/controllers/meta.py:337
msgid "Meta case created."
msgstr ""
-#: mpulsweb/controllers/meta.py:337
+#: mpulsweb/controllers/meta.py:338
msgid "The meta case was sucessfully created and linked with this case."
msgstr ""
-#: mpulsweb/controllers/meta.py:343
+#: mpulsweb/controllers/meta.py:344
msgid "Error! Meta case not created."
msgstr ""
-#: mpulsweb/controllers/meta.py:348
+#: mpulsweb/controllers/meta.py:349
msgid "Link with meta?"
msgstr ""
-#: mpulsweb/controllers/meta.py:349
+#: mpulsweb/controllers/meta.py:350
msgid "Do you really want to link this the case with the selected meta case?"
msgstr ""
-#: mpulsweb/controllers/meta.py:363
+#: mpulsweb/controllers/meta.py:364
msgid "Case linked."
msgstr ""
-#: mpulsweb/controllers/meta.py:364
+#: mpulsweb/controllers/meta.py:365
msgid "The case was sucessfully link with the meta case."
msgstr ""
-#: mpulsweb/controllers/meta.py:370
+#: mpulsweb/controllers/meta.py:371
msgid "Error! Case not linked."
msgstr ""
-#: mpulsweb/controllers/meta.py:379
+#: mpulsweb/controllers/meta.py:380
msgid "Unlink from meta?"
msgstr ""
-#: mpulsweb/controllers/meta.py:380
+#: mpulsweb/controllers/meta.py:381
msgid ""
"Do you really want to unlink this the case from the meta case and delete "
"already stored data from this agency in the meta case?"
msgstr ""
-#: mpulsweb/controllers/meta.py:389
+#: mpulsweb/controllers/meta.py:390
msgid "Case unlinked."
msgstr ""
-#: mpulsweb/controllers/meta.py:390
+#: mpulsweb/controllers/meta.py:391
msgid ""
"The case was sucessfully unlinked from the meta case. Already transfered data"
" has been deleted in meta case."
msgstr ""
-#: mpulsweb/controllers/meta.py:398
+#: mpulsweb/controllers/meta.py:399
msgid "Error! Case not unlinked."
msgstr ""
-#: mpulsweb/controllers/meta.py:404
+#: mpulsweb/controllers/meta.py:405
msgid "Data uploaded."
msgstr ""
-#: mpulsweb/controllers/meta.py:405
+#: mpulsweb/controllers/meta.py:406
msgid "The data was sucessfully uploaded to the meta case."
msgstr ""
-#: mpulsweb/controllers/meta.py:411
+#: mpulsweb/controllers/meta.py:412
msgid "Error! Data not uploaded."
msgstr ""
-#: mpulsweb/controllers/meta.py:433 mpulsweb/controllers/meta.py:447
+#: mpulsweb/controllers/meta.py:434 mpulsweb/controllers/meta.py:448
msgid "Error! Data not downloaded."
msgstr ""
-#: mpulsweb/controllers/meta.py:457
+#: mpulsweb/controllers/meta.py:458
msgid ""
"The meta server did not accept the request because of either disabled user or"
" missing or incorrect username or password. Please check whether the meta-"
"server is configured correctly."
msgstr ""
-#: mpulsweb/controllers/meta.py:467
+#: mpulsweb/controllers/meta.py:468
msgid ""
"The meta case doesn't seem to exist (anymore) on the meta server. The most "
"likely reason for this is that the permission to store data on the meta "
@@ -1232,21 +1232,21 @@
" and the revocation of the permission has been recorded in WASKU as well."
msgstr ""
-#: mpulsweb/controllers/meta.py:480
+#: mpulsweb/controllers/meta.py:481
msgid ""
"The meta-case has been anonymized. Please check whether the case has to be "
"anonymized as well. The information about the meta-case has been deleted and "
"the permission to sync has been revoked."
msgstr ""
-#: mpulsweb/controllers/meta.py:490
+#: mpulsweb/controllers/meta.py:491
msgid ""
"The meta-case has been marked for deletion or anonymization. It is possible "
"that the case may be available for editing later, so you might be able to "
"complete your task later."
msgstr ""
-#: mpulsweb/controllers/meta.py:501
+#: mpulsweb/controllers/meta.py:502
msgid ""
"The project part of the meta-case seems to be missing. Since the information "
"about the meta case seems to be outdated, the link to the project part has "
@@ -1491,47 +1491,47 @@
"finish the phase and try to anonymise again.</p>"
msgstr ""
-#: mpulsweb/model/case.py:1116
+#: mpulsweb/model/case.py:1130
msgid "Error on fetching data for formletter"
msgstr ""
-#: mpulsweb/model/case.py:1415 mpulsweb/model/case.py:1416
+#: mpulsweb/model/case.py:1433 mpulsweb/model/case.py:1434
#: mpulsweb/templates/casemanagement/caselist.mako:184
#: mpulsweb/templates/casemanagement/caselist.mako:185
#: mpulsweb/templates/search/search.mako:75
msgid "Editable"
msgstr ""
-#: mpulsweb/model/case.py:1417
+#: mpulsweb/model/case.py:1435
msgid "Outstanding deleted"
msgstr ""
-#: mpulsweb/model/case.py:1418
+#: mpulsweb/model/case.py:1436
msgid "Outstanding made anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1419
+#: mpulsweb/model/case.py:1437
msgid "Make anonymous"
msgstr ""
-#: mpulsweb/model/case.py:1600
+#: mpulsweb/model/case.py:1618
#, python-format
msgid "The case with UUID '%s' could not be imported due to rule violations"
msgstr ""
-#: mpulsweb/model/case.py:1634
+#: mpulsweb/model/case.py:1652
#, python-format
msgid "The case with UUID '%s' was anonymized already."
msgstr ""
-#: mpulsweb/model/case.py:1637
+#: mpulsweb/model/case.py:1655
#, python-format
msgid ""
"The case with UUID '%s' is either marked for anonymization or marked for "
"deletion."
msgstr ""
-#: mpulsweb/model/case.py:1669
+#: mpulsweb/model/case.py:1687
#, python-format
msgid "The XML file has the version '%s', but supported is only version '%s'"
msgstr ""
@@ -1564,8 +1564,8 @@
msgid "Case is not linked"
msgstr ""
-#: mpulsweb/model/meta.py:211 mpulsweb/model/meta.py:222 mpulsweb/model/meta.py:247
-#: mpulsweb/model/meta.py:258 mpulsweb/model/meta.py:270
+#: mpulsweb/model/meta.py:211 mpulsweb/model/meta.py:218 mpulsweb/model/meta.py:229
+#: mpulsweb/model/meta.py:254 mpulsweb/model/meta.py:265 mpulsweb/model/meta.py:277
msgid "Case is not linked with any meta case."
msgstr ""
@@ -1576,11 +1576,11 @@
"and has missing required fields: %s"
msgstr ""
-#: mpulsweb/model/phase.py:469
+#: mpulsweb/model/phase.py:470
msgid "Field is OK and requires no further editing"
msgstr ""
-#: mpulsweb/model/phase.py:472
+#: mpulsweb/model/phase.py:473
msgid "Field is not OK and requires further editing"
msgstr ""
@@ -3223,7 +3223,7 @@
#: mpulsweb/templates/dialogs/success.mako:8
#: mpulsweb/templates/phase/dialogs/success_fullautomatic_set_phase.mako:20
#: mpulsweb/templates/privacy/dialogs/missing_statement_body.mako:26
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:32
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:30
msgid "OK"
msgstr ""
@@ -4049,35 +4049,31 @@
"resonsible for this."
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:13
-msgid "Please notice that the sync permission needs to be written."
-msgstr ""
-
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:16
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:15
msgid "<strong>Permission granted</strong>, when the permission is granted."
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:19
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:18
msgid ""
"<strong>Permission unclear</strong>, when the permission is unclear but "
"should be obtained later."
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:21
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:20
msgid ""
"<strong>Permission refused</strong>, when permission is refused and will not "
"be granted later."
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:26
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:24
msgid "Permission granted"
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:27
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:25
msgid "Permission unclear"
msgstr ""
-#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:28
+#: mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako:26
msgid "Permission refused"
msgstr ""
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako 2011-12-20 13:27:13 UTC (rev 5728)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_syncpermission.mako 2011-12-22 08:32:20 UTC (rev 5729)
@@ -10,18 +10,16 @@
<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('Missing data for the sync persmission')}</h1>
<p>${_('The sync permission of the youth to sync data to the meta server. You are resonsible for this.')}</p>
% if h.hasRole(['cm']):
- <p>${h.literal(_('Please notice that the sync permission needs to be written.'))}</p>
- <ol>
- <li>
- ${h.literal(_('<strong>Permission granted</strong>, when the permission is granted.'))}
- </li>
- <li>
- ${h.literal(_('<strong>Permission unclear</strong>, when the permission is unclear but should be obtained later.'))}
- </li>
- <li>${h.literal(_('<strong>Permission refused</strong>, when permission is refused and will not be granted later.'))}
- </li>
- </ol>
- </p>
+ <ol>
+ <li>
+ ${h.literal(_('<strong>Permission granted</strong>, when the permission is granted.'))}
+ </li>
+ <li>
+ ${h.literal(_('<strong>Permission unclear</strong>, when the permission is unclear but should be obtained later.'))}
+ </li>
+ <li>${h.literal(_('<strong>Permission refused</strong>, when permission is refused and will not be granted later.'))}
+ </li>
+ </ol>
<p>
<a class="button" href="${h.url_for(controller="meta", action="index", id=c.ds_id, confirmed=0)}">${_('Permission granted')}</a>
<a class="button" href="${c.targeturl}">${_('Permission unclear')}</a>
More information about the Mpuls-commits
mailing list