[evolvis-commits] r17713: refresh

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Nov 7 16:30:57 CET 2011


Author: mirabilos
Date: 2011-11-07 16:30:57 +0100 (Mon, 07 Nov 2011)
New Revision: 17713

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
   trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
Log:
refresh

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-11-07 15:30:52 UTC (rev 17712)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-11-07 15:30:57 UTC (rev 17713)
@@ -29,12 +29,13 @@
   * Version libjs-* Depends on fixed versions
   * Use lightbox for image pop-ins on Tracker attachments
   * Unbreak Project Summary widget changes
+  * [#1842] disambiguate some texts
 
   [ Mike Esser ]
   * [#1850] Fix merge glitch
   * [#1859] [#1906] Port code from Evolvis 4.8 to 5.1
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 04 Nov 2011 12:59:19 +0100
+ -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 07 Nov 2011 16:29:44 +0100
 
 fusionforge (5.1.1-2) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2011-11-07 15:30:52 UTC (rev 17712)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2011-11-07 15:30:57 UTC (rev 17713)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: EvolvisForge 5.1+evolvis0exp5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-03 14:27+0100\n"
+"POT-Creation-Date: 2011-11-07 16:27+0100\n"
 "PO-Revision-Date: 2011-11-02 16:50+0100\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
@@ -1921,11 +1921,11 @@
 msgid "Group already active"
 msgstr "Diese Gruppe ist bereits aktiv."
 
-#: common/include/Group.class.php:2684 common/include/Group.class.php:2763
+#: common/include/Group.class.php:2689 common/include/Group.class.php:2768
 msgid "Group does not have any administrators."
 msgstr "Diese Gruppe besitzt keinen Administrator."
 
-#: common/include/Group.class.php:2692
+#: common/include/Group.class.php:2697
 #, php-format
 msgid ""
 "Your project registration for %4$s has been approved.\n"
@@ -1995,12 +1995,12 @@
 "\n"
 "-- Die %4$s Leitung"
 
-#: common/include/Group.class.php:2728
+#: common/include/Group.class.php:2733
 #, php-format
 msgid "%1$s Project Approved"
 msgstr "%1$s Projekt genehmigt"
 
-#: common/include/Group.class.php:2770
+#: common/include/Group.class.php:2775
 #, php-format
 msgid ""
 "Your project registration for %3$s has been denied.\n"
@@ -2019,21 +2019,21 @@
 "Gründe für die negative Entscheidung:\n"
 "\n"
 
-#: common/include/Group.class.php:2789
+#: common/include/Group.class.php:2794
 #, php-format
 msgid "%1$s Project Denied"
 msgstr "%1$s Projekt abgelehnt"
 
-#: common/include/Group.class.php:2821
+#: common/include/Group.class.php:2826
 msgid "Could not find user who has submitted the project."
 msgstr "Der Nutzer, der das Projekt anlegte, konnte nicht gefunden werden."
 
-#: common/include/Group.class.php:2828
+#: common/include/Group.class.php:2833
 #, fuzzy
 msgid "There is no administrator to send the mail to."
 msgstr "Konnte keinen Administrator finden, dem die Mail zugesandt werden kann"
 
-#: common/include/Group.class.php:2840
+#: common/include/Group.class.php:2845
 #, fuzzy, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -2051,12 +2051,12 @@
 "abzuweisen:\n"
 "%4$s "
 
-#: common/include/Group.class.php:2850
+#: common/include/Group.class.php:2855
 #, fuzzy, php-format
 msgid "Submitter: %1$s (%2$s)\n"
 msgstr "Gepostet von %1$s (%2$s)"
 
-#: common/include/Group.class.php:2856
+#: common/include/Group.class.php:2861
 #, php-format
 msgid ""
 "\n"
@@ -2064,12 +2064,12 @@
 "%1$s"
 msgstr ""
 
-#: common/include/Group.class.php:2860 common/include/Group.class.php:2875
+#: common/include/Group.class.php:2865 common/include/Group.class.php:2880
 #, php-format
 msgid "New %1$s Project Submitted"
 msgstr "Neues %1$s Projekt vorgeschlagen"
 
-#: common/include/Group.class.php:2868
+#: common/include/Group.class.php:2873
 #, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -2088,43 +2088,43 @@
 "Das %1$s-Admin-Team wird jetzt Ihre Projekt-Anmeldung überprüfen. Sie werden "
 "über deren Entscheidung benachrichtigt."
 
-#: common/include/Group.class.php:2893
+#: common/include/Group.class.php:2898
 msgid "Group name is too short"
 msgstr "Der Gruppenname ist zu kurz"
 
-#: common/include/Group.class.php:2896
+#: common/include/Group.class.php:2901
 msgid "Group name is too long"
 msgstr "Der Gruppenname ist zu lang"
 
-#: common/include/Group.class.php:2899
+#: common/include/Group.class.php:2904
 msgid "Group name already taken"
 msgstr "Der Gruppenname wird bereits verwendet"
 
-#: common/include/Group.class.php:2990
+#: common/include/Group.class.php:2995
 #, php-format
 msgid "ERROR - Could Not Update Group Unix Status: %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/Group.class.php:3049
+#: common/include/Group.class.php:3054
 msgid "Error: Enable to get users from group"
 msgstr ""
 
-#: common/include/Group.class.php:3070
+#: common/include/Group.class.php:3075
 #, fuzzy, php-format
 msgid "ERROR - Could Not Update Group DocmanCreateOnline Status: %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/Group.class.php:3088
+#: common/include/Group.class.php:3093
 #, fuzzy, php-format
 msgid "ERROR - Could Not Update Group UseWebdab Status: %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/Group.class.php:3106
+#: common/include/Group.class.php:3111
 #, fuzzy, php-format
 msgid "ERROR - Could Not Update Group UseDocmanSearch Status: %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
 
-#: common/include/Group.class.php:3124
+#: common/include/Group.class.php:3129
 #, fuzzy, php-format
 msgid "ERROR - Could Not Update Group force_docman_reindex %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
@@ -2416,22 +2416,22 @@
 "obviously I can't. Sorry."
 msgstr ""
 
-#: common/include/RBAC.php:1145
+#: common/include/RBAC.php:1158
 #, php-format
 msgid "%s (global role)"
 msgstr ""
 
-#: common/include/RBAC.php:1149
+#: common/include/RBAC.php:1162
 #, fuzzy, php-format
 msgid "%s (in project %s)"
 msgstr "%1$s Projekte"
 
-#: common/include/RBAC.php:1473
+#: common/include/RBAC.php:1486
 #, fuzzy
 msgid "Anonymous/not logged in"
 msgstr "Sie müssen eingeloggt sein"
 
-#: common/include/RBAC.php:1521
+#: common/include/RBAC.php:1534
 #, fuzzy
 msgid "Any user logged in"
 msgstr "Sie müssen sich erst einloggen"
@@ -3728,8 +3728,8 @@
 #: www/admin/pending-news.php:174 www/forum/admin/index.php:427
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/news/admin/index.php:163
-#: www/news/news_utils.php:45 www/news/submit.php:168 www/pm/add_task.php:52
-#: www/pm/add_task.php:147 www/pm/add_task.php:161 www/pm/admin/index.php:220
+#: www/news/submit.php:168 www/pm/add_task.php:52 www/pm/add_task.php:147
+#: www/pm/add_task.php:161 www/pm/admin/index.php:220
 #: www/pm/admin/index.php:265 www/pm/admin/index.php:302
 #: www/pm/deletetask.php:44 www/pm/mod_task.php:122 www/pm/mod_task.php:326
 #: www/project/admin/editimages.php:237 www/project/admin/roledelete.php:85
@@ -13156,6 +13156,10 @@
 msgid "-tooltip:news:view"
 msgstr ""
 
+#: www/news/news_utils.php:45 www/news/news_utils.php:228
+msgid "Submit News Item"
+msgstr "Newsbeitrag einschicken"
+
 #: www/news/news_utils.php:47
 msgid "-tooltip:news:new"
 msgstr ""
@@ -13180,10 +13184,6 @@
 msgid "News archive"
 msgstr "News-Archiv"
 
-#: www/news/news_utils.php:228
-msgid "Submit News"
-msgstr "Neuigkeiten posten"
-
 #: www/news/news_utils.php:286
 msgid "Not Found"
 msgstr "Keine gefunden"
@@ -18181,7 +18181,7 @@
 msgid "Unable to Create Template Group Object"
 msgstr "Außerstande ein ArtifactCanned Objekt anzulegen"
 
-#: www/tracker/admin/form-clonetracker.php:48 www/tracker/admin/tracker.php:61
+#: www/tracker/admin/form-clonetracker.php:48
 #: www/tracker/include/ArtifactTypeHtml.class.php:765
 msgid "Clone Tracker"
 msgstr "Tracker-Vorlage klonen"
@@ -18596,9 +18596,13 @@
 msgid "Create/change generic response messages for the tracker."
 msgstr "Allgemeine Antworten für den Tracker hinzufügen/ändern"
 
+#: www/tracker/admin/tracker.php:61
+msgid "Apply Template Tracker"
+msgstr "Template-Tracker auf diesen anwenden"
+
 #: www/tracker/admin/tracker.php:62
-msgid "Create a new tracker as a copy of this one."
-msgstr "Eine Kopie dieses Trackers als neuen Tracker anlegen."
+msgid "Duplicate parameters and fields from a template trackers in this one."
+msgstr ""
 
 #: www/tracker/admin/tracker.php:67
 msgid "Permanently delete this tracker."

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2011-11-07 15:30:52 UTC (rev 17712)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2011-11-07 15:30:57 UTC (rev 17713)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-03 14:27+0100\n"
+"POT-Creation-Date: 2011-11-07 16:27+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"
@@ -1761,11 +1761,11 @@
 msgid "Group already active"
 msgstr ""
 
-#: common/include/Group.class.php:2684 common/include/Group.class.php:2763
+#: common/include/Group.class.php:2689 common/include/Group.class.php:2768
 msgid "Group does not have any administrators."
 msgstr ""
 
-#: common/include/Group.class.php:2692
+#: common/include/Group.class.php:2697
 #, php-format
 msgid ""
 "Your project registration for %4$s has been approved.\n"
@@ -1801,12 +1801,12 @@
 "-- the %4$s crew"
 msgstr ""
 
-#: common/include/Group.class.php:2728
+#: common/include/Group.class.php:2733
 #, php-format
 msgid "%1$s Project Approved"
 msgstr ""
 
-#: common/include/Group.class.php:2770
+#: common/include/Group.class.php:2775
 #, php-format
 msgid ""
 "Your project registration for %3$s has been denied.\n"
@@ -1818,20 +1818,20 @@
 "\n"
 msgstr ""
 
-#: common/include/Group.class.php:2789
+#: common/include/Group.class.php:2794
 #, php-format
 msgid "%1$s Project Denied"
 msgstr ""
 
-#: common/include/Group.class.php:2821
+#: common/include/Group.class.php:2826
 msgid "Could not find user who has submitted the project."
 msgstr ""
 
-#: common/include/Group.class.php:2828
+#: common/include/Group.class.php:2833
 msgid "There is no administrator to send the mail to."
 msgstr ""
 
-#: common/include/Group.class.php:2840
+#: common/include/Group.class.php:2845
 #, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -1840,12 +1840,12 @@
 "Submitted Description: %3$s\n"
 msgstr ""
 
-#: common/include/Group.class.php:2850
+#: common/include/Group.class.php:2855
 #, php-format
 msgid "Submitter: %1$s (%2$s)\n"
 msgstr ""
 
-#: common/include/Group.class.php:2856
+#: common/include/Group.class.php:2861
 #, php-format
 msgid ""
 "\n"
@@ -1853,12 +1853,12 @@
 "%1$s"
 msgstr ""
 
-#: common/include/Group.class.php:2860 common/include/Group.class.php:2875
+#: common/include/Group.class.php:2865 common/include/Group.class.php:2880
 #, php-format
 msgid "New %1$s Project Submitted"
 msgstr ""
 
-#: common/include/Group.class.php:2868
+#: common/include/Group.class.php:2873
 #, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -1870,43 +1870,43 @@
 "notified of their decision."
 msgstr ""
 
-#: common/include/Group.class.php:2893
+#: common/include/Group.class.php:2898
 msgid "Group name is too short"
 msgstr ""
 
-#: common/include/Group.class.php:2896
+#: common/include/Group.class.php:2901
 msgid "Group name is too long"
 msgstr ""
 
-#: common/include/Group.class.php:2899
+#: common/include/Group.class.php:2904
 msgid "Group name already taken"
 msgstr ""
 
-#: common/include/Group.class.php:2990
+#: common/include/Group.class.php:2995
 #, php-format
 msgid "ERROR - Could Not Update Group Unix Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3049
+#: common/include/Group.class.php:3054
 msgid "Error: Enable to get users from group"
 msgstr ""
 
-#: common/include/Group.class.php:3070
+#: common/include/Group.class.php:3075
 #, php-format
 msgid "ERROR - Could Not Update Group DocmanCreateOnline Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3088
+#: common/include/Group.class.php:3093
 #, php-format
 msgid "ERROR - Could Not Update Group UseWebdab Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3106
+#: common/include/Group.class.php:3111
 #, php-format
 msgid "ERROR - Could Not Update Group UseDocmanSearch Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3124
+#: common/include/Group.class.php:3129
 #, php-format
 msgid "ERROR - Could Not Update Group force_docman_reindex %s"
 msgstr ""
@@ -2184,21 +2184,21 @@
 "obviously I can't. Sorry."
 msgstr ""
 
-#: common/include/RBAC.php:1145
+#: common/include/RBAC.php:1158
 #, php-format
 msgid "%s (global role)"
 msgstr ""
 
-#: common/include/RBAC.php:1149
+#: common/include/RBAC.php:1162
 #, php-format
 msgid "%s (in project %s)"
 msgstr ""
 
-#: common/include/RBAC.php:1473
+#: common/include/RBAC.php:1486
 msgid "Anonymous/not logged in"
 msgstr ""
 
-#: common/include/RBAC.php:1521
+#: common/include/RBAC.php:1534
 msgid "Any user logged in"
 msgstr ""
 
@@ -3372,8 +3372,8 @@
 #: www/admin/pending-news.php:174 www/forum/admin/index.php:427
 #: www/include/vote_function.php:281 www/my/bookmark_add.php:50
 #: www/my/bookmark_edit.php:63 www/news/admin/index.php:163
-#: www/news/news_utils.php:45 www/news/submit.php:168 www/pm/add_task.php:52
-#: www/pm/add_task.php:147 www/pm/add_task.php:161 www/pm/admin/index.php:220
+#: www/news/submit.php:168 www/pm/add_task.php:52 www/pm/add_task.php:147
+#: www/pm/add_task.php:161 www/pm/admin/index.php:220
 #: www/pm/admin/index.php:265 www/pm/admin/index.php:302
 #: www/pm/deletetask.php:44 www/pm/mod_task.php:122 www/pm/mod_task.php:326
 #: www/project/admin/editimages.php:237 www/project/admin/roledelete.php:85
@@ -11688,6 +11688,10 @@
 msgid "-tooltip:news:view"
 msgstr ""
 
+#: www/news/news_utils.php:45 www/news/news_utils.php:228
+msgid "Submit News Item"
+msgstr ""
+
 #: www/news/news_utils.php:47
 msgid "-tooltip:news:new"
 msgstr ""
@@ -11712,10 +11716,6 @@
 msgid "News archive"
 msgstr ""
 
-#: www/news/news_utils.php:228
-msgid "Submit News"
-msgstr ""
-
 #: www/news/news_utils.php:286
 msgid "Not Found"
 msgstr ""
@@ -16244,7 +16244,7 @@
 msgid "Unable to Create Template Group Object"
 msgstr ""
 
-#: www/tracker/admin/form-clonetracker.php:48 www/tracker/admin/tracker.php:61
+#: www/tracker/admin/form-clonetracker.php:48
 #: www/tracker/include/ArtifactTypeHtml.class.php:765
 msgid "Clone Tracker"
 msgstr ""
@@ -16600,8 +16600,12 @@
 msgid "Create/change generic response messages for the tracker."
 msgstr ""
 
+#: www/tracker/admin/tracker.php:61
+msgid "Apply Template Tracker"
+msgstr ""
+
 #: www/tracker/admin/tracker.php:62
-msgid "Create a new tracker as a copy of this one."
+msgid "Duplicate parameters and fields from a template trackers in this one."
 msgstr ""
 
 #: www/tracker/admin/tracker.php:67



More information about the evolvis-commits mailing list