Changeset 1212 in josm for trunk/src

Timestamp:

2009-01-06T18:06:36+01:00 (16 years ago)

Author:

stoecker

Message:

language fixes, hopefully the last set

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AlignInLineAction.java (modified) (1 diff)
• actions/DownloadAction.java (modified) (1 diff)
• actions/GpxExportAction.java (modified) (1 diff)
• actions/OpenFileAction.java (modified) (1 diff)
• actions/PreferencesAction.java (modified) (1 diff)
• actions/SaveAsAction.java (modified) (1 diff)
• actions/UploadAction.java (modified) (1 diff)
• actions/search/SearchAction.java (modified) (1 diff)
• data/projection/Lambert.java (modified) (3 diffs)
• gui/SplashScreen.java (modified) (1 diff)
• gui/preferences/DrawingPreference.java (modified) (1 diff)
• gui/preferences/PluginPreference.java (modified) (2 diffs)
• plugins/PluginDownloader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

@@ -30 +30 @@
 
     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);
     }

trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

@@ -31 +31 @@
 
     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);
     }
 

trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java

@@ -45 +45 @@
 
     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;
     }

trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

@@ -39 +39 @@
      */
     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));
     }
 

trunk/src/org/openstreetmap/josm/actions/PreferencesAction.java

@@ -29 +29 @@
      */
     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);
     }

trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java

@@ -22 +22 @@
      */
     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);
     }
 

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -60 +60 @@
 
     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);
 
         /**

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -37 +37 @@
 
     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);
     }

trunk/src/org/openstreetmap/josm/data/projection/Lambert.java

@@ -80 +80 @@
         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 +111 @@
                         + "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 +124 @@
                         || (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"

trunk/src/org/openstreetmap/josm/gui/SplashScreen.java

@@ -147 +147 @@
         if (!visible)
             return;
-        status.setText(message + " ...");
+        status.setText(message + "...");
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

@@ -55 +55 @@
         });
         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));
 

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -124 +124 @@
         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 +293 @@
                             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) {

trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java

@@ -141 +141 @@
             } 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));
             }
         }