Changeset 24165 in osm for applications/editors/josm/plugins

Timestamp:

2010-11-08T23:37:05+01:00 (14 years ago)

Author:

oliverw

Message:

Added some missing "tr" calls/fixed some names after reviewing launchpad entries.

Location:

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses

Files:

• GuessAddressRunnable.java (modified) (2 diffs)
• gui/actions/ApplyAllGuessesAction.java (modified) (1 diff)
• gui/actions/AssignAddressToStreetAction.java (modified) (1 diff)
• gui/actions/ConvertAllToRelationAction.java (modified) (1 diff)
• gui/actions/ConvertToRelationAction.java (modified) (1 diff)
• gui/actions/GuessAddressDataAction.java (modified) (3 diffs)
• gui/actions/SelectAddressesInMapAction.java (modified) (1 diff)

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java

@@ -175 +175 @@
                 cancelled = false;
                 
+                // Start progress monitor to guess address values
                 progressMonitor.subTask(tr("Searching") + "...");
                 
@@ -206 +207 @@
                                         break;
                                 }
-                                
+                                // Update progress monitor
                                 progressMonitor.subTask(tr("Guess values for ") + aNode);
 

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java

@@ -39 +39 @@
 public class ApplyAllGuessesAction extends AbstractAddressEditAction implements MouseListener{
 
-        public ApplyAllGuessesAction() {
-                //super(tr("Apply all guesses"), "applyguesses_24", "Turns all guesses into the corresponding tag values.");
-                super(tr("Apply all guesses"), "applyguesses_24", "Turns all guesses into the corresponding tag values.");
+        /**
+         * Instantiates a new "apply all guesses" action.
+         */
+        public ApplyAllGuessesAction() {        
+                super(tr("Apply all guesses"), "applyguesses_24", tr("Turns all guesses into the corresponding tag values."));
         }
 

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java

@@ -29 +29 @@
 public class AssignAddressToStreetAction extends AbstractAddressEditAction  {
 
+        /**
+         * Instantiates a new "assign address to street" action.
+         */
         public AssignAddressToStreetAction() {
-                super(tr("Assign address to street"), "assignstreet_24", "Assign the selected address(es) to the selected street.");
+                super(tr("Assign address to street"), "assignstreet_24", 
+                                tr("Assign the selected address(es) to the selected street."));
         }
 

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java

@@ -23 +23 @@
 public class ConvertAllToRelationAction extends ConvertToRelationAction {
         public ConvertAllToRelationAction() {
-                super(tr("Convert ALL streets."), "convert2rel_24", "Create relation between street and related addresses for ALL streets in the current layer.");
+                super(tr("Convert ALL streets."), "convert2rel_24", 
+                                tr("Create relation between street and related addresses for ALL streets in the current layer."));
         }
         

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java

@@ -30 +30 @@
 
         public ConvertToRelationAction() {
-                super(tr("Convert to relation."), "convert2rel_24", "Create relation between street and related addresses.");
+                super(tr("Convert to relation."), "convert2rel_24", 
+                                tr("Create relation between street and related addresses."));
         }
         

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java

@@ -26 +26 @@
 
 /**
- * Guesses address tags by picking the closest street node with a name. The same is done (some day)
+ * Guesses address tags by picking the closest street node with a name. The same is done
  * with city, post code, state,... However, I strongly encourage you to check the result.
+ * 
  * @author Oliver Wieland <oliver.wieland@online.de>
- * 
  */
 
@@ -35 +35 @@
 public class GuessAddressDataAction extends AbstractAddressEditAction implements IProgressMonitorFinishedListener {
 
+        /**
+         * Instantiates a new "guess address data" action.
+         */
         public GuessAddressDataAction() {
-                super(tr("Guess address data"), "guessstreets_24", "Tries to guess the street name by picking the name of the closest way.");
+                super(tr("Guess address data"), "guessstreets_24", tr("Tries to guess address data by picking the name of the closest object with according tag."));
         }
 
@@ -84 +87 @@
                 if (nodes == null) return;
                 
-                GuessAddressRunnable aft = new GuessAddressRunnable(nodes, tr("Guess street names"));
+                // Launch address guessing thread
+                GuessAddressRunnable aft = new GuessAddressRunnable(nodes, tr("Guessing address values"));
                 aft.addFinishListener(this);
                 Main.worker.submit(aft);

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java

@@ -48 +48 @@
 public class SelectAddressesInMapAction extends AbstractAddressEditAction {
 
+        /**
+         * Instantiates a new "select addresses in map" action.
+         */
         public SelectAddressesInMapAction() {
-                // we simply use the existing icon :-|
-                super(tr("Select"), "selectall", "Selects selected addresses in the map");
+                super(tr("Select"), "selectall", tr("Marks selected addresses in the map"));
         }