Changeset 2181 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

Timestamp:

2009-09-22T15:34:19+02:00 (15 years ago)

Author:

stoecker

Message:

lots of i18n fixes

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) (15 diffs)

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

@@ -436 +436 @@
                 putValue(Action.NAME, tr("> bottom"));
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements to the end of the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements to the end of the list of merged elements."));
             setEnabled(false);
         }
@@ -463 +463 @@
                 putValue(Action.NAME, "> before");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements before the first selected element in the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements before the first selected element in the list of merged elements."));
             setEnabled(false);
         }
@@ -497 +497 @@
                 putValue(Action.NAME, "> after");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements after the first selected element in the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy my selected elements after the first selected element in the list of merged elements."));
             setEnabled(false);
         }
@@ -527 +527 @@
                 putValue(Action.NAME, "< top");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected element to the start of the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected element to the start of the list of merged elements."));
             setEnabled(false);
         }
@@ -550 +550 @@
                 putValue(Action.NAME, "< bottom");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements to the end of the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements to the end of the list of merged elements."));
             setEnabled(false);
         }
@@ -572 +572 @@
                 putValue(Action.NAME, "< before");
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements before the first selected element in the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Copy their selected elements before the first selected element in the list of merged elements."));
             setEnabled(false);
         }
@@ -632 +632 @@
                 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 elements by one position."));
             setEnabled(false);
         }
@@ -664 +664 @@
                 putValue(Action.NAME, tr("Down"));
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Move down the selected entries by one position"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Move down the selected entries by one position."));
             setEnabled(false);
         }
@@ -696 +696 @@
                 putValue(Action.NAME, tr("Remove"));
             }
-            putValue(Action.SHORT_DESCRIPTION, tr("Remove the selected entries from the list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Remove the selected entries from the list of merged elements."));
             setEnabled(false);
         }
@@ -726 +726 @@
         public FreezeAction() {
             putValue(Action.NAME, tr("Freeze"));
-            putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements"));
+            putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements."));
             putValue(PROP_SELECTED, false);
             setEnabled(true);
@@ -759 +759 @@
             if (state == ItemEvent.SELECTED) {
                 putValue(Action.NAME, tr("Unfreeze"));
-                putValue(Action.SHORT_DESCRIPTION, tr("Unfreeze the list of merged elements and start merging"));
+                putValue(Action.SHORT_DESCRIPTION, tr("Unfreeze the list of merged elements and start merging."));
                 model.setFrozen(true);
             } else if (state == ItemEvent.DESELECTED) {
                 putValue(Action.NAME, tr("Freeze"));
-                putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements"));
+                putValue(Action.SHORT_DESCRIPTION, tr("Freeze the current list of merged elements."));
                 model.setFrozen(false);
             }
@@ -786 +786 @@
         if (newValue) {
             lblFrozenState.setText(
-                    tr("<html>Click <strong>{0}</strong> to start merging my and their entries</html>",
+                    tr("<html>Click <strong>{0}</strong> to start merging my and their entries.</html>",
                             freezeAction.getValue(Action.NAME))
             );
         } else {
             lblFrozenState.setText(
-                    tr("<html>Click <strong>{0}</strong> to finish merging my and their entries</html>",
+                    tr("<html>Click <strong>{0}</strong> to finish merging my and their entries.</html>",
                             freezeAction.getValue(Action.NAME))
             );
@@ -879 +879 @@
         protected void setParticipatingInSynchronizedScrolling(Adjustable adjustable, boolean isParticipating) {
             if (adjustable == null)
-                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
+                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable"));
 
             if (! synchronizedAdjustables.contains(adjustable))
-                throw new IllegalStateException(tr("adjustable {0} not registered yet. Can't set participation in synchronized adjustment",adjustable));
+                throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can't set participation in synchronized adjustment.", adjustable));
 
             enabledMap.put(adjustable, isParticipating);
@@ -897 +897 @@
         protected boolean isParticipatingInSynchronizedScrolling(Adjustable adjustable) throws IllegalStateException {
             if (! synchronizedAdjustables.contains(adjustable))
-                throw new IllegalStateException(tr("adjustable {0} not registered yet",adjustable));
+                throw new IllegalStateException(tr("Adjustable {0} not registered yet.", adjustable));
 
             return enabledMap.get(adjustable);
@@ -920 +920 @@
         protected void adapt(final JCheckBox view, final Adjustable adjustable) throws IllegalArgumentException, IllegalStateException {
             if (adjustable == null)
-                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "adjustable"));
+                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable"));
             if (view == null)
-                throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "view"));
+                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "view"));
 
             if (! synchronizedAdjustables.contains(adjustable)) {