Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 3309)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 3310)
@@ -513,4 +513,5 @@
 
         JButton buttonAutoGuess = new JButton(tr("Auto-Guess"));
+        buttonAutoGuess.setToolTipText(tr("Matches first photo with first gpx point"));
         buttonAutoGuess.addActionListener(new AutoGuessActionListener());
 
Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 3309)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 3310)
@@ -238,6 +238,5 @@
                 Main.map.mapView.addPropertyChangeListener(layer);
                 if (Main.map.getToggleDialog(ImageViewerDialog.class) == null) {
-                    System.err.println("JO");
-                    ImageViewerDialog.newInstance();// = new ImageViewerDialog();
+                    ImageViewerDialog.newInstance();
                     Main.map.addToggleDialog(ImageViewerDialog.getInstance());
                 }
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 3309)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 3310)
@@ -20,4 +20,6 @@
 import javax.swing.text.StyleConstants;
 
+import org.openstreetmap.josm.Main;
+
 /**
  * @author guilhem.bonnefille@gmail.com
@@ -69,16 +71,17 @@
             
             // if the text starts with a number we don't autocomplete
-            //
-            try {
-                Long.parseLong(str);
-                if (curText.length() == 0) {
-                    // we don't autocomplete on numbers
+            if (Main.pref.getBoolean("autocomplete.dont_complete_numbers", false)) {
+                try {
+                    Long.parseLong(str);
+                    if (curText.length() == 0) {
+                        // we don't autocomplete on numbers
+                        return;
+                    }
+                    Long.parseLong(curText);
                     return;
-                }
-                Long.parseLong(curText);
-                return;
-            } catch (NumberFormatException e) {
-                // either the new text or the current text isn't a number. We continue with
-                // autocompletion
+                } catch (NumberFormatException e) {
+                    // either the new text or the current text isn't a number. We continue with
+                    // autocompletion
+                }
             }
             
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java	(revision 3309)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java	(revision 3310)
@@ -21,4 +21,5 @@
 import javax.swing.text.StyleConstants;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.util.TableCellEditorSupport;
@@ -71,18 +72,19 @@
             String currentText = getText(0, getLength());
             // if the text starts with a number we don't autocomplete
-            //
-            try {
-                Long.parseLong(str);
-                if (currentText.length() == 0) {
-                    // we don't autocomplete on numbers
+            if (Main.pref.getBoolean("autocomplete.dont_complete_numbers", false)) {
+                try {
+                    Long.parseLong(str);
+                    if (currentText.length() == 0) {
+                        // we don't autocomplete on numbers
+                        super.insertString(offs, str, a);
+                        return;
+                    }
+                    Long.parseLong(currentText);
                     super.insertString(offs, str, a);
                     return;
+                } catch(NumberFormatException e) {
+                    // either the new text or the current text isn't a number. We continue with
+                    // autocompletion
                 }
-                Long.parseLong(currentText);
-                super.insertString(offs, str, a);
-                return;
-            } catch(NumberFormatException e) {
-                // either the new text or the current text isn't a number. We continue with
-                // autocompletion
             }
             String prefix = currentText.substring(0, offs);