Browse Source

more dot squashing

Waldemar Brodkorb 11 years ago
parent
commit
53c878565d

+ 15 - 16
target/linux/config/Config.in.fs

@@ -57,14 +57,14 @@ config ADK_KERNEL_JFFS2_ZLIB
 	default n
 	default n
 
 
 config ADK_KERNEL_JFFS2_FS
 config ADK_KERNEL_JFFS2_FS
-	prompt "jffs2............................. JFFS2 filesystem"
+	prompt "JFFS2 filesystem"
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS
 	select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS
 	select ADK_KERNEL_JFFS2_ZLIB
 	select ADK_KERNEL_JFFS2_ZLIB
 	boolean
 	boolean
 
 
 config ADK_KERNEL_SQUASHFS
 config ADK_KERNEL_SQUASHFS
-	prompt "squashfs.......................... SquashFS filesystem"
+	prompt "SquashFS filesystem"
 	boolean
 	boolean
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_SQUASHFS_XZ
 	select ADK_KERNEL_SQUASHFS_XZ
@@ -76,7 +76,7 @@ config ADK_KERNEL_EXT2_FS
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_EXT2_FS
 config ADK_KPACKAGE_KMOD_EXT2_FS
-	prompt "kmod-fs-ext2...................... EXT2 filesystem support"
+	prompt "EXT2 filesystem support"
 	tristate
 	tristate
 	default n
 	default n
 	depends on !ADK_KERNEL_EXT2_FS
 	depends on !ADK_KERNEL_EXT2_FS
@@ -93,7 +93,7 @@ config ADK_KERNEL_EXT3_FS
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_EXT3_FS
 config ADK_KPACKAGE_KMOD_EXT3_FS
-	prompt "kmod-fs-ext3...................... EXT3 filesystem support"
+	prompt "EXT3 filesystem support"
 	tristate
 	tristate
 	select ADK_KPACKAGE_KMOD_FS_MBCACHE if !ADK_KERNEL_EXT4_FS
 	select ADK_KPACKAGE_KMOD_FS_MBCACHE if !ADK_KERNEL_EXT4_FS
 	depends on !ADK_KERNEL_EXT3_FS
 	depends on !ADK_KERNEL_EXT3_FS
@@ -123,13 +123,12 @@ config ADK_KPACKAGE_KMOD_EXT3_FS
 	  (available at <http://sourceforge.net/projects/e2fsprogs/>).
 	  (available at <http://sourceforge.net/projects/e2fsprogs/>).
 
 
 config ADK_KERNEL_EXT4_FS
 config ADK_KERNEL_EXT4_FS
-	prompt "ext4.............................. EXT4 filesystem support (kernel)"
 	boolean
 	boolean
 	select ADK_KERNEL_CRC16
 	select ADK_KERNEL_CRC16
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_EXT4_FS
 config ADK_KPACKAGE_KMOD_EXT4_FS
-	prompt "kmod-fs-ext4...................... EXT4 filesystem support"
+	prompt "EXT4 filesystem support"
 	tristate
 	tristate
 	select ADK_KPACKAGE_KMOD_FS_MBCACHE
 	select ADK_KPACKAGE_KMOD_FS_MBCACHE
 	select ADK_KPACKAGE_KMOD_CRC16
 	select ADK_KPACKAGE_KMOD_CRC16
@@ -139,7 +138,7 @@ config ADK_KPACKAGE_KMOD_EXT4_FS
 	  Ext4 filesystem.
 	  Ext4 filesystem.
 
 
 config ADK_KPACKAGE_KMOD_HFSPLUS_FS
 config ADK_KPACKAGE_KMOD_HFSPLUS_FS
-	prompt "kmod-fs-hfsplus................... HFS+ filesystem support"
+	prompt "HFS+ filesystem support"
 	tristate
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS_UTF8
 	select ADK_KPACKAGE_KMOD_NLS_UTF8
@@ -155,9 +154,10 @@ config ADK_KPACKAGE_KMOD_HFSPLUS_FS
 	  style features such as file ownership and permissions.
 	  style features such as file ownership and permissions.
 
 
 config ADK_KPACKAGE_KMOD_NTFS_FS
 config ADK_KPACKAGE_KMOD_NTFS_FS
-	prompt "kmod-fs-ntfs...................... NTFS file system support"
+	prompt "NTFS file system support"
 	tristate
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
+	depends on !ADK_PACKAGE_NTFS_3G
 	default n
 	default n
 	help
 	help
 	  NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.
 	  NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.
@@ -183,7 +183,7 @@ config ADK_KPACKAGE_KMOD_NTFS_FS
 	  Kernel modules for NTFS support
 	  Kernel modules for NTFS support
 
 
 config ADK_KPACKAGE_KMOD_VFAT_FS
 config ADK_KPACKAGE_KMOD_VFAT_FS
-	prompt "kmod-vfat-fs...................... VFAT filesystem support"
+	prompt "VFAT filesystem support"
 	tristate
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
 	select ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
@@ -201,13 +201,12 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
 
 
 
 
 config ADK_KERNEL_XFS_FS
 config ADK_KERNEL_XFS_FS
-	prompt "xfs............................... XFS filesystem support (kernel)"
 	boolean
 	boolean
 	select ADK_KERNEL_EXPORTFS
 	select ADK_KERNEL_EXPORTFS
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_XFS_FS
 config ADK_KPACKAGE_KMOD_XFS_FS
-	prompt "kmod-fs-xfs....................... XFS filesystem support (module)"
+	prompt "XFS filesystem support"
 	tristate
 	tristate
 	select ADK_KERNEL_EXPORTFS
 	select ADK_KERNEL_EXPORTFS
 	select ADK_KPACKAGE_KMOD_CRYPTO_CRC32C
 	select ADK_KPACKAGE_KMOD_CRYPTO_CRC32C
@@ -226,7 +225,7 @@ config ADK_KPACKAGE_KMOD_XFS_FS
 	  with the IRIX version of XFS.
 	  with the IRIX version of XFS.
 
 
 config ADK_KPACKAGE_KMOD_FUSE_FS
 config ADK_KPACKAGE_KMOD_FUSE_FS
-	prompt   "kmod-fuse-fs...................... Filesystem in Userspace support"
+	prompt "Filesystem in Userspace support"
 	tristate
 	tristate
 	default n
 	default n
 	help
 	help
@@ -246,7 +245,7 @@ config ADK_KERNEL_ISO9660_FS
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_ISO9660_FS
 config ADK_KPACKAGE_KMOD_ISO9660_FS
-	prompt "kmod-fs-iso9660................... ISO 9660 CDROM file system support"
+	prompt "ISO 9660 / JOLIET CDROM file system support"
 	tristate
 	tristate
 	select ADK_KERNEL_JOLIET
 	select ADK_KERNEL_JOLIET
 	default n
 	default n
@@ -262,7 +261,7 @@ config ADK_KPACKAGE_KMOD_ISO9660_FS
 	  enlarging your kernel by about 27 KB; otherwise say N.
 	  enlarging your kernel by about 27 KB; otherwise say N.
 
 
 config ADK_KPACKAGE_KMOD_UDF_FS
 config ADK_KPACKAGE_KMOD_UDF_FS
-	prompt "kmod-fs-udf....................... UDF file system support"
+	prompt "UDF file system support"
 	tristate
 	tristate
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T
 	default n
 	default n
@@ -273,7 +272,7 @@ config ADK_KPACKAGE_KMOD_UDF_FS
 	  Please read <file:Documentation/filesystems/udf.txt>.
 	  Please read <file:Documentation/filesystems/udf.txt>.
 
 
 config ADK_KERNEL_INOTIFY
 config ADK_KERNEL_INOTIFY
-	prompt "inotify........................... Inotify file change notification support"
+	prompt "Inotify file change notification support"
 	boolean
 	boolean
 	default n
 	default n
 	help
 	help
@@ -284,7 +283,7 @@ config ADK_KERNEL_INOTIFY
 	  notification.
 	  notification.
 
 
 config ADK_KERNEL_INOTIFY_USER
 config ADK_KERNEL_INOTIFY_USER
-	prompt "inotify-user...................... Inotify support for userspace"
+	prompt "Inotify support for userspace"
 	boolean
 	boolean
 	depends on ADK_KERNEL_INOTIFY
 	depends on ADK_KERNEL_INOTIFY
 	default n
 	default n

+ 4 - 4
target/linux/config/Config.in.fsnet

@@ -6,7 +6,7 @@ config ADK_KERNEL_FS_POSIX_ACL
 	default y
 	default y
 
 
 config ADK_KPACKAGE_KMOD_CIFS
 config ADK_KPACKAGE_KMOD_CIFS
-	prompt "kmod-cifs......................... CIFS support"
+	prompt "CIFS support"
 	tristate
 	tristate
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
@@ -42,7 +42,7 @@ config ADK_KPACKAGE_KMOD_CIFS
 	  to mount to Samba or Windows from this machine, say Y.
 	  to mount to Samba or Windows from this machine, say Y.
 
 
 config ADK_KPACKAGE_KMOD_CODA_FS
 config ADK_KPACKAGE_KMOD_CODA_FS
-	prompt "kmod-fs-coda...................... support for coda client"
+	prompt "Support for CODA filesystem"
 	tristate
 	tristate
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	default n
 	default n
@@ -60,7 +60,7 @@ config ADK_KERNEL_RPCSEC_GSS_KRB5
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_NFS_FS
 config ADK_KPACKAGE_KMOD_NFS_FS
-	prompt "kmod-fs-nfs....................... NFS client support (includes V3 support)"
+	prompt "NFS client support (includes V3 support)"
 	tristate
 	tristate
 	default n
 	default n
 	select ADK_KERNEL_NFS_V3
 	select ADK_KERNEL_NFS_V3
@@ -114,7 +114,7 @@ config ADK_KERNEL_NFSD_V4
 	default n
 	default n
 
 
 config ADK_KPACKAGE_KMOD_NFSD
 config ADK_KPACKAGE_KMOD_NFSD
-	prompt "kmod-nfsd......................... NFS server support"
+	prompt "NFS server support"
 	tristate
 	tristate
 	default n
 	default n
 	select ADK_KERNEL_EXPORTFS
 	select ADK_KERNEL_EXPORTFS

+ 38 - 38
target/linux/config/Config.in.nls

@@ -5,7 +5,7 @@ config ADK_KERNEL_NLS_DEFAULT
 	default "utf-8"
 	default "utf-8"
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437
-	prompt   "kmod-nls-codepage-437........... Codepage 437 (United States, Canada)"
+	prompt "Codepage 437 (United States, Canada)"
 	tristate
 	tristate
 	default n
 	default n
 	help
 	help
@@ -19,7 +19,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_437
 	  the United States and parts of Canada. This is recommended.
 	  the United States and parts of Canada. This is recommended.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_737
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_737
-	prompt   "kmod-nls-codepage-737........... Codepage 737 (Greek)"
+	prompt "Codepage 737 (Greek)"
 	tristate
 	tristate
 	default n
 	default n
 	help
 	help
@@ -33,7 +33,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_737
 	  Greek. If unsure, say N.
 	  Greek. If unsure, say N.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_775
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_775
-	prompt   "kmod-nls-codepage-775........... Codepage 775 (Baltic Rim)"
+	prompt "Codepage 775 (Baltic Rim)"
 	tristate
 	tristate
 	default n
 	default n
 	help
 	help
@@ -48,7 +48,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_775
 	  say N.
 	  say N.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
-	prompt   "kmod-nls-codepage-850........... Codepage 850 (Western European Languages)"
+	prompt "Codepage 850 (Western European Languages)"
 	tristate
 	tristate
 	default n
 	default n
 	help
 	help
@@ -64,7 +64,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_850
 	  languages that are not part of the US codepage 437.
 	  languages that are not part of the US codepage 437.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_852
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_852
-        prompt   "kmod-nls-codepage-852........... Codepage 852 (Eastern European Languages)"
+        prompt "Codepage 852 (Eastern European Languages)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -81,7 +81,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_852
 	  transcription), Slovak, Slovenian, and Sorbian.
 	  transcription), Slovak, Slovenian, and Sorbian.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_855
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_855
-        prompt   "kmod-nls-codepage-855........... Codepage 855 (Cyrillic)"
+        prompt "Codepage 855 (Cyrillic)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -94,7 +94,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_855
 	  say Y here if you want to include the DOS codepage for Cyrillic.
 	  say Y here if you want to include the DOS codepage for Cyrillic.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_857
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_857
-        prompt   "kmod-nls-codepage-857........... Codepage 857 (Turkish)"
+        prompt "Codepage 857 (Turkish)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -107,7 +107,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_857
 	  say Y here if you want to include the DOS codepage for Turkish.
 	  say Y here if you want to include the DOS codepage for Turkish.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_860
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_860
-        prompt   "kmod-nls-codepage-860........... Codepage 860 (Portuguese)"
+        prompt "Codepage 860 (Portuguese)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -120,7 +120,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_860
 	  say Y here if you want to include the DOS codepage for Portuguese.
 	  say Y here if you want to include the DOS codepage for Portuguese.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_861
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_861
-        prompt   "kmod-nls-codepage-861........... Codepage 861 (Icelandic)"
+        prompt "Codepage 861 (Icelandic)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -133,7 +133,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_861
 	  say Y here if you want to include the DOS codepage for Icelandic.
 	  say Y here if you want to include the DOS codepage for Icelandic.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_862
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_862
-        prompt   "kmod-nls-codepage-862........... Codepage 862 (Hebrew)"
+        prompt "Codepage 862 (Hebrew)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -146,7 +146,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_862
 	  say Y here if you want to include the DOS codepage for Hebrew.
 	  say Y here if you want to include the DOS codepage for Hebrew.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_863
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_863
-        prompt   "kmod-nls-codepage-863........... Codepage 863 (French Canadian)"
+        prompt "Codepage 863 (French Canadian)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -160,7 +160,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_863
 	  French.
 	  French.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_864
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_864
-        prompt   "kmod-nls-codepage-864........... Codepage 864 (Arabic)"
+        prompt "Codepage 864 (Arabic)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -173,7 +173,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_864
 	  say Y here if you want to include the DOS codepage for Arabic.
 	  say Y here if you want to include the DOS codepage for Arabic.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_865
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_865
-        prompt   "kmod-nls-codepage-865........... Codepage 865 (Norwegian, Danish)"
+        prompt "Codepage 865 (Norwegian, Danish)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -187,7 +187,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_865
 	  European countries.
 	  European countries.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_866
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_866
-        prompt   "kmod-nls-codepage-866........... Codepage 866 (Cyrillic/Russian)"
+        prompt "Codepage 866 (Cyrillic/Russian)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -201,7 +201,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_866
 	  Cyrillic/Russian.
 	  Cyrillic/Russian.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_869
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_869
-        prompt   "kmod-nls-codepage-869........... Codepage 869 (Greek)"
+        prompt "Codepage 869 (Greek)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -214,7 +214,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_869
 	  say Y here if you want to include the DOS codepage for Greek.
 	  say Y here if you want to include the DOS codepage for Greek.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_874
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_874
-        prompt   "kmod-nls-codepage-874........... Codepage 874 (Thai)"
+        prompt "Codepage 874 (Thai)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -227,7 +227,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_874
 	  say Y here if you want to include the DOS codepage for Thai.
 	  say Y here if you want to include the DOS codepage for Thai.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_932
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_932
-        prompt   "kmod-nls-codepage-932........... Codepage 932 (Japanese)"
+        prompt "Codepage 932 (Japanese)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -242,7 +242,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_932
 	  NLS Default value during kernel configuration, instead of 'cp932'.
 	  NLS Default value during kernel configuration, instead of 'cp932'.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_936
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_936
-        prompt   "kmod-nls-codepage-936........... Codepage 936 (Simplified Chinese)"
+        prompt "Codepage 936 (Simplified Chinese)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -256,7 +256,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_936
 	  Chinese(GBK).
 	  Chinese(GBK).
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_949
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_949
-        prompt   "kmod-nls-codepage-949........... Codepage 949 (Korean)"
+        prompt "Codepage 949 (Korean)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -269,7 +269,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_949
 	  say Y here if you want to include the DOS codepage for UHC.
 	  say Y here if you want to include the DOS codepage for UHC.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_950
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_950
-        prompt   "kmod-nls-codepage-950........... Codepage 950 (Traditional Chinese)"
+        prompt "Codepage 950 (Traditional Chinese)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -283,7 +283,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_950
 	  Chinese(Big5).
 	  Chinese(Big5).
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1250
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1250
-        prompt   "kmod-nls-codepage-1250.......... Codepage 1250 (Slavic/Central European)"
+        prompt "Codepage 1250 (Slavic/Central European)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -296,7 +296,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1250
 	  Slovak, Slovene.
 	  Slovak, Slovene.
 
 
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1251
 config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1251
-        prompt   "kmod-nls-codepage-1251.......... Codepage 1251 (Bulgarian, Belarusian)"
+        prompt "Codepage 1251 (Bulgarian, Belarusian)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -310,7 +310,7 @@ config ADK_KPACKAGE_KMOD_NLS_CODEPAGE_1251
 	  Bulgarian and Belarusian.
 	  Bulgarian and Belarusian.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ASCII
 config ADK_KPACKAGE_KMOD_NLS_ASCII
-	prompt   "kmod-nls-ascii.................. ASCII (United States)"
+	prompt "ASCII (United States)"
 	tristate
 	tristate
 	default n
 	default n
 	help
 	help
@@ -319,7 +319,7 @@ config ADK_KPACKAGE_KMOD_NLS_ASCII
 	  non-ASCII characters to be translated.
 	  non-ASCII characters to be translated.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_1
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_1
-	prompt   "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin-1; Western European Languages)"
+	prompt "NLS ISO 8859-1 (Latin-1; Western European Languages)"
 	tristate
 	tristate
 	default y
 	default y
 	help
 	help
@@ -333,7 +333,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_1
 	  and Swedish. It is also the default for the US. If unsure, say Y.
 	  and Swedish. It is also the default for the US. If unsure, say Y.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_2
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_2
-        prompt   "kmod-nls-iso8859-2.............. NLS ISO 8859-2 (Latin-2; Central European Languages)"
+        prompt "NLS ISO 8859-2 (Latin-2; Central European Languages)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -346,7 +346,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_2
 	  Slovak, Slovene.
 	  Slovak, Slovene.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_3
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_3
-        prompt   "kmod-nls-iso8859-3.............. NLS ISO 8859-3 (Latin-3; Esperanto, Galician, Maltese, Turkish)"
+        prompt "NLS ISO 8859-3 (Latin-3; Esperanto, Galician, Maltese, Turkish)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -358,7 +358,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_3
 	  and Turkish.
 	  and Turkish.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_4
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_4
-        prompt   "kmod-nls-iso8859-4.............. NLS ISO 8859-4 (Latin-4; old Baltic charset)"
+        prompt "NLS ISO 8859-4 (Latin-4; old Baltic charset)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -370,7 +370,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_4
 	  Lithuanian. It is an incomplete predecessor of Latin 7.
 	  Lithuanian. It is an incomplete predecessor of Latin 7.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_5
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_5
-        prompt   "kmod-nls-iso8859-5.............. NLS ISO 8859-5 (Cyrillic)"
+        prompt "NLS ISO 8859-5 (Cyrillic)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -383,7 +383,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_5
 	  KOI8-R is preferred in Russia.
 	  KOI8-R is preferred in Russia.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_6
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_6
-        prompt   "kmod-nls-iso8859-6.............. NLS ISO 8859-6 (Arabic)"
+        prompt "NLS ISO 8859-6 (Arabic)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -394,7 +394,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_6
 	  character set.
 	  character set.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_7
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_7
-        prompt   "kmod-nls-iso8859-7.............. NLS ISO 8859-7 (Greek)"
+        prompt "NLS ISO 8859-7 (Greek)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -405,7 +405,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_7
 	  Greek character set.
 	  Greek character set.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_8
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_8
-        prompt   "kmod-nls-iso8859-8.............. NLS ISO 8859-8 (Hebrew)"
+        prompt "NLS ISO 8859-8 (Hebrew)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -416,7 +416,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_8
 	  character set.
 	  character set.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_9
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_9
-        prompt   "kmod-nls-iso8859-9.............. NLS ISO 8859-9 (Latin-5; Turkish)"
+        prompt "NLS ISO 8859-9 (Latin-5; Turkish)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -428,7 +428,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_9
 	  with the Turkish ones. Useful in Turkey.
 	  with the Turkish ones. Useful in Turkey.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_13
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_13
-        prompt   "kmod-nls-iso8859-13............. NLS ISO 8859-13 (Latin-7; Baltic Rim)"
+        prompt "NLS ISO 8859-13 (Latin-7; Baltic Rim)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -440,7 +440,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_13
 	  and Lithuanian.
 	  and Lithuanian.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_14
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_14
-        prompt   "kmod-nls-iso8859-14............. NLS ISO 8859-14 (Latin-8; Celtic)"
+        prompt "NLS ISO 8859-14 (Latin-8; Celtic)"
         tristate
         tristate
         default n
         default n
         help
         help
@@ -453,7 +453,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_14
 	  <http://linux.speech.cymru.org/> has further information.
 	  <http://linux.speech.cymru.org/> has further information.
 
 
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_15
 config ADK_KPACKAGE_KMOD_NLS_ISO8859_15
-	prompt   "kmod-nls-iso8859-15............. NLS ISO 8859-15 (Latin-9; Western European Languages with Euro)"
+	prompt "NLS ISO 8859-15 (Latin-9; Western European Languages with Euro)"
 	tristate
 	tristate
 	default n
 	default n
 	help
 	help
@@ -471,7 +471,7 @@ config ADK_KPACKAGE_KMOD_NLS_ISO8859_15
 	  If unsure, say Y.
 	  If unsure, say Y.
 
 
 config ADK_KPACKAGE_KMOD_NLS_KOI8_R
 config ADK_KPACKAGE_KMOD_NLS_KOI8_R
-	prompt   "kmod-nls-koi8-r................. NLS KOI8-R (Cryllic for Russian and Bulgarian"
+	prompt "NLS KOI8-R (Cryllic for Russian and Bulgarian)"
 	tristate
 	tristate
 	default n
 	default n
 	help
 	help
@@ -482,7 +482,7 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_R
 	  character set.
 	  character set.
 
 
 config ADK_KPACKAGE_KMOD_NLS_KOI8_U
 config ADK_KPACKAGE_KMOD_NLS_KOI8_U
-	prompt   "kmod-nls-koi8-u................. NLS KOI8-U (Cyrillic for Russian, Bulgarian and Ukrainian"
+	prompt "NLS KOI8-U (Cyrillic for Russian, Bulgarian and Ukrainian)"
 	tristate
 	tristate
 	default n
 	default n
 	help
 	help
@@ -493,7 +493,7 @@ config ADK_KPACKAGE_KMOD_NLS_KOI8_U
 	  (koi8-u) and Belarusian (koi8-ru) character sets.
 	  (koi8-u) and Belarusian (koi8-ru) character sets.
 
 
 config ADK_KPACKAGE_KMOD_NLS_UTF8
 config ADK_KPACKAGE_KMOD_NLS_UTF8
-	prompt   "kmod-nls-utf8................... NLS UTF8"
+	prompt "NLS UTF8"
 	tristate
 	tristate
 	default y
 	default y
 	help
 	help