Changeset 6679 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-01-13T00:11:28+01:00 (10 years ago)

Author:

stoecker

Message:

see #9110 - fix singular forms, even if they are useless

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractInfoAction.java (modified) (2 diffs)
• CombineWayAction.java (modified) (1 diff)
• MergeNodesAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (1 diff)
• UnGlueAction.java (modified) (1 diff)
• mapmode/SelectAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java

@@ -87 +87 @@
     public static boolean confirmLaunchMultiple(int numBrowsers) {
         String msg  = /* for correct i18n of plural forms - see #9110 */ trn(
-                "You are about to launch {0} browser windows.<br>"
+                "You are about to launch {0} browser window.<br>"
                         + "This may both clutter your screen with browser windows<br>"
                         + "and take some time to finish.",
@@ -98 +98 @@
                         tr("Continue"),
                         ImageProvider.get("ok"),
-                        trn("Click to continue and to open {0} browsers", "Click to continue and to open {0} browsers", numBrowsers, numBrowsers),
+                        trn("Click to continue and to open {0} browser", "Click to continue and to open {0} browsers", numBrowsers, numBrowsers),
                         null // no specific help topic
                 ),

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -192 +192 @@
         cmds.add(new DeleteCommand(deletedWays));
         final SequenceCommand sequenceCommand = new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
-                trn("Combine {0} ways", "Combine {0} ways", ways.size(), ways.size()), cmds);
+                trn("Combine {0} way", "Combine {0} ways", ways.size(), ways.size()), cmds);
 
         return new Pair<Way, Command>(targetWay, sequenceCommand);

trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

@@ -356 +356 @@
             }
             return new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
-                    trn("Merge {0} nodes", "Merge {0} nodes", nodes.size(), nodes.size()), cmds);
+                    trn("Merge {0} node", "Merge {0} nodes", nodes.size(), nodes.size()), cmds);
         } catch (UserCancelException ex) {
             return null;

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -506 +506 @@
                 new SequenceCommand(
                         /* for correct i18n of plural forms - see #9110 */
-                        trn("Split way {0} into {1} parts", "Split way {0} into {1} parts", wayChunks.size(),
+                        trn("Split way {0} into {1} part", "Split way {0} into {1} parts", wayChunks.size(),
                                 way.getDisplayName(DefaultNameFormatter.getInstance()), wayChunks.size()),
                         commandList

trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

@@ -380 +380 @@
 
         Main.main.undoRedo.add(new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
-                trn("Dupe into {0} nodes", "Dupe into {0} nodes", newNodes.size() + 1, newNodes.size() + 1), cmds));
+                trn("Dupe into {0} node", "Dupe into {0} nodes", newNodes.size() + 1, newNodes.size() + 1), cmds));
         // select one of the new nodes
         getCurrentDataSet().setSelected(newNodes.getFirst());

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -809 +809 @@
                     /* for correct i18n of plural forms - see #9110 */
                     trn(
-                            "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
+                            "You moved more than {0} element. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
                             "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
                             max, max));