Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 2887) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 2888) @@ -118,5 +118,5 @@ JOptionPane.showMessageDialog( Main.parent, - tr("Cannot open directory.
Please select a file!"), + tr("Cannot open directory.
Please select a file!"), tr("Open file"), JOptionPane.INFORMATION_MESSAGE Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 2887) +++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 2888) @@ -36,14 +36,14 @@ */ public final class OrthogonalizeAction extends JosmAction { - String USAGE = tr( - "When one or more ways are selected, the shape is adjusted such, that all angles are 90 or 180 degrees.

"+ - "You can add two nodes to the selection. Then, the direction is fixed by these two reference nodes."+ - "(Afterwards, you can undo the movement for certain nodes:
"+ - "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)"); + private String USAGE = tr( + "

When one or more ways are selected, the shape is adjusted such, that all angles are 90 or 180 degrees.

"+ + "You can add two nodes to the selection. Then, the direction is fixed by these two reference nodes. "+ + "(Afterwards, you can undo the movement for certain nodes:
"+ + "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)"); public OrthogonalizeAction() { super(tr("Orthogonalize Shape"), "ortho", - tr("Move nodes so all angles are 90 or 270 degree"), + tr("Move nodes so all angles are 90 or 270 degrees"), Shortcut.registerShortcut("tools:orthogonalize", tr("Tool: {0}", tr("Orthogonalize Shape")), KeyEvent.VK_Q, @@ -105,5 +105,5 @@ Main.parent, tr("Orthogonalize Shape / Undo\n"+ - "Please select nodes that were moved by the previous Orthogonalize Shape action!"), + "Please select nodes that were moved by the previous Orthogonalize Shape action!"), tr("Undo Orthogonalize Shape"), JOptionPane.INFORMATION_MESSAGE); @@ -119,5 +119,5 @@ "to undesirable results when doing rectangular alignments.
" + "Change your projection to get rid of this warning.
" + - "Do you want to continue?"); + "Do you want to continue?"); if (!ConditionalOptionPaneUtil.showConfirmationDialog( "align_rectangular_4326", @@ -144,5 +144,5 @@ wayDataList.add(new WayData((Way) p)); } else - throw new InvalidUserInputException("Selection must consist only of ways and nodes."); + throw new InvalidUserInputException(tr("Selection must consist only of ways and nodes.")); } if (wayDataList.isEmpty()) @@ -201,5 +201,5 @@ JOptionPane.showMessageDialog( Main.parent, - "" + tr(ex.getMessage()) + "

" + tr("Usage") + "

" + USAGE + "", + "" + ex.getMessage() + "

" + tr("Usage") + "

" + USAGE + "", tr("Selected Elements cannot be orthogonalized"), JOptionPane.INFORMATION_MESSAGE); @@ -260,6 +260,6 @@ } catch (RejectedAngleException ex) { throw new InvalidUserInputException( - "Please make sure all selected ways head in a similar direction
"+ - "or orthogonalize them one by one."); + tr("Please make sure all selected ways head in a similar direction
"+ + "or orthogonalize them one by one.")); } @@ -413,5 +413,5 @@ direction = direction.changeBy(angleToDirectionChange(h2 - h1, TOLERANCE1)); } catch (RejectedAngleException ex) { - throw new InvalidUserInputException("Please select ways with angles of approximately 90 or 180 degrees."); + throw new InvalidUserInputException(tr("Please select ways with angles of approximately 90 or 180 degrees.")); } segDirections[i+1] = direction;