[evolvis-commits] r18675: regen

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Oct 2 16:06:53 CEST 2012


Author: mirabilos
Date: 2012-10-02 16:06:52 +0200 (Tue, 02 Oct 2012)
New Revision: 18675

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/debian/control
   trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
   trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/browse_task.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/pm_columns.php
Log:
regen

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-10-02 14:06:47 UTC (rev 18674)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-10-02 14:06:52 UTC (rev 18675)
@@ -16,8 +16,11 @@
   * /wsdl.xml is now the live version of the current instance’s SOAP WSDL
   * Put Jenkins config into bzr/svn (baseline, not necessarily up-to-date)
   * Sync lintian overrides
+  * Update default Wiki Content Licence link (HTTPS)
+  * Ship the Gravatar plugin for Evolvis instances
+  * [#3324] Add "Hours Worked" as display column
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 28 Sep 2012 16:17:14 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 02 Oct 2012 16:04:29 +0200
 
 fusionforge (1:5.1.1+evolvis70.1) unstable; urgency=high
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/control
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/control	2012-10-02 14:06:47 UTC (rev 18674)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/control	2012-10-02 14:06:52 UTC (rev 18675)
@@ -299,8 +299,8 @@
  gforge-shell-postgresql, gforge-lists-mailman,
  fusionforge-plugin-scmgit, fusionforge-plugin-scmsvn,
  evolvis-anonsvnsh,
- fusionforge-plugin-extratabs, fusionforge-plugin-projectlabels,
- fusionforge-plugin-mediawiki,
+ fusionforge-plugin-extratabs, fusionforge-plugin-gravatar,
+ fusionforge-plugin-projectlabels, fusionforge-plugin-mediawiki,
  evolvisforge-common, evolvisforge-web-apache2,
  evolvisforge-db-postgresql, evolvisforge-mta-postfix,
  evolvisforge-shell-postgresql, evolvisforge-lists-mailman,

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-10-02 14:06:47 UTC (rev 18674)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2012-10-02 14:06:52 UTC (rev 18675)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: EvolvisForge 5.1+evolvis72\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-28 15:12+0200\n"
+"POT-Creation-Date: 2012-10-02 16:04+0200\n"
 "PO-Revision-Date: 2012-09-28 12:32+0200\n"
 "Last-Translator: Thorsten Glaser <t.glaser at tarent.de>\n"
 "Language-Team: german\n"
@@ -18,7 +18,7 @@
 #: common/docman/views/search.php:51 common/include/Navigation.class.php:143
 #: common/include/Navigation.class.php:415
 #: plugins/globalsearch/common/globalsearch_stats_boxes.php:48
-#: www/pm/browse_task.php:300
+#: www/pm/browse_task.php:301
 #: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:330
 #: www/search/include/renderers/HtmlGroupSearchRenderer.class.php:65
 #: www/search/include/renderers/SkillHtmlSearchRenderer.class.php:57
@@ -514,7 +514,7 @@
 msgstr "Gruppiere die Dokument-Zugehörigkeit in:"
 
 #: common/docman/include/utils.php:327 common/docman/views/editfile.php:132
-#: www/pm/browse_task.php:622 www/project/admin/database.php:208
+#: www/pm/browse_task.php:633 www/project/admin/database.php:208
 #: www/tracker/admin/form-customizelist.php:44 www/tracker/browse.php:527
 #: www/tracker/browse.php:689 www/tracker/browse.php:924
 #: www/tracker/query.php:346
@@ -796,7 +796,7 @@
 #: www/frs/admin/index.php:155 www/my/dashboard.php:67
 #: www/news/admin/index.php:137 www/people/editjob.php:74
 #: www/people/editjob.php:166 www/people/viewjob.php:75
-#: www/pm/browse_task.php:296 www/pm/browse_task.php:415
+#: www/pm/browse_task.php:297 www/pm/browse_task.php:417
 #: www/pm/ganttpage.php:156 www/pm/include/ProjectTaskHTML.class.php:118
 #: www/pm/include/pm_columns.php:38 www/pm/templates/detail_template.php:15
 #: www/reporting/usersummary.php:103
@@ -10822,7 +10822,7 @@
 
 #: www/admin/pending-news.php:155 www/my/diary.php:185
 #: www/news/admin/index.php:143 www/news/submit.php:150
-#: www/pm/browse_task.php:425 www/pm/include/ProjectView.class.php:329
+#: www/pm/browse_task.php:427 www/pm/include/ProjectView.class.php:329
 #: www/pm/include/ProjectView.class.php:333
 #: www/pm/include/ProjectView.class.php:337
 #: www/pm/include/ProjectView.class.php:342 www/pm/include/pm_columns.php:43
@@ -13075,8 +13075,8 @@
 msgstr "Evolvis Hilfedienst: %s"
 
 #: www/include/html.php:342 www/include/html.php:475 www/include/html.php:739
-#: www/pm/browse_task.php:587 www/pm/browse_task.php:612
-#: www/pm/browse_task.php:623 www/tracker/browse.php:908
+#: www/pm/browse_task.php:598 www/pm/browse_task.php:623
+#: www/pm/browse_task.php:634 www/tracker/browse.php:908
 #: www/tracker/browse.php:916 www/tracker/browse.php:925
 msgid "No Change"
 msgstr "Keine Änderung"
@@ -13745,7 +13745,7 @@
 msgstr "Ändern"
 
 #: www/my/dashboard.php:69 www/pm/browse_task.php:219
-#: www/pm/browse_task.php:413 www/pm/browse_task.php:613
+#: www/pm/browse_task.php:415 www/pm/browse_task.php:624
 #: www/pm/include/pm_columns.php:37 www/pm/templates/detail_template.php:20
 #: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:280
 #: www/tracker/browse.php:692 www/tracker/browse.php:912
@@ -13753,8 +13753,8 @@
 msgid "Priority"
 msgstr "Priorität"
 
-#: www/my/dashboard.php:71 www/pm/browse_task.php:411
-#: www/pm/browse_task.php:620 www/pm/templates/detail_template.php:30
+#: www/my/dashboard.php:71 www/pm/browse_task.php:413
+#: www/pm/browse_task.php:631 www/pm/templates/detail_template.php:30
 #: www/tracker/browse.php:695 www/tracker/browse.php:915
 #: www/tracker/item.php:172
 msgid "Assigned to"
@@ -14231,8 +14231,8 @@
 #: www/people/createjob.php:49 www/people/editjob.php:52
 #: www/people/editjob.php:74 www/people/editjob.php:163
 #: www/people/people_utils.php:350 www/people/people_utils.php:406
-#: www/pm/browse_task.php:297 www/pm/browse_task.php:409
-#: www/pm/browse_task.php:610 www/pm/ganttpage.php:157
+#: www/pm/browse_task.php:298 www/pm/browse_task.php:411
+#: www/pm/browse_task.php:621 www/pm/ganttpage.php:157
 #: www/pm/include/pm_columns.php:35 www/pm/templates/detail_template.php:25
 #: www/pm/templates/time_tracking.php:7 www/reporting/timeadd.php:142
 #: www/snippet/package.php:163 www/snippet/submit.php:131
@@ -14555,7 +14555,7 @@
 
 #: www/people/editprofile.php:283 www/people/skills_utils.php:50
 #: www/people/skills_utils.php:157 www/pm/browse_task.php:216
-#: www/pm/browse_task.php:401 www/pm/ganttpage.php:70
+#: www/pm/browse_task.php:403 www/pm/ganttpage.php:70
 #: www/pm/include/pm_columns.php:32 www/pm/templates/detail_template.php:42
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:50
 #: www/tracker/include/ArtifactTypeHtml.class.php:147
@@ -14564,7 +14564,7 @@
 
 #: www/people/editprofile.php:284 www/people/skills_utils.php:51
 #: www/people/skills_utils.php:158 www/pm/browse_task.php:217
-#: www/pm/browse_task.php:404 www/pm/ganttpage.php:71
+#: www/pm/browse_task.php:406 www/pm/ganttpage.php:71
 #: www/pm/include/pm_columns.php:33 www/pm/templates/detail_template.php:47
 #: www/reporting/usersummary.php:106
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:51
@@ -14965,7 +14965,7 @@
 msgstr "Aufgaben durchsuchen"
 
 #: www/pm/browse_task.php:195 www/pm/browse_task.php:206
-#: www/pm/browse_task.php:296 www/pm/ganttpage.php:56 www/pm/ganttpage.php:58
+#: www/pm/browse_task.php:297 www/pm/ganttpage.php:56 www/pm/ganttpage.php:58
 #: www/pm/ganttpage.php:60 www/pm/ganttpage.php:62
 #: www/reporting/usersummary.php:53 www/tracker/browse.php:267
 #: www/tracker/browse.php:346 www/tracker/browse.php:353
@@ -14973,24 +14973,24 @@
 msgid "Any"
 msgstr "Alle"
 
-#: www/pm/browse_task.php:197 www/pm/browse_task.php:584
+#: www/pm/browse_task.php:197 www/pm/browse_task.php:595
 #: www/pm/ganttpage.php:58 www/tracker/browse.php:272
 msgid "Unassigned"
 msgstr "Nicht zugeordnet"
 
-#: www/pm/browse_task.php:214 www/pm/browse_task.php:397
+#: www/pm/browse_task.php:214 www/pm/browse_task.php:399
 #: www/pm/ganttpage.php:68 www/pm/include/ProjectTaskHTML.class.php:84
 msgid "Task Id"
 msgstr "Aufgaben-ID"
 
-#: www/pm/browse_task.php:215 www/pm/browse_task.php:399
+#: www/pm/browse_task.php:215 www/pm/browse_task.php:401
 #: www/pm/ganttpage.php:69 www/pm/include/ProjectTaskHTML.class.php:85
 #: www/pm/templates/detail_template.php:99
 #: www/tracker/include/ArtifactTypeHtml.class.php:146
 msgid "Task Summary"
 msgstr "Zusammenfassung der Aufgabe"
 
-#: www/pm/browse_task.php:218 www/pm/browse_task.php:407
+#: www/pm/browse_task.php:218 www/pm/browse_task.php:409
 #: www/pm/ganttpage.php:72 www/pm/include/pm_columns.php:34
 #: www/pm/templates/detail_template.php:10
 msgid "Percent Complete"
@@ -15000,108 +15000,113 @@
 msgid "Detailed"
 msgstr "detailliert"
 
-#: www/pm/browse_task.php:294
+#: www/pm/browse_task.php:295
 #, fuzzy
 msgid "Subprojects"
 msgstr "Unterprojekt"
 
-#: www/pm/browse_task.php:295 www/pm/ganttpage.php:155
+#: www/pm/browse_task.php:296 www/pm/ganttpage.php:155
 #: www/tracker/browse.php:285 www/tracker/browse.php:524
 #: www/tracker/query.php:203 www/tracker/query.php:343
 msgid "Assignee"
 msgstr "Bearbeiter"
 
-#: www/pm/browse_task.php:298 www/pm/ganttpage.php:158
+#: www/pm/browse_task.php:299 www/pm/ganttpage.php:158
 msgid "Sort On"
 msgstr "Sortiere nach"
 
-#: www/pm/browse_task.php:299
+#: www/pm/browse_task.php:300
 msgid "Detail View"
 msgstr "Detailansicht"
 
-#: www/pm/browse_task.php:305
+#: www/pm/browse_task.php:306
 #, fuzzy
 msgid "Customise display:"
 msgstr "Anpassbares Feld Gelöscht"
 
-#: www/pm/browse_task.php:306
+#: www/pm/browse_task.php:307
 msgid "Add/Remove Columns"
 msgstr "Rubrik hinzufügen/entfernen"
 
-#: www/pm/browse_task.php:346
+#: www/pm/browse_task.php:347
 msgid "No Matching Tasks found"
 msgstr "Keine übereinstimmenden Aufgaben gefunden"
 
-#: www/pm/browse_task.php:348
+#: www/pm/browse_task.php:349
 msgid "Add tasks using the link above"
 msgstr "Fügen Sie Aufgaben hinzu, indem Sie auf den obigen Link klicken"
 
-#: www/pm/browse_task.php:351 www/tracker/browse.php:579
+#: www/pm/browse_task.php:352 www/tracker/browse.php:579
 #, php-format
 msgid "Displaying %d results."
 msgstr "Stelle %d Ergebnisse dar."
 
-#: www/pm/browse_task.php:417
+#: www/pm/browse_task.php:419
 msgid "Project Task Id"
 msgstr ""
 
-#: www/pm/browse_task.php:419 www/pm/include/pm_columns.php:40
+#: www/pm/browse_task.php:421 www/pm/include/pm_columns.php:40
 #: www/snippet/browse.php:83 www/tracker/query.php:341
 msgid "Creator"
 msgstr "Ersteller"
 
-#: www/pm/browse_task.php:421 www/pm/include/pm_columns.php:41
+#: www/pm/browse_task.php:423 www/pm/include/pm_columns.php:41
 #, fuzzy
 msgid "Duration"
 msgstr "Operationen"
 
-#: www/pm/browse_task.php:423 www/pm/include/pm_columns.php:42
+#: www/pm/browse_task.php:425 www/pm/include/pm_columns.php:42
 #, fuzzy
 msgid "Parent Id"
 msgstr "Für Projekt"
 
-#: www/pm/browse_task.php:427 www/pm/include/pm_columns.php:44
+#: www/pm/browse_task.php:429 www/pm/include/pm_columns.php:44
 #: www/pm/templates/detail_template.php:55
 msgid "Estimated Hours"
 msgstr "Geschätzte Stunden"
 
-#: www/pm/browse_task.php:429 www/pm/include/pm_columns.php:45
+#: www/pm/browse_task.php:431 www/pm/include/pm_columns.php:45
+#: www/pm/templates/time_tracking.php:6 www/reporting/timeadd.php:141
+msgid "Hours worked"
+msgstr "Geleistete Stunden"
+
+#: www/pm/browse_task.php:433 www/pm/include/pm_columns.php:46
 #, fuzzy
 msgid "Status Id"
 msgstr "Status"
 
-#: www/pm/browse_task.php:431 www/pm/include/pm_columns.php:46
+#: www/pm/browse_task.php:435 www/pm/include/pm_columns.php:47
 #, fuzzy
 msgid "Category Id"
 msgstr "Kategorie"
 
-#: www/pm/browse_task.php:433 www/pm/include/pm_columns.php:47
+#: www/pm/browse_task.php:437 www/pm/include/pm_columns.php:48
 #, fuzzy
 msgid "Last Modified Date"
 msgstr "Zuletzt veränderter Datumsbereich"
 
-#: www/pm/browse_task.php:435 www/pm/include/pm_columns.php:48
+#: www/pm/browse_task.php:439 www/pm/include/pm_columns.php:49
 msgid "External Id"
 msgstr "Externe ID"
 
-#: www/pm/browse_task.php:437 www/pm/include/pm_columns.php:49
+#: www/pm/browse_task.php:441 www/pm/include/pm_columns.php:50
 #, fuzzy
 msgid "Sub-Project"
 msgstr "Unterprojekt"
 
-#: www/pm/browse_task.php:568 www/tracker/browse.php:869
+#: www/pm/browse_task.php:579 www/tracker/browse.php:869
 msgid "Mass Update"
 msgstr "Massen-Update"
 
-#: www/pm/browse_task.php:603
+#: www/pm/browse_task.php:614
 msgid "Check all"
 msgstr "Alle auswählen"
 
-#: www/pm/browse_task.php:605
+#: www/pm/browse_task.php:616
 msgid "Clear all"
 msgstr "Alle abwählen"
 
-#: www/pm/browse_task.php:607 www/tracker/browse.php:891
+#: www/pm/browse_task.php:618 www/tracker/browse.php:891
 msgid ""
 "<strong>Admin:</strong> If you wish to apply changes to all items selected "
 "above, use these controls to change their properties and click once on "
@@ -15111,15 +15116,15 @@
 "Änderungen durchführen möchten, nutzen Sie diese Bedienungselemente, um ihre "
 "Eigenschaften zu ändern, und klicken Sie anschließend auf \"Massen-Update\"."
 
-#: www/pm/browse_task.php:626 www/pm/templates/detail_template.php:79
+#: www/pm/browse_task.php:637 www/pm/templates/detail_template.php:79
 msgid "Subproject"
 msgstr "Unterprojekt"
 
-#: www/pm/browse_task.php:629 www/tracker/browse.php:932
+#: www/pm/browse_task.php:640 www/tracker/browse.php:932
 msgid "Mass update"
 msgstr "Massen-Update"
 
-#: www/pm/browse_task.php:677
+#: www/pm/browse_task.php:688
 msgid "* Denotes overdue tasks"
 msgstr "* markiert überfällige Aufgaben"
 
@@ -15451,11 +15456,11 @@
 msgid "Assigned To"
 msgstr "Zugewiesen an"
 
-#: www/pm/include/pm_columns.php:83
+#: www/pm/include/pm_columns.php:84
 msgid "Select PM Display Columns"
 msgstr "Task-Anzeigespalten auswählen"
 
-#: www/pm/include/pm_columns.php:89
+#: www/pm/include/pm_columns.php:90
 msgid "Select Columns"
 msgstr "Spalten auswählen"
 
@@ -15688,10 +15693,6 @@
 msgid "Day"
 msgstr "Tag"
 
-#: www/pm/templates/time_tracking.php:6 www/reporting/timeadd.php:141
-msgid "Hours worked"
-msgstr "Geleistete Stunden"
-
 #: www/pm/templates/time_tracking.php:73
 msgid "Time tracking list"
 msgstr "Zeitverfolgungsliste"

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-10-02 14:06:47 UTC (rev 18674)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/fusionforge.pot	2012-10-02 14:06:52 UTC (rev 18675)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-28 15:12+0200\n"
+"POT-Creation-Date: 2012-10-02 16:04+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"
@@ -23,7 +23,7 @@
 #: common/docman/views/search.php:51 common/include/Navigation.class.php:143
 #: common/include/Navigation.class.php:415
 #: plugins/globalsearch/common/globalsearch_stats_boxes.php:48
-#: www/pm/browse_task.php:300
+#: www/pm/browse_task.php:301
 #: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:330
 #: www/search/include/renderers/HtmlGroupSearchRenderer.class.php:65
 #: www/search/include/renderers/SkillHtmlSearchRenderer.class.php:57
@@ -463,7 +463,7 @@
 msgstr ""
 
 #: common/docman/include/utils.php:327 common/docman/views/editfile.php:132
-#: www/pm/browse_task.php:622 www/project/admin/database.php:208
+#: www/pm/browse_task.php:633 www/project/admin/database.php:208
 #: www/tracker/admin/form-customizelist.php:44 www/tracker/browse.php:527
 #: www/tracker/browse.php:689 www/tracker/browse.php:924
 #: www/tracker/query.php:346
@@ -716,7 +716,7 @@
 #: www/frs/admin/index.php:155 www/my/dashboard.php:67
 #: www/news/admin/index.php:137 www/people/editjob.php:74
 #: www/people/editjob.php:166 www/people/viewjob.php:75
-#: www/pm/browse_task.php:296 www/pm/browse_task.php:415
+#: www/pm/browse_task.php:297 www/pm/browse_task.php:417
 #: www/pm/ganttpage.php:156 www/pm/include/ProjectTaskHTML.class.php:118
 #: www/pm/include/pm_columns.php:38 www/pm/templates/detail_template.php:15
 #: www/reporting/usersummary.php:103
@@ -9535,7 +9535,7 @@
 
 #: www/admin/pending-news.php:155 www/my/diary.php:185
 #: www/news/admin/index.php:143 www/news/submit.php:150
-#: www/pm/browse_task.php:425 www/pm/include/ProjectView.class.php:329
+#: www/pm/browse_task.php:427 www/pm/include/ProjectView.class.php:329
 #: www/pm/include/ProjectView.class.php:333
 #: www/pm/include/ProjectView.class.php:337
 #: www/pm/include/ProjectView.class.php:342 www/pm/include/pm_columns.php:43
@@ -11543,8 +11543,8 @@
 msgstr ""
 
 #: www/include/html.php:342 www/include/html.php:475 www/include/html.php:739
-#: www/pm/browse_task.php:587 www/pm/browse_task.php:612
-#: www/pm/browse_task.php:623 www/tracker/browse.php:908
+#: www/pm/browse_task.php:598 www/pm/browse_task.php:623
+#: www/pm/browse_task.php:634 www/tracker/browse.php:908
 #: www/tracker/browse.php:916 www/tracker/browse.php:925
 msgid "No Change"
 msgstr ""
@@ -12110,7 +12110,7 @@
 msgstr ""
 
 #: www/my/dashboard.php:69 www/pm/browse_task.php:219
-#: www/pm/browse_task.php:413 www/pm/browse_task.php:613
+#: www/pm/browse_task.php:415 www/pm/browse_task.php:624
 #: www/pm/include/pm_columns.php:37 www/pm/templates/detail_template.php:20
 #: www/tracker/admin/form-customizelist.php:45 www/tracker/browse.php:280
 #: www/tracker/browse.php:692 www/tracker/browse.php:912
@@ -12118,8 +12118,8 @@
 msgid "Priority"
 msgstr ""
 
-#: www/my/dashboard.php:71 www/pm/browse_task.php:411
-#: www/pm/browse_task.php:620 www/pm/templates/detail_template.php:30
+#: www/my/dashboard.php:71 www/pm/browse_task.php:413
+#: www/pm/browse_task.php:631 www/pm/templates/detail_template.php:30
 #: www/tracker/browse.php:695 www/tracker/browse.php:915
 #: www/tracker/item.php:172
 msgid "Assigned to"
@@ -12517,8 +12517,8 @@
 #: www/people/createjob.php:49 www/people/editjob.php:52
 #: www/people/editjob.php:74 www/people/editjob.php:163
 #: www/people/people_utils.php:350 www/people/people_utils.php:406
-#: www/pm/browse_task.php:297 www/pm/browse_task.php:409
-#: www/pm/browse_task.php:610 www/pm/ganttpage.php:157
+#: www/pm/browse_task.php:298 www/pm/browse_task.php:411
+#: www/pm/browse_task.php:621 www/pm/ganttpage.php:157
 #: www/pm/include/pm_columns.php:35 www/pm/templates/detail_template.php:25
 #: www/pm/templates/time_tracking.php:7 www/reporting/timeadd.php:142
 #: www/snippet/package.php:163 www/snippet/submit.php:131
@@ -12817,7 +12817,7 @@
 
 #: www/people/editprofile.php:283 www/people/skills_utils.php:50
 #: www/people/skills_utils.php:157 www/pm/browse_task.php:216
-#: www/pm/browse_task.php:401 www/pm/ganttpage.php:70
+#: www/pm/browse_task.php:403 www/pm/ganttpage.php:70
 #: www/pm/include/pm_columns.php:32 www/pm/templates/detail_template.php:42
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:50
 #: www/tracker/include/ArtifactTypeHtml.class.php:147
@@ -12826,7 +12826,7 @@
 
 #: www/people/editprofile.php:284 www/people/skills_utils.php:51
 #: www/people/skills_utils.php:158 www/pm/browse_task.php:217
-#: www/pm/browse_task.php:404 www/pm/ganttpage.php:71
+#: www/pm/browse_task.php:406 www/pm/ganttpage.php:71
 #: www/pm/include/pm_columns.php:33 www/pm/templates/detail_template.php:47
 #: www/reporting/usersummary.php:106
 #: www/search/include/renderers/TasksHtmlSearchRenderer.class.php:51
@@ -13180,7 +13180,7 @@
 msgstr ""
 
 #: www/pm/browse_task.php:195 www/pm/browse_task.php:206
-#: www/pm/browse_task.php:296 www/pm/ganttpage.php:56 www/pm/ganttpage.php:58
+#: www/pm/browse_task.php:297 www/pm/ganttpage.php:56 www/pm/ganttpage.php:58
 #: www/pm/ganttpage.php:60 www/pm/ganttpage.php:62
 #: www/reporting/usersummary.php:53 www/tracker/browse.php:267
 #: www/tracker/browse.php:346 www/tracker/browse.php:353
@@ -13188,24 +13188,24 @@
 msgid "Any"
 msgstr ""
 
-#: www/pm/browse_task.php:197 www/pm/browse_task.php:584
+#: www/pm/browse_task.php:197 www/pm/browse_task.php:595
 #: www/pm/ganttpage.php:58 www/tracker/browse.php:272
 msgid "Unassigned"
 msgstr ""
 
-#: www/pm/browse_task.php:214 www/pm/browse_task.php:397
+#: www/pm/browse_task.php:214 www/pm/browse_task.php:399
 #: www/pm/ganttpage.php:68 www/pm/include/ProjectTaskHTML.class.php:84
 msgid "Task Id"
 msgstr ""
 
-#: www/pm/browse_task.php:215 www/pm/browse_task.php:399
+#: www/pm/browse_task.php:215 www/pm/browse_task.php:401
 #: www/pm/ganttpage.php:69 www/pm/include/ProjectTaskHTML.class.php:85
 #: www/pm/templates/detail_template.php:99
 #: www/tracker/include/ArtifactTypeHtml.class.php:146
 msgid "Task Summary"
 msgstr ""
 
-#: www/pm/browse_task.php:218 www/pm/browse_task.php:407
+#: www/pm/browse_task.php:218 www/pm/browse_task.php:409
 #: www/pm/ganttpage.php:72 www/pm/include/pm_columns.php:34
 #: www/pm/templates/detail_template.php:10
 msgid "Percent Complete"
@@ -13215,115 +13215,120 @@
 msgid "Detailed"
 msgstr ""
 
-#: www/pm/browse_task.php:294
+#: www/pm/browse_task.php:295
 msgid "Subprojects"
 msgstr ""
 
-#: www/pm/browse_task.php:295 www/pm/ganttpage.php:155
+#: www/pm/browse_task.php:296 www/pm/ganttpage.php:155
 #: www/tracker/browse.php:285 www/tracker/browse.php:524
 #: www/tracker/query.php:203 www/tracker/query.php:343
 msgid "Assignee"
 msgstr ""
 
-#: www/pm/browse_task.php:298 www/pm/ganttpage.php:158
+#: www/pm/browse_task.php:299 www/pm/ganttpage.php:158
 msgid "Sort On"
 msgstr ""
 
-#: www/pm/browse_task.php:299
+#: www/pm/browse_task.php:300
 msgid "Detail View"
 msgstr ""
 
-#: www/pm/browse_task.php:305
+#: www/pm/browse_task.php:306
 msgid "Customise display:"
 msgstr ""
 
-#: www/pm/browse_task.php:306
+#: www/pm/browse_task.php:307
 msgid "Add/Remove Columns"
 msgstr ""
 
-#: www/pm/browse_task.php:346
+#: www/pm/browse_task.php:347
 msgid "No Matching Tasks found"
 msgstr ""
 
-#: www/pm/browse_task.php:348
+#: www/pm/browse_task.php:349
 msgid "Add tasks using the link above"
 msgstr ""
 
-#: www/pm/browse_task.php:351 www/tracker/browse.php:579
+#: www/pm/browse_task.php:352 www/tracker/browse.php:579
 #, php-format
 msgid "Displaying %d results."
 msgstr ""
 
-#: www/pm/browse_task.php:417
+#: www/pm/browse_task.php:419
 msgid "Project Task Id"
 msgstr ""
 
-#: www/pm/browse_task.php:419 www/pm/include/pm_columns.php:40
+#: www/pm/browse_task.php:421 www/pm/include/pm_columns.php:40
 #: www/snippet/browse.php:83 www/tracker/query.php:341
 msgid "Creator"
 msgstr ""
 
-#: www/pm/browse_task.php:421 www/pm/include/pm_columns.php:41
+#: www/pm/browse_task.php:423 www/pm/include/pm_columns.php:41
 msgid "Duration"
 msgstr ""
 
-#: www/pm/browse_task.php:423 www/pm/include/pm_columns.php:42
+#: www/pm/browse_task.php:425 www/pm/include/pm_columns.php:42
 msgid "Parent Id"
 msgstr ""
 
-#: www/pm/browse_task.php:427 www/pm/include/pm_columns.php:44
+#: www/pm/browse_task.php:429 www/pm/include/pm_columns.php:44
 #: www/pm/templates/detail_template.php:55
 msgid "Estimated Hours"
 msgstr ""
 
-#: www/pm/browse_task.php:429 www/pm/include/pm_columns.php:45
+#: www/pm/browse_task.php:431 www/pm/include/pm_columns.php:45
+#: www/pm/templates/time_tracking.php:6 www/reporting/timeadd.php:141
+msgid "Hours worked"
+msgstr ""
+
+#: www/pm/browse_task.php:433 www/pm/include/pm_columns.php:46
 msgid "Status Id"
 msgstr ""
 
-#: www/pm/browse_task.php:431 www/pm/include/pm_columns.php:46
+#: www/pm/browse_task.php:435 www/pm/include/pm_columns.php:47
 msgid "Category Id"
 msgstr ""
 
-#: www/pm/browse_task.php:433 www/pm/include/pm_columns.php:47
+#: www/pm/browse_task.php:437 www/pm/include/pm_columns.php:48
 msgid "Last Modified Date"
 msgstr ""
 
-#: www/pm/browse_task.php:435 www/pm/include/pm_columns.php:48
+#: www/pm/browse_task.php:439 www/pm/include/pm_columns.php:49
 msgid "External Id"
 msgstr ""
 
-#: www/pm/browse_task.php:437 www/pm/include/pm_columns.php:49
+#: www/pm/browse_task.php:441 www/pm/include/pm_columns.php:50
 msgid "Sub-Project"
 msgstr ""
 
-#: www/pm/browse_task.php:568 www/tracker/browse.php:869
+#: www/pm/browse_task.php:579 www/tracker/browse.php:869
 msgid "Mass Update"
 msgstr ""
 
-#: www/pm/browse_task.php:603
+#: www/pm/browse_task.php:614
 msgid "Check all"
 msgstr ""
 
-#: www/pm/browse_task.php:605
+#: www/pm/browse_task.php:616
 msgid "Clear all"
 msgstr ""
 
-#: www/pm/browse_task.php:607 www/tracker/browse.php:891
+#: www/pm/browse_task.php:618 www/tracker/browse.php:891
 msgid ""
 "<strong>Admin:</strong> If you wish to apply changes to all items selected "
 "above, use these controls to change their properties and click once on "
 "\"Mass Update\"."
 msgstr ""
 
-#: www/pm/browse_task.php:626 www/pm/templates/detail_template.php:79
+#: www/pm/browse_task.php:637 www/pm/templates/detail_template.php:79
 msgid "Subproject"
 msgstr ""
 
-#: www/pm/browse_task.php:629 www/tracker/browse.php:932
+#: www/pm/browse_task.php:640 www/tracker/browse.php:932
 msgid "Mass update"
 msgstr ""
 
-#: www/pm/browse_task.php:677
+#: www/pm/browse_task.php:688
 msgid "* Denotes overdue tasks"
 msgstr ""
 
@@ -13643,11 +13648,11 @@
 msgid "Assigned To"
 msgstr ""
 
-#: www/pm/include/pm_columns.php:83
+#: www/pm/include/pm_columns.php:84
 msgid "Select PM Display Columns"
 msgstr ""
 
-#: www/pm/include/pm_columns.php:89
+#: www/pm/include/pm_columns.php:90
 msgid "Select Columns"
 msgstr ""
 
@@ -13863,10 +13868,6 @@
 msgid "Day"
 msgstr ""
 
-#: www/pm/templates/time_tracking.php:6 www/reporting/timeadd.php:141
-msgid "Hours worked"
-msgstr ""
-
 #: www/pm/templates/time_tracking.php:73
 msgid "Time tracking list"
 msgstr ""

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/browse_task.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/browse_task.php	2012-10-02 14:06:47 UTC (rev 18674)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/browse_task.php	2012-10-02 14:06:52 UTC (rev 18675)
@@ -428,7 +428,7 @@
 	if ($display_col['hours'])
 		$title_arr[]=_('Estimated Hours');
 	if ($display_col['hworked'])
-		$title_arr[]=_('Hours Worked');
+		$title_arr[]=_('Hours worked');
 	if ($display_col['status_id'])
 		$title_arr[]=_('Status Id');
 	if ($display_col['category_id'])

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/pm_columns.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/pm_columns.php	2012-10-02 14:06:47 UTC (rev 18674)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/include/pm_columns.php	2012-10-02 14:06:52 UTC (rev 18675)
@@ -42,7 +42,7 @@
 	array("parentId", 0, _('Parent Id')),
 	array("details", 0, _('Details')),
 	array("hours", 0, _('Estimated Hours')),
-	array("hworked", 0, _('Hours Worked')),
+	array("hworked", 0, _('Hours worked')),
 	array("statusId", 0, _('Status Id')),
 	array("categoryId", 0, _('Category Id')),
 	array("lastModDat", 0, _('Last Modified Date')),



More information about the evolvis-commits mailing list