Changeset 2955 in josm for trunk


Ignore:
Timestamp:
2010-02-08T17:26:01+01:00 (10 years ago)
Author:
mjulius
Message:
 
Location:
trunk/src/org/openstreetmap/josm
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

    r2849 r2955  
    181181        colorTypeNone.setToolTipText(tr("All points and track segments will have the same color. Can be customized in Layer Manager."));
    182182        colorTypeVelocity.setToolTipText(tr("Colors points and track segments by velocity."));
    183         colorTypeDilution.setToolTipText(tr("Colors points and track segments by dilution of position (HDOP). Your capture device needs to logs that information."));
     183        colorTypeDilution.setToolTipText(tr("Colors points and track segments by dilution of position (HDOP). Your capture device needs to log that information."));
    184184
    185185        // color Tracks by Velocity Tune
  • trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

    r2924 r2955  
    6868            sb.append(trn(
    6969                    "The following plugin has been downloaded <strong>successfully</strong>:",
    70                     "The following {0} plugins have been downloaded successfully:",
     70                    "The following {0} plugins have been downloaded <strong>successfully</strong>:",
    7171                    downloaded.size(),
    7272                    downloaded.size()
  • trunk/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java

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

    r2851 r2955  
    6060            JOptionPane.showMessageDialog(
    6161                    Main.parent,
    62                     tr("<html>Could not read file ''{0}\''.<br> Error is: <br>{1}</html>", f.getName(), e.getMessage()),
     62                    tr("<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>", f.getName(), e.getMessage()),
    6363                    tr("Error"),
    6464                    JOptionPane.ERROR_MESSAGE
     
    7474            JOptionPane.showMessageDialog(
    7575                    Main.parent,
    76                     tr("<html>Could not read files.<br> Error is: <br>{0}</html>", e.getMessage()),
     76                    tr("<html>Could not read files.<br>Error is:<br>{0}</html>", e.getMessage()),
    7777                    tr("Error"),
    7878                    JOptionPane.ERROR_MESSAGE
  • trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

    r2852 r2955  
    8080            }
    8181            if (id <= 0) {
    82                 throwException(tr("Illegal nummeric value for attribute ''{0}''. Got ''{1}''.", "id", id));
     82                throwException(tr("Illegal numeric value for attribute ''{0}''. Got ''{1}''.", "id", id));
    8383            }
    8484            current.setId(id);
  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r2924 r2955  
    554554            monitor.subTask(tr("Removing deprecated plugins..."));
    555555            filterDeprecatedPlugins(parent, plugins);
    556             monitor.subTask(tr("Removing umaintained plugins..."));
     556            monitor.subTask(tr("Removing unmaintained plugins..."));
    557557            filterUnmaintainedPlugins(parent, plugins);
    558558            Map<String, PluginInformation> infos = loadLocallyAvailablePluginInformation(monitor.createSubTaskMonitor(1,false));
     
    731731                if (!plugin.delete()) {
    732732                    System.err.println(tr("Warning: failed to delete outdated plugin ''{0}''.", plugin.toString()));
    733                     System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM still going to load the old plugin version.", pluginName));
     733                    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));
    734734                    continue;
    735735                }
     
    737737            if (!updatedPlugin.renameTo(plugin)) {
    738738                System.err.println(tr("Warning: failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed.", plugin.toString(), updatedPlugin.toString()));
    739                 System.err.println(tr("Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM still going to load the old plugin version.", pluginName));
     739                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));
    740740            }
    741741        }
  • trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

    r2859 r2955  
    115115                JPanel p = new JPanel(new GridBagLayout());
    116116                p.add(new JMultilineLabel(
    117                         tr("You have encountered an error in JOSM. Before you file a bug report" +
    118                         "make sure you have updated to the latest version of JOSM here:")), GBC.eol());
     117                        tr("You have encountered an error in JOSM. Before you file a bug report " +
     118                           "make sure you have updated to the latest version of JOSM here:")), GBC.eol());
    119119                p.add(new UrlLabel("http://josm.openstreetmap.de/#Download"), GBC.eop().insets(8,0,0,0));
    120120                p.add(new JMultilineLabel(
    121                         tr("You should also update your plugins. If neither of those help please" +
    122                         "file a bug report in our bugtracker using this link:")), GBC.eol());
     121                        tr("You should also update your plugins. If neither of those help please " +
     122                           "file a bug report in our bugtracker using this link:")), GBC.eol());
    123123                p.add(new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?..."), GBC.eop().insets(8,0,0,0));
    124124                p.add(new JMultilineLabel(
    125                         tr("There the error information provided below should already be" +
    126                                 "filled in for you. Please include information on how to reproduce" +
    127                         "the error and try to supply as much detail as possible.")), GBC.eop());
     125                        tr("There the error information provided below should already be " +
     126                           "filled in for you. Please include information on how to reproduce " +
     127                           "the error and try to supply as much detail as possible.")), GBC.eop());
    128128                p.add(new JMultilineLabel(
    129                         tr("Alternatively, if that does not work you can manually fill in the information" +
    130                         "below at this URL:")), GBC.eol());
     129                        tr("Alternatively, if that does not work you can manually fill in the information " +
     130                           "below at this URL:")), GBC.eol());
    131131                p.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eop().insets(8,0,0,0));
    132132                try {
Note: See TracChangeset for help on using the changeset viewer.