Changeset 4045 in josm for trunk/src

Timestamp:

2011-04-20T15:31:14+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6097 - i18n issues

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DownloadPrimitiveAction.java (modified) (2 diffs)
• FullscreenToggleAction.java (modified) (1 diff)
• JoinAreasAction.java (modified) (1 diff)
• MergeNodesAction.java (modified) (1 diff)
• OpenLocationAction.java (modified) (1 diff)
• SaveActionBase.java (modified) (1 diff)

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

@@ -37 +37 @@
     public DownloadPrimitiveAction() {
         super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID."),
-                Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download Object...")), KeyEvent.VK_O, Shortcut.GROUP_MENU + Shortcut.GROUPS_ALT1), true);
+                Shortcut.registerShortcut("system:download_primitive", tr("File: {0}", tr("Download object...")), KeyEvent.VK_O, Shortcut.GROUP_MENU + Shortcut.GROUPS_ALT1), true);
         putValue("help", ht("/Action/DownloadObject"));
     }
@@ -76 +76 @@
         all.add(layer, gc);
         ExtendedDialog dialog = new ExtendedDialog(Main.parent,
-                tr("Download Object"),
+                tr("Download object"),
                 new String[] {tr("Download object"), tr("Cancel")}
         );

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

@@ -33 +33 @@
     public FullscreenToggleAction() {
         super(
-                tr("Fullscreen View"),
+                tr("Fullscreen view"),
                 null, /* no icon */
                 tr("Toggle fullscreen view"),
-                Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle Fullscreen view"),KeyEvent.VK_F11, Shortcut.GROUP_DIRECT),
+                Shortcut.registerShortcut("menu:view:fullscreen", tr("Toggle fullscreen view"),KeyEvent.VK_F11, Shortcut.GROUP_DIRECT),
                 true /* register shortcut */
         );

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

@@ -1436 +1436 @@
             stripTags(w);
         }
+        /* I18N: current action printed in status display */
         commitCommands(marktr("Remove tags from inner ways"));
     }

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

@@ -68 +68 @@
                 JOptionPane.showMessageDialog(
                         Main.parent,
-                        tr("Please select at least two nodes to merge or node that is close to another node."),
+                        tr("Please select at least two nodes to merge or a node that is close to another node."),
                         tr("Warning"),
                         JOptionPane.WARNING_MESSAGE

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

@@ -37 +37 @@
      */
     public OpenLocationAction() {
+        /* I18N: Command to download a specific location/URL */
         super(tr("Open Location..."), "openlocation", tr("Open an URL."),
                 Shortcut.registerShortcut("system:open_location", tr("File: {0}", tr("Open Location...")), KeyEvent.VK_L, Shortcut.GROUP_MENU), true);

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

@@ -110 +110 @@
                 ExtendedDialog dialog = new ExtendedDialog(
                         Main.parent,
+                        /* I18N: Display title of the window showing conflicts */
                         tr("Conflicts"),
                         new String[] {tr("Reject Conflicts and Save"), tr("Cancel")}