Changeset 2181 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

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

Author:

stoecker

Message:

lots of i18n fixes

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• BoundingBoxDownloader.java (modified) (1 diff)
• ChangesetQuery.java (modified) (1 diff)
• FileExporter.java (modified) (1 diff)
• FileImporter.java (modified) (1 diff)
• GpxExporter.java (modified) (2 diffs)
• GpxReader.java (modified) (1 diff)
• MultiFetchServerObjectReader.java (modified) (2 diffs)
• OsmApi.java (modified) (12 diffs)
• OsmApiException.java (modified) (1 diff)
• OsmChangesetParser.java (modified) (10 diffs)
• OsmExporter.java (modified) (2 diffs)
• OsmHistoryReader.java (modified) (7 diffs)
• OsmImporter.java (modified) (1 diff)
• OsmReader.java (modified) (16 diffs)
• OsmServerBackreferenceReader.java (modified) (2 diffs)
• OsmServerChangesetReader.java (modified) (2 diffs)
• OsmServerHistoryReader.java (modified) (1 diff)
• OsmServerReader.java (modified) (2 diffs)
• OsmServerUserInfoReader.java (modified) (2 diffs)
• OsmServerWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -72 +72 @@
             if (cancel)
                 return null;
-            throw new SAXException("Illegal characters within the HTTP-header response", e);
+            throw new SAXException("Illegal characters within the HTTP-header response.", e);
         } catch (IOException e) {
             if (cancel)

trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

@@ -23 +23 @@
     public ChangesetQuery forUser(long uid) {
         if (uid <= 0)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 expected. Got {1}", "uid", uid));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "uid", uid));
         this.user = uid;
         return this;

trunk/src/org/openstreetmap/josm/io/FileExporter.java

@@ -22 +22 @@
 
     public void exportData(File file, Layer layer) throws IOException {
-        throw new IOException(tr("Could not export \"{0}\"", file.getName()));
+        throw new IOException(tr("Could not export ''{0}''.", file.getName()));
     }
 }

trunk/src/org/openstreetmap/josm/io/FileImporter.java

@@ -22 +22 @@
 
     public void importData(File file) throws IOException, IllegalDataException {
-        throw new IOException(tr("Could not read \"{0}\"", file.getName()));
+        throw new IOException(tr("Could not read ''{0}''.", file.getName()));
     }
 

trunk/src/org/openstreetmap/josm/io/GpxExporter.java

@@ -53 +53 @@
     public void exportData(File file, Layer layer) throws IOException {
         if (layer == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer"));
         if (!(layer instanceof OsmDataLayer) && !(layer instanceof GpxLayer))
-            throw new IllegalArgumentException(tr("expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer
+            throw new IllegalArgumentException(tr("Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer
                     .getClass().getName()));
         if (file == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "file"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "file"));
 
         String fn = file.getPath();
@@ -69 +69 @@
         JPanel p = new JPanel(new GridBagLayout());
 
-        p.add(new JLabel(tr("gps track description")), GBC.eol());
+        p.add(new JLabel(tr("GPS track description")), GBC.eol());
         JTextArea desc = new JTextArea(3, 40);
         desc.setWrapStyleWord(true);

trunk/src/org/openstreetmap/josm/io/GpxReader.java

@@ -308 +308 @@
         @Override public void endDocument() throws SAXException  {
             if (!states.empty()) {
-                throw new SAXException(tr("Parse error: invalid document structure for gpx document"));
+                throw new SAXException(tr("Parse error: invalid document structure for GPX document."));
             }
             data = currentData;

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -112 +112 @@
     protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws IllegalArgumentException, NoSuchElementException{
         if (ds == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "ds"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "ds"));
         if (id <= 0) return;
         OsmPrimitive primitive = ds.getPrimitiveById(id, type);
         if (primitive == null)
-            throw new NoSuchElementException(tr("no primitive with id {0} in local dataset. Can't infer primitive type", id));
+            throw new NoSuchElementException(tr("No primitive with id {0} in local dataset. Can't infer primitive type.", id));
         remember(id, OsmPrimitiveType.from(primitive));
         return;
@@ -414 +414 @@
             } catch(OsmApiException e) {
                 if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
-                    logger.warning(tr("Server replied with response code 404, retrying with an individual request for each primitive"));
+                    logger.warning(tr("Server replied with response code 404, retrying with an individual request for each primitive."));
                     singleGetIdPackage(type, pkg, progressMonitor);
                 } else

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -80 +80 @@
         String serverUrl = Main.pref.get("osm-server.url", "http://api.openstreetmap.org/api");
         if (serverUrl == null)
-            throw new IllegalStateException(tr("preference ''{0}'' missing. Can't initialize OsmApi", "osm-server.url"));
+            throw new IllegalStateException(tr("Preference ''{0}'' missing. Can't initialize OsmApi.", "osm-server.url"));
         return getOsmApi(serverUrl);
     }
@@ -132 +132 @@
     protected OsmApi(String serverUrl)  {
         if (serverUrl == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "serverUrl"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "serverUrl"));
         this.serverUrl = serverUrl;
     }
@@ -176 +176 @@
                 initialized = false;
             }
-            System.out.println(tr("Communications with {0} established using protocol version {1}",
+            System.out.println(tr("Communications with {0} established using protocol version {1}.",
                     serverUrl,
                     version));
@@ -251 +251 @@
             osm.setOsmId(Long.parseLong(ret.trim()), 1);
         } catch(NumberFormatException e){
-            throw new OsmTransferException(tr("unexpected format of id replied by the server, got ''{0}''", ret));
+            throw new OsmTransferException(tr("Unexpected format of ID replied by the server. Got ''{0}''.", ret));
         }
     }
@@ -277 +277 @@
             }
         } catch(NumberFormatException e) {
-            throw new OsmTransferException(tr("unexpected format of new version of modified primitive ''{0}'', got ''{1}''", osm.getId(), ret));
+            throw new OsmTransferException(tr("Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''.", osm.getId(), ret));
         }
     }
@@ -311 +311 @@
     public void openChangeset(Changeset changeset, ProgressMonitor progressMonitor) throws OsmTransferException {
         if (changeset == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "changeset"));
         try {
             progressMonitor.beginTask((tr("Creating changeset...")));
@@ -321 +321 @@
                 changeset.setOpen(true);
             } catch(NumberFormatException e){
-                throw new OsmTransferException(tr("unexpected format of id replied by the server, got ''{0}''", ret));
+                throw new OsmTransferException(tr("Unexpected format of ID replied by the server. Got ''{0}''.", ret));
             }
             progressMonitor.setCustomText((tr("Successfully opened changeset {0}",changeset.getId())));
@@ -343 +343 @@
     public void updateChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
         if (changeset == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "changeset"));
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
         }
         if (changeset.getId() <= 0)
-            throw new IllegalArgumentException(tr("id of changeset > 0 required. Got {0}", changeset.getId()));
+            throw new IllegalArgumentException(tr("Changeset ID > 0 expected. Got {0}.", changeset.getId()));
         try {
             monitor.beginTask(tr("Updating changeset..."));
@@ -378 +378 @@
     public void closeChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
         if (changeset == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "changeset"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "changeset"));
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
         }
         if (changeset.getId() <= 0)
-            throw new IllegalArgumentException(tr("id of changeset > 0 required. Got {0}", changeset.getId()));
+            throw new IllegalArgumentException(tr("Changeset ID > 0 expected. Got {0}.", changeset.getId()));
         try {
             monitor.beginTask(tr("Closing changeset..."));
@@ -405 +405 @@
             progressMonitor.beginTask("", list.size() * 2);
             if (changeset == null)
-                throw new OsmTransferException(tr("No changeset present for diff upload"));
+                throw new OsmTransferException(tr("No changeset present for diff upload."));
 
             initialize(progressMonitor);
@@ -596 +596 @@
             throw new OsmTransferException(tr("Current changeset is null. Can't upload data."));
         if (changeset.getId() <= 0)
-            throw new OsmTransferException(tr("id of current changeset > 0 required. Current id is {0}", changeset.getId()));
+            throw new OsmTransferException(tr("ID of current changeset > 0 required. Current ID is {0}.", changeset.getId()));
     }
     /**
@@ -622 +622 @@
         }
         if (changeset.getId() <= 0)
-            throw new IllegalArgumentException(tr("Changeset id > 0 expected. Got {0}", changeset.getId()));
+            throw new IllegalArgumentException(tr("Changeset ID > 0 expected. Got {0}.", changeset.getId()));
         if (!changeset.isOpen())
-            throw new IllegalArgumentException(tr("Open changeset expected. Got closed changeset with id {0}", changeset.getId()));
+            throw new IllegalArgumentException(tr("Open changeset expected. Got closed changeset with id {0}.", changeset.getId()));
         this.changeset = changeset;
     }

trunk/src/org/openstreetmap/josm/io/OsmApiException.java

@@ -91 +91 @@
             sb.append(tr("(Code={0})", responseCode));
         } else {
-            sb.append(tr("The server replied an error with code {0}", responseCode));
+            sb.append(tr("The server replied an error with code {0}.", responseCode));
         }
         return sb.toString();

trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

@@ -70 +70 @@
             String value = atts.getValue("id");
             if (value == null) {
-                throwException(tr("missing mandatory attribute ''{0}''", "id"));
+                throwException(tr("Missing mandatory attribute ''{0}''.", "id"));
             }
             long id = 0;
@@ -76 +76 @@
                 id = Long.parseLong(value);
             } catch(NumberFormatException e) {
-                throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "id", value));
+                throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "id", value));
             }
             if (id <= 0) {
-                throwException(tr("illegal nummeric value for attribute ''{0}''. Got ''{1}''", "id", id));
+                throwException(tr("Illegal nummeric value for attribute ''{0}''. Got ''{1}''.", "id", id));
             }
             current.setId(id);
@@ -107 +107 @@
             value = atts.getValue("open");
             if (value == null) {
-                throwException(tr("missing mandatory attribute ''{0}''", "open"));
+                throwException(tr("Missing mandatory attribute ''{0}''.", "open"));
             } else if (value.equals("true")) {
                 current.setOpen(true);
@@ -113 +113 @@
                 current.setOpen(false);
             } else {
-                throwException(tr("illegal boolean value for attribute ''{0}''. Got ''{1}''", "open", value));
+                throwException(tr("Illegal boolean value for attribute ''{0}''. Got ''{1}''.", "open", value));
             }
 
@@ -126 +126 @@
                     minLon = Double.parseDouble(min_lon);
                 } catch(NumberFormatException e) {
-                    throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "min_lon", min_lon));
+                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lon", min_lon));
                 }
                 double minLat = 0;
@@ -132 +132 @@
                     minLat = Double.parseDouble(min_lat);
                 } catch(NumberFormatException e) {
-                    throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "min_lat", min_lat));
+                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "min_lat", min_lat));
                 }
                 current.setMin(new LatLon(minLat, minLon));
@@ -142 +142 @@
                     maxLon = Double.parseDouble(max_lon);
                 } catch(NumberFormatException e) {
-                    throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "max_lon", max_lon));
+                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lon", max_lon));
                 }
                 double maxLat = 0;
@@ -148 +148 @@
                     maxLat = Double.parseDouble(max_lat);
                 } catch(NumberFormatException e) {
-                    throwException(tr("illegal value for attribute ''{0}''. Got ''{1}''", "max_lat", max_lat));
+                    throwException(tr("Illegal value for attribute ''{0}''. Got ''{1}''.", "max_lat", max_lat));
                 }
                 current.setMax(new LatLon(maxLon, maxLat));
@@ -157 +157 @@
             if (qName.equals("osm")) {
                 if (atts == null) {
-                    throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}", "version", "osm"));
+                    throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}.", "version", "osm"));
                 }
                 String v = atts.getValue("version");
                 if (v == null) {
-                    throwException(tr("Missing mandatory attribute ''{0}''", "version"));
+                    throwException(tr("Missing mandatory attribute ''{0}''.", "version"));
                 }
                 if (!(v.equals("0.6"))) {
@@ -195 +195 @@
                 return User.createOsmUser(id, name);
             } catch(NumberFormatException e) {
-                throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''", uid));
+                throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''.", uid));
             }
             return null;

trunk/src/org/openstreetmap/josm/io/OsmExporter.java

@@ -81 +81 @@
             JOptionPane.showMessageDialog(
                     Main.parent,
-                    tr("<html>An error occurred while saving.<br>Error is: <br>{0}</html>", e.getMessage()),
+                    tr("<html>An error occurred while saving.<br>Error is:<br>{0}</html>", e.getMessage()),
                     tr("Error"),
                     JOptionPane.ERROR_MESSAGE
@@ -96 +96 @@
                 JOptionPane.showMessageDialog(
                         Main.parent,
-                        tr("<html>An error occurred while restoring backup file.<br>Error is: <br>{0}</html>", e2.getMessage()),
+                        tr("<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</html>", e2.getMessage()),
                         tr("Error"),
                         JOptionPane.ERROR_MESSAGE

trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java

@@ -66 +66 @@
             String v = attr.getValue(name);
             if (v == null) {
-                throwException(tr("mandatory attribute ''{0}'' missing", name));
+                throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
             Long l = 0l;
@@ -72 +72 @@
                 l = Long.parseLong(v);
             } catch(NumberFormatException e) {
-                throwException(tr("illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''", name, v));
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''.", name, v));
             }
             if (l < 0) {
-                throwException(tr("illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''", name, v));
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''.", name, v));
             }
             return l;
@@ -83 +83 @@
             String v = attr.getValue(name);
             if (v == null) {
-                throwException(tr("mandatory attribute ''{0}'' missing", name));
+                throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
             Integer i = 0;
@@ -89 +89 @@
                 i = Integer.parseInt(v);
             } catch(NumberFormatException e) {
-                throwException(tr("illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''", name, v));
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int. Got ''{1}''.", name, v));
             }
             if (i < 0) {
-                throwException(tr("illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''", name, v));
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type int (>=0). Got ''{1}''.", name, v));
             }
             return i;
@@ -100 +100 @@
             String v = attr.getValue(name);
             if (v == null) {
-                throwException(tr("mandatory attribute ''{0}'' missing", name));
+                throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
             return v;
@@ -108 +108 @@
             String v = attr.getValue(name);
             if (v == null) {
-                throwException(tr("mandatory attribute ''{0}'' missing", name));
+                throwException(tr("Missing mandatory attribute ''{0}''.", name));
             }
             if (v.equals("true")) return true;
             if (v.equals("false")) return false;
-            throwException(tr("illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''", name, v));
+            throwException(tr("Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''.", name, v));
             // not reached
             return false;
@@ -172 +172 @@
                 type = OsmPrimitiveType.fromApiTypeName(v);
             } catch(IllegalArgumentException e) {
-                throwException(tr("illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got ''{1}''", "type", v));
+                throwException(tr("Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''.", "type", v));
             }
             String role = getMandatoryAttributeString(atts, "role");

trunk/src/org/openstreetmap/josm/io/OsmImporter.java

@@ -34 +34 @@
         } catch (FileNotFoundException e) {
             e.printStackTrace();
-            throw new IOException(tr("File \"{0}\" does not exist", file.getName()));
+            throw new IOException(tr("File ''{0}'' does not exist.", file.getName()));
         }
     }

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -172 +172 @@
             if (qName.equals("osm")) {
                 if (atts == null) {
-                    throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}", "version", "osm"));
+                    throwException(tr("Missing mandatory attribute ''{0}'' of XML element {1}.", "version", "osm"));
                 }
                 String v = atts.getValue("version");
                 if (v == null) {
-                    throwException(tr("Missing mandatory attribute ''{0}''", "version"));
+                    throwException(tr("Missing mandatory attribute ''{0}''.", "version"));
                 }
                 if (!(v.equals("0.5") || v.equals("0.6"))) {
@@ -203 +203 @@
                 } else {
                     throwException(tr(
-                            "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''",
+                            "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
                             minlon, minlat, maxlon, maxlat, origin
                     ));
@@ -226 +226 @@
                 if (list == null) {
                     throwException(
-                            tr("found XML element <nd> element not as direct child of element <way>")
+                            tr("Found XML element <nd> not as direct child of element <way>.")
                     );
                 }
                 if (atts.getValue("ref") == null) {
                     throwException(
-                            tr("Missing mandatory attribute ''{0}'' on <nd> of way {1}", "ref", current.id)
+                            tr("Missing mandatory attribute ''{0}'' on <nd> of way {1}.", "ref", current.id)
                     );
                 }
@@ -237 +237 @@
                 if (id == 0) {
                     throwException(
-                            tr("Illegal value of attribute ''ref'' of element <nd>. Got {0}", id)
+                            tr("Illegal value of attribute ''ref'' of element <nd>. Got {0}.", id)
                     );
                 }
@@ -254 +254 @@
                 if (list == null) {
                     throwException(
-                            tr("Found XML element <member> not as direct child of element <relation>")
+                            tr("Found XML element <member> not as direct child of element <relation>.")
                     );
                 }
@@ -260 +260 @@
                 String value = atts.getValue("ref");
                 if (value == null) {
-                    throwException(tr("Missing attribute ''ref'' on member in relation {0}",current.id));
+                    throwException(tr("Missing attribute ''ref'' on member in relation {0}.",current.id));
                 }
                 try {
@@ -269 +269 @@
                 value = atts.getValue("type");
                 if (value == null) {
-                    throwException(tr("Missing attribute ''type'' on member {0} in relation {1}", Long.toString(emd.id), Long.toString(current.id)));
+                    throwException(tr("Missing attribute ''type'' on member {0} in relation {1}.", Long.toString(emd.id), Long.toString(current.id)));
                 }
                 if (! (value.equals("way") || value.equals("node") || value.equals("relation"))) {
@@ -309 +309 @@
                 return User.createOsmUser(id, name);
             } catch(NumberFormatException e) {
-                throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''", uid));
+                throwException(tr("Illegal value for attribute ''uid''. Got ''{0}''.", uid));
             }
             return null;
@@ -319 +319 @@
             current.id = getLong(atts, "id");
             if (current.id == 0) {
-                throwException(tr("Illegal object with id=0"));
+                throwException(tr("Illegal object with ID=0."));
             }
 
@@ -345 +345 @@
                     current.version = Integer.parseInt(version);
                 } catch(NumberFormatException e) {
-                    throwException(tr("Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}", Long.toString(current.id), version));
+                    throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.id), version));
                 }
                 if (ds.version.equals("0.6")){
                     if (current.version <= 0 && current.id > 0) {
-                        throwException(tr("Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}", Long.toString(current.id), version));
+                        throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.id), version));
                     } else if (current.version < 0 && current.id  <=0) {
-                        System.out.println(tr("WARNING: normalizing value of attribute ''version'' of element {0} to 0, API version is ''0.6''. Got {1}", current.id, current.version));
+                        System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 0, "0.6"));
                         current.version = 0;
                     }
                 } else if (ds.version.equals("0.5")) {
                     if (current.version <= 0 && current.id > 0) {
-                        System.out.println(tr("WARNING: normalizing value of attribute ''version'' of element {0} to 1, API version is ''0.5''. Got {1}", current.id, current.version));
+                        System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 1, "0.5"));
                         current.version = 1;
                     } else if (current.version < 0 && current.id  <=0) {
-                        System.out.println(tr("WARNING: normalizing value of attribute ''version'' of element {0} to 0, API version is ''0.5''. Got {1}", current.id, current.version));
+                        System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.id, current.version, 0, "0.5"));
                         current.version = 0;
                     }
                 } else {
                     // should not happen. API version has been checked before
-                    throwException(tr("Unknown or unsupported API version. Got {0}", ds.version));
+                    throwException(tr("Unknown or unsupported API version. Got {0}.", ds.version));
                 }
             } else {
@@ -370 +370 @@
                 //
                 if (current.id > 0 && ds.version != null && ds.version.equals("0.6")) {
-                    throwException(tr("Missing attribute ''version'' on OSM primitive with id {0}", Long.toString(current.id)));
+                    throwException(tr("Missing attribute ''version'' on OSM primitive with ID {0}.", Long.toString(current.id)));
                 }
             }
@@ -392 +392 @@
                 return Long.parseLong(value);
             } catch(NumberFormatException e) {
-                throwException(tr("Illegal long value for attribute ''{0}''. Got ''{1}''",name, value));
+                throwException(tr("Illegal long value for attribute ''{0}''. Got ''{1}''.",name, value));
             }
             return 0; // should not happen
@@ -416 +416 @@
                         throw new IllegalDataException (
                                 tr(
-                                        "way with external id ''{0}'' includes missing node with external id ''{1}''",
+                                        "Way with external ID ''{0}'' includes missing node with external ID ''{1}''.",
                                         externalWayId,
                                         id
@@ -429 +429 @@
             w.setNodes(wayNodes);
             if (incomplete) {
-                logger.warning(tr("marked way {0} with {1} nodes incomplete because at least one node was missing in the " +
-                        "loaded data and is therefore incomplete too", externalWayId, w.getNodesCount()));
+                logger.warning(tr("Marked way {0} with {1} nodes incomplete because at least one node was missing in the " +
+                        "loaded data and is therefore incomplete too.", externalWayId, w.getNodesCount()));
                 w.incomplete = true;
                 ds.addPrimitive(w);
@@ -477 +477 @@
                 } else
                     throw new IllegalDataException(
-                            tr("Unknown relation member type ''{0}'' in relation with external id ''{1}''", rm.type,externalRelationId)
+                            tr("Unknown relation member type ''{0}'' in relation with external id ''{1}''.", rm.type,externalRelationId)
                     );
 
@@ -488 +488 @@
                         throw new IllegalDataException(
                                 tr(
-                                        "Relation with external id ''{0}'' refers to missing primitive with external id ''{1}''",
+                                        "Relation with external id ''{0}'' refers to missing primitive with external id ''{1}''.",
                                         externalRelationId,
                                         rm.id

trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

@@ -50 +50 @@
     public OsmServerBackreferenceReader(OsmPrimitive primitive) throws IllegalArgumentException {
         if (primitive == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "primitive"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive"));
         if (primitive.getId() == 0)
-            throw new IllegalArgumentException(tr("id parameter ''{0}'' > 0 required. Got {1}", "primitive", primitive.getId()));
+            throw new IllegalArgumentException(tr("ID parameter ''{0}'' > 0 expected. Got ''{1}''.", "primitive", primitive.getId()));
         this.id = primitive.getId();
         this.primitiveType = OsmPrimitiveType.from(primitive);
@@ -70 +70 @@
     public OsmServerBackreferenceReader(long id, OsmPrimitiveType type) throws IllegalArgumentException   {
         if (id <= 0)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 required. Got {1}", "id", id));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id));
         if (type == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type"));
         this.id = id;
         this.primitiveType = type;

trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java

@@ -44 +44 @@
     public List<Changeset> queryChangesets(ChangesetQuery query, ProgressMonitor monitor) throws OsmTransferException {
         if (query == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "query"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "query"));
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -78 +78 @@
     public Changeset readChangeset(long id, ProgressMonitor monitor) throws OsmTransferException {
         if (id <= 0)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 expected. Got {1}", "id", id));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id));
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;

trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java

@@ -31 +31 @@
     public OsmServerHistoryReader(OsmPrimitiveType type, long id) throws IllegalArgumentException {
         if (type == null)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "type"));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "type"));
         if (id < 0)
-            throw new IllegalArgumentException(tr("parameter ''{0}'' >= 0 expected, got ''{1}''", "id", id));
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' >= 0 expected. Got ''{1}''.", "id", id));
         this.primitiveType = type;
         this.id = id;

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -61 +61 @@
                 activeConnection = (HttpURLConnection)url.openConnection();
             } catch(Exception e) {
-                throw new OsmTransferException(tr("Failed to open connection to API {0}", url.toExternalForm()), e);
+                throw new OsmTransferException(tr("Failed to open connection to API {0}.", url.toExternalForm()), e);
             }
             if (cancel) {
@@ -86 +86 @@
                 activeConnection.connect();
             } catch (Exception e) {
-                throw new OsmTransferException(tr("Couldn't connect to the osm server. Please check your internet connection."), e);
+                throw new OsmTransferException(tr("Couldn't connect to the OSM server. Please check your internet connection."), e);
             }
             try {

trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java

@@ -46 +46 @@
             Node xmlNode = (Node)xpath.compile("/osm/user[1]").evaluate(document, XPathConstants.NODE);
             if ( xmlNode== null)
-                throw new OsmDataParsingException(tr("XML tag <user> is missing"));
+                throw new OsmDataParsingException(tr("XML tag <user> is missing."));
 
             // -- id
             String v = getAttribute(xmlNode, "id");
             if (v == null)
-                throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''", "id", "user"));
+                throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "id", "user"));
             try {
                 userInfo.setId(Long.parseLong(v));
             } catch(NumberFormatException e) {
-                throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}", "id", "user", v));
+                throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "id", "user", v));
             }
             // -- display name
@@ -75 +75 @@
                 v = getAttribute(xmlNode, "lat");
                 if (v == null)
-                    throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''", "lat", "home"));
+                    throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "lat", "home"));
                 double lat;
                 try {
                     lat = Double.parseDouble(v);
                 } catch(NumberFormatException e) {
-                    throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}", "lat", "home", v));
+                    throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "lat", "home", v));
                 }
 
                 v = getAttribute(xmlNode, "lon");
                 if (v == null)
-                    throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''", "lon", "home"));
+                    throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "lon", "home"));
                 double lon;
                 try {
                     lon = Double.parseDouble(v);
                 } catch(NumberFormatException e) {
-                    throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}", "lon", "home", v));
+                    throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "lon", "home", v));
                 }
 
                 v = getAttribute(xmlNode, "zoom");
                 if (v == null)
-                    throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''", "zoom", "home"));
+                    throw new OsmDataParsingException(tr("Missing attribute ''{0}'' on XML tag ''{1}''.", "zoom", "home"));
                 int zoom;
                 try {
                     zoom = Integer.parseInt(v);
                 } catch(NumberFormatException e) {
-                    throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}", "zoom", "home", v));
+                    throw new OsmDataParsingException(tr("Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}.", "zoom", "home", v));
                 }
                 userInfo.setHome(new LatLon(lat,lon));

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -145 +145 @@
             boolean useDiffUpload = Main.pref.getBoolean("osm-server.atomic-upload", apiVersion.compareTo("0.6")>=0);
             if (useDiffUpload && ! casUseDiffUploads) {
-                System.out.println(tr("WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to use diff uploads, but API is not able to handle them. Ignoring diff upload.", "osm-server.atomic-upload", apiVersion));
+                System.out.println(tr("WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to use diff uploads, but API is not able to handle them. Ignoring diff upload.", "osm-server.atomic-upload", apiVersion));
                 useDiffUpload = false;
             }