Changeset 2955 in josm

Timestamp:

2010-02-08T17:26:01+01:00 (14 years ago)

Author:

mjulius

Message:

 

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/DrawingPreference.java (modified) (1 diff)
• gui/preferences/PluginPreference.java (modified) (1 diff)
• gui/preferences/PrefJPanel.java (modified) (1 diff)
• io/FileImporter.java (modified) (2 diffs)
• io/OsmChangesetParser.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (3 diffs)
• tools/BugReportExceptionHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

@@ -181 +181 @@
         colorTypeNone.setToolTipText(tr("All points and track segments will have the same color. Can be customized in Layer Manager."));
         colorTypeVelocity.setToolTipText(tr("Colors points and track segments by velocity."));
-        colorTypeDilution.setToolTipText(tr("Colors points and track segments by dilution of position (HDOP). Your capture device needs to logs that information."));
+        colorTypeDilution.setToolTipText(tr("Colors points and track segments by dilution of position (HDOP). Your capture device needs to log that information."));
 
         // color Tracks by Velocity Tune

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -68 +68 @@
             sb.append(trn(
                     "The following plugin has been downloaded <strong>successfully</strong>:",
-                    "The following {0} plugins have been downloaded successfully:",
+                    "The following {0} plugins have been downloaded <strong>successfully</strong>:",
                     downloaded.size(),
                     downloaded.size()

trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java

@@ -163 +163 @@
         editor.setText(
                 tr("<h1><a name=\"top\">Keyboard Shortcuts</a></h1>")+
-                tr("<p>Please note that shortcuts keys are assigned to the actions when JOSM is started. So you need to <b>restart</b> "
-                        +"JOSM to see your changes.</p>")+
-                        tr("<p>Furthermore, the shortcuts are activated when the actions are assigned to a menu entry of button for the first "
-                                +"time. So some of your changes may become active even without restart --- but also without collistion handling. "
-                                +"This is another reason to <b>restart</b> JOSM after making any changes here.</p>")+
-                                tr("<p>You may notice that the key selection list on the next page lists all keys that exist on all kinds of keyboards "
-                                        +"Java knows about, not just those keys that exist on your keyboard. Please use only those values that correspond to "
-                                        +"a real key on your keyboard. So if your keyboard has no ''Copy'' key (PC keyboard do not have them, Sun keyboards do), "
-                                        +"the do not use it. Also there will be ''keys'' listed that correspond to a shortcut on your keyboard (e.g. '':''/Colon). "
-                                        +"Please also do not use them, use the base key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, ...) "
-                                        +"instead. Not doing so may result in conflicts, as there is no way for JOSM to know that Ctrl+Shift+; and Ctrl+: "
-                                        +"actually is the same thing on an US keyboard...</p>")+
-                                        tr("<p>Thank you for your understanding</p>")+
-                                        tr("<h1>Modifier Groups</h1>")+
-                                        tr("<p>The last page lists the modifier keys JOSM will automatically assign to shortcuts. For every of the four kinds "
-                                                +"of shortcuts there are three alternatives. JOSM will try those alternative in the listed order when managing a "
-                                                +"conflict. If all alternatives would result in shortcuts that are already taken, it will assign a random shortcut "
-                                                +"instead.</p>")+
-                                                tr("<p>The pseudo-modifier ''disabled'' will disable the shortcut when encountered.</p>")
+                tr("<p>Please note that shortcut keys are assigned to the actions when JOSM is started. So you need to <b>restart</b> "
+                   +"JOSM to see your changes.</p>")+
+                tr("<p>Furthermore, the shortcuts are activated when the actions are assigned to a menu entry of button for the first "
+                   +"time. So some of your changes may become active even without restart --- but also without collision handling. "
+                   +"This is another reason to <b>restart</b> JOSM after making any changes here.</p>")+
+                tr("<p>You may notice that the key selection list on the next page lists all keys that exist on all kinds of keyboards "
+                   +"Java knows about, not just those keys that exist on your keyboard. Please use only those values that correspond to "
+                   +"a real key on your keyboard. So if your keyboard has no ''Copy'' key (PC keyboard do not have them, Sun keyboards do), "
+                   +"then do not use it. Also there will be ''keys'' listed that correspond to a shortcut on your keyboard (e.g. '':''/Colon). "
+                   +"Please also do not use them, use the base key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, ...) "
+                   +"instead. Not doing so may result in conflicts, as there is no way for JOSM to know that Ctrl+Shift+; and Ctrl+: "
+                   +"actually is the same thing on an US keyboard...</p>")+
+                tr("<p>Thank you for your understanding</p>")+
+                tr("<h1>Modifier Groups</h1>")+
+                tr("<p>The last page lists the modifier keys JOSM will automatically assign to shortcuts. For every of the four kinds "
+                   +"of shortcuts there are three alternatives. JOSM will try those alternatives in the listed order when managing a "
+                   +"conflict. If all alternatives would result in shortcuts that are already taken, it will assign a random shortcut "
+                   +"instead.</p>")+
+                tr("<p>The pseudo-modifier ''disabled'' will disable the shortcut when encountered.</p>")
         );
         editor.setCaretPosition(0); // scroll up

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

@@ -60 +60 @@
             JOptionPane.showMessageDialog(
                     Main.parent,
-                    tr("<html>Could not read file ''{0}\''.<br> Error is: <br>{1}</html>", f.getName(), e.getMessage()),
+                    tr("<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>", f.getName(), e.getMessage()),
                     tr("Error"),
                     JOptionPane.ERROR_MESSAGE
@@ -74 +74 @@
             JOptionPane.showMessageDialog(
                     Main.parent,
-                    tr("<html>Could not read files.<br> Error is: <br>{0}</html>", e.getMessage()),
+                    tr("<html>Could not read files.<br>Error is:<br>{0}</html>", e.getMessage()),
                     tr("Error"),
                     JOptionPane.ERROR_MESSAGE

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

@@ -80 +80 @@
             }
             if (id <= 0) {
-                throwException(tr("Illegal nummeric value for attribute ''{0}''. Got ''{1}''.", "id", id));
+                throwException(tr("Illegal numeric value for attribute ''{0}''. Got ''{1}''.", "id", id));
             }
             current.setId(id);

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -554 +554 @@
             monitor.subTask(tr("Removing deprecated plugins..."));
             filterDeprecatedPlugins(parent, plugins);
-            monitor.subTask(tr("Removing umaintained plugins..."));
+            monitor.subTask(tr("Removing unmaintained plugins..."));
             filterUnmaintainedPlugins(parent, plugins);
             Map<String, PluginInformation> infos = loadLocallyAvailablePluginInformation(monitor.createSubTaskMonitor(1,false));
@@ -731 +731 @@
                 if (!plugin.delete()) {
                     System.err.println(tr("Warning: failed to delete outdated plugin ''{0}''.", plugin.toString()));
-                    System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM still going to load the old plugin version.", pluginName));
+                    System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
                     continue;
                 }
@@ -737 +737 @@
             if (!updatedPlugin.renameTo(plugin)) {
                 System.err.println(tr("Warning: failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed.", plugin.toString(), updatedPlugin.toString()));
-                System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM still going to load the old plugin version.", pluginName));
+                System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version.", pluginName));
             }
         }

trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -115 +115 @@
                 JPanel p = new JPanel(new GridBagLayout());
                 p.add(new JMultilineLabel(
-                        tr("You have encountered an error in JOSM. Before you file a bug report" +
-                        "make sure you have updated to the latest version of JOSM here:")), GBC.eol());
+                        tr("You have encountered an error in JOSM. Before you file a bug report " +
+                           "make sure you have updated to the latest version of JOSM here:")), GBC.eol());
                 p.add(new UrlLabel("http://josm.openstreetmap.de/#Download"), GBC.eop().insets(8,0,0,0));
                 p.add(new JMultilineLabel(
-                        tr("You should also update your plugins. If neither of those help please" +
-                        "file a bug report in our bugtracker using this link:")), GBC.eol());
+                        tr("You should also update your plugins. If neither of those help please " +
+                           "file a bug report in our bugtracker using this link:")), GBC.eol());
                 p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0));
                 p.add(new JMultilineLabel(
-                        tr("There the error information provided below should already be" +
-                                "filled in for you. Please include information on how to reproduce" +
-                        "the error and try to supply as much detail as possible.")), GBC.eop());
+                        tr("There the error information provided below should already be " +
+                           "filled in for you. Please include information on how to reproduce " +
+                           "the error and try to supply as much detail as possible.")), GBC.eop());
                 p.add(new JMultilineLabel(
-                        tr("Alternatively, if that does not work you can manually fill in the information" +
-                        "below at this URL:")), GBC.eol());
+                        tr("Alternatively, if that does not work you can manually fill in the information " +
+                           "below at this URL:")), GBC.eol());
                 p.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eop().insets(8,0,0,0));
                 try {