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/command
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • 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 "";
Note: See TracChangeset for help on using the changeset viewer.