package/matchbox: fix option prompts

Use the package names instead of some fancy human-readable strings. ;-)

Note: the matchbox package is really named matchbox-window-manager by
upstream. However:
  - it already is in a section of the menu title 'X window managers'
  - users are probably only looking for 'matchbox'
  - keeping just 'matchbox' keeps it in sync with the Kconfig variable,
    and allows us to not handle a legacy entry (see a previous commit)
  - matchbox-window-manager is a bit long. ;-)

So, in this case, the short 'matchbox' prompt is used instead of the
real upstream name.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Reviewed-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/matchbox-common/Config.in b/package/matchbox-common/Config.in
index 7d22d05f19c09e1e026afd437651c7d0ce4ffc87..f1c4ce3e1ba6947c2511de033a1ba341a7c61d03 100644 (file)
--- a/package/matchbox-common/Config.in
+++ b/package/matchbox-common/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_MATCHBOX_COMMON
-       bool "Matchbox session common files"
+       bool "matchbox-common"
        depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP
        help
          Common desktop folders and matchbox-session script.
 
 config BR2_PACKAGE_MATCHBOX_COMMON_PDA
-       bool "PDA style desktop folders"
+       bool "PDA style app folder"
        depends on BR2_PACKAGE_MATCHBOX_COMMON

diff --git a/package/matchbox-desktop/Config.in b/package/matchbox-desktop/Config.in
index c9fd196134b83d19478cd78a5849ef0878723ab4..ed80c223d35b6fe327ec0f0ab81a0d72cb940e3c 100644 (file)
--- a/package/matchbox-desktop/Config.in
+++ b/package/matchbox-desktop/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_MATCHBOX_DESKTOP
-       bool "Matchbox Desktop"
+       bool "matchbox-desktop"
        select BR2_PACKAGE_ZLIB
        help
          A PDA style application launcher or 'item browser'.

diff --git a/package/matchbox-keyboard/Config.in b/package/matchbox-keyboard/Config.in
index e017358b35031adfaeec7d2648f43ded094f6248..056a255cb43115cd7718beaf0ca711400e892990 100644 (file)
--- a/package/matchbox-keyboard/Config.in
+++ b/package/matchbox-keyboard/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_MATCHBOX_KEYBOARD
-       bool "Matchbox Virtual Keyboard"
+       bool "matchbox-keyboard"
        select BR2_PACKAGE_XLIB_LIBXTST
        select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO
        select BR2_PACKAGE_MATCHBOX_FAKEKEY

diff --git a/package/matchbox-panel/Config.in b/package/matchbox-panel/Config.in
index e3daaf5faeedc0d8b67a3c76adc18b193ffd8e9e..47bd10ad7e2b423ce49eb6ff175a7df268b88f78 100644 (file)
--- a/package/matchbox-panel/Config.in
+++ b/package/matchbox-panel/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_MATCHBOX_PANEL
-       bool "Matchbox Panel"
+       bool "matchbox-panel"
        select BR2_PACKAGE_MATCHBOX_LIB
        help
          A flexible always present 'window bar' for holding

diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 3d771d3cc6e99c440f7bc5534e21e3f9f0312186..344635cc972efd28b75bb919fc008211a623faf2 100644 (file)
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_MATCHBOX
-       bool "MatchBox Window Manager"
+       bool "matchbox"
        depends on BR2_PACKAGE_XORG7
        depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_FONTCONFIG