Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 2865)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 2866)
@@ -170,5 +170,5 @@
                 )
                 + "</html>";
-            togglePreferenceKey = "pluginmanager.version";
+            togglePreferenceKey = "pluginmanager.dontshowagain.version";
         }  else {
             long tim = System.currentTimeMillis();
@@ -183,5 +183,5 @@
                     + tr("Last plugin update more than {0} days ago.", d)
                     + "</html>";
-                togglePreferenceKey = "pluginmanager.time";
+                togglePreferenceKey = "pluginmanager.dontshowagain.time";
             }
         }
@@ -206,4 +206,9 @@
         pnlMessage.setMessage(message);
         pnlMessage.initDontShowAgain(togglePreferenceKey);
+
+        // check whether automatic update at startup was disabled
+        //
+        boolean doAsk = !Main.pref.getBoolean(togglePreferenceKey, false);
+        if (! doAsk) return false;
 
         int ret = HelpAwareOptionPane.showOptionDialog(
@@ -792,5 +797,5 @@
         if (! plugins.contains(plugin.getPluginInformation().name))
             // plugin not activated ? strange in this context but anyway, don't bother
-            // the user with dialogs, skip condiational deactivation
+            // the user with dialogs, skip conditional deactivation
             return;
 
@@ -883,5 +888,5 @@
             gc.fill = GridBagConstraints.HORIZONTAL;
             gc.weighty = 0.0;
-            add(cbDontShowAgain = new JCheckBox(tr("Do not show again (remembers choice)")), gc);
+            add(cbDontShowAgain = new JCheckBox(tr("Do not check and ask again at startup (remembers choice)")), gc);
             cbDontShowAgain.setFont(cbDontShowAgain.getFont().deriveFont(Font.PLAIN));
         }