added nextButtonText wizardTitle description

2 files changed, 323 insertions, 98 deletions

diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index 178836df..e0711b62 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -8,6 +8,9 @@ msgid ""
 "Press next to configure these parameters now, or Cancel to exit this wizard."
 msgstr ""
 
+msgid "OK"
+msgstr ""
+
 msgid "Name of the machine :"
 msgstr ""
 
@@ -17,6 +20,9 @@ msgstr ""
 msgid "DNS Client Wizard"
 msgstr ""
 
+msgid "Client wizard"
+msgstr ""
+
 msgid "The wizard collected the following parameter"
 msgstr ""
 
@@ -74,6 +80,9 @@ msgstr ""
 msgid "Client IP:"
 msgstr ""
 
+msgid "Configure"
+msgstr ""
+
 msgid "\\qConfigure\\q or use the Back button to correct them."
 msgstr ""
 
@@ -95,12 +104,15 @@ msgstr ""
 msgid "Press next if you want to change the already existing value,"
 msgstr ""
 
-msgid "Congratulations"
+msgid "Quit"
 msgstr ""
 
 msgid "needed to add a client to your network:"
 msgstr ""
 
+msgid "Congratulations"
+msgstr ""
+
 msgid "or back to correct your choice."
 msgstr ""
 
@@ -125,6 +137,9 @@ msgstr ""
 msgid "Configuring the MySQL Database Server"
 msgstr ""
 
+msgid "Confirm"
+msgstr ""
+
 msgid "Password:"
 msgstr ""
 
@@ -137,6 +152,9 @@ msgstr ""
 msgid "\\qConfirm\\q or use the Back button to correct them."
 msgstr ""
 
+msgid "Add"
+msgstr ""
+
 msgid "To accept this value, and configure your server, click on"
 msgstr ""
 
@@ -149,6 +167,9 @@ msgstr ""
 msgid "Note: This user will have all permissions"
 msgstr ""
 
+msgid "MySQL Database wizard"
+msgstr ""
+
 msgid "Configuration Wizard"
 msgstr ""
 
@@ -173,6 +194,9 @@ msgstr ""
 msgid "needed to configure your DHCP service:"
 msgstr ""
 
+msgid "Fix it"
+msgstr ""
+
 msgid "Lowest IP Address:"
 msgstr ""
 
@@ -182,49 +206,52 @@ msgstr ""
 msgid "Select the range of addresses assigned to the workstations"
 msgstr ""
 
-msgid "the DHCP services of your server."
+msgid "DHCP Wizard"
 msgstr ""
 
 msgid "Range of addresses used by dhcp"
 msgstr ""
 
-msgid "SSystem error, no configuration done."
-msgstr ""
-
 msgid "services of your server."
 msgstr ""
 
 msgid "The wizard successfully configured the DHCP"
 msgstr ""
 
-msgid "The IP range specified is not correct"
+msgid "by the DHCP service; unless you have special needs,"
 msgstr ""
 
-msgid "To accept these values, and configure your server, click on"
+msgid "Highest IP address:"
 msgstr ""
 
-msgid "DHCP is a service that automatically assigns"
+msgid "with the DHCP configuration"
 msgstr ""
 
-msgid "you can safely accept the proposed values."
+msgid "Highest IP Address:"
 msgstr ""
 
-msgid "by the DHCP service; unless you have special needs,"
+msgid "the DHCP services of your server."
 msgstr ""
 
-msgid "Highest IP address:"
+msgid "SSystem error, no configuration done."
 msgstr ""
 
-msgid "networking addresses to your workstations."
+msgid "The IP range specified is not correct"
 msgstr ""
 
-msgid "Lowest  IP Address:"
+msgid "you can safely accept the proposed values."
 msgstr ""
 
-msgid "with the DHCP configuration"
+msgid "DHCP is a service that automatically assigns"
 msgstr ""
 
-msgid "Highest IP Address:"
+msgid "To accept these values, and configure your server, click on"
+msgstr ""
+
+msgid "networking addresses to your workstations."
+msgstr ""
+
+msgid "Lowest  IP Address:"
 msgstr ""
 
 msgid "DHCP Configuration Wizard"
@@ -266,6 +293,9 @@ msgstr ""
 msgid "Primary DNS Address:"
 msgstr ""
 
+msgid "DNS Wizard"
+msgstr ""
+
 msgid "Configuring the DNS Server"
 msgstr ""
 
@@ -311,27 +341,18 @@ msgstr ""
 msgid "Some terrible happened"
 msgstr ""
 
-msgid "Internet Network Device:"
+msgid "Firewall wizard"
 msgstr ""
 
 msgid "choose the level that corresponds to your needs.  If you don't know,"
 msgstr ""
 
-msgid "Protecion Level:"
-msgstr ""
-
-msgid "choose the device you are using for the external connection."
-msgstr ""
-
 msgid "The firewall protects your internal network from"
 msgstr ""
 
 msgid "The device name is not correct"
 msgstr ""
 
-msgid "Firewall Configuration Wizard"
-msgstr ""
-
 msgid "unauthorized accesses from the Internet."
 msgstr ""
 
@@ -344,24 +365,54 @@ msgstr ""
 msgid "Firewall Network Device"
 msgstr ""
 
-msgid "The firewall need to know how your server is connected to Internet;"
-msgstr ""
-
 msgid "Configuring the Firewall"
 msgstr ""
 
 msgid "This wizard will help you configuring your server firewall."
 msgstr ""
 
-msgid "your server firewall."
-msgstr ""
-
 msgid "needed to configure your firewall:"
 msgstr ""
 
 msgid "This Wizard need to run as root"
 msgstr ""
 
+msgid "Medium - web, ftp and ssh shown to outside"
+msgstr ""
+
+msgid "Strong - no outside visibility, users limited to web"
+msgstr ""
+
+msgid "None - No protection"
+msgstr ""
+
+msgid "Internet Network Device:"
+msgstr ""
+
+msgid "choose the device you are using for the external connection."
+msgstr ""
+
+msgid "Protecion Level:"
+msgstr ""
+
+msgid "Fix It"
+msgstr ""
+
+msgid "Firewall Configuration Wizard"
+msgstr ""
+
+msgid "The firewall need to know how your server is connected to Internet;"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
+msgid "your server firewall."
+msgstr ""
+
+msgid "Low - Light filtering, standard services available"
+msgstr ""
+
 msgid "Internet FTP Server:"
 msgstr ""
 
@@ -371,6 +422,9 @@ msgstr ""
 msgid "Enable the FTP Server for the Intranet"
 msgstr ""
 
+msgid "FTP wizard"
+msgstr ""
+
 msgid "Enable the FTP Server for the Intranet and for the Internet"
 msgstr ""
 
@@ -409,49 +463,88 @@ msgstr ""
 msgid "needed to configure your FTP Server"
 msgstr ""
 
-msgid "Web configuration wizard"
+msgid "Global"
 msgstr ""
 
-msgid "Basic server wizard"
+msgid "->dns"
+msgstr ""
+
+msgid "->mail"
+msgstr ""
+
+msgid "Ftp configuration wizard"
+msgstr ""
+
+msgid "Global Configuration Wizard"
+msgstr ""
+
+msgid "Press next to begin:"
+msgstr ""
+
+msgid "DHCP configuration wizard"
+msgstr ""
+
+msgid "Congratulations, your server have been"
+msgstr ""
+
+msgid "->firewall"
+msgstr ""
+
+msgid "->ftp"
+msgstr ""
+
+msgid "Domain Names wizard"
+msgstr ""
+
+msgid "This wizard will help you in configuring"
+msgstr ""
+
+msgid "->samba"
 msgstr ""
 
 msgid "The configuration process will involve the following steps:"
 msgstr ""
 
+msgid "Basic server wizard"
+msgstr ""
+
+msgid "Web configuration wizard"
+msgstr ""
+
 msgid "different services of your machine (DNS, Mail, DHCP...)."
 msgstr ""
 
-msgid "Ftp configuration wizard"
+msgid "->News"
 msgstr ""
 
-msgid "Mail configuration wizard"
+msgid "->Server"
 msgstr ""
 
-msgid "correctly configured!"
+msgid "Mail configuration wizard"
 msgstr ""
 
-msgid "Global Configuration Wizard"
+msgid "correctly configured!"
 msgstr ""
 
 msgid "Configuration tasks"
 msgstr ""
 
-msgid "Welcome to the configuration wizard!"
+msgid "->time"
 msgstr ""
 
-msgid "[done]"
+msgid "Welcome to the configuration wizard!"
 msgstr ""
 
-msgid "News configuration wizard"
+msgid "->web"
 msgstr ""
 
-msgid "Press next to begin:"
+msgid "->Dhcp"
 msgstr ""
 
-msgid "DHCP configuration wizard"
+msgid "News configuration wizard"
 msgstr ""
 
-msgid "Congratulations, your server have been"
+msgid "[done]"
 msgstr ""
 
 msgid "Firewall configuration wizard"
@@ -460,16 +553,13 @@ msgstr ""
 msgid "Time wizard"
 msgstr ""
 
-msgid "Domain Names wizard"
-msgstr ""
-
 msgid "Samba configuration wizard"
 msgstr ""
 
-msgid "This wizard will help you in configuring"
+msgid "Note however that you must be root to accomplish some of the tasks."
 msgstr ""
 
-msgid "Note however that you must be root to accomplish some of the tasks."
+msgid "News Wizard"
 msgstr ""
 
 msgid "The polling period is not correct"
@@ -552,6 +642,9 @@ msgstr ""
 msgid "needed to configure your Internet Mail Service:"
 msgstr ""
 
+msgid "Do It"
+msgstr ""
+
 msgid "See you soon!"
 msgstr ""
 
@@ -567,6 +660,9 @@ msgstr ""
 msgid "Mail Server Name:"
 msgstr ""
 
+msgid "Postfix wizard"
+msgstr ""
+
 msgid "There seems to be a problem... go ask to the big black man downstairs"
 msgstr ""
 
@@ -596,6 +692,9 @@ msgstr ""
 msgid "Outgoing Mail Address"
 msgstr ""
 
+msgid "End"
+msgstr ""
+
 msgid "Internet Mail Configuration Wizard"
 msgstr ""
 
@@ -637,6 +736,9 @@ msgstr ""
 msgid "Proxy Configuration Wizard"
 msgstr ""
 
+msgid "Local Network - access for local network (recommended)"
+msgstr ""
+
 msgid "You must choose a port greater than 1024 and lower than 65535"
 msgstr ""
 
@@ -646,6 +748,9 @@ msgstr ""
 msgid "Configuring the Proxy"
 msgstr ""
 
+msgid "Define an upper level proxy"
+msgstr ""
+
 msgid "Filesystem            Size  Used Avail Use% Mounted on"
 msgstr ""
 
@@ -711,6 +816,9 @@ msgstr ""
 msgid "Proxy Cache Size"
 msgstr ""
 
+msgid "No upper level proxy (recommended)"
+msgstr ""
+
 msgid ""
 "Proxy port value sets what port the proxy server will listen on for http "
 "requests. Default is 3128, other common value can be 8080, the port value "
@@ -732,6 +840,9 @@ msgstr ""
 msgid "Squid is a web caching proxy server, it allows"
 msgstr ""
 
+msgid "Squid wizard"
+msgstr ""
+
 msgid "Proxy port:"
 msgstr ""
 
@@ -744,6 +855,12 @@ msgstr ""
 msgid "Upper level proxy hostname:"
 msgstr ""
 
+msgid "All - No access restriction"
+msgstr ""
+
+msgid "Localhost - access restricted to this server only"
+msgstr ""
+
 msgid "or Back to correct your choice."
 msgstr ""
 
@@ -829,6 +946,9 @@ msgstr ""
 msgid "Samba allows your server to behave as a file and print server"
 msgstr ""
 
+msgid "Samba wizard"
+msgstr ""
+
 msgid "The Workgroup is wrong"
 msgstr ""
 
@@ -981,10 +1101,10 @@ msgstr ""
 msgid "The Server IP address is incorrect"
 msgstr ""
 
-msgid "and at the end of the wizard you should exit your session"
+msgid "Gateway IP:"
 msgstr ""
 
-msgid "Gateway IP:"
+msgid "and at the end of the wizard you should exit your session"
 msgstr ""
 
 msgid "be known from the other workstations in your network"
@@ -1002,6 +1122,9 @@ msgstr ""
 msgid "The wizard collected the following parameters"
 msgstr ""
 
+msgid "Server Wizard"
+msgstr ""
+
 msgid "value is designed for a configuration not connected to Internet, or"
 msgstr ""
 
@@ -1056,10 +1179,13 @@ msgstr ""
 msgid "Network Device"
 msgstr ""
 
-msgid "Testing  the time servers availability"
+msgid "CRI, Campus d'Orsay, Universite Paris Sud, France"
 msgstr ""
 
-msgid "Press next to start the time servers test."
+msgid "University of Manchester, Manchester, England"
+msgstr ""
+
+msgid "SCI, Universite de Limoges, France"
 msgstr ""
 
 msgid "(please, choose servers in your geographical area)"
@@ -1071,20 +1197,39 @@ msgstr ""
 msgid "If the time server is not immediately available"
 msgstr ""
 
-msgid ""
-"You can set the time of your machine in two ways: Locally means that the "
-"setting"
+msgid "University of Regina, Regina, Saskatchewan, Canada"
 msgstr ""
 
-msgid "Cant install the NTP tools!"
+msgid "Internet time setting (external time server)"
 msgstr ""
 
 msgid "Secondary Time Server:"
 msgstr ""
 
+msgid "Try again"
+msgstr ""
+
+msgid "The Chinese University of Hong Kong"
+msgstr ""
+
+msgid "UNLV College of Engineering, Las Vegas, NV"
+msgstr ""
+
+msgid "Altea (Alicante/SPAIN)"
+msgstr ""
+
 msgid "Press next. otherwise, press \\qback\\q to set the local time only,"
 msgstr ""
 
+msgid "CISM, Lyon, France"
+msgstr ""
+
+msgid "Inet, Inc., Seoul, Korea"
+msgstr ""
+
+msgid "Scientific Center in Chernogolovka, Moscow region, Russia"
+msgstr ""
+
 msgid "Sorry, you must be root to run this wizard"
 msgstr ""
 
@@ -1096,12 +1241,10 @@ msgstr ""
 msgid "The time servers are not responding. The causes could be:"
 msgstr ""
 
-msgid "- other reasons..."
+msgid "Local time setting"
 msgstr ""
 
-msgid ""
-"will simply set the system clock, without synchronizing with the external "
-"world"
+msgid "- other reasons..."
 msgstr ""
 
 msgid "please, install ntp manually if you can,"
@@ -1110,48 +1253,133 @@ msgstr ""
 msgid "WARNING"
 msgstr ""
 
-msgid "- non existant time servers"
+msgid "with the TIME configuration"
 msgstr ""
 
-msgid "back to return,"
+msgid "Fukuoka university, Fukuoka, Japan"
 msgstr ""
 
-msgid "with the TIME configuration"
+msgid "Swiss Fed. Inst. of Technology"
 msgstr ""
 
-msgid "If you want to continue (and you know what you are doing)"
+msgid "LAAS/CNRS, Toulouse, France"
 msgstr ""
 
-msgid "Time Servers"
+msgid "This wizard will help you to set the time of your server,"
 msgstr ""
 
-msgid "(network or other reason), you will wait about 30 seconds"
+msgid "WARNING:"
 msgstr ""
 
-msgid "either locally or synchronized with an external time server."
+msgid "or cancel to exit this wizard."
 msgstr ""
 
-msgid "Select a primary and secondary server from the list, or specify one:"
+msgid "Click next to install that tools,"
 msgstr ""
 
-msgid "This wizard will help you to set the time of your server,"
+msgid "MIT Information Systems, Cambridge, MA"
 msgstr ""
 
-msgid "WARNING:"
+msgid "Dept. Computer Science, Strathclyde University, Glasgow, Scotland"
 msgstr ""
 
-msgid "or cancel to exit this wizard."
+msgid "Baylor College of Medicine, Houston, Tx"
 msgstr ""
 
-msgid "Click next to install that tools,"
+msgid "Penn State University, University Park, PA"
 msgstr ""
 
-msgid "No network have been detected."
+msgid "University of Oslo, Norway"
+msgstr ""
+
+msgid "- no outside network"
+msgstr ""
+
+msgid "Type of setting"
+msgstr ""
+
+msgid "Choose a time zone:"
+msgstr ""
+
+msgid "Computer Science Department, University of Wisconsin-Madison"
+msgstr ""
+
+msgid "Testing  the time servers availability"
+msgstr ""
+
+msgid "Canadian Meteorological Centre, Dorval, Quebec, Canada"
+msgstr ""
+
+msgid "Press next to start the time servers test."
+msgstr ""
+
+msgid ""
+"You can set the time of your machine in two ways: Locally means that the "
+"setting"
+msgstr ""
+
+msgid "University of Oklahoma, Norman, Oklahoma, USA"
+msgstr ""
+
+msgid "Cant install the NTP tools!"
+msgstr ""
+
+msgid "Singapore"
+msgstr ""
+
+msgid "Trinity College, Dublin, Ireland"
+msgstr ""
+
+msgid "National Research Council of Canada, Ottawa, Ontario, Canada"
+msgstr ""
+
+msgid "Washington State University Tri-Cities, Richland, Wa"
+msgstr ""
+
+msgid "University of Adelaide, South Australia"
+msgstr ""
+
+msgid "CRIUC, Universite de Caen, France"
+msgstr ""
+
+msgid ""
+"will simply set the system clock, without synchronizing with the external "
+"world"
+msgstr ""
+
+msgid "- non existant time servers"
+msgstr ""
+
+msgid "back to return,"
+msgstr ""
+
+msgid "Loria, Nancy, France"
+msgstr ""
+
+msgid "If you want to continue (and you know what you are doing)"
+msgstr ""
+
+msgid "Time Servers"
+msgstr ""
+
+msgid "(network or other reason), you will wait about 30 seconds"
+msgstr ""
+
+msgid "either locally or synchronized with an external time server."
+msgstr ""
+
+msgid "Save config without test"
+msgstr ""
+
+msgid "Select a primary and secondary server from the list, or specify one:"
 msgstr ""
 
 msgid "or insert the CDROM containing it"
 msgstr ""
 
+msgid "No network have been detected."
+msgstr ""
+
 msgid "or save configuration without actually setting time."
 msgstr ""
 
@@ -1164,15 +1392,9 @@ msgstr ""
 msgid "Thus your server will be the local time server for your network."
 msgstr ""
 
-msgid "- no outside network"
-msgstr ""
-
 msgid "Primary Time Server:"
 msgstr ""
 
-msgid "Type of setting"
-msgstr ""
-
 msgid "WARNING: the net time tool arent there."
 msgstr ""
 
@@ -1185,9 +1407,6 @@ msgstr ""
 msgid "press next to begin, or cancel to leave this wizard"
 msgstr ""
 
-msgid "Choose a time zone:"
-msgstr ""
-
 msgid "Intranet Web Server:"
 msgstr ""
 
@@ -1212,15 +1431,18 @@ msgstr ""
 msgid "Enable the Web Server for the Intranet and for the Internet"
 msgstr ""
 
-msgid "Your server can act as a Web Server toward your internal"
+msgid "Web wizard"
 msgstr ""
 
-msgid "the Web Server for your network."
+msgid "Your server can act as a Web Server toward your internal"
 msgstr ""
 
 msgid "needed to configure your Web Server"
 msgstr ""
 
+msgid "the Web Server for your network."
+msgstr ""
+
 msgid "Don't check any box if you don't want to activate your Web Server."
 msgstr ""
 
diff --git a/wiz2pot.pl b/wiz2pot.pl
index cbd091eb..4b8f2c6d 100755
--- a/wiz2pot.pl
+++ b/wiz2pot.pl
@@ -3,6 +3,13 @@ use strict;
 use XML::Parser;
 
 
+sub wrap {
+    @_[0] =~ s/\\'/\\\\'/g;
+    @_[0] =~ s/\\q/\\\\q/g;
+    @_[0] =~ s/\\a/\\\\a/g;
+    @_[0] =~ s/\\n/\\\\n/g;
+}
+
 sub load_wpo {
     my ($tree, $tag ,$page) = @_;
     
@@ -11,12 +18,15 @@ sub load_wpo {
 	    $page = load_wpo($leaf, $tag, $page);
 	} elsif (ref($leaf) eq 'HASH') {
 	    # XML compatibility
-	    $leaf->{helpText} =~ s/\\'/\\\\'/g;
-	    $leaf->{helpText} =~ s/\\q/\\\\q/g;
-	    $leaf->{helpText} =~ s/\\a/\\\\a/g;
-	    $leaf->{helpText} =~ s/\\n/\\\\n/g;
+	    wrap $leaf->{description};
+	    wrap $leaf->{helpText};
+	    wrap $leaf->{wizardTitle};
+	    wrap $leaf->{nextButtonText};
+	    $page->{$leaf->{wizardTitle}} = "";
 	    $page->{$leaf->{helpText}} = "";
-	}elsif(ref($leaf)=~ /\w\D/){
+	    $page->{$leaf->{description}} = "";
+	    $page->{$leaf->{nextButtonText}} = "";
+	} elsif(ref($leaf)=~ /\w\D/){
 	    $tag = $leaf;
 	}
     }
@@ -34,15 +44,8 @@ my $date = `date +%Y-%m-%d\\ %H:%M\\ %z`;
 chomp $date;
 
 foreach (keys %{$wpo}) {
-    if ($_ ne "") {
-	if ($_ eq $wpo->{$_}) {
-	    print PO "msgid \"$_\"\nmsgstr \"\"\n\n";
-	}
-	else {
-	    print PO "msgid \"$_\"\nmsgstr \"$wpo->{$_}\"\n\n";
-	}
-    }
-    
+    print "$_\n";
+    $_ ne "" and print PO "msgid \"$_\"\nmsgstr \"\"\n\n";
 }
 close PO;
 print STDERR "./po/$1.pot\n";