Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 24147)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 24165)
@@ -175,4 +175,5 @@
 		cancelled = false;
 		
+		// Start progress monitor to guess address values
 		progressMonitor.subTask(tr("Searching") + "...");
 		
@@ -206,5 +207,5 @@
 					break;
 				}
-				
+				// Update progress monitor
 				progressMonitor.subTask(tr("Guess values for ") + aNode);
 
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java	(revision 24147)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ApplyAllGuessesAction.java	(revision 24165)
@@ -39,7 +39,9 @@
 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."));
 	}
 
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java	(revision 24147)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/AssignAddressToStreetAction.java	(revision 24165)
@@ -29,6 +29,10 @@
 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."));
 	}
 
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java	(revision 24147)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertAllToRelationAction.java	(revision 24165)
@@ -23,5 +23,6 @@
 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."));
 	}
 	
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java	(revision 24147)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/ConvertToRelationAction.java	(revision 24165)
@@ -30,5 +30,6 @@
 
 	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."));
 	}
 	
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java	(revision 24147)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/GuessAddressDataAction.java	(revision 24165)
@@ -26,8 +26,8 @@
 
 /**
- * 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,6 +35,9 @@
 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,5 +87,6 @@
 		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);
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java	(revision 24147)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java	(revision 24165)
@@ -48,7 +48,9 @@
 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"));
 	}