Changeset 2181 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

Timestamp:

2009-09-22T15:34:19+02:00 (15 years ago)

Author:

stoecker

Message:

lots of i18n fixes

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

@@ -31 +31 @@
     public void populate(Way my, Way their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my"));
         if (their == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their"));
         getMergedEntries().clear();
         getMyEntries().clear();
@@ -65 +65 @@
     public WayNodesConflictResolverCommand buildResolveCommand(Way my, Way their) {
         if (my == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "my"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "my"));
         if (their == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "their"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "their"));
         if (! isFrozen())
-            throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command"));
+            throw new IllegalArgumentException(tr("Merged nodes not frozen yet. Can't build resolution command."));
         return new WayNodesConflictResolverCommand(my, their, getMergedEntries());
     }