12 files changed, 13 insertions, 13 deletions

diff --git a/core/settings/button/config.in b/core/settings/button/config.in
index 6f466f5..3eb9155 100644
--- a/core/settings/button/config.in
+++ b/core/settings/button/config.in
@@ -1,4 +1,4 @@
   config BUTTON-SETTINGS
-    boolean "buttons"
+    boolean "opie-button-settings (application buttons settings)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && !TARGET_RAMSES
diff --git a/core/settings/citytime/config.in b/core/settings/citytime/config.in
index f40252a..295b8b8 100644
--- a/core/settings/citytime/config.in
+++ b/core/settings/citytime/config.in
@@ -1,4 +1,4 @@
   config CITYTIME
-    boolean "citytime"
+    boolean "opie-citytime (Time-zone / world clock settings)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/settings/launcher/config.in b/core/settings/launcher/config.in
index 19fedd8..e167313 100644
--- a/core/settings/launcher/config.in
+++ b/core/settings/launcher/config.in
@@ -1,4 +1,4 @@
   config LAUNCHER-SETTINGS
-    boolean "launcher"
+    boolean "opie-launcher-settings (Opie taskbar settings)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/settings/light-and-power/config.in b/core/settings/light-and-power/config.in
index 8ebc714..96346bb 100644
--- a/core/settings/light-and-power/config.in
+++ b/core/settings/light-and-power/config.in
@@ -1,4 +1,4 @@
   config LIGHT-AND-POWER
-    boolean "light-and-power"
+    boolean "opie-light-and-power (apm and energy saving settings)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/settings/security/config.in b/core/settings/security/config.in
index 73b6b8d..0973349 100644
--- a/core/settings/security/config.in
+++ b/core/settings/security/config.in
@@ -1,4 +1,4 @@
   config SECURITY
-    boolean "security"
+    boolean "opie-security (to set a pin for PDA usage protection)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/networksettings/config.in b/noncore/settings/networksettings/config.in
index aeaf0db..7c30c30 100644
--- a/noncore/settings/networksettings/config.in
+++ b/noncore/settings/networksettings/config.in
@@ -1,5 +1,5 @@
 config NETWORKSETUP
-  boolean "Networksettings"
+  boolean "opie-networksettings (TCP/IP network settings)"
   default "y"
   depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
 
diff --git a/noncore/settings/networksettings/ppp/config.in b/noncore/settings/networksettings/ppp/config.in
index 81b8ce4..3b8501d 100644
--- a/noncore/settings/networksettings/ppp/config.in
+++ b/noncore/settings/networksettings/ppp/config.in
@@ -1,4 +1,4 @@
   config PPP
-    boolean "PPP Module"
+    boolean "opie-networksettingsplugin-kppp (PPP module)"
     default "n" if NETWORKSETUP
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index 217a17f..53bcb1e 100644
--- a/noncore/settings/networksettings/wlan/config.in
+++ b/noncore/settings/networksettings/wlan/config.in
@@ -1,4 +1,4 @@
   config WLAN
-    boolean "Wireless LAN Module"
+    boolean "opie-networksettingsplugin-wlan (wireless LAN module)"
     default "n" if NETWORKSETUP
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES
diff --git a/noncore/settings/sound/config.in b/noncore/settings/sound/config.in
index 64d9a2a..febb0be 100644
--- a/noncore/settings/sound/config.in
+++ b/noncore/settings/sound/config.in
@@ -1,4 +1,4 @@
   config SOUND
-    boolean "sound (opie-vmemo-settings)"
+    boolean "opie-vmemo-settings (control sound settings for the vmemo app)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/sshkeys/config.in b/noncore/settings/sshkeys/config.in
index 1e7f626..bc39ceb 100644
--- a/noncore/settings/sshkeys/config.in
+++ b/noncore/settings/sshkeys/config.in
@@ -1,4 +1,4 @@
   config SSHKEYS
-    boolean "sshkeys"
+    boolean "opie-sshkeys (manage ssh-agent keys)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/tabmanager/config.in b/noncore/settings/tabmanager/config.in
index 3737058..3d3a080 100644
--- a/noncore/settings/tabmanager/config.in
+++ b/noncore/settings/tabmanager/config.in
@@ -1,4 +1,4 @@
   config TABMANAGER
-    boolean "tabmanager"
+    boolean "opie-tabmanager (menu editor for the Opie taskbar)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/noncore/settings/usermanager/config.in b/noncore/settings/usermanager/config.in
index 5484a4e..90dcc05 100644
--- a/noncore/settings/usermanager/config.in
+++ b/noncore/settings/usermanager/config.in
@@ -1,4 +1,4 @@
   config USERMANAGER
-    boolean "usermanager"
+    boolean "opie-usermanager (User/Group manager)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE