Changeset 6679 in josm

Timestamp:

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

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AbstractInfoAction.java (modified) (2 diffs)
• actions/CombineWayAction.java (modified) (1 diff)
• actions/MergeNodesAction.java (modified) (1 diff)
• actions/SplitWayAction.java (modified) (1 diff)
• actions/UnGlueAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (1 diff)
• command/ChangePropertyCommand.java (modified) (2 diffs)
• command/TagConflictResolveCommand.java (modified) (1 diff)
• gui/conflict/tags/CombinePrimitiveResolverDialog.java (modified) (1 diff)
• gui/dialogs/FilterTableModel.java (modified) (2 diffs)

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));

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -167 +167 @@
             Map.Entry<String, String> entry = tags.entrySet().iterator().next();
             if (entry.getValue() == null) {
-                /* for correct i18n of plural forms - see #9110 */
-                text = trn("Remove \"{0}\" for {1} objects", "Remove \"{0}\" for {1} objects", objects.size(), entry.getKey(), objects.size());
+                /* I18n: plural form for objects, but value < 2 not possible! */
+                text = trn("Remove \"{0}\" for {1} object", "Remove \"{0}\" for {1} objects", objects.size(), entry.getKey(), objects.size());
             } else {
-                /* for correct i18n of plural forms - see #9110 */
-                text = trn("Set {0}={1} for {2} objects", "Set {0}={1} for {2} objects", objects.size(), entry.getKey(), entry.getValue(), objects.size());
+                /* I18n: plural form for objects, but value < 2 not possible! */
+                text = trn("Set {0}={1} for {2} object", "Set {0}={1} for {2} objects", objects.size(), entry.getKey(), entry.getValue(), objects.size());
             }
         }
@@ -184 +184 @@
 
             if (allnull) {
-                /* for correct i18n of plural forms - see #9110 */
-                text = trn("Deleted {0} tags for {1} objects", "Deleted {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
+                /* I18n: plural form detected for objects only (but value < 2 not possible!), try to do your best for tags */ 
+                text = trn("Deleted {0} tags for {1} object", "Deleted {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
             } else {
-                /* for correct i18n of plural forms - see #9110 */
-                text = trn("Set {0} tags for {1} objects", "Set {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
+                /* I18n: plural form detected for objects only (but value < 2 not possible!), try to do your best for tags */
+                text = trn("Set {0} tags for {1} object", "Set {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
             }
         }

trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

@@ -60 +60 @@
             case NODE:
                 /* for correct i18n of plural forms - see #9110 */
-                return trn("Resolve {0} tag conflicts in node {1}", "Resolve {0} tag conflicts in node {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+                return trn("Resolve {0} tag conflict in node {1}", "Resolve {0} tag conflicts in node {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
             case WAY:
                 /* for correct i18n of plural forms - see #9110 */
-                return trn("Resolve {0} tag conflicts in way {1}", "Resolve {0} tag conflicts in way {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+                return trn("Resolve {0} tag conflict in way {1}", "Resolve {0} tag conflicts in way {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
             case RELATION:
                 /* for correct i18n of plural forms - see #9110 */
-                return trn("Resolve {0} tag conflicts in relation {1}", "Resolve {0} tag conflicts in relation {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
+                return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
         }
         return "";

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -549 +549 @@
             final Collection<? extends OsmPrimitive> primitives,
             final Set<Relation> parentRelations) throws UserCancelException {
-        String msg = trn("You are about to combine {1} objects, "
+        /* I18n: object count < 2 is not possible */
+        String msg = trn("You are about to combine {1} object, "
                 + "which are part of {0} relation:<br/>{2}"
                 + "Combining these objects may break this relation. If you are unsure, please cancel this operation.<br/>"

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

@@ -376 +376 @@
         if (disabledAndHiddenCount != 0) {
             /* for correct i18n of plural forms - see #9110 */
-            message += trn("<p><b>{0}</b> objects hidden", "<p><b>{0}</b> objects hidden", disabledAndHiddenCount, disabledAndHiddenCount);
+            message += trn("<p><b>{0}</b> object hidden", "<p><b>{0}</b> objects hidden", disabledAndHiddenCount, disabledAndHiddenCount);
         }
 
@@ -385 +385 @@
         if (disabledCount != 0) {
             /* for correct i18n of plural forms - see #9110 */
-            message += trn("<b>{0}</b> objects disabled", "<b>{0}</b> objects disabled", disabledCount, disabledCount);
+            message += trn("<b>{0}</b> object disabled", "<b>{0}</b> objects disabled", disabledCount, disabledCount);
         }