Index: trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java (revision 1212) @@ -30,5 +30,5 @@ public AlignInLineAction() { - super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes onto a line."), + super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes in to a line."), Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.GROUP_EDIT), true); } Index: trunk/src/org/openstreetmap/josm/actions/DownloadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 1212) @@ -31,6 +31,6 @@ public DownloadAction() { - super(tr("Download from OSM ..."), "download", tr("Download map data from the OSM server."), - Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM ...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true); + super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."), + Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true); } Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 1212) @@ -45,6 +45,6 @@ public GpxExportAction(Layer layer) { - super(tr("Export to GPX ..."), "exportgpx", tr("Export the data to GPX file."), - Shortcut.registerShortcut("file:exportgpx", tr("Export to GPX ..."), KeyEvent.VK_E, Shortcut.GROUP_MENU)); + super(tr("Export to GPX..."), "exportgpx", tr("Export the data to GPX file."), + Shortcut.registerShortcut("file:exportgpx", tr("Export to GPX..."), KeyEvent.VK_E, Shortcut.GROUP_MENU)); this.layer = layer; } Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 1212) @@ -39,6 +39,6 @@ */ public OpenFileAction() { - super(tr("Open ..."), "open", tr("Open a file."), - Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open ...")), KeyEvent.VK_O, Shortcut.GROUP_MENU)); + super(tr("Open..."), "open", tr("Open a file."), + Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.GROUP_MENU)); } Index: trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java (revision 1212) @@ -29,5 +29,5 @@ */ public PreferencesAction() { - super(tr("Preferences ..."), "preference", tr("Open a preferences page for global settings."), + super(tr("Preferences..."), "preference", tr("Open a preferences page for global settings."), Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.GROUP_DIRECT), true); } Index: trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java (revision 1212) @@ -22,6 +22,6 @@ */ public SaveAsAction(Layer layer) { - super(tr("Save as ..."), "save_as", tr("Save the current data to a new file."), - Shortcut.registerShortcut("system:saveas", tr("File: {0}", tr("Save as ...")), KeyEvent.VK_S, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), layer); + super(tr("Save as..."), "save_as", tr("Save the current data to a new file."), + Shortcut.registerShortcut("system:saveas", tr("File: {0}", tr("Save as...")), KeyEvent.VK_S, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), layer); } Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 1212) @@ -60,6 +60,6 @@ public UploadAction() { - super(tr("Upload to OSM ..."), "upload", tr("Upload all changes to the OSM server."), - Shortcut.registerShortcut("file:upload", tr("File: {0}", tr("Upload to OSM ...")), KeyEvent.VK_U, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true); + super(tr("Upload to OSM..."), "upload", tr("Upload all changes to the OSM server."), + Shortcut.registerShortcut("file:upload", tr("File: {0}", tr("Upload to OSM...")), KeyEvent.VK_U, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true); /** Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 1212) @@ -37,5 +37,5 @@ public SearchAction() { - super(tr("Search ..."), "dialogs/search", tr("Search for objects."), + super(tr("Search..."), "dialogs/search", tr("Search for objects."), Shortcut.registerShortcut("system:find", tr("Search..."), KeyEvent.VK_F, Shortcut.GROUP_HOTKEY), true); } Index: trunk/src/org/openstreetmap/josm/data/projection/Lambert.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/data/projection/Lambert.java (revision 1212) @@ -80,5 +80,5 @@ double lg = geo.lon(); - // check if longitude and latitude are inside the french Lambert zones + // check if longitude and latitude are inside the French Lambert zones currentZone = 0; boolean outOfLambertZones = false; @@ -111,5 +111,5 @@ + "latitudes between 46.1° and 57° only.\n" + "Use another projection system if you are not using\n" - + "a french WMS server.\n" + + "a French WMS server.\n" + "Do not upload any data after this message.", this.toString())); dontDisplayErrors = true; @@ -124,5 +124,5 @@ || (currentZone > layoutZone && Math.abs(zoneLimits[layoutZone] - lt) > cMaxOverlappingZones)) { JOptionPane.showMessageDialog(Main.parent, - tr("IMPORTANT : data positionned far away from\n" + tr("IMPORTANT : data positioned far away from\n" + "the current Lambert zone limits.\n" + "Do not upload any data after this message.\n" Index: trunk/src/org/openstreetmap/josm/gui/SplashScreen.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 1212) @@ -147,5 +147,5 @@ if (!visible) return; - status.setText(message + " ..."); + status.setText(message + "..."); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (revision 1212) @@ -55,5 +55,5 @@ }); drawRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines")); - drawRawGpsLines.setToolTipText(tr("If your gps device draw too few lines, select this to draw lines along your way.")); + drawRawGpsLines.setToolTipText(tr("If your gps device draws too few lines, select this to draw lines along your way.")); panel.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0)); Index: trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 1212) @@ -124,5 +124,5 @@ plugin.add(update, GBC.std().insets(0,0,10,0)); - JButton configureSites = new JButton(tr("Configure Sites ...")); + JButton configureSites = new JButton(tr("Configure Sites...")); configureSites.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent e) { @@ -293,5 +293,5 @@ try { int answer = JOptionPane.showConfirmDialog(Main.parent, - tr("Plugin archive already available. Do you want to download current version by deleting existing archive?\n\n{0}", + tr("Plugin archive already available. Do you want to download the current version by deleting existing archive?\n\n{0}", plinfo.file.getCanonicalPath()), tr("Plugin already exists"), JOptionPane.OK_CANCEL_OPTION); if (answer == JOptionPane.OK_OPTION) { Index: trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (revision 1211) +++ trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (revision 1212) @@ -141,5 +141,5 @@ } catch (Exception e) { e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent, tr("The plugin {0} seem to be broken or could not be downloaded automatically.", pd.name)); + JOptionPane.showMessageDialog(Main.parent, tr("The plugin {0} seems to be broken or could not be downloaded automatically.", pd.name)); } }