[Mpuls-commits] r6017 - in base/trunk/mpulsweb: i18n i18n/de/LC_MESSAGES templates/meta
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Tue Aug 7 14:21:59 CEST 2012
Author: ludwig
Date: 2012-08-07 14:21:58 +0200 (Tue, 07 Aug 2012)
New Revision: 6017
Modified:
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/meta/index.mako
Log:
After rm meta download function, change the meta index translation.
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2012-08-07 11:56:41 UTC (rev 6016)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2012-08-07 12:21:58 UTC (rev 6017)
@@ -8,7 +8,7 @@
"Project-Id-Version: mpulsweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2012-04-20 15:59+0200\n"
-"PO-Revision-Date: 2012-08-02 14:11+0200\n"
+"PO-Revision-Date: 2012-08-07 14:17+0200\n"
"Last-Translator: Roland Geider <roland.geider at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -1460,21 +1460,18 @@
msgid "Data uploaded."
msgstr "Daten übertragen."
-#: mpulsweb/controllers/meta.py:426
+#: mpulsweb/controllers/meta.py:426 mpulsweb/controllers/phase.py:41
msgid "The data was sucessfully uploaded to the meta case."
msgstr ""
"Die Daten der Fallakten konnten erfolgreich zur AiR-Akte übertragen "
"werden."
-#: mpulsweb/controllers/meta.py:432
+#: mpulsweb/controllers/meta.py:432 mpulsweb/controllers/phase.py:44
+#: mpulsweb/controllers/phase.py:46
msgid "Error! Data not uploaded."
msgstr "Fehler! Daten nicht übertragen."
-#: mpulsweb/controllers/meta.py:454 mpulsweb/controllers/meta.py:468
-msgid "Error! Data not downloaded."
-msgstr "Fehler! Daten nicht geladen."
-
-#: mpulsweb/controllers/meta.py:478
+#: mpulsweb/controllers/meta.py:450
msgid ""
"The meta server did not accept the request because of either disabled "
"user or missing or incorrect username or password. Please check whether "
@@ -1485,7 +1482,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:490
+#: mpulsweb/controllers/meta.py:462
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 "
@@ -1499,7 +1496,7 @@
"Verknüpfung mit der AiR-Akte aufgehoben und das Zurückziehen des "
"Einverständnisses auch in Projektakte festgehalten."
-#: mpulsweb/controllers/meta.py:505
+#: mpulsweb/controllers/meta.py:477
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 "
@@ -1513,7 +1510,7 @@
"zurückgezogen worden. Bitte prüfen Sie, ob auch die Fallakte auf "
"Projektebene anonymisiert werden muss."
-#: mpulsweb/controllers/meta.py:515
+#: mpulsweb/controllers/meta.py:487
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 "
@@ -1523,7 +1520,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:526
+#: mpulsweb/controllers/meta.py:498
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 "
@@ -1549,11 +1546,11 @@
"Wollen Sie die Nachricht wirklich als gelesen markieren? Sie wird dadurch"
" dauerhaft aus der Übersicht entfernt."
-#: mpulsweb/controllers/phase.py:37
+#: mpulsweb/controllers/phase.py:48
msgid "Phase changed!"
msgstr "Phase gewechselt!"
-#: mpulsweb/controllers/phase.py:38
+#: mpulsweb/controllers/phase.py:49
msgid ""
"The phase could be changed successfully. Please follow the shown steps to"
" reach the phase overview."
@@ -1783,8 +1780,8 @@
#: mpulsweb/lib/validators.py:292 mpulsweb/lib/validators.py:294
#, python-format
-msgid "The dates must be at most %(value)s Days apart."
-msgstr "Die Datumsangaben dürfen maximal %(value)s Tage auseinander liegen."
+msgid "The dates must be at most %s Days apart."
+msgstr "Die Datumsangaben dürfen maximal %s Tage auseinander liegen."
#: mpulsweb/lib/helper/case.py:48
msgid "< 1 week"
@@ -1908,7 +1905,7 @@
msgid "Synchronisation is not allowed for this case."
msgstr "Die Synchronisation ist für diesen Fall nicht zugelassen."
-#: mpulsweb/model/meta.py:189 mpulsweb/templates/meta/index.mako:85
+#: mpulsweb/model/meta.py:189 mpulsweb/templates/meta/index.mako:84
msgid "Case is not linked"
msgstr "Der Fall ist nicht verknüpft."
@@ -3620,8 +3617,8 @@
#: mpulsweb/templates/dialogs/error_case.mako:5
#: mpulsweb/templates/dialogs/error_main.mako:5
#: mpulsweb/templates/dialogs/failed.mako:4
-#: mpulsweb/templates/meta/index.mako:84 mpulsweb/templates/meta/index.mako:95
-#: mpulsweb/templates/meta/index.mako:102
+#: mpulsweb/templates/meta/index.mako:83 mpulsweb/templates/meta/index.mako:94
+#: mpulsweb/templates/meta/index.mako:101
msgid "Error"
msgstr "Fehler"
@@ -4149,8 +4146,8 @@
"Akte durchgeführt haben."
#: mpulsweb/templates/meta/index.mako:12 mpulsweb/templates/meta/index.mako:25
-#: mpulsweb/templates/meta/index.mako:71 mpulsweb/templates/meta/index.mako:83
-#: mpulsweb/templates/meta/index.mako:94 mpulsweb/templates/meta/index.mako:101
+#: mpulsweb/templates/meta/index.mako:71 mpulsweb/templates/meta/index.mako:82
+#: mpulsweb/templates/meta/index.mako:93 mpulsweb/templates/meta/index.mako:100
#: mpulsweb/templates/meta/search.mako:112
msgid "State"
msgstr "Status"
@@ -4203,42 +4200,32 @@
#: mpulsweb/templates/meta/index.mako:66
msgid ""
-"Transfer of data can be done in two directions.<ol><li>You can download "
-"data from the meta case to display it. Downloading data will not effect "
-"any data stored in the local case.</li><li>To update the meta case with "
-"data from the local case you can upload.</li></ol>The updated data will "
-"be stored permanently in the meta case and will be available for other "
-"agencys who also have access to the meta case."
+"Transfer of data can be done in one direction.<ol><li>To update the meta "
+"case with data from the local case you can upload.</li></ol>The updated "
+"data will be stored permanently in the meta case."
msgstr ""
-"Die Synchronisation der Daten kann in zwei Richtungen "
-"geschehen.<ol><li>Sie können Daten aus der AiR-Akte zur Ansicht herunter "
-"laden. Diese werden nicht im lokalen Fall gespeichert. </li> <li>Mit dem "
-"Hochladen von Daten aus dem lokalen Fall kann die AiR-Akte aktualisiert "
-"werden. </li></ol>Die übermittelten Daten werden gespeichert und stehen "
-"damit für andere Einrichtungen, die den gleichen jungen Menschen "
-"begleiten, zur Verfügung."
+"Die Daten können nur in eine Richtung transferiert werden.<ol><li>Um die "
+"Daten zu aktualisieren, kann man die lokale Fallakte "
+"übertragen.</li></ol>Die übertragenen Daten werden dauerhaft in der AiR "
+"Akte gespeichert."
#: mpulsweb/templates/meta/index.mako:73
msgid "Case is linked"
msgstr "Fall ist verknüpft."
#: mpulsweb/templates/meta/index.mako:77
-msgid "Download meta"
-msgstr "AiR-Akte anzeigen"
-
-#: mpulsweb/templates/meta/index.mako:78
msgid "Upload case"
msgstr "Falldaten übertragen"
-#: mpulsweb/templates/meta/index.mako:79 mpulsweb/templates/meta/unlink.mako:4
+#: mpulsweb/templates/meta/index.mako:78 mpulsweb/templates/meta/unlink.mako:4
msgid "Unlink case"
msgstr "Verknüpfung löschen"
-#: mpulsweb/templates/meta/index.mako:89
+#: mpulsweb/templates/meta/index.mako:88
msgid "Link case"
msgstr "Fall verknüpfen"
-#: mpulsweb/templates/meta/index.mako:96
+#: mpulsweb/templates/meta/index.mako:95
msgid ""
"Sychronisation is not allowed. Please set permission for synchronisation "
"before linking"
@@ -4246,7 +4233,7 @@
"Die Synchronisation ist nicht zugelassen. Bitte setzten Sie die "
"Einwilligung zur Synchronisation."
-#: mpulsweb/templates/meta/index.mako:103
+#: mpulsweb/templates/meta/index.mako:102
msgid ""
"Meta user is not configured properly. Please consult the administration "
"to do so."
@@ -4430,19 +4417,6 @@
msgid "Print"
msgstr "Drucken"
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:16
-msgid ""
-"It is strongly recommended to sync the case with its meta-case after "
-"changing the phase as this is a significant change in the support of the "
-"client. Please open the meta-case to sync the updated case to the meta-"
-"server."
-msgstr ""
-"Es wird dringend empfohlen nach einem Wechsel der Phase die Daten der "
-"Fallakte zur AiR-Akte zu übertragen, da es sich bei einem Wechsel der "
-"Phase um eine signifikante Änderung der Betreuung handelt. Bitte öffnen "
-"Sie die AiR-Akte, um die aktualisierten Daten zum AiR-Server zu "
-"übertragen."
-
#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:23
#, python-format
msgid ""
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2012-08-07 11:56:41 UTC (rev 6016)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2012-08-07 12:21:58 UTC (rev 6017)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 2.1.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2012-08-02 14:05+0200\n"
+"POT-Creation-Date: 2012-08-07 14:17+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"
@@ -1209,26 +1209,23 @@
msgid "Data uploaded."
msgstr ""
-#: mpulsweb/controllers/meta.py:426
+#: mpulsweb/controllers/meta.py:426 mpulsweb/controllers/phase.py:41
msgid "The data was sucessfully uploaded to the meta case."
msgstr ""
-#: mpulsweb/controllers/meta.py:432
+#: mpulsweb/controllers/meta.py:432 mpulsweb/controllers/phase.py:44
+#: mpulsweb/controllers/phase.py:46
msgid "Error! Data not uploaded."
msgstr ""
-#: mpulsweb/controllers/meta.py:454 mpulsweb/controllers/meta.py:468
-msgid "Error! Data not downloaded."
-msgstr ""
-
-#: mpulsweb/controllers/meta.py:478
+#: mpulsweb/controllers/meta.py:450
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:490
+#: mpulsweb/controllers/meta.py:462
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 "
@@ -1236,21 +1233,21 @@
" and the revocation of the permission has been recorded in WASKU as well."
msgstr ""
-#: mpulsweb/controllers/meta.py:505
+#: mpulsweb/controllers/meta.py:477
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:515
+#: mpulsweb/controllers/meta.py:487
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:526
+#: mpulsweb/controllers/meta.py:498
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 "
@@ -1268,11 +1265,11 @@
"It will permanently disappear from the overview."
msgstr ""
-#: mpulsweb/controllers/phase.py:37
+#: mpulsweb/controllers/phase.py:48
msgid "Phase changed!"
msgstr ""
-#: mpulsweb/controllers/phase.py:38
+#: mpulsweb/controllers/phase.py:49
msgid ""
"The phase could be changed successfully. Please follow the shown steps to "
"reach the phase overview."
@@ -1570,7 +1567,7 @@
msgid "Synchronisation is not allowed for this case."
msgstr ""
-#: mpulsweb/model/meta.py:189 mpulsweb/templates/meta/index.mako:85
+#: mpulsweb/model/meta.py:189 mpulsweb/templates/meta/index.mako:84
msgid "Case is not linked"
msgstr ""
@@ -3224,8 +3221,8 @@
#: mpulsweb/templates/dialogs/error_case.mako:5
#: mpulsweb/templates/dialogs/error_main.mako:5
-#: mpulsweb/templates/dialogs/failed.mako:4 mpulsweb/templates/meta/index.mako:84
-#: mpulsweb/templates/meta/index.mako:95 mpulsweb/templates/meta/index.mako:102
+#: mpulsweb/templates/dialogs/failed.mako:4 mpulsweb/templates/meta/index.mako:83
+#: mpulsweb/templates/meta/index.mako:94 mpulsweb/templates/meta/index.mako:101
msgid "Error"
msgstr ""
@@ -3720,8 +3717,8 @@
msgstr ""
#: mpulsweb/templates/meta/index.mako:12 mpulsweb/templates/meta/index.mako:25
-#: mpulsweb/templates/meta/index.mako:71 mpulsweb/templates/meta/index.mako:83
-#: mpulsweb/templates/meta/index.mako:94 mpulsweb/templates/meta/index.mako:101
+#: mpulsweb/templates/meta/index.mako:71 mpulsweb/templates/meta/index.mako:82
+#: mpulsweb/templates/meta/index.mako:93 mpulsweb/templates/meta/index.mako:100
#: mpulsweb/templates/meta/search.mako:112
msgid "State"
msgstr ""
@@ -3770,12 +3767,9 @@
#: mpulsweb/templates/meta/index.mako:66
msgid ""
-"Transfer of data can be done in two directions.<ol><li>You can download data "
-"from the meta case to display it. Downloading data will not effect any data "
-"stored in the local case.</li><li>To update the meta case with data from the "
-"local case you can upload.</li></ol>The updated data will be stored "
-"permanently in the meta case and will be available for other agencys who also"
-" have access to the meta case."
+"Transfer of data can be done in one direction.<ol><li>To update the meta case"
+" with data from the local case you can upload.</li></ol>The updated data will"
+" be stored permanently in the meta case."
msgstr ""
#: mpulsweb/templates/meta/index.mako:73
@@ -3783,28 +3777,24 @@
msgstr ""
#: mpulsweb/templates/meta/index.mako:77
-msgid "Download meta"
-msgstr ""
-
-#: mpulsweb/templates/meta/index.mako:78
msgid "Upload case"
msgstr ""
-#: mpulsweb/templates/meta/index.mako:79 mpulsweb/templates/meta/unlink.mako:4
+#: mpulsweb/templates/meta/index.mako:78 mpulsweb/templates/meta/unlink.mako:4
msgid "Unlink case"
msgstr ""
-#: mpulsweb/templates/meta/index.mako:89
+#: mpulsweb/templates/meta/index.mako:88
msgid "Link case"
msgstr ""
-#: mpulsweb/templates/meta/index.mako:96
+#: mpulsweb/templates/meta/index.mako:95
msgid ""
"Sychronisation is not allowed. Please set permission for synchronisation "
"before linking"
msgstr ""
-#: mpulsweb/templates/meta/index.mako:103
+#: mpulsweb/templates/meta/index.mako:102
msgid ""
"Meta user is not configured properly. Please consult the administration to do"
" so."
@@ -3957,13 +3947,6 @@
msgid "Print"
msgstr ""
-#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:16
-msgid ""
-"It is strongly recommended to sync the case with its meta-case after changing"
-" the phase as this is a significant change in the support of the client. "
-"Please open the meta-case to sync the updated case to the meta-server."
-msgstr ""
-
#: mpulsweb/templates/phase/dialogs/success_set_phase.mako:23
#, python-format
msgid ""
Modified: base/trunk/mpulsweb/templates/meta/index.mako
===================================================================
--- base/trunk/mpulsweb/templates/meta/index.mako 2012-08-07 11:56:41 UTC (rev 6016)
+++ base/trunk/mpulsweb/templates/meta/index.mako 2012-08-07 12:21:58 UTC (rev 6017)
@@ -63,7 +63,7 @@
<br>
<div class="widget container">
<h2>${_('Transfer')}</h2>
-<p>${h.literal(_('Transfer of data can be done in one direction.<ol><li>To update the meta case with data from the local case you can upload.</li></ol>The updated data will be stored permanently in the meta case and will be available for other agencys who also have access to the meta case.'))}</p>
+<p>${h.literal(_('Transfer of data can be done in one direction.<ol><li>To update the meta case with data from the local case you can upload.</li></ol>The updated data will be stored permanently in the meta case.'))}</p>
% if c.agency.is_metauser_configured():
% if c.meta.is_sync_allowed():
% if c.meta.is_linked():
More information about the Mpuls-commits
mailing list