[Mpuls-commits] r4681 - in jmd/trunk: . jmdweb/i18n jmdweb/i18n/de/LC_MESSAGES

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-02-23 12:10:21 +0100 (Wed, 23 Feb 2011)
New Revision: 4681

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/jmdweb.po
   jmd/trunk/jmdweb/i18n/jmdweb.pot
Log:
Bugfix: Removed parts of a conflict.


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-02-23 10:30:49 UTC (rev 4680)
+++ jmd/trunk/ChangeLog	2011-02-23 11:10:21 UTC (rev 4681)
@@ -1,5 +1,10 @@
 2011-02-22  Ludwig Reiter <ludwig.reiter at intevation.de>
 
+	* jmdweb/i18n/de/LC_MESSAGES/jmdweb.po:
+	Removed part of a conflict.
+
+2011-02-22  Ludwig Reiter <ludwig.reiter at intevation.de>
+
 	* jmdweb/i18n/de/LC_MESSAGES/jmdweb.po
 	jmdweb/i18n/jmdweb.pot
 	jmdstrukturweb/templates/casemanagement/caselist.mako

Modified: jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/jmdweb.po
===================================================================
--- jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/jmdweb.po	2011-02-23 10:30:49 UTC (rev 4680)
+++ jmd/trunk/jmdweb/i18n/de/LC_MESSAGES/jmdweb.po	2011-02-23 11:10:21 UTC (rev 4681)
@@ -8,7 +8,7 @@
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
 "POT-Creation-Date: 2010-11-02 14:28+0100\n"
-"PO-Revision-Date: 2011-02-22 11:26+0100\n"
+"PO-Revision-Date: 2011-02-23 12:06+0100\n"
 "Last-Translator: Ludwig Reiter <ludwig.reiter at intevation.de>\n"
 "Language-Team: de <LL at li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -73,28 +73,7 @@
 msgid "Evaluations"
 msgstr ""
 
-<<<<<<< .mine
 #: jmdstrukturweb/templates/main.mako:155
-=======
-#: jmdweb/templates/settings/edit.mako:12 jmdweb/templates/settings/show.mako:7
-#: jmdstrukturweb/templates/main.mako:161 jmdweb/templates/main.mako:175
-msgid "Administration"
-msgstr "Administration"
-
-#: jmdstrukturweb/templates/main.mako:166 jmdweb/templates/main.mako:180
-msgid "User"
-msgstr ""
-
-#: jmdstrukturweb/templates/main.mako:172 jmdweb/templates/main.mako:186
-msgid "Usergroup"
-msgstr ""
-
-#: jmdstrukturweb/templates/main.mako:177 jmdweb/templates/main.mako:191
-msgid "Settings"
-msgstr ""
-
-#: jmdstrukturweb/templates/main.mako:201 jmdweb/templates/main.mako:215
->>>>>>> .r4678
 msgid "Wrong formular input"
 msgstr ""
 
@@ -361,12 +340,20 @@
 msgid "Automatic review after days"
 msgstr ""
 
+#: jmdweb/templates/settings/edit.mako:12 jmdweb/templates/settings/show.mako:7
+msgid "Administration"
+msgstr "Administration"
+
 #: jmdweb/templates/settings/edit.mako:15
 #: jmdweb/templates/settings/show.mako:10
 msgid "Show settings"
 msgstr ""
 
 #: jmdweb/templates/settings/edit.mako:18
+#: jmdweb/templates/settings/edit.mako:24
+msgid "Edit settings"
+msgstr ""
+
 #: jmdweb/templates/settings/edit.mako:32
 msgid "adm_actions_link_showsettings"
 msgstr ""
@@ -436,3 +423,12 @@
 msgid "No"
 msgstr ""
 
+#~ msgid "User"
+#~ msgstr ""
+
+#~ msgid "Usergroup"
+#~ msgstr ""
+
+#~ msgid "Settings"
+#~ msgstr ""
+

Modified: jmd/trunk/jmdweb/i18n/jmdweb.pot
===================================================================
--- jmd/trunk/jmdweb/i18n/jmdweb.pot	2011-02-23 10:30:49 UTC (rev 4680)
+++ jmd/trunk/jmdweb/i18n/jmdweb.pot	2011-02-23 11:10:21 UTC (rev 4681)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: jmdweb 2.0.0-pre\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2011-02-22 11:26+0100\n"
+"POT-Creation-Date: 2011-02-23 12:06+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"
@@ -183,7 +183,7 @@
 #: jmdstrukturweb/templates/casemanagement/caselist.mako:197
 #: jmdstrukturweb/templates/home/remindlist.mako:6
 #: jmdstrukturweb/templates/home/remindlist.mako:7
-msgid "cm_overview_a_show"
+msgid "Show"
 msgstr ""
 
 #: jmdstrukturweb/templates/casemanagement/caselist.mako:207
@@ -205,7 +205,7 @@
 
 #: jmdstrukturweb/templates/casemanagement/caselist.mako:250
 #: jmdstrukturweb/templates/casemanagement/caselist.mako:251
-msgid "cm_overview_a_delete"
+msgid "Delete"
 msgstr ""
 
 #: jmdstrukturweb/templates/casemanagement/caselist.mako:269