Merge pull request #1980 from kwoot/fix-missed-strings

Removed double strings in language files.

ganttzk/src/main/resources/i18n/keys.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-23 14:47+0100\n"
+"POT-Creation-Date: 2024-11-27 20:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,46 +17,102 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:510
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
-msgid "filtering by name"
+msgid "Show/Hide critical path"
 msgstr ""
 
-#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:474
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:56
-msgid "All"
+msgid "None"
 msgstr ""
 
-#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49
-msgid "Project"
+msgid "Print"
 msgstr ""
 
-#: org/zkoss/ganttz/TaskList.java:298
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57
-msgid "Add Dependency"
+msgid "Worker"
 msgstr ""
 
-#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:59
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:70
-msgid "Task"
+msgid "Week"
 msgstr ""
 
-#: org/zkoss/ganttz/Planner.java:648
+#: org/zkoss/ganttz/Planner.java:693
-msgid "Hide critical path"
+msgid "Show reported hours"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:102
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:96
-msgid "Show/Hide money cost bar"
+msgid "Show/Hide reported hours"
 msgstr ""
 
-#: org/zkoss/ganttz/LeftTasksTreeRow.java:273
+#: org/zkoss/ganttz/DependencyList.java:236
-#: org/zkoss/ganttz/LeftTasksTreeRow.java:280
+msgid "Set End-End"
-msgid "and no later than"
 msgstr ""
 
-#: org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:192
+#: org/zkoss/ganttz/Planner.java:464
-msgid "available effort: {0}, assigned effort: {1}"
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:398
+msgid "Graphics are disabled"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:138
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:65
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:103
+msgid "Criterion"
-msgid "Graphics"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:159
+msgid "showing resources"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:31
+msgid "T / M"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:679
+msgid "Hide progress"
+msgstr ""
+
+#: org/zkoss/ganttz/DependencyList.java:234
+msgid "Set Start-Start"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:88
+msgid "Show/Hide progress"
+msgstr ""
+
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:272
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:279
+msgid "Please enter date not before"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:76
+msgid "Expand/Collapse all"
+msgstr ""
+
+#: org/zkoss/ganttz/DependencyList.java:66
+msgid "The specified dependency is not allowed"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:162
+msgid "showing criteria"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:698
+msgid "Hide reported hours"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:88
+msgid "Generic allocation criteria"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:56
+msgid "Group by"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:670
+msgid "Show progress"
+msgstr ""
+
+#: org/zkoss/ganttz/DependencyList.java:232
+msgid "Set End-Start"
 msgstr ""
 
 #: org/zkoss/ganttz/DependencyList.java:213
@@ -68,88 +124,98 @@ msgstr ""
 msgid "Show all elements"
 msgstr ""
 
-#: org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:184
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:38
-msgid "Load: {0}%"
+msgid "Zoom"
-msgstr ""
-
-#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:82
-msgid "Day"
-msgstr ""
-
-#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:88
-msgid "Generic allocation criteria"
-msgstr ""
-
-#: org/zkoss/ganttz/Planner.java:693
-msgid "Show reported hours"
-msgstr ""
-
-#: org/zkoss/ganttz/Planner.java:344
-msgid "decreasing zoom"
-msgstr ""
-
-#: org/zkoss/ganttz/Planner.java:670
-msgid "Show progress"
 msgstr ""
 
 #: org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:147
 msgid "See resource allocation"
 msgstr ""
 
-#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:65
+#: org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:192
-msgid "Criterion"
+msgid "available effort: {0}, assigned effort: {1}"
+msgstr ""
+
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:58
+msgid "Project"
 msgstr ""
 
 #: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:81
 msgid "Flatten/Unflatten tree"
 msgstr ""
 
-#: org/zkoss/ganttz/Planner.java:326
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:59
-msgid "increasing zoom"
+msgid "Task"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:31
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:46
-msgid "T / M"
+msgid "Quarter"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:49
+#: org/zkoss/ganttz/TaskList.java:298
-msgid "Print"
+msgid "Add Dependency"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:88
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
-msgid "Show/Hide progress"
+msgid "Show/Hide resources"
 msgstr ""
 
-#: org/zkoss/ganttz/Planner.java:717
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:138
-msgid "Hide money cost bar"
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:103
+msgid "Graphics"
 msgstr ""
 
-#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58
+#: org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:170
-msgid "Month"
+msgid "See scheduling"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:273
-msgid "End"
+#: org/zkoss/ganttz/LeftTasksTreeRow.java:280
+msgid "and no later than"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:96
+#: org/zkoss/ganttz/Planner.java:643
-msgid "Show/Hide reported hours"
+msgid "Show critical path"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50
+msgid "Page"
+msgstr ""
+
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
+msgid "Show/Hide labels"
 msgstr ""
 
 #: org/zkoss/ganttz/Planner.java:712
 msgid "Show money cost bar"
 msgstr ""
 
-#: org/zkoss/ganttz/DependencyList.java:66
+#: org/zkoss/ganttz/Planner.java:344
-msgid "The specified dependency is not allowed"
+msgid "decreasing zoom"
 msgstr ""
 
-#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:82
-msgid "Worker"
+msgid "Day"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29
-msgid "Show/Hide resources"
+msgid "Start"
+msgstr ""
+
+#: org/zkoss/ganttz/timetracker/TimeTracker.java:229
+msgid "changing zoom"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:474
+msgid "All"
+msgstr ""
+
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:510
+msgid "filtering by name"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:648
+msgid "Hide critical path"
 msgstr ""
 
 #: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:28
@@ -157,98 +223,32 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java:170
+#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:30
-msgid "See scheduling"
+msgid "End"
-msgstr ""
-
-#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:159
-msgid "showing resources"
-msgstr ""
-
-#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:70
-msgid "Week"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:56
-msgid "Group by"
-msgstr ""
-
-#: org/zkoss/ganttz/Planner.java:679
-msgid "Hide progress"
-msgstr ""
-
-#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:162
-msgid "showing criteria"
-msgstr ""
-
-#: org/zkoss/ganttz/DependencyList.java:234
-msgid "Set Start-Start"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50
-msgid "Page"
-msgstr ""
-
-#: org/zkoss/ganttz/Planner.java:698
-msgid "Hide reported hours"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:42
-msgid "Refresh"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul:29
-msgid "Start"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:76
-msgid "Expand/Collapse all"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
-msgid "Show/Hide labels"
-msgstr ""
-
-#: org/zkoss/ganttz/DependencyList.java:236
-msgid "Set End-End"
-msgstr ""
-
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:38
-msgid "Zoom"
-msgstr ""
-
-#: org/zkoss/ganttz/Planner.java:643
-msgid "Show critical path"
 msgstr ""
 
 #: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:34
 msgid "Year"
 msgstr ""
 
-#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:56
+#: org/zkoss/ganttz/resourceload/ResourceLoadComponent.java:184
-msgid "None"
+msgid "Load: {0}%"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:717
+msgid "Hide money cost bar"
+msgstr ""
+
+#: org/zkoss/ganttz/Planner.java:326
+msgid "increasing zoom"
 msgstr ""
 
 #: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:86
 msgid "Resources"
 msgstr ""
 
-#: org/zkoss/ganttz/DependencyList.java:232
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:42
-msgid "Set End-Start"
+msgid "Refresh"
-msgstr ""
-
-#: org/zkoss/ganttz/Planner.java:464
-#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:398
-msgid "Graphics are disabled"
-msgstr ""
-
-#: org/zkoss/ganttz/LeftTasksTreeRow.java:272
-#: org/zkoss/ganttz/LeftTasksTreeRow.java:279
-msgid "Please enter date not before"
-msgstr ""
-
-#: org/zkoss/ganttz/timetracker/TimeTracker.java:229
-msgid "changing zoom"
 msgstr ""
 
 #: org/zkoss/ganttz/LeftTasksTreeRow.java:271
@@ -256,11 +256,11 @@ msgstr ""
 msgid "The date you entered is invalid"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:102
-msgid "Show/Hide critical path"
+msgid "Show/Hide money cost bar"
 msgstr ""
 
-#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:46
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:58
-msgid "Quarter"
+msgid "Month"
 msgstr ""
 

libreplan-webapp/src/main/webapp/common/layout/login.zul

@@ -179,7 +179,9 @@
                 <n:div align="left">
                     <n:p><n:strong>${i18n:_('Did you know LibrePlan is funded only by donations, from people like you?')}</n:strong></n:p>
                     <n:p>${i18n:_('We don’t show advertisements or sell your data.')} 
-                    <n:strong>${i18n:_('Ever!')}</n:strong> ${i18n:_('But')} <n:strong>${i18n:_('without you, LibrePlan can’t exist.')}</n:strong></n:p>
+                    <n:strong>${i18n:_('Ever!')}</n:strong> 
+		       ${i18n:_('But')} <n:strong>
+                       ${i18n:_('without you, LibrePlan can’t exist.')}</n:strong></n:p>
                     <n:p>${i18n:_('Giving a gift today means LibrePlan continues to remain available and in active development tomorrow!')}</n:p>
                     <n:p><n:script src="https://opencollective.com/libreplan/donate/button.js" color="blue"></n:script></n:p>
                 </n:div>