Improve i18n strings with undistinguished singular/plural form

[simon04]

tr("With the currently used mappaint style(s) the style for outer way mismatches the area style")
tr("Multipolygon rings share node(s)")
tr("Multipolygon outer way shares segment(s) with other ring")
tr("Multipolygon member(s) repeated with different role")
tr("Multipolygon member(s) repeated with same role")
tr("Could not access data file(s):\n{0}", errorSources)
tr("Disable access to the given resource(s), separated by comma")
tr("Zoom to selected element(s)")
tr("Copy the key and value of the selected tag(s) to clipboard")
tr("Remove photo(s) from layer")
tr("Delete photo file(s) from disk")
tr("Delete file(s) from disk")

[Hb---]

Replying to simon04:

"Multipolygon rings share node(s)"

If this message is only called with two or more modes affected, then please use equal source strings for the singular and for the plural form, see #18814.

tr("Zoom to selected element(s)")

This is accompanied with Zoom to selection in the same context menu. The meanings seem to contradict. Please consider to simply use Zoom to. This would be similar to Edit and Delete already present there. It would be equal to the context menu item in the relation editor.

[stoecker]

Replying to Hb---:

Replying to simon04:

"Multipolygon rings share node(s)"

If this message is only called with two or more modes affected, then please use equal source strings for the singular and for the plural form, see #18814.

Can you please stop to ask for changes which violate our guidelines. I18n always has to have full strings independent from the possibly used numbers in the code, as:

• each language defines the strings different and
• code may change

[simon04]

In 16072/josm:

see #18643 - I18n: improve plural forms

[simon04]

I was unsuccessful for most strings. What about using the plural form instead of the nasty and typographically catastrophic word(s)?

src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -163 +163 @@
                     if (areaOuter != null) {
                         if (!area.equals(areaOuter)) {
                             String message = !areaStyle ? tr("Style for outer way mismatches")
-                                    : tr("With the currently used mappaint style(s) the style for outer way mismatches the area style");
+                                    : tr("With the currently used mappaint style the style for outer way mismatches the area style");
                             errors.add(TestError.builder(this, Severity.OTHER, OUTER_STYLE_MISMATCH)
                                     .message(message)
                                     .primitives(Arrays.asList(r, wOuter))
@@ -378 +378 @@
             }
             if (errorCode == RINGS_SHARE_NODES) {
                 errors.add(TestError.builder(this, Severity.OTHER, errorCode)
-                        .message(tr("Multipolygon rings share node(s)"))
+                        .message(tr("Multipolygon rings share nodes"))
                         .primitives(prims)
                         .highlight(sharedByPolygons)
                         .build());
@@ -577 +577 @@
                     } else if (loop == 0 || samePoly || (loop == 1 && !allInner)) {
                         String msg = loop == 0 ? tr("Intersection between multipolygon ways")
                                 : samePoly ? tr("Multipolygon ring contains segments twice")
-                                        : tr("Multipolygon outer way shares segment(s) with other ring");
+                                        : tr("Multipolygon outer way shares segments with other ring");
                         errors.add(TestError.builder(this, Severity.ERROR, CROSSING_WAYS)
                                 .message(msg)
                                 .primitives(Arrays.asList(r, ways.get(0), ways.get(1)))
@@ -692 +692 @@
 
     /**
      * Check for:<ul>
-     * <li>{@link #REPEATED_MEMBER_DIFF_ROLE}: Multipolygon member(s) repeated with different role</li>
-     * <li>{@link #REPEATED_MEMBER_SAME_ROLE}: Multipolygon member(s) repeated with same role</li>
+     * <li>{@link #REPEATED_MEMBER_DIFF_ROLE}: Multipolygon members repeated with different role</li>
+     * <li>{@link #REPEATED_MEMBER_SAME_ROLE}: Multipolygon members repeated with same role</li>
      * </ul>
      * @param r relation
      * @return true if repeated members have been detected, false otherwise
@@ -737 +737 @@
                     repeatedSameRole.addAll(primitives);
                 }
             }
-            addRepeatedMemberError(r, repeatedDiffRole, REPEATED_MEMBER_DIFF_ROLE, tr("Multipolygon member(s) repeated with different role"));
-            addRepeatedMemberError(r, repeatedSameRole, REPEATED_MEMBER_SAME_ROLE, tr("Multipolygon member(s) repeated with same role"));
+            addRepeatedMemberError(r, repeatedDiffRole, REPEATED_MEMBER_DIFF_ROLE, tr("Multipolygon members repeated with different role"));
+            addRepeatedMemberError(r, repeatedSameRole, REPEATED_MEMBER_SAME_ROLE, tr("Multipolygon members repeated with same role"));
         }
         return hasDups;
     }

src/org/openstreetmap/josm/gui/dialogs/properties/CopyKeyValueAction.java

@@ -31 +31 @@
     public CopyKeyValueAction(JTable tagTable, IntFunction<String> keyFn, Supplier<Collection<? extends Tagged>> objectSp) {
         super(tagTable, keyFn, objectSp);
         setName(0);
-        putValue(SHORT_DESCRIPTION, tr("Copy the key and value of the selected tag(s) to clipboard"));
+        putValue(SHORT_DESCRIPTION, tr("Copy the key and value of the selected tags to clipboard"));
     }
 
     private void setName(long n) {

src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -289 +289 @@
 
     private class ImageRemoveAction extends JosmAction {
         ImageRemoveAction() {
-            super(null, new ImageProvider("dialogs", "delete"), tr("Remove photo(s) from layer"), Shortcut.registerShortcut(
-                    "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo(s) from layer")), KeyEvent.VK_DELETE, Shortcut.SHIFT),
+            super(null, new ImageProvider("dialogs", "delete"), tr("Remove photo from layer"), Shortcut.registerShortcut(
+                    "geoimage:deleteimagefromlayer", tr("Geoimage: {0}", tr("Remove photo from layer")), KeyEvent.VK_DELETE, Shortcut.SHIFT),
                   false, null, false);
         }
 
@@ -304 +304 @@
 
     private class ImageRemoveFromDiskAction extends JosmAction {
         ImageRemoveFromDiskAction() {
-            super(null, new ImageProvider("dialogs", "geoimage/deletefromdisk"), tr("Delete photo file(s) from disk"),
+            super(null, new ImageProvider("dialogs", "geoimage/deletefromdisk"), tr("Delete photo file from disk"),
                   Shortcut.registerShortcut(
-                    "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete file(s) from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT),
+                    "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete file from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT),
                   false, null, false);
         }
 

[stoecker]

Replying to simon04:

I was unsuccessful for most strings. What about using the plural form instead of the nasty and typographically catastrophic word(s)?

Sounds better to me for the given cases.

[simon04]

In 16076/josm:

fix #18643 - I18n: improve plural forms

[GerdP]

For MultipolygonTest I'd prefer the singular form in all cases where you use the plural form.

[simon04]

@GerdP, no objections. Would you change the strings?

[GerdP]

In 16078/josm:

see #18643: I18n: improve plural forms

[Hb---]

The term photo file occurs only once in the JOSM translation set now.

The term image file is used 16 times. Even the confirmation dialog of this action uses it (18 lines below in ImageViewerDialog.java).

Please replace photo file completely with image file.

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -304 +304 @@
 
     private class ImageRemoveFromDiskAction extends JosmAction {
         ImageRemoveFromDiskAction() {
-            super(null, new ImageProvider("dialogs", "geoimage/deletefromdisk"), tr("Delete photo file from disk"),
+            super(null, new ImageProvider("dialogs", "geoimage/deletefromdisk"), tr("Delete image file from disk"),
                   Shortcut.registerShortcut(
-                    "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete photo file from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT),
+                    "geoimage:deletefilefromdisk", tr("Geoimage: {0}", tr("Delete image file from disk")), KeyEvent.VK_DELETE, Shortcut.CTRL_SHIFT),
                   false, null, false);
         }
 
         @Override
         public void actionPerformed(ActionEvent e) {
             if (currentData != null && currentData.getSelectedImage() != null) {
                 List<ImageEntry> toDelete = currentData.getSelectedImages();
                 int size = toDelete.size();
 
                 int result = new ExtendedDialog(
                         MainApplication.getMainFrame(),
                         tr("Delete image file from disk"),
                         tr("Cancel"), tr("Delete"))
                         .setButtonIcons("cancel", "dialogs/delete")
                         .setContent(new JLabel("<html><h3>"
                                 + trn("Delete the file from disk?",
                                       "Delete the {0} files from disk?", size, size)
                                 + "<p>" + trn("The image file will be permanently lost!",
                                               "The images files will be permanently lost!", size) + "</h3></html>",
                                 ImageProvider.get("dialogs/geoimage/deletefromdisk"), SwingConstants.LEFT))

[simon04]

In 16107/josm:

see #18643: I18n: improve plural forms (patch by Hb---)