Changeset 30052 in osm for applications/editors/josm/plugins/tracer2/src/org/openstreetmap

Timestamp:

2013-11-16T00:04:49+01:00 (11 years ago)

Author:

simon04

Message:

JOSM/tracer2: fix wording/i18n for English strings

Location:

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2

Files:

• TracerAction.java (modified) (3 diffs)
• server/Request.java (modified) (2 diffs)

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/TracerAction.java

@@ -223 +223 @@
             }
             if (oGetVersion.m_nVersionMajor != nMajor) {
-                JOptionPane.showMessageDialog(Main.parent, tr("The Tracer2Server version isn''t compatible with this plugin. Please download version {0} from",nMajor + ".x" )
-                                + "\nhttp://sourceforge.net/projects/tracer2server/." , tr("Error"),  JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Main.parent, tr("The Tracer2Server version isn''t compatible with this plugin. Please download version {0} from\n{1}.", nMajor + ".x",
+                                + "http://sourceforge.net/projects/tracer2server/"), tr("Error"),  JOptionPane.ERROR_MESSAGE);
                 return false;
             }
             if (oGetVersion.m_nVersionMinor < nMinor) {
-                JOptionPane.showMessageDialog(Main.parent, tr("New version of Tracer2Server is avalibel. For best results please upgrade to version {0}.",nMajor + "." + nMinor ), tr("Information"),  JOptionPane.INFORMATION_MESSAGE);
+                JOptionPane.showMessageDialog(Main.parent, tr("New version of Tracer2Server is available. For best results please upgrade to version {0}.",nMajor + "." + nMinor ), tr("Information"),  JOptionPane.INFORMATION_MESSAGE);
             }
             s_bServerVersionOK = true;
@@ -246 +246 @@
             if (listEnableParam == null || listEnableParam.size() == 0) {
                 listParam.setActivParam(null);
-                JOptionPane.showMessageDialog(Main.parent, tr("No set of parameter is activ!"), tr("Error"),  JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Main.parent, tr("No set of parameter is active!"), tr("Error"),  JOptionPane.ERROR_MESSAGE);
                 return false;
             }
@@ -331 +331 @@
                 String strCommand;
                 if (ConnectWays.s_bAddNewWay == true) {
-                        strCommand = tr("Tracer2 add a Way with {0} points", coordList.size());
+                        strCommand = tr("Tracer2: add a way with {0} points", coordList.size());
                 } else {
-                        strCommand = tr("Tracer2 modified Way to {0} points", coordList.size());
+                        strCommand = tr("Tracer2: modify way to {0} points", coordList.size());
                 }
                 Main.main.undoRedo.add(new SequenceCommand(strCommand, commands));

applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/server/Request.java

@@ -53 +53 @@
             return oBuilder.toString();
         } catch (ConnectException e) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Tracer2Server isn''t running. Pleas start the Server.\nIf you don''t have the Server please download it at"
-                        + "\nhttp://sourceforge.net/projects/tracer2server/.") , tr("Error"),  JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent, tr("Tracer2Server isn''t running. Please start the Server.\nIf you don''t have the server, please download it from\n{1}.",
+                        + "http://sourceforge.net/projects/tracer2server/") , tr("Error"),  JOptionPane.ERROR_MESSAGE);
             return "";
         } catch (Exception e) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Tracer2Server has nothing found.") + "\n", tr("Error"),  JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent, tr("Tracer2Server hasn''t found anything.") + "\n", tr("Error"),  JOptionPane.ERROR_MESSAGE);
                 return "";
         }
@@ -71 +71 @@
         if (strResponse.contains(strIdentifier)) {
                 String strError = strResponse.replaceFirst(strIdentifier, "").trim();
-            JOptionPane.showMessageDialog(Main.parent, tr("Tracer2Server has an Error detected.") + "\n" + strError, tr("Error"),  JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent, tr("Tracer2Server has detected an error.") + "\n" + strError, tr("Error"),  JOptionPane.ERROR_MESSAGE);
                 return true;
         }