Changeset 16076 in josm


Ignore:
Timestamp:
2020-03-08T13:06:42+01:00 (3 months ago)
Author:
simon04
Message:

fix #18643 - I18n: improve plural forms

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

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

    r15959 r16076  
    164164                        if (!area.equals(areaOuter)) {
    165165                            String message = !areaStyle ? tr("Style for outer way mismatches")
    166                                     : tr("With the currently used mappaint style(s) the style for outer way mismatches the area style");
     166                                    : tr("With the currently used mappaint style the style for outer way mismatches the area style");
    167167                            errors.add(TestError.builder(this, Severity.OTHER, OUTER_STYLE_MISMATCH)
    168168                                    .message(message)
     
    379379            if (errorCode == RINGS_SHARE_NODES) {
    380380                errors.add(TestError.builder(this, Severity.OTHER, errorCode)
    381                         .message(tr("Multipolygon rings share node(s)"))
     381                        .message(tr("Multipolygon rings share nodes"))
    382382                        .primitives(prims)
    383383                        .highlight(sharedByPolygons)
     
    578578                        String msg = loop == 0 ? tr("Intersection between multipolygon ways")
    579579                                : samePoly ? tr("Multipolygon ring contains segments twice")
    580                                         : tr("Multipolygon outer way shares segment(s) with other ring");
     580                                        : tr("Multipolygon outer way shares segments with other ring");
    581581                        errors.add(TestError.builder(this, Severity.ERROR, CROSSING_WAYS)
    582582                                .message(msg)
     
    693693    /**
    694694     * Check for:<ul>
    695      * <li>{@link #REPEATED_MEMBER_DIFF_ROLE}: Multipolygon member(s) repeated with different role</li>
    696      * <li>{@link #REPEATED_MEMBER_SAME_ROLE}: Multipolygon member(s) repeated with same role</li>
     695     * <li>{@link #REPEATED_MEMBER_DIFF_ROLE}: Multipolygon members repeated with different role</li>
     696     * <li>{@link #REPEATED_MEMBER_SAME_ROLE}: Multipolygon members repeated with same role</li>
    697697     * </ul>
    698698     * @param r relation
     
    738738                }
    739739            }
    740             addRepeatedMemberError(r, repeatedDiffRole, REPEATED_MEMBER_DIFF_ROLE, tr("Multipolygon member(s) repeated with different role"));
    741             addRepeatedMemberError(r, repeatedSameRole, REPEATED_MEMBER_SAME_ROLE, tr("Multipolygon member(s) repeated with same role"));
     740            addRepeatedMemberError(r, repeatedDiffRole, REPEATED_MEMBER_DIFF_ROLE, tr("Multipolygon members repeated with different role"));
     741            addRepeatedMemberError(r, repeatedSameRole, REPEATED_MEMBER_SAME_ROLE, tr("Multipolygon members repeated with same role"));
    742742        }
    743743        return hasDups;
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/CopyKeyValueAction.java

    r15751 r16076  
    3232        super(tagTable, keyFn, objectSp);
    3333        setName(0);
    34         putValue(SHORT_DESCRIPTION, tr("Copy the key and value of the selected tag(s) to clipboard"));
     34        putValue(SHORT_DESCRIPTION, tr("Copy the key and value of the selected tags to clipboard"));
    3535    }
    3636
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

    r16070 r16076  
    290290    private class ImageRemoveAction extends JosmAction {
    291291        ImageRemoveAction() {
    292             super(null, new ImageProvider("dialogs", "delete"), tr("Remove photo(s) from layer"), Shortcut.registerShortcut(
    293                     "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo(s) from layer")), KeyEvent.VK_DELETE, Shortcut.SHIFT),
     292            super(null, new ImageProvider("dialogs", "delete"), tr("Remove photo from layer"), Shortcut.registerShortcut(
     293                    "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo from layer")), KeyEvent.VK_DELETE, Shortcut.SHIFT),
    294294                  false, null, false);
    295295        }
     
    305305    private class ImageRemoveFromDiskAction extends JosmAction {
    306306        ImageRemoveFromDiskAction() {
    307             super(null, new ImageProvider("dialogs", "geoimage/deletefromdisk"), tr("Delete photo file(s) from disk"),
     307            super(null, new ImageProvider("dialogs", "geoimage/deletefromdisk"), tr("Delete photo file from disk"),
    308308                  Shortcut.registerShortcut(
    309                     "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete file(s) from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT),
     309                    "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete photo file from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT),
    310310                  false, null, false);
    311311        }
Note: See TracChangeset for help on using the changeset viewer.