Changeset 6679 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2014-01-13T00:11:28+01:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
r6538 r6679 167 167 Map.Entry<String, String> entry = tags.entrySet().iterator().next(); 168 168 if (entry.getValue() == null) { 169 /* for correct i18n ofplural forms - see #9110*/170 text = trn("Remove \"{0}\" for {1} object s", "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()); 171 171 } else { 172 /* for correct i18n ofplural forms - see #9110*/173 text = trn("Set {0}={1} for {2} object s", "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()); 174 174 } 175 175 } … … 184 184 185 185 if (allnull) { 186 /* for correct i18n ofplural forms - see #9110 */187 text = trn("Deleted {0} tags for {1} object s", "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()); 188 188 } else { 189 /* for correct i18n ofplural forms - see #9110*/190 text = trn("Set {0} tags for {1} object s", "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()); 191 191 } 192 192 } -
trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
r6507 r6679 60 60 case NODE: 61 61 /* for correct i18n of plural forms - see #9110 */ 62 return trn("Resolve {0} tag conflict sin 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()); 63 63 case WAY: 64 64 /* for correct i18n of plural forms - see #9110 */ 65 return trn("Resolve {0} tag conflict sin 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()); 66 66 case RELATION: 67 67 /* for correct i18n of plural forms - see #9110 */ 68 return trn("Resolve {0} tag conflict sin 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()); 69 69 } 70 70 return "";
Note:
See TracChangeset
for help on using the changeset viewer.