Index: trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 3995)
@@ -42,5 +42,5 @@
         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/")) {
Index: trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java	(revision 3995)
@@ -27,5 +27,5 @@
 
     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"));
Index: trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 3995)
@@ -20,5 +20,5 @@
 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 */
Index: trunk/src/org/openstreetmap/josm/actions/PasteAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/PasteAction.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/actions/PasteAction.java	(revision 3995)
@@ -20,8 +20,8 @@
 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,7 +154,7 @@
                 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;
Index: trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java	(revision 3995)
@@ -254,5 +254,5 @@
         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(
Index: trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java	(revision 3995)
@@ -28,5 +28,5 @@
         JOptionPane.showMessageDialog(
                 Main.parent,
-                tr("<html>Layer ''{0}'' already has a conflict for primitive<br>"
+                tr("<html>Layer ''{0}'' already has a conflict for object<br>"
                         + "''{1}''.<br>"
                         + "This conflict cannot be added.</html>",
@@ -50,5 +50,5 @@
     @Override public void undoCommand() {
         if (! Main.map.mapView.hasLayer(getLayer())) {
-            System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for primitive ''{1}''.",
+            System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
                     getLayer().getName(),
                     conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
@@ -65,9 +65,9 @@
     @Override public JLabel getDescription() {
         return new JLabel(
-                        tr("Add conflict for ''{0}''",
-                                conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
-                        ),
-                        ImageProvider.get(OsmPrimitiveType.from(conflict.getMy())),
-                        JLabel.HORIZONTAL
+                tr("Add conflict for ''{0}''",
+                        conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
+                ),
+                ImageProvider.get(OsmPrimitiveType.from(conflict.getMy())),
+                JLabel.HORIZONTAL
         );
     }
Index: trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java	(revision 3995)
@@ -63,7 +63,7 @@
     @Override public JLabel getDescription() {
         return new JLabel(
-                        trn("Undelete {0} primitive", "Undelete {0} primitives", toUndelete.size(), toUndelete.size()),
-                        ImageProvider.get("data", "object"),
-                        JLabel.HORIZONTAL
+                trn("Undelete {0} object", "Undelete {0} objects", toUndelete.size(), toUndelete.size()),
+                ImageProvider.get("data", "object"),
+                JLabel.HORIZONTAL
         );
     }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 3995)
@@ -323,5 +323,5 @@
         StringBuffer sb = new StringBuffer();
         sb.append("<html>");
-        sb.append(tr("The following primitives could not be copied to the target primitive<br>because they are deleted in the target dataset:"));
+        sb.append(tr("The following objects could not be copied to the target object<br>because they are deleted in the target dataset:"));
         sb.append("<ul>");
         for (String item: items) {
@@ -333,5 +333,5 @@
                 Main.parent,
                 sb.toString(),
-                tr("Merging deleted primitives failed"),
+                tr("Merging deleted objects failed"),
                 JOptionPane.WARNING_MESSAGE,
                 HelpUtil.ht("/Dialog/Conflict#MergingDeletedPrimitivesFailed")
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 3995)
@@ -5,6 +5,6 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -26,15 +26,16 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
-import javax.swing.JLabel;
 import javax.swing.ListSelectionModel;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableColumnModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumnModel;
 
 import org.openstreetmap.josm.Main;
@@ -50,6 +51,4 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.ImageProvider;
-import javax.swing.ImageIcon;
 
 /**
@@ -118,4 +117,5 @@
         columnModel.getColumn(3).setPreferredWidth(20);
         columnModel.getColumn(3).setCellRenderer(new DefaultTableCellRenderer() {
+            @Override
             public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
                 final JLabel label = (JLabel) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
@@ -179,5 +179,5 @@
         public SelectUsersPrimitivesAction() {
             putValue(NAME, tr("Select"));
-            putValue(SHORT_DESCRIPTION, tr("Select primitives submitted by this user"));
+            putValue(SHORT_DESCRIPTION, tr("Select objects submitted by this user"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
             updateEnabledState();
@@ -281,5 +281,5 @@
             Layer layer = Main.main.getActiveLayer();
             if (layer instanceof OsmDataLayer) {
-               refresh(((OsmDataLayer)layer).data.getSelected());
+                refresh(((OsmDataLayer)layer).data.getSelected());
             }
             setEnabled(false);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java	(revision 3995)
@@ -248,5 +248,5 @@
             putValue(NAME, tr("Show history"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "history"));
-            putValue(SHORT_DESCRIPTION, tr("Download and show the history of the selected primitives"));
+            putValue(SHORT_DESCRIPTION, tr("Download and show the history of the selected objects"));
             updateEnabledState();
         }
@@ -377,5 +377,5 @@
             putValue(NAME, tr("Zoom to in layer"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection"));
-            putValue(SHORT_DESCRIPTION, tr("Zoom to the corresponding primitives in the current data layer"));
+            putValue(SHORT_DESCRIPTION, tr("Zoom to the corresponding objects in the current data layer"));
             updateEnabledState();
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java	(revision 3995)
@@ -415,5 +415,5 @@
             putValue(NAME, tr("Zoom to in layer"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection"));
-            putValue(SHORT_DESCRIPTION, tr("Zoom to the primitives in the content of this changeset in the current data layer"));
+            putValue(SHORT_DESCRIPTION, tr("Zoom to the objects in the content of this changeset in the current data layer"));
             updateEnabledState();
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 3995)
@@ -670,5 +670,5 @@
         protected boolean confirmAddingPrimtive(OsmPrimitive primitive)  throws AddAbortException {
             String msg = tr("<html>This relation already has one or more members referring to<br>"
-                    + "the primitive ''{0}''<br>"
+                    + "the object ''{0}''<br>"
                     + "<br>"
                     + "Do you really want to add another relation member?</html>",
@@ -679,5 +679,5 @@
                     Main.parent,
                     msg,
-                    tr("Multiple members referring to same primitive"),
+                    tr("Multiple members referring to same object."),
                     JOptionPane.YES_NO_CANCEL_OPTION,
                     JOptionPane.WARNING_MESSAGE,
@@ -738,5 +738,5 @@
         public AddSelectedAtStartAction() {
             putValue(SHORT_DESCRIPTION,
-                    tr("Add all primitives selected in the current dataset before the first member"));
+                    tr("Add all objects selected in the current dataset before the first member"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copystartright"));
             // putValue(NAME, tr("Add Selected"));
@@ -764,5 +764,5 @@
     class AddSelectedAtEndAction extends AddFromSelectionAction implements TableModelListener {
         public AddSelectedAtEndAction() {
-            putValue(SHORT_DESCRIPTION, tr("Add all primitives selected in the current dataset after the last member"));
+            putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyendright"));
             // putValue(NAME, tr("Add Selected"));
@@ -791,5 +791,5 @@
         public AddSelectedBeforeSelection() {
             putValue(SHORT_DESCRIPTION,
-                    tr("Add all primitives selected in the current dataset before the first selected member"));
+                    tr("Add all objects selected in the current dataset before the first selected member"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copybeforecurrentright"));
             // putValue(NAME, tr("Add Selected"));
@@ -825,5 +825,5 @@
         public AddSelectedAfterSelection() {
             putValue(SHORT_DESCRIPTION,
-                    tr("Add all primitives selected in the current dataset after the last selected member"));
+                    tr("Add all objects selected in the current dataset after the last selected member"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyaftercurrentright"));
             // putValue(NAME, tr("Add Selected"));
@@ -857,5 +857,5 @@
     class RemoveSelectedAction extends AbstractAction implements TableModelListener {
         public RemoveSelectedAction() {
-            putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected primitives"));
+            putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected objects"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "deletemembers"));
             // putValue(NAME, tr("Remove Selected"));
@@ -894,5 +894,5 @@
     class SelectedMembersForSelectionAction extends AbstractAction implements TableModelListener {
         public SelectedMembersForSelectionAction() {
-            putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to primitives in the current selection"));
+            putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to objects in the current selection"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectmembers"));
             updateEnabledState();
@@ -904,7 +904,7 @@
 
             if (enabled) {
-                putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to {0} primitives in the current selection",memberTableModel.getChildPrimitives(getLayer().data.getSelected()).size()));
+                putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to {0} objects in the current selection",memberTableModel.getChildPrimitives(getLayer().data.getSelected()).size()));
             } else {
-                putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to primitives in the current selection"));
+                putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to objects in the current selection"));
             }
             setEnabled(enabled);
@@ -928,5 +928,5 @@
     class SelectPrimitivesForSelectedMembersAction extends AbstractAction implements ListSelectionListener {
         public SelectPrimitivesForSelectedMembersAction() {
-            putValue(SHORT_DESCRIPTION, tr("Select primitives for selected relation members"));
+            putValue(SHORT_DESCRIPTION, tr("Select objects for selected relation members"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectprimitives"));
             updateEnabledState();
@@ -1183,5 +1183,5 @@
             JOptionPane.showMessageDialog(
                     Main.parent,
-                    tr("<html>Layer ''{0}'' already has a conflict for primitive<br>"
+                    tr("<html>Layer ''{0}'' already has a conflict for object<br>"
                             + "''{1}''.<br>"
                             + "Please resolve this conflict first, then try again.</html>",
@@ -1381,8 +1381,8 @@
         protected boolean confirmSettingEmptyRole(int onNumMembers) {
             String message = "<html>"
-                + trn("You are setting an empty role on {0} primitive.",
-                        "You are setting an empty role on {0} primitives.", onNumMembers, onNumMembers)
+                + trn("You are setting an empty role on {0} object.",
+                        "You are setting an empty role on {0} objects.", onNumMembers, onNumMembers)
                         + "<br>"
-                        + tr("This is equal to deleting the roles of these primitives.") +
+                        + tr("This is equal to deleting the roles of these objects.") +
                         "<br>"
                         + tr("Do you really want to apply the new role?") + "</html>";
Index: trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java	(revision 3995)
@@ -24,5 +24,5 @@
         // column 0 - Version
         col = new TableColumn(1);
-        col.setHeaderValue(tr("Primitive"));
+        col.setHeaderValue(tr("Object"));
         col.setCellRenderer(renderer);
         addColumn(col);
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java	(revision 3995)
@@ -92,5 +92,5 @@
             // we tried to delete an already deleted primitive.
             //
-            System.out.println(tr("Warning: primitive ''{0}'' is already deleted on the server. Skipping this primitive and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
+            System.out.println(tr("Warning: object ''{0}'' is already deleted on the server. Skipping this object and retrying to upload.", p.getDisplayName(DefaultNameFormatter.getInstance())));
             processedPrimitives.addAll(writer.getProcessedPrimitives());
             processedPrimitives.add(p);
@@ -106,5 +106,5 @@
     @Override
     public void run() {
-        monitor.indeterminateSubTask(tr("Preparing primitives to upload ..."));
+        monitor.indeterminateSubTask(tr("Preparing objects to upload ..."));
         APIDataSet ds = new APIDataSet(layer.data);
         try {
Index: trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 3994)
+++ trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 3995)
@@ -421,5 +421,5 @@
             } catch(OsmApiException e) {
                 if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
-                    logger.warning(tr("Server replied with response code 404, retrying with an individual request for each primitive."));
+                    logger.warning(tr("Server replied with response code 404, retrying with an individual request for each object."));
                     singleGetIdPackage(type, pkg, progressMonitor);
                 } else