Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6386)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 6388)
@@ -435,6 +435,6 @@
// Finishing the sequence command
- String text = trn("Add and a new node to way",
- "Add and a new node to {0} ways",
+ String text = trn("Add a new node to way",
+ "Add a new node to {0} ways",
virtualSegments.size(), virtualSegments.size());
Index: trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 6386)
+++ trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java (revision 6388)
@@ -278,5 +278,5 @@
}
if (parameters.containsKey(Param.no_defs.key))
- throw new ProjectionConfigurationException(tr("Datum required (+datum=*, +towgs84=* or +nadgirds=*)"));
+ throw new ProjectionConfigurationException(tr("Datum required (+datum=*, +towgs84=* or +nadgrids=*)"));
return new CentricDatum(null, null, ellps);
}
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6386)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 6388)
@@ -685,5 +685,5 @@
putValue(Action.NAME, tr("Up"));
}
- putValue(Action.SHORT_DESCRIPTION, tr("Move up the selected elements by one position."));
+ putValue(Action.SHORT_DESCRIPTION, tr("Move up the selected entries by one position."));
setEnabled(false);
}
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (revision 6386)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (revision 6388)
@@ -105,8 +105,8 @@
pnl.add(new JLabel(trc("tag", "Key:")));
pnl.add(tfKey = new AutoCompletingTextField(10));
- tfKey.setToolTipText(tr("Enter a tag key, i.e. fixme"));
+ tfKey.setToolTipText(tr("Enter a tag key, e.g. fixme"));
pnl.add(new JLabel(tr("Value:")));
pnl.add(tfValue = new AutoCompletingTextField(10));
- tfValue.setToolTipText(tr("Enter a tag value, i.e. check members"));
+ tfValue.setToolTipText(tr("Enter a tag value, e.g. check members"));
cbTagRelations.setSelected(false);
tfKey.setEnabled(false);