Changeset 2888 in josm for trunk


Ignore:
Timestamp:
2010-01-24T12:15:50+01:00 (10 years ago)
Author:
bastiK
Message:

applied #4425 - Text fixes (patch by andre68)

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

    r2851 r2888  
    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
  • trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

    r2842 r2888  
    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,
     
    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);
     
    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",
     
    144144                    wayDataList.add(new WayData((Way) p));
    145145                } else
    146                     throw new InvalidUserInputException("Selection must consist only of ways and nodes.");
     146                    throw new InvalidUserInputException(tr("Selection must consist only of ways and nodes."));
    147147            }
    148148            if (wayDataList.isEmpty())
     
    201201                JOptionPane.showMessageDialog(
    202202                        Main.parent,
    203                         "<html>" + tr(ex.getMessage()) + "<br><hr><h2>" + tr("Usage") + "</h2>" + USAGE + "</html>",
     203                        "<html>" + ex.getMessage() + "<br><hr><h2>" + tr("Usage") + "</h2>" + USAGE + "</html>",
    204204                        tr("Selected Elements cannot be orthogonalized"),
    205205                        JOptionPane.INFORMATION_MESSAGE);
     
    260260        } catch (RejectedAngleException ex) {
    261261            throw new InvalidUserInputException(
    262                     "<html>Please make sure all selected ways head in a similar direction<br>"+
    263             "or orthogonalize them one by one.");
     262                    tr("<html>Please make sure all selected ways head in a similar direction<br>"+
     263                       "or orthogonalize them one by one.</html>"));
    264264        }
    265265
     
    413413                    direction = direction.changeBy(angleToDirectionChange(h2 - h1, TOLERANCE1));
    414414                } catch (RejectedAngleException ex) {
    415                     throw new InvalidUserInputException("Please select ways with angles of approximately 90 or 180 degrees.");
     415                    throw new InvalidUserInputException(tr("Please select ways with angles of approximately 90 or 180 degrees."));
    416416                }
    417417                segDirections[i+1] = direction;
Note: See TracChangeset for help on using the changeset viewer.