[evolvis-commits] r18387: refresh

mirabilos at evolvis.org mirabilos at evolvis.org
Thu May 3 16:15:45 CEST 2012


Author: mirabilos
Date: 2012-05-03 16:15:44 +0200 (Thu, 03 May 2012)
New Revision: 18387

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	2012-05-03 14:15:38 UTC (rev 18386)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-05-03 14:15:44 UTC (rev 18387)
@@ -1,4 +1,4 @@
-fusionforge (1:5.1.1+evolvis57) xunstable; urgency=low
+fusionforge (1:5.1.1+evolvis57) unstable; urgency=low
 
   [ Roland Mas ]
   * Handle whitespace in subdirectories of repositories
@@ -18,10 +18,11 @@
 
   [ Thorsten Glaser ]
   * Improve security of git repositories
-  * Fix environment of cronjobs (including scmsvn tasktrac.sh)
+  * [#2498] Fix environment of cronjobs (including scmsvn tasktrac.sh)
   * Ship all *.po files again
+  * Merge FusionForge 5.1.1-6+
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 02 May 2012 14:33:58 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 02 May 2012 14:40:05 +0200
 
 fusionforge (5.1.1-6) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-05-03 14:15:38 UTC (rev 18386)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-05-03 14:15:44 UTC (rev 18387)
@@ -1,9 +1,9 @@
 # German translations for Evolvis.
 msgid ""
 msgstr ""
-"Project-Id-Version: EvolvisForge 5.1+evolvis56\n"
+"Project-Id-Version: EvolvisForge 5.1+evolvis57\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-25 17:32+0200\n"
+"POT-Creation-Date: 2012-05-02 14:39+0200\n"
 "PO-Revision-Date: 2012-04-25 17:33+0200\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
@@ -407,14 +407,14 @@
 #: www/pm/include/ProjectTaskHTML.class.php:186
 #: www/project/admin/project_admin_utils.php:165
 #: www/reporting/usersummary.php:127
-#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:71
+#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:97
 #: www/search/include/renderers/DocsHtmlSearchRenderer.class.php:63
-#: www/search/include/renderers/ForumHtmlSearchRenderer.class.php:68
-#: www/search/include/renderers/ForumsHtmlSearchRenderer.class.php:62
+#: www/search/include/renderers/ForumHtmlSearchRenderer.class.php:93
+#: www/search/include/renderers/ForumsHtmlSearchRenderer.class.php:88
 #: www/search/include/renderers/FrsHtmlSearchRenderer.class.php:62
 #: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:62
-#: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:65
-#: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:63
+#: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:93
+#: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:89
 #: www/snippet/detail.php:80 www/snippet/detail.php:169
 #: www/softwaremap/full_list.php:169 www/softwaremap/tag_cloud.php:176
 #: www/softwaremap/trove_list.php:311 www/stats/lastlogins.php:61
@@ -1247,12 +1247,12 @@
 msgid "Forum"
 msgstr "Forum"
 
-#: common/forum/ForumFactory.class.php:124
-#: common/forum/ForumFactory.class.php:133
+#: common/forum/ForumFactory.class.php:127
+#: common/forum/ForumFactory.class.php:136
 msgid "You don't have a permission to access this page"
 msgstr "Sie haben keine Berechtigung diese Seite zu betreten"
 
-#: common/forum/ForumFactory.class.php:140
+#: common/forum/ForumFactory.class.php:143
 msgid "Forum not found"
 msgstr "Forum nicht gefunden."
 
@@ -1941,11 +1941,11 @@
 msgid "Group already active"
 msgstr "Diese Gruppe ist bereits aktiv."
 
-#: common/include/Group.class.php:2699 common/include/Group.class.php:2780
+#: common/include/Group.class.php:2703 common/include/Group.class.php:2784
 msgid "Group does not have any administrators."
 msgstr "Diese Gruppe besitzt keinen Administrator."
 
-#: common/include/Group.class.php:2707
+#: common/include/Group.class.php:2711
 #, php-format
 msgid ""
 "Your project registration for %4$s has been approved.\n"
@@ -2015,12 +2015,12 @@
 "\n"
 "-- Die %4$s Leitung"
 
-#: common/include/Group.class.php:2744
+#: common/include/Group.class.php:2748
 #, php-format
 msgid "%1$s Project Approved"
 msgstr "%1$s Projekt genehmigt"
 
-#: common/include/Group.class.php:2787
+#: common/include/Group.class.php:2791
 #, php-format
 msgid ""
 "Your project registration for %3$s has been denied.\n"
@@ -2039,21 +2039,21 @@
 "Gründe für die negative Entscheidung:\n"
 "\n"
 
-#: common/include/Group.class.php:2807
+#: common/include/Group.class.php:2811
 #, php-format
 msgid "%1$s Project Denied"
 msgstr "%1$s Projekt abgelehnt"
 
-#: common/include/Group.class.php:2840
+#: common/include/Group.class.php:2844
 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:2847
+#: common/include/Group.class.php:2851
 #, 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:2859
+#: common/include/Group.class.php:2863
 #, fuzzy, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -2071,12 +2071,12 @@
 "abzuweisen:\n"
 "%4$s "
 
-#: common/include/Group.class.php:2869
+#: common/include/Group.class.php:2873
 #, fuzzy, php-format
 msgid "Submitter: %1$s (%2$s)\n"
 msgstr "Gepostet von %1$s (%2$s)"
 
-#: common/include/Group.class.php:2875
+#: common/include/Group.class.php:2879
 #, php-format
 msgid ""
 "\n"
@@ -2088,12 +2088,12 @@
 "verwerfen:\n"
 "%1$s"
 
-#: common/include/Group.class.php:2880 common/include/Group.class.php:2901
+#: common/include/Group.class.php:2884 common/include/Group.class.php:2905
 #, php-format
 msgid "New %1$s Project Submitted"
 msgstr "Neues %1$s Projekt vorgeschlagen"
 
-#: common/include/Group.class.php:2889
+#: common/include/Group.class.php:2893
 #, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -2112,43 +2112,43 @@
 "Das %1$s-Admin-Team wird jetzt Ihre Projekt-Anmeldung überprüfen. Sie werden "
 "über deren Entscheidung benachrichtigt."
 
-#: common/include/Group.class.php:2920
+#: common/include/Group.class.php:2924
 msgid "Group name is too short"
 msgstr "Der Gruppenname ist zu kurz"
 
-#: common/include/Group.class.php:2923
+#: common/include/Group.class.php:2927
 msgid "Group name is too long"
 msgstr "Der Gruppenname ist zu lang"
 
-#: common/include/Group.class.php:2926
+#: common/include/Group.class.php:2930
 msgid "Group name already taken"
 msgstr "Der Gruppenname wird bereits verwendet"
 
-#: common/include/Group.class.php:3017
+#: common/include/Group.class.php:3021
 #, 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:3076
+#: common/include/Group.class.php:3080
 msgid "Error: Enable to get users from group"
 msgstr "Fehler: Unmöglich die Benutzer der Gruppe anzuzeigen"
 
-#: common/include/Group.class.php:3097
+#: common/include/Group.class.php:3101
 #, 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:3115
+#: common/include/Group.class.php:3119
 #, 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:3133
+#: common/include/Group.class.php:3137
 #, 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:3151
+#: common/include/Group.class.php:3155
 #, fuzzy, php-format
 msgid "ERROR - Could Not Update Group force_docman_reindex %s"
 msgstr "Fehler - Konnte den Unix Gruppen Status nicht aktualisieren: %s"
@@ -4522,7 +4522,9 @@
 #: common/widget/Widget_ProjectMembers.class.php:123
 #, php-format
 msgid "View the %1$d Member(s), as well as users linked from external roles"
-msgstr "Zeige %1$d Projektmitglied(er) sowie Nutzer, die über eine externe Rolle verknüpft sind"
+msgstr ""
+"Zeige %1$d Projektmitglied(er) sowie Nutzer, die über eine externe Rolle "
+"verknüpft sind"
 
 #: common/widget/Widget_ProjectMembers.class.php:130
 msgid "Request to join"
@@ -4603,7 +4605,7 @@
 #: plugins/scmgit/www/index.php:23 plugins/scmgit/www/index.php:36
 #: www/register/index.php:221 www/scm/admin/index.php:72
 #: www/scm/admin/index.php:89 www/scm/browser.php:42 www/scm/index.php:32
-#: www/scm/viewvc.php:134
+#: www/scm/viewvc.php:138
 msgid "SCM Repository"
 msgstr "SCM Repository"
 
@@ -8587,11 +8589,11 @@
 msgid "Browse primary Git Repository"
 msgstr "primäres git-Repository ansehen"
 
-#: plugins/scmgit/common/GitPlugin.class.php:639
+#: plugins/scmgit/common/GitPlugin.class.php:641
 msgid "Create new subrepository with name:"
 msgstr "Neues Unter-Repository anlegen mit Namen:"
 
-#: plugins/scmgit/common/GitPlugin.class.php:679
+#: plugins/scmgit/common/GitPlugin.class.php:681
 #, php-format
 msgid "Subrepository %s scheduled for creation."
 msgstr "Unter-Repository %s wird bald angelegt."

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-05-03 14:15:38 UTC (rev 18386)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-05-03 14:15:44 UTC (rev 18387)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-25 17:32+0200\n"
+"POT-Creation-Date: 2012-05-02 14:39+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"
@@ -361,14 +361,14 @@
 #: www/pm/include/ProjectTaskHTML.class.php:186
 #: www/project/admin/project_admin_utils.php:165
 #: www/reporting/usersummary.php:127
-#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:71
+#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:97
 #: www/search/include/renderers/DocsHtmlSearchRenderer.class.php:63
-#: www/search/include/renderers/ForumHtmlSearchRenderer.class.php:68
-#: www/search/include/renderers/ForumsHtmlSearchRenderer.class.php:62
+#: www/search/include/renderers/ForumHtmlSearchRenderer.class.php:93
+#: www/search/include/renderers/ForumsHtmlSearchRenderer.class.php:88
 #: www/search/include/renderers/FrsHtmlSearchRenderer.class.php:62
 #: www/search/include/renderers/NewsHtmlSearchRenderer.class.php:62
-#: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:65
-#: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:63
+#: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:93
+#: www/search/include/renderers/TrackersHtmlSearchRenderer.class.php:89
 #: www/snippet/detail.php:80 www/snippet/detail.php:169
 #: www/softwaremap/full_list.php:169 www/softwaremap/tag_cloud.php:176
 #: www/softwaremap/trove_list.php:311 www/stats/lastlogins.php:61
@@ -1141,12 +1141,12 @@
 msgid "Forum"
 msgstr ""
 
-#: common/forum/ForumFactory.class.php:124
-#: common/forum/ForumFactory.class.php:133
+#: common/forum/ForumFactory.class.php:127
+#: common/forum/ForumFactory.class.php:136
 msgid "You don't have a permission to access this page"
 msgstr ""
 
-#: common/forum/ForumFactory.class.php:140
+#: common/forum/ForumFactory.class.php:143
 msgid "Forum not found"
 msgstr ""
 
@@ -1752,11 +1752,11 @@
 msgid "Group already active"
 msgstr ""
 
-#: common/include/Group.class.php:2699 common/include/Group.class.php:2780
+#: common/include/Group.class.php:2703 common/include/Group.class.php:2784
 msgid "Group does not have any administrators."
 msgstr ""
 
-#: common/include/Group.class.php:2707
+#: common/include/Group.class.php:2711
 #, php-format
 msgid ""
 "Your project registration for %4$s has been approved.\n"
@@ -1792,12 +1792,12 @@
 "-- the %4$s crew"
 msgstr ""
 
-#: common/include/Group.class.php:2744
+#: common/include/Group.class.php:2748
 #, php-format
 msgid "%1$s Project Approved"
 msgstr ""
 
-#: common/include/Group.class.php:2787
+#: common/include/Group.class.php:2791
 #, php-format
 msgid ""
 "Your project registration for %3$s has been denied.\n"
@@ -1809,20 +1809,20 @@
 "\n"
 msgstr ""
 
-#: common/include/Group.class.php:2807
+#: common/include/Group.class.php:2811
 #, php-format
 msgid "%1$s Project Denied"
 msgstr ""
 
-#: common/include/Group.class.php:2840
+#: common/include/Group.class.php:2844
 msgid "Could not find user who has submitted the project."
 msgstr ""
 
-#: common/include/Group.class.php:2847
+#: common/include/Group.class.php:2851
 msgid "There is no administrator to send the mail to."
 msgstr ""
 
-#: common/include/Group.class.php:2859
+#: common/include/Group.class.php:2863
 #, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -1831,12 +1831,12 @@
 "Submitted Description: %3$s\n"
 msgstr ""
 
-#: common/include/Group.class.php:2869
+#: common/include/Group.class.php:2873
 #, php-format
 msgid "Submitter: %1$s (%2$s)\n"
 msgstr ""
 
-#: common/include/Group.class.php:2875
+#: common/include/Group.class.php:2879
 #, php-format
 msgid ""
 "\n"
@@ -1844,12 +1844,12 @@
 "%1$s"
 msgstr ""
 
-#: common/include/Group.class.php:2880 common/include/Group.class.php:2901
+#: common/include/Group.class.php:2884 common/include/Group.class.php:2905
 #, php-format
 msgid "New %1$s Project Submitted"
 msgstr ""
 
-#: common/include/Group.class.php:2889
+#: common/include/Group.class.php:2893
 #, php-format
 msgid ""
 "New %1$s Project Submitted\n"
@@ -1861,43 +1861,43 @@
 "notified of their decision."
 msgstr ""
 
-#: common/include/Group.class.php:2920
+#: common/include/Group.class.php:2924
 msgid "Group name is too short"
 msgstr ""
 
-#: common/include/Group.class.php:2923
+#: common/include/Group.class.php:2927
 msgid "Group name is too long"
 msgstr ""
 
-#: common/include/Group.class.php:2926
+#: common/include/Group.class.php:2930
 msgid "Group name already taken"
 msgstr ""
 
-#: common/include/Group.class.php:3017
+#: common/include/Group.class.php:3021
 #, php-format
 msgid "ERROR - Could Not Update Group Unix Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3076
+#: common/include/Group.class.php:3080
 msgid "Error: Enable to get users from group"
 msgstr ""
 
-#: common/include/Group.class.php:3097
+#: common/include/Group.class.php:3101
 #, php-format
 msgid "ERROR - Could Not Update Group DocmanCreateOnline Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3115
+#: common/include/Group.class.php:3119
 #, php-format
 msgid "ERROR - Could Not Update Group UseWebdab Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3133
+#: common/include/Group.class.php:3137
 #, php-format
 msgid "ERROR - Could Not Update Group UseDocmanSearch Status: %s"
 msgstr ""
 
-#: common/include/Group.class.php:3151
+#: common/include/Group.class.php:3155
 #, php-format
 msgid "ERROR - Could Not Update Group force_docman_reindex %s"
 msgstr ""
@@ -4136,7 +4136,7 @@
 #: plugins/scmgit/www/index.php:23 plugins/scmgit/www/index.php:36
 #: www/register/index.php:221 www/scm/admin/index.php:72
 #: www/scm/admin/index.php:89 www/scm/browser.php:42 www/scm/index.php:32
-#: www/scm/viewvc.php:134
+#: www/scm/viewvc.php:138
 msgid "SCM Repository"
 msgstr ""
 
@@ -7599,11 +7599,11 @@
 msgid "Browse primary Git Repository"
 msgstr ""
 
-#: plugins/scmgit/common/GitPlugin.class.php:639
+#: plugins/scmgit/common/GitPlugin.class.php:641
 msgid "Create new subrepository with name:"
 msgstr ""
 
-#: plugins/scmgit/common/GitPlugin.class.php:679
+#: plugins/scmgit/common/GitPlugin.class.php:681
 #, php-format
 msgid "Subrepository %s scheduled for creation."
 msgstr ""



More information about the evolvis-commits mailing list