Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 17226)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 17227)
@@ -787,5 +787,5 @@
          */
         public Settings(DefaultMutableTreeNode rootActionsNode) {
-            super(/* ICON(preferences/) */ "toolbar", tr("Toolbar customization"), tr("Customize the elements on the toolbar."));
+            super(/* ICON(preferences/) */ "toolbar", tr("Toolbar"), tr("Customize the elements on the toolbar."));
             actionsTreeModel = new DefaultTreeModel(rootActionsNode);
             actionsTree = new JTree(actionsTreeModel);
Index: trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java	(revision 17226)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java	(revision 17227)
@@ -37,5 +37,5 @@
 
     private AudioPreference() {
-        super(/* ICON(preferences/) */ "audio", tr("Audio Settings"), tr("Settings for the audio player and audio markers."));
+        super(/* ICON(preferences/) */ "audio", tr("Audio"), tr("Settings for the audio player and audio markers."));
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java	(revision 17226)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/DisplayPreference.java	(revision 17227)
@@ -30,5 +30,5 @@
 
     private DisplayPreference() {
-        super(/* ICON(preferences/) */ "display", tr("Display Settings"),
+        super(/* ICON(preferences/) */ "display", tr("Display"),
                 tr("Various settings that influence the visual representation of the whole program."), false, new JTabbedPane());
     }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 17226)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 17227)
@@ -71,5 +71,5 @@
 
     private ImageryPreference() {
-        super(/* ICON(preferences/) */ "imagery", tr("Imagery preferences"),
+        super(/* ICON(preferences/) */ "imagery", tr("Imagery"),
                 tr("Modify list of imagery layers displayed in the Imagery menu"),
                 false, new JTabbedPane());
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java	(revision 17226)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPreference.java	(revision 17227)
@@ -29,5 +29,5 @@
 
     private MapPreference() {
-        super(/* ICON(preferences/) */ "map", tr("Map Settings"),
+        super(/* ICON(preferences/) */ "map", tr("Map"),
                 tr("Settings for the map projection and data interpretation."), false, new JTabbedPane());
     }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreference.java	(revision 17226)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreference.java	(revision 17227)
@@ -36,5 +36,5 @@
 
     private ProxyPreference() {
-        super(null, tr("Proxy settings"), tr("Configure whether to use a proxy server"));
+        super(null, tr("Proxy"), tr("Configure whether to use a proxy server"));
     }