summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-21 13:29:04 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-21 13:29:04 +0000
commit45e7e244b23ff242bfc0011f7878af418b699456 (patch)
treece1e7af4d0ec056a508bc99c0525a7da6db1a047
parent53ad12628c85902ed94364e4e8449be8ac79dd07 (diff)
downloadcontrol-center-45e7e244b23ff242bfc0011f7878af418b699456.tar
control-center-45e7e244b23ff242bfc0011f7878af418b699456.tar.gz
control-center-45e7e244b23ff242bfc0011f7878af418b699456.tar.bz2
control-center-45e7e244b23ff242bfc0011f7878af418b699456.tar.xz
control-center-45e7e244b23ff242bfc0011f7878af418b699456.zip
english proof reading by Alastair Scott
-rwxr-xr-xcontrol-center78
-rw-r--r--drakconf.spec5
2 files changed, 43 insertions, 40 deletions
diff --git a/control-center b/control-center
index ef42b9cd..7eaf9983 100755
--- a/control-center
+++ b/control-center
@@ -98,44 +98,44 @@ $::isRpmDrake = -e "/usr/sbin/rpmdrake";
# { key => [ log_exp, [ binary, win_nb ], gtkplug?, description ] }
my $exec_hash =
{
- "Auto Install" => [ "drakautoinst", "$sbindir/drakautoinst", 1, N("DrakAutoInst enables to configure an Auto Install floppy") ],
+ "Auto Install" => [ "drakautoinst", "$sbindir/drakautoinst", 1, N("DrakAutoInst helps you produce an Auto Install floppy") ],
"Backups" => [ "drakbackup", "$sbindir/drakbackup", 1, N("DrakBackup help in configuring Backups") ],
- "Boot Config" => [ "drakboot", "$sbindir/drakboot", 1, N("DrakBoot help in configuring the system bootstrapping") ],
- "Boot Disk" => [ "drakfloppy", "$sbindir/drakfloppy", 1, N("Drakfloppy enables to build a customized Boot Disk") ],
- "Connection Sharing" => [ "drakgw", "$sbindir/drakgw", 1, N("DrakGw enables to share an internet connection") ],
- "Connection" => [ "drakconnect", "$sbindir/drakconnect", 1, N("DrakConnect help in configuring network connections") ],
+ "Boot Config" => [ "drakboot", "$sbindir/drakboot", 1, N("DrakBoot helps you set up how your system boots") ],
+ "Boot Disk" => [ "drakfloppy", "$sbindir/drakfloppy", 1, N("DrakFloppy helps you produce your own boot floppy") ],
+ "Connection Sharing" => [ "drakgw", "$sbindir/drakgw", 1, N("DrakGw helps you share your Internet connection") ],
+ "Connection" => [ "drakconnect", "$sbindir/drakconnect", 1, N("DrakConnect helps you set up your network and Internet connection") ],
# little workaround to avoid drakconf freeze
# "Console" => [ "rxvt", "$xbindir/rxvt", -1, "" ],
- "Console" => [ "rxvt", [ "$xbindir/rxvt", "rxvt", 1 ], 0, N("The Console will help you to solve issues") ],
- "Date & Time" => [ "clock", "$sbindir/clock.pl", 1, N("Date & Time configuration") ],
- "Firewall" => [ "drakfirewall", "$sbindir/drakfirewall", 1, N("DrakFirewall configures a personal firewall (look at MNF for a powerful dedicated firewall solution)") ],
- "Fonts" => [ "drakfont", "$sbindir/drakfont", 1, N("DrakFont enables to install and remove fonts") ],
- "Graphical server configuration" => [ "XFdrake", "$sbindir/XFdrake", 1, N("The X configurator help in configuring the graphical server") ],
- "Hard Drives" => [ "diskdrake", "$sbindir/diskdrake --hd", 1, N("DiskDrake enables to alter hard disks partitionning scheme and to resize partitions") ],
- "Hardware List" => [ "harddrake", "$sbindir/harddrake2", 1, N("Harddrake enables to list and configure the hardware") ],
- "Install Software" => [ "rpmdrake", "$sbindir/rpmdrake", -1, N("Install Software: RpmDrake enables to install software packages") ],
- "Keyboard" => [ "keyboarddrake", "$sbindir/keyboarddrake", 1, N("KeyboardDrake let configure the keyboard layout") ],
- "Logs" => [ "logdrake", "$sbindir/logdrake", 1, N("Logdrake enables to search in system logs") ],
- "Mandrake Update" => [ "rpmdrake", "$sbindir/MandrakeUpdate", -1, N("Mandrake Update will enable you to update your system pacakges") ],
- "Menus" => [ "menudrake", "$sbindir/menus_launcher.pl", 1, N("MenuDrake enables to manage menus"), "$bindir/menudrake" ],
- "Monitor" => [ "XFdrake", "$sbindir/XFdrake monitor", 1, N("Monitor configuration") ],
- "Mouse" => [ "mousedrake", "$sbindir/mousedrake", 1, N("MouseDrake enables to configure the mouse") ],
- "NFS mount points" => [ "diskdrake", "$sbindir/diskdrake --nfs", 1, N("NFS mount points: dummy description") ],
+ "Console" => [ "rxvt", [ "$xbindir/rxvt", "rxvt", 1 ], 0, N("Open a console") ], #The Console will help you to solve issues
+ "Date & Time" => [ "clock", "$sbindir/clock.pl", 1, N("Set date and time") ],
+ "Firewall" => [ "drakfirewall", "$sbindir/drakfirewall", 1, N("drakfirewall helps you set up a personal firewall") ],
+ "Fonts" => [ "drakfont", "$sbindir/drakfont", 1, N("DrakFont helps you add and remove fonts, including Windows fonts") ],
+ "Graphical server configuration" => [ "XFdrake", "$sbindir/XFdrake", 1, N("XFdrake helps you set up the graphical server") ],
+ "Hard Drives" => [ "diskdrake", "$sbindir/diskdrake --hd", 1, N("DiskDrake helps you define and resize hard disk partitions") ],
+ "Hardware List" => [ "harddrake", "$sbindir/harddrake2", 1, N("Harddrake lists and helps you set up your hardware") ],
+ "Install Software" => [ "rpmdrake", "$sbindir/rpmdrake", -1, N("RpmDrake helps you install software packages") ],
+ "Keyboard" => [ "keyboarddrake", "$sbindir/keyboarddrake", 1, N("KeyboardDrake helps you to set your keyboard layout") ],
+ "Logs" => [ "logdrake", "$sbindir/logdrake", 1, N("LogDrake helps you view and search system logs") ],
+ "Mandrake Update" => [ "rpmdrake", "$sbindir/MandrakeUpdate", -1, N("Mandrake Update helps you apply any fixes or upgrades to installed packages") ],
+ "Menus" => [ "menudrake", "$sbindir/menus_launcher.pl", 1, N("MenuDrake helps you change what programs are shown on the menu"), "$bindir/menudrake" ],
+ "Monitor" => [ "XFdrake", "$sbindir/XFdrake monitor", 1, N("Configure your monitor") ],
+ "Mouse" => [ "mousedrake", "$sbindir/mousedrake", 1, N("MouseDrake helps you set up your mouse") ],
+ "NFS mount points" => [ "diskdrake", "$sbindir/diskdrake --nfs", 1, N("Set NFS mount points") ],
"Partition Sharing" => [ "diskdrake", "$sbindir/diskdrake --fileshare", 1, N("Partition Sharing enables to allow users to share some of their directories, allowing users to simply click on \"Share\" in konqueror and nautilus") ],
- "Printer" => [ "printerdrake", "$sbindir/printerdrake", 1, N("Printerdrake help in configuring printers, print job queues, ..."), "$sbindir/printerdrake" ],
- "Programs scheduling" => [ "drakcronat", "/usr/X11R6/bin/drakcronat", 1, N("DrakCronAt enables to schedule Programs execution through crond and atd daemons") ],
- "Proxy Configuration" => [ "drakproxy", "$sbindir/drakproxy", 1, N("DrakProxy help in configuring file and web proxy") ],
- "Remove Software" => [ "rpmdrake", "$sbindir/rpmdrake-remove", -1, N("Remove Software: RpmDrake enables to remove software packages") ],
- "Resolution" => [ "XFdrake", "$sbindir/XFdrake resolution", 1, N("Screen resolution configuration") ],
- "Samba mount points" => [ "diskdrake", "$sbindir/diskdrake --smb", 1, N("Samba mount points: dummy description") ],
- "Scanner" => [ "scannerdrake", "$sbindir/scannerdrake", 1, N("ScannerDrake enables to configure scanners") ],
- "Security Level" => [ "draksec", "$sbindir/draksec", 1, N("DrakSec enables to shrewdly configure the system Security Level") ],
- "Security Permissions" => [ "drakperm", "$sbindir/drakperm", 1, N("Security Permissions: dummy description") ],
- "Services" => [ "drakxservices", "$sbindir/drakxservices", 1, N("DrakxServices provides an easy way to enabling or disabling system services") ],
- "Software Sources Manager" => [ "rpmdrake", "$sbindir/edit-urpm-sources.pl", -1, N("The Software Sources Manager enables to configure packages sources") ],
- "TV Cards" => [ "drakxtv", "$sbindir/drakxtv", 1, N("DrakxTV help in configuring tv cards") ],
- "Users" => [ "userdrake", "$bindir/userdrake", 1, N("Userdrake help in managing system's users") ],
- "WebDAV mount points" => [ "diskdrake", "$sbindir/diskdrake --dav", 1, N("WebDAV mount points: dummy description") ],
+ "Printer" => [ "printerdrake", "$sbindir/printerdrake", 1, N("PrinterDrake helps you set up your printer, job queues ...."), "$sbindir/printerdrake" ],
+ "Programs scheduling" => [ "drakcronat", "/usr/X11R6/bin/drakcronat", 1, N("DrakCronAt helps you run programs or scripts at certain times") ], #DrakCronAt enables to schedule Programs execution through crond and atd daemons
+ "Proxy Configuration" => [ "drakproxy", "$sbindir/drakproxy", 1, N("DrakProxy helps you set up proxy servers") ], #for files and web browsing
+ "Remove Software" => [ "rpmdrake", "$sbindir/rpmdrake-remove", -1, N("RpmDrake helps you remove software packages") ],
+ "Resolution" => [ "XFdrake", "$sbindir/XFdrake resolution", 1, N("Change your screen resolution") ],
+ "Samba mount points" => [ "diskdrake", "$sbindir/diskdrake --smb", 1, N("Set Samba mount points") ],
+ "Scanner" => [ "scannerdrake", "$sbindir/scannerdrake", 1, N("ScannerDrake helps you set up your scanner") ],
+ "Security Level" => [ "draksec", "$sbindir/draksec", 1, N("DrakSec helps you set the system security level") ],
+ "Security Permissions" => [ "drakperm", "$sbindir/drakperm", 1, N("DrakPerm helps you fine-tune the system security level and permissions") ],
+ "Services" => [ "drakxservices", "$sbindir/drakxservices", 1, N("DrakXServices helps you enable or disable services") ],
+ "Software Sources Manager" => [ "rpmdrake", "$sbindir/edit-urpm-sources.pl", -1, N("Software Sources Manager helps you define where software packages are downloaded from") ],
+ "TV Cards" => [ "drakxtv", "$sbindir/drakxtv", 1, N("DrakxTV helps you set up your TV card") ],
+ "Users" => [ "userdrake", "$bindir/userdrake", 1, N("UserDrake helps you add, remove or change users of your system") ],
+ "WebDAV mount points" => [ "diskdrake", "$sbindir/diskdrake --dav", 1, N("Set WebDAV mount points") ],
};
# [ [ class_label, class icon name, [ [ program_label, program icon name ] ... ] ] ]
@@ -175,11 +175,11 @@ my @tree =
foreach (detect_devices::cdroms()) {
my $type = detect_devices::isBurner($_) ? 'burner' : detect_devices::isDvdDrive($_) ? 'DVD' : 'cdrom';
push @{$cdroms_by_type{$type}}, $_;
- } ([ 'cdrom', N("CD-ROM"), sub { @{$cdroms_by_type{cdrom} || []} }, N("CD-ROM drive: mount point configuration") ],
- [ 'dvd', N("DVD"), sub { @{$cdroms_by_type{DVD} || []} }, N("DVD drive: mount point configuration") ],
- [ 'cdwriter', N("CD Burner"), sub { @{$cdroms_by_type{burner} || []} }, N("CD/DVD burner: mount point configuration") ],
- [ 'floppy', N("Floppy"), \&detect_devices::floppies, N("Floppy drive: mount point configuration") ],
- [ 'zip', N("Zip"), \&detect_devices::zips, N("ZIP drive: mount point configuration") ],
+ } ([ 'cdrom', N("CD-ROM"), sub { @{$cdroms_by_type{cdrom} || []} }, N("Set where your CD-ROM drive is mounted") ],
+ [ 'dvd', N("DVD"), sub { @{$cdroms_by_type{DVD} || []} }, N("Set where your DVD-ROM drive is mounted") ],
+ [ 'cdwriter', N("CD Burner"), sub { @{$cdroms_by_type{burner} || []} }, N("Set where your CD/DVD burner is mounted") ],
+ [ 'floppy', N("Floppy"), \&detect_devices::floppies, N("Set where your floppy drive is mounted") ],
+ [ 'zip', N("Zip"), \&detect_devices::zips, N("Set where your ZIP drive is mounted") ],
),
}),
[ "NFS mount points", 'diskdrake_nfs', ],
diff --git a/drakconf.spec b/drakconf.spec
index 24fc5f57..5cbdb0db 100644
--- a/drakconf.spec
+++ b/drakconf.spec
@@ -4,7 +4,7 @@
Summary: The Mandrake Control Center
Name: drakconf
Version: 9.1
-Release: 0.8mdk
+Release: 0.9mdk
# get the source from our cvs repository (see
# http://www.linuxmandrake.com/en/cvs.php3)
Source0: %name-%version.tar.bz2
@@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT
%_datadir/mcc/themes/kde
%changelog
+* Tue Jan 21 2003 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.1-0.9mdk
+- better describe tools (Alastair Scott, )
+
* Fri Jan 17 2003 Daouda LO <daouda@mandrakesoft.com> 9.1-0.8mdk
- drakhelp support