Ticket #4425: josm-text-fixes.diff

File josm-text-fixes.diff, 3.9 KB (added by andre68@…, 16 years ago)
  • src/org/openstreetmap/josm/actions/OpenFileAction.java

     
    117117                        if (f.isDirectory()) {
    118118                            JOptionPane.showMessageDialog(
    119119                                    Main.parent,
    120                                     tr("<html>Cannot open directory.<br>Please select a file!"),
     120                                    tr("<html>Cannot open directory.<br>Please select a file!</html>"),
    121121                                    tr("Open file"),
    122122                                    JOptionPane.INFORMATION_MESSAGE
    123123                            );
  • src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

     
    3535 * See USAGE String below.
    3636 */
    3737public final class OrthogonalizeAction extends JosmAction {
    38     String USAGE = tr(
    39     "When one or more ways are selected, the shape is adjusted such, that all angles are 90 or 180 degrees.<h3>"+
    40     "You can add two nodes to the selection. Then, the direction is fixed by these two reference nodes."+
    41     "(Afterwards, you can undo the movement for certain nodes:<br>"+
    42     "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)");
     38    private String USAGE = tr(
     39        "<h3>When one or more ways are selected, the shape is adjusted such, that all angles are 90 or 180 degrees.</h3>"+
     40        "You can add two nodes to the selection. Then, the direction is fixed by these two reference nodes. "+
     41        "(Afterwards, you can undo the movement for certain nodes:<br>"+
     42        "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)");
    4343
    4444    public OrthogonalizeAction() {
    4545        super(tr("Orthogonalize Shape"),
    4646                "ortho",
    47                 tr("Move nodes so all angles are 90 or 270 degree"),
     47                tr("Move nodes so all angles are 90 or 270 degrees"),
    4848                Shortcut.registerShortcut("tools:orthogonalize", tr("Tool: {0}", tr("Orthogonalize Shape")),
    4949                        KeyEvent.VK_Q,
    5050                        Shortcut.GROUP_EDIT), true);
     
    104104                JOptionPane.showMessageDialog(
    105105                        Main.parent,
    106106                        tr("Orthogonalize Shape / Undo\n"+
    107                         "Please select nodes that were moved by the previous Orthogonalize Shape action!"),
     107                           "Please select nodes that were moved by the previous Orthogonalize Shape action!"),
    108108                        tr("Undo Orthogonalize Shape"),
    109109                        JOptionPane.INFORMATION_MESSAGE);
    110110            }
     
    118118            String msg = tr("<html>You are using the EPSG:4326 projection which might lead<br>" +
    119119                    "to undesirable results when doing rectangular alignments.<br>" +
    120120                    "Change your projection to get rid of this warning.<br>" +
    121             "Do you want to continue?</html>");
     121                    "Do you want to continue?</html>");
    122122            if (!ConditionalOptionPaneUtil.showConfirmationDialog(
    123123                    "align_rectangular_4326",
    124124                    Main.parent,
     
    260260        } catch (RejectedAngleException ex) {
    261261            throw new InvalidUserInputException(
    262262                    "<html>Please make sure all selected ways head in a similar direction<br>"+
    263             "or orthogonalize them one by one.");
     263                    "or orthogonalize them one by one.</html>");
    264264        }
    265265
    266266        // put the nodes of all ways in a set