changed some strings to make translation easier

4 files changed, 21 insertions, 26 deletions

diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 5712c4e79..d222b1d76 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -2110,7 +2110,7 @@ sub main {
 			{title => _("Printerdrake"),
 			 messages =>
 			     ($noprinters ? "" :
-			      _("he following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it.")),
+			      _("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it.")),
 			 cancel => (""),
 			 ok => (""),
 			},
diff --git a/perl-install/services.pm b/perl-install/services.pm
index b8a71b735..e89759aa8 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -25,8 +25,7 @@ Midnight Commander. It also allows mouse-based console cut-and-paste operations,
 and includes support for pop-up menus on the console."),
 harddrake => __("HardDrake runs a hardware probe, and optionally configures
 new/changed hardware."),
-httpd => __("Apache is a World Wide Web server.  It is used to serve HTML files
-and CGI."),
+httpd => __("Apache is a World Wide Web server. It is used to serve HTML files and CGI."),
 inet => __("The internet superserver daemon (commonly called inetd) starts a
 variety of other internet services as needed. It is responsible for starting
 many services, including telnet, ftp, rsh, and rlogin. Disabling inetd disables
@@ -45,8 +44,7 @@ lpd => __("lpd is the print daemon required for lpr to work properly. It is
 basically a server that arbitrates print jobs to printer(s)."),
 lvs => __("Linux Virtual Server, used to build a high-performance and highly
 available server."),
-named => __("named (BIND) is a Domain Name Server (DNS) that is used to resolve
-host names to IP addresses."),
+named => __("named (BIND) is a Domain Name Server (DNS) that is used to resolve host names to IP addresses."),
 netfs => __("Mounts and unmounts all Network File System (NFS), SMB (Lan
 Manager/Windows), and NCP (NetWare) mount points."),
 network => __("Activates/Deactivates all network interfaces configured to start
@@ -65,8 +63,7 @@ it installed on machines that don't need it."),
 portmap => __("The portmapper manages RPC connections, which are used by
 protocols such as NFS and NIS. The portmap server must be running on machines
 which act as servers for protocols which make use of the RPC mechanism."),
-postfix => __("Postfix is a Mail Transport Agent, which is the program that
-moves mail from one machine to another."),
+postfix => __("Postfix is a Mail Transport Agent, which is the program that moves mail from one machine to another."),
 random => __("Saves and restores system entropy pool for higher quality random
 number generation."),
 rawdevices => __("Assign raw devices to block devices (such as hard drive
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 322fc86d6..305f378a3 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -3188,9 +3188,9 @@ Otherwise, you are able to select only one of this
 
 "),  
 			"main" =>
-			_(" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>
-
- This program is free software; you can redistribute it and/or modify
+			_(" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>") .
+"\n\n" .
+_(" This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2, or (at your option)
  any later version.
@@ -3202,11 +3202,9 @@ Otherwise, you are able to select only one of this
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-                                            _____________________
-
-Description:
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.") .
+"\n\n                                            _____________________\n" .
+_("Description:
 
   Drakbackup is used to backup your system.
   During the configuration you can select: 
@@ -3247,7 +3245,6 @@ Restore Step:
 			_("options description:
 
 Please be careful when you are using ftp backup, because only 
-
 backups that are already built are sent to the server.
 So at the moment, you need to build the backup on your hard 
 drive before sending it to the server.
@@ -3266,9 +3263,9 @@ backup data files by hand.
 ")
 );
 
-    my $default_help = _(" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>
-
- This program is free software; you can redistribute it and/or modify
+    my $default_help = _(" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>") .
+"\n\n" .
+_(" This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2, or (at your option)
  any later version.
@@ -3280,11 +3277,9 @@ backup data files by hand.
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-                                            _____________________
-
-Description:
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.") .
+"\n\n                                            _____________________\n" .
+_("Description:
 
   Drakbackup is used to backup your system.
   During the configuration you can select 
diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake
index 7e72fbbc9..842a98c1e 100755
--- a/perl-install/standalone/logdrake
+++ b/perl-install/standalone/logdrake
@@ -403,7 +403,7 @@ my $r= "*** ". chomp_(`date`) . " ***\n";
 	   };
 
     $in->ask_from(_("service setting"),
-		  _("You will recieve an alert if one of the selected service is no more running"),
+		  _("You will receive an alert if one of the selected service is no more running"),
 		  [ map { {label => "$_", val=> \${$_}, type => "bool", text => "$l->{$_}[1]" }; } keys %$l
 		  ]) or goto begin;
 
@@ -414,7 +414,7 @@ my $r= "*** ". chomp_(`date`) . " ***\n";
 
   step_load:
     $in->ask_from(_("load setting"),
-		  _("You will recieve an alert if the load is upper than this value"),
+		  _("You will receive an alert if the load is higher than this value"),
 		  [
 		   { label => "load ", val => \$load, type => 'range', min => 1, max => 50 },
 		  ]) or goto step_service;
@@ -508,6 +508,9 @@ sub destroy_window {
 
 # log
 # $Log$
+# Revision 1.5  2002/02/01 10:01:39  pablo
+# changed some strings to make translation easier
+#
 # Revision 1.4  2002/01/29 23:19:31  yduret
 # logdrake is now under gi/perl-install/standalone
 #