Changeset 4310 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

2011-08-11T00:26:21+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6680, fix #6677 - i18n issues

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair

Files:

• ListMerger.java (modified) (1 diff)
• properties/PropertiesMergeModel.java (modified) (1 diff)
• properties/PropertiesMerger.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -284 +284 @@
         gc.gridy = 0;
         lblMergedVersion = new JLabel(tr("Merged version"));
-        lblMergedVersion.setToolTipText(tr("List of merged elements. They will replace the my elements when the merge decisions are applied."));
+        lblMergedVersion.setToolTipText(tr("List of merged elements. They will replace the list of my elements when the merge decisions are applied."));
         add(lblMergedVersion, gc);
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -23 +23 @@
 /**
  * This is the model for resolving conflicts in the properties of the
- * {@see OsmPrimitive}s. In particular, it represents conflicts in the coordiates of {@see Node}s and
+ * {@see OsmPrimitive}s. In particular, it represents conflicts in the coordinates of {@see Node}s and
  * the deleted or visible state of {@see OsmPrimitive}s.
  *

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -394 +394 @@
         public KeepMyCoordinatesAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine"));
-            putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordiates"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordinates"));
         }
 
@@ -409 +409 @@
         public KeepTheirCoordinatesAction() {
             putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir"));
-            putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordiates"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordinates"));
         }