Changeset 6679 in josm


Ignore:
Timestamp:
2014-01-13T00:11:28+01:00 (6 years ago)
Author:
stoecker
Message:

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

Location:
trunk/src/org/openstreetmap/josm
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java

    r6507 r6679  
    8787    public static boolean confirmLaunchMultiple(int numBrowsers) {
    8888        String msg  = /* for correct i18n of plural forms - see #9110 */ trn(
    89                 "You are about to launch {0} browser windows.<br>"
     89                "You are about to launch {0} browser window.<br>"
    9090                        + "This may both clutter your screen with browser windows<br>"
    9191                        + "and take some time to finish.",
     
    9898                        tr("Continue"),
    9999                        ImageProvider.get("ok"),
    100                         trn("Click to continue and to open {0} browsers", "Click to continue and to open {0} browsers", numBrowsers, numBrowsers),
     100                        trn("Click to continue and to open {0} browser", "Click to continue and to open {0} browsers", numBrowsers, numBrowsers),
    101101                        null // no specific help topic
    102102                ),
  • trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

    r6596 r6679  
    192192        cmds.add(new DeleteCommand(deletedWays));
    193193        final SequenceCommand sequenceCommand = new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
    194                 trn("Combine {0} ways", "Combine {0} ways", ways.size(), ways.size()), cmds);
     194                trn("Combine {0} way", "Combine {0} ways", ways.size(), ways.size()), cmds);
    195195
    196196        return new Pair<Way, Command>(targetWay, sequenceCommand);
  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r6507 r6679  
    356356            }
    357357            return new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
    358                     trn("Merge {0} nodes", "Merge {0} nodes", nodes.size(), nodes.size()), cmds);
     358                    trn("Merge {0} node", "Merge {0} nodes", nodes.size(), nodes.size()), cmds);
    359359        } catch (UserCancelException ex) {
    360360            return null;
  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r6507 r6679  
    506506                new SequenceCommand(
    507507                        /* for correct i18n of plural forms - see #9110 */
    508                         trn("Split way {0} into {1} parts", "Split way {0} into {1} parts", wayChunks.size(),
     508                        trn("Split way {0} into {1} part", "Split way {0} into {1} parts", wayChunks.size(),
    509509                                way.getDisplayName(DefaultNameFormatter.getInstance()), wayChunks.size()),
    510510                        commandList
  • trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

    r6639 r6679  
    380380
    381381        Main.main.undoRedo.add(new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
    382                 trn("Dupe into {0} nodes", "Dupe into {0} nodes", newNodes.size() + 1, newNodes.size() + 1), cmds));
     382                trn("Dupe into {0} node", "Dupe into {0} nodes", newNodes.size() + 1, newNodes.size() + 1), cmds));
    383383        // select one of the new nodes
    384384        getCurrentDataSet().setSelected(newNodes.getFirst());
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r6546 r6679  
    809809                    /* for correct i18n of plural forms - see #9110 */
    810810                    trn(
    811                             "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
     811                            "You moved more than {0} element. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
    812812                            "You moved more than {0} elements. " + "Moving a large number of elements is often an error.\n" + "Really move them?",
    813813                            max, max));
  • trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

    r6538 r6679  
    167167            Map.Entry<String, String> entry = tags.entrySet().iterator().next();
    168168            if (entry.getValue() == null) {
    169                 /* for correct i18n of plural forms - see #9110 */
    170                 text = trn("Remove \"{0}\" for {1} objects", "Remove \"{0}\" for {1} objects", objects.size(), entry.getKey(), objects.size());
     169                /* I18n: plural form for objects, but value < 2 not possible! */
     170                text = trn("Remove \"{0}\" for {1} object", "Remove \"{0}\" for {1} objects", objects.size(), entry.getKey(), objects.size());
    171171            } else {
    172                 /* for correct i18n of plural forms - see #9110 */
    173                 text = trn("Set {0}={1} for {2} objects", "Set {0}={1} for {2} objects", objects.size(), entry.getKey(), entry.getValue(), objects.size());
     172                /* I18n: plural form for objects, but value < 2 not possible! */
     173                text = trn("Set {0}={1} for {2} object", "Set {0}={1} for {2} objects", objects.size(), entry.getKey(), entry.getValue(), objects.size());
    174174            }
    175175        }
     
    184184
    185185            if (allnull) {
    186                 /* for correct i18n of plural forms - see #9110 */
    187                 text = trn("Deleted {0} tags for {1} objects", "Deleted {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
     186                /* I18n: plural form detected for objects only (but value < 2 not possible!), try to do your best for tags */
     187                text = trn("Deleted {0} tags for {1} object", "Deleted {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
    188188            } else {
    189                 /* for correct i18n of plural forms - see #9110 */
    190                 text = trn("Set {0} tags for {1} objects", "Set {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
     189                /* I18n: plural form detected for objects only (but value < 2 not possible!), try to do your best for tags */
     190                text = trn("Set {0} tags for {1} object", "Set {0} tags for {1} objects", objects.size(), tags.size(), objects.size());
    191191            }
    192192        }
  • trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

    r6507 r6679  
    6060            case NODE:
    6161                /* for correct i18n of plural forms - see #9110 */
    62                 return trn("Resolve {0} tag conflicts in node {1}", "Resolve {0} tag conflicts in node {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
     62                return trn("Resolve {0} tag conflict in node {1}", "Resolve {0} tag conflicts in node {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
    6363            case WAY:
    6464                /* for correct i18n of plural forms - see #9110 */
    65                 return trn("Resolve {0} tag conflicts in way {1}", "Resolve {0} tag conflicts in way {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
     65                return trn("Resolve {0} tag conflict in way {1}", "Resolve {0} tag conflicts in way {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
    6666            case RELATION:
    6767                /* for correct i18n of plural forms - see #9110 */
    68                 return trn("Resolve {0} tag conflicts in relation {1}", "Resolve {0} tag conflicts in relation {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
     68                return trn("Resolve {0} tag conflict in relation {1}", "Resolve {0} tag conflicts in relation {1}", getNumDecidedConflicts(), getNumDecidedConflicts(), conflict.getMy().getId());
    6969        }
    7070        return "";
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

    r6507 r6679  
    549549            final Collection<? extends OsmPrimitive> primitives,
    550550            final Set<Relation> parentRelations) throws UserCancelException {
    551         String msg = trn("You are about to combine {1} objects, "
     551        /* I18n: object count < 2 is not possible */
     552        String msg = trn("You are about to combine {1} object, "
    552553                + "which are part of {0} relation:<br/>{2}"
    553554                + "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

    r6507 r6679  
    376376        if (disabledAndHiddenCount != 0) {
    377377            /* for correct i18n of plural forms - see #9110 */
    378             message += trn("<p><b>{0}</b> objects hidden", "<p><b>{0}</b> objects hidden", disabledAndHiddenCount, disabledAndHiddenCount);
     378            message += trn("<p><b>{0}</b> object hidden", "<p><b>{0}</b> objects hidden", disabledAndHiddenCount, disabledAndHiddenCount);
    379379        }
    380380
     
    385385        if (disabledCount != 0) {
    386386            /* for correct i18n of plural forms - see #9110 */
    387             message += trn("<b>{0}</b> objects disabled", "<b>{0}</b> objects disabled", disabledCount, disabledCount);
     387            message += trn("<b>{0}</b> object disabled", "<b>{0}</b> objects disabled", disabledCount, disabledCount);
    388388        }
    389389
Note: See TracChangeset for help on using the changeset viewer.