Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java	(revision 23949)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/AddressEditDialog.java	(revision 23950)
@@ -60,6 +60,8 @@
 @SuppressWarnings("serial")
 public class AddressEditDialog extends JDialog implements ActionListener, ListSelectionListener, IAddressEditContainerListener {
-	private static final String UNRESOLVED_HEADER_FMT = tr("Unresolved Addresses (%d)");
-	private static final String STREET_HEADER_FMT = tr("Streets (%d)");
+	private static final String UNRESOLVED_ADDRESS = tr("Unresolved Addresses");
+	private static final String STREETS = tr("Streets");
+	private static final String UNRESOLVED_HEADER_FMT = tr("%s (%d)");
+	private static final String STREET_HEADER_FMT = tr("%s (%d)");
 	private static final String OK_COMMAND = tr("Close");
 	private static final String SELECT_AND_CLOSE = tr("Select and close");
@@ -109,5 +111,7 @@
 			streetPanel.add(scroll1, BorderLayout.CENTER);
 			
-			streetLabel = createHeaderLabel(STREET_HEADER_FMT, editContainer.getNumberOfStreets());
+			streetLabel = createHeaderLabel(STREET_HEADER_FMT,
+					STREETS,
+					editContainer.getNumberOfStreets());
 			streetPanel.add(streetLabel, BorderLayout.NORTH);
 			streetPanel.setMinimumSize(new Dimension(350, 300));
@@ -124,5 +128,7 @@
 			unresolvedPanel.add(scroll2, BorderLayout.CENTER);
 			unresolvedAddressesLabel = createHeaderLabel(
-					UNRESOLVED_HEADER_FMT, editContainer.getNumberOfUnresolvedAddresses());
+					UNRESOLVED_HEADER_FMT, 
+					UNRESOLVED_ADDRESS, 
+					editContainer.getNumberOfUnresolvedAddresses());
 			unresolvedPanel.add(unresolvedAddressesLabel , BorderLayout.NORTH);
 			unresolvedPanel.setMinimumSize(new Dimension(350, 200));
@@ -185,14 +191,30 @@
 	}
 
-	private JLabel createHeaderLabel(String fmtString, int n) {
-		JLabel label = new JLabel(String.format(fmtString, n));
+	/**
+	 * Creates a header label in the form "title (number)" with bold font. 
+	 * @param fmtString The format string having a string and a numeric placeholder.
+	 * @param title The title of the header.
+	 * @param n The number to show in the header.
+	 * @return
+	 */
+	private JLabel createHeaderLabel(String fmtString, String title, int n) {
+		JLabel label = new JLabel(String.format(fmtString, title, n));
 		label.setFont(label.getFont().deriveFont(Font.BOLD));
 		return label;
 	}
 	
+	/**
+	 * Updates the list headings.
+	 */
 	private void updateHeaders() {
 		if (editContainer != null) {
-			streetLabel.setText(String.format(STREET_HEADER_FMT, editContainer.getNumberOfStreets()));
-			unresolvedAddressesLabel.setText(String.format(UNRESOLVED_HEADER_FMT, editContainer.getNumberOfUnresolvedAddresses()));
+			streetLabel.setText(String.format(
+					STREET_HEADER_FMT,
+					STREETS,
+					editContainer.getNumberOfStreets()));
+			unresolvedAddressesLabel.setText(
+					String.format(UNRESOLVED_HEADER_FMT,
+							UNRESOLVED_ADDRESS,
+							editContainer.getNumberOfUnresolvedAddresses()));
 		} else {
 			streetLabel.setText(String.format(STREET_HEADER_FMT, 0));
@@ -244,4 +266,7 @@
 	}
 
+	/**
+	 * Removes all markers and rectangles from the map viewer.
+	 */
 	private void clearMapViewer() {
 		mapViewer.setVisible(false);
@@ -271,6 +296,5 @@
 	 *   
 	 * @author Oliver Wieland <oliver.wieland@online.de> 
-	 */
-	
+	 */	
 	class IncompleteAddressListener implements ListSelectionListener {