Changeset 3995 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2011-03-20T01:29:48+01:00 (13 years ago)

Author:

mjulius

Message:

fix #3590 - Primitives or objects: Pick one

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractInfoAction.java (modified) (1 diff)
• DownloadReferrersAction.java (modified) (1 diff)
• MergeSelectionAction.java (modified) (1 diff)
• PasteAction.java (modified) (2 diffs)
• PasteTagsAction.java (modified) (1 diff)

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

@@ -42 +42 @@
         String ret =  pattern.matcher(baseUrl).replaceAll("/browse");
         if (ret.equals(baseUrl)) {
-            System.out.println(tr("WARNING: unexpected format of API base URL. Redirection to info or history page for OSM primitive will probably fail. API base URL is: ''{0}''",baseUrl));
+            System.out.println(tr("WARNING: unexpected format of API base URL. Redirection to info or history page for OSM object will probably fail. API base URL is: ''{0}''",baseUrl));
         }
         if (ret.startsWith("http://api.openstreetmap.org/")) {

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

@@ -27 +27 @@
 
     public DownloadReferrersAction() {
-        super(tr("Download parent ways/relations..."), "downloadreferrers", tr("Download primitives referring to one of the selected primitives"),
+        super(tr("Download parent ways/relations..."), "downloadreferrers", tr("Download objects referring to one of the selected objects"),
                 Shortcut.registerShortcut("file:downloadreferrers", tr("File: {0}", tr("Download parent ways/relations...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT2+Shortcut.GROUP_HOTKEY), true);
         putValue("help", ht("/Action/DownloadReferrers"));

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

@@ -20 +20 @@
 public class MergeSelectionAction extends AbstractMergeAction {
     public MergeSelectionAction() {
-        super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected primitives into another layer"), Shortcut
+        super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected objects into another layer"), Shortcut
                 .registerShortcut("system:mergeselection", tr("Edit: {0}", tr("Merge selection")), KeyEvent.VK_M, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT),
                 true /* register */

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

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy;
+import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
 import org.openstreetmap.josm.data.osm.RelationData;
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.WayData;
-import org.openstreetmap.josm.data.osm.PrimitiveDeepCopy.PasteBufferChangedListener;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -154 +154 @@
                 new String[] {tr("Paste without incomplete members"), tr("Cancel")});
         ed.setButtonIcons(new String[] {"dialogs/relation/deletemembers.png", "cancel.png"});
-        ed.setContent(tr("The copied data contains incomplete primitives.  "
-                + "When pasting the incomplete primitives are removed.  "
-                + "Do you want to paste the data without the incomplete primitives?"));
+        ed.setContent(tr("The copied data contains incomplete objects.  "
+                + "When pasting the incomplete objects are removed.  "
+                + "Do you want to paste the data without the incomplete objects?"));
         ed.showDialog();
         return ed.getValue() == 1;

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

@@ -254 +254 @@
         if (!commands.isEmpty()) {
             String title1 = trn("Pasting {0} tag", "Pasting {0} tags", commands.size(), commands.size());
-            String title2 = trn("to {0} primitive", "to {0} primtives", selection.size(), selection.size());
+            String title2 = trn("to {0} object", "to {0} objects", selection.size(), selection.size());
             Main.main.undoRedo.add(
                     new SequenceCommand(