Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java	(revision 1495)
+++ trunk/src/org/openstreetmap/josm/Main.java	(revision 1496)
@@ -308,5 +308,5 @@
         }
         if (bounds == null)
-            bounds = !args.containsKey("no-fullscreen") ? new Rectangle(0,0,screenDimension.width,screenDimension.height) : new Rectangle(1000,740);
+            bounds = !args.containsKey("no-maximize") ? new Rectangle(0,0,screenDimension.width,screenDimension.height) : new Rectangle(1000,740);
 
             // preinitialize a wait dialog for all early downloads (e.g. via command line)
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 1495)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 1496)
@@ -141,5 +141,5 @@
                     "\t--downloadgps=minlat,minlon,maxlat,maxlon "+tr("Download the bounding box as raw gps")+"\n"+
                     "\t--selection=<searchstring>                "+tr("Select with the given search")+"\n"+
-                    "\t--[no-]fullscreen                         "+tr("Launch in fullscreen mode")+"\n"+
+                    "\t--[no-]maximize                           "+tr("Launch in maximized mode")+"\n"+
                     "\t--reset-preferences                       "+tr("Reset the preferences to default")+"\n\n"+
                     "\t--language=<language>                     "+tr("Set the language.")+"\n\n"+
@@ -176,6 +176,6 @@
         splash.closeSplash();
 
-        if (((!args.containsKey("no-fullscreen") && !args.containsKey("geometry")
-        && Main.pref.get("gui.geometry").length() == 0) || args.containsKey("fullscreen"))
+        if (((!args.containsKey("no-maximize") && !args.containsKey("geometry")
+        && Main.pref.get("gui.geometry").length() == 0) || args.containsKey("maximize"))
         && Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH))
             mainFrame.setExtendedState(JFrame.MAXIMIZED_BOTH);