- change Makefile not to change __WIZ_HOME__ in drakwizard.pl before installation

- add apache2 wizard

1 files changed, 39 insertions, 35 deletions

diff --git a/po/drakwizard.pot b/po/drakwizard.pot
index 73eb34ad..5e32a41b 100644
--- a/po/drakwizard.pot
+++ b/po/drakwizard.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-02-21 15:04+0100\n"
+"POT-Creation-Date: 2003-03-01 07:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 #: ../dhcp_wizard/dhcp.wiz_.c:7 ../dns_wizard/dns.wiz_.c:5
 #: ../ftp_wizard/ftp.wiz_.c:9 ../proxy_wizard/proxy.wiz_.c:5
 #: ../samba_wizard/samba.wiz_.c:7 ../server_wizard/server.wiz_.c:5
-#: ../web_wizard/web.wiz_.c:11
+#: ../web_wizard/apache2.wiz_.c:11 ../web_wizard/web.wiz_.c:11
 msgid "OK"
 msgstr ""
 
@@ -122,7 +122,7 @@ msgstr ""
 #: ../ftp_wizard/ftp.wiz_.c:5 ../news_wizard/news.wiz_.c:6
 #: ../nfs_wizard/nfs.wiz_.c:5 ../proxy_wizard/proxy.wiz_.c:35
 #: ../samba_wizard/samba.wiz_.c:28 ../server_wizard/server.wiz_.c:33
-#: ../web_wizard/web.wiz_.c:8
+#: ../web_wizard/apache2.wiz_.c:8 ../web_wizard/web.wiz_.c:8
 msgid "Configure"
 msgstr ""
 
@@ -150,12 +150,14 @@ msgstr ""
 #: ../news_wizard/news.wiz_.c:14 ../nfs_wizard/nfs.wiz_.c:12
 #: ../postfix_wizard/postfix.wiz_.c:16 ../proxy_wizard/proxy.wiz_.c:44
 #: ../samba_wizard/samba.wiz_.c:45 ../server_wizard/server.wiz_.c:44
-#: ../time_wizard/time.wiz_.c:39 ../web_wizard/web.wiz_.c:19
+#: ../time_wizard/time.wiz_.c:39 ../web_wizard/apache2.wiz_.c:19
+#: ../web_wizard/web.wiz_.c:19
 msgid "Quit"
 msgstr ""
 
 #: ../client_wizard/client.wiz_.c:27 ../dhcp_wizard/dhcp.wiz_.c:15
-#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/web.wiz_.c:22
+#: ../ftp_wizard/ftp.wiz_.c:19 ../web_wizard/apache2.wiz_.c:22
+#: ../web_wizard/web.wiz_.c:22
 msgid "Warning\\nYou are in dhcp, server may not work with your configuration."
 msgstr ""
 
@@ -171,7 +173,7 @@ msgstr ""
 #: ../news_wizard/news.wiz_.c:21 ../nfs_wizard/nfs.wiz_.c:17
 #: ../postfix_wizard/postfix.wiz_.c:24 ../proxy_wizard/proxy.wiz_.c:49
 #: ../samba_wizard/samba.wiz_.c:53 ../server_wizard/server.wiz_.c:48
-#: ../web_wizard/web.wiz_.c:24
+#: ../web_wizard/apache2.wiz_.c:24 ../web_wizard/web.wiz_.c:24
 msgid "Congratulations"
 msgstr ""
 
@@ -236,7 +238,7 @@ msgid "Add"
 msgstr ""
 
 #: ../db_wizard/db.wiz_.c:14 ../ftp_wizard/ftp.wiz_.c:18
-#: ../web_wizard/web.wiz_.c:21
+#: ../web_wizard/apache2.wiz_.c:21 ../web_wizard/web.wiz_.c:21
 msgid "Sorry, you must be root to do this..."
 msgstr ""
 
@@ -298,7 +300,8 @@ msgstr ""
 
 #: ../dhcp_wizard/dhcp.wiz_.c:2 ../ftp_wizard/ftp.wiz_.c:1
 #: ../news_wizard/news.wiz_.c:2 ../samba_wizard/samba.wiz_.c:1
-#: ../server_wizard/server.wiz_.c:1 ../web_wizard/web.wiz_.c:1
+#: ../server_wizard/server.wiz_.c:1 ../web_wizard/apache2.wiz_.c:1
+#: ../web_wizard/web.wiz_.c:1
 msgid "Fix it"
 msgstr ""
 
@@ -319,7 +322,8 @@ msgstr ""
 #: ../firewall_wizard/firewall.wiz_.c:4 ../ftp_wizard/ftp.wiz_.c:8
 #: ../news_wizard/news.wiz_.c:8 ../postfix_wizard/postfix.wiz_.c:4
 #: ../proxy_wizard/proxy.wiz_.c:6 ../samba_wizard/samba.wiz_.c:6
-#: ../server_wizard/server.wiz_.c:6 ../web_wizard/web.wiz_.c:10
+#: ../server_wizard/server.wiz_.c:6 ../web_wizard/apache2.wiz_.c:10
+#: ../web_wizard/web.wiz_.c:10
 msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
@@ -439,11 +443,11 @@ msgstr ""
 msgid "DNS Wizard (configuration)"
 msgstr ""
 
-#: ../drakwizard.pl_.c:62
+#: ../drakwizard.pl_.c:63
 msgid "Drakwizard wizard selection"
 msgstr ""
 
-#: ../drakwizard.pl_.c:63
+#: ../drakwizard.pl_.c:64
 msgid "Please select a wizard"
 msgstr ""
 
@@ -607,7 +611,7 @@ msgid ""
 msgstr ""
 
 #: ../ftp_wizard/ftp.wiz_.c:22 ../samba_wizard/samba.wiz_.c:18
-#: ../web_wizard/web.wiz_.c:23
+#: ../web_wizard/apache2.wiz_.c:23 ../web_wizard/web.wiz_.c:23
 msgid "The path you entered does not exist."
 msgstr ""
 
@@ -1695,104 +1699,104 @@ msgstr ""
 msgid "Computer Science Department, University of Wisconsin-Madison"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:2
+#: ../web_wizard/apache2.wiz_.c:2 ../web_wizard/web.wiz_.c:2
 msgid ""
 "* User module : allows users to have a directory in their home directories "
 "available on your http server via http://www.yourserver.com/~user, you will "
 "be asked for the name of this directory afterward."
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:3
+#: ../web_wizard/apache2.wiz_.c:3 ../web_wizard/web.wiz_.c:3
 msgid ""
 "Your server can act as a Web Server toward your internal network (intranet) "
 "and as a Web Server for the Internet."
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:4
+#: ../web_wizard/apache2.wiz_.c:4 ../web_wizard/web.wiz_.c:4
 msgid "Internet web server:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:5
+#: ../web_wizard/apache2.wiz_.c:5 ../web_wizard/web.wiz_.c:5
 msgid "Modules :"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:6
+#: ../web_wizard/apache2.wiz_.c:6 ../web_wizard/web.wiz_.c:6
 msgid "Document root:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:7
+#: ../web_wizard/apache2.wiz_.c:7 ../web_wizard/web.wiz_.c:7
 msgid "user http sub-directory : ~/"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:9
+#: ../web_wizard/apache2.wiz_.c:9 ../web_wizard/web.wiz_.c:9
 msgid "Enable the Web Server for the Intranet"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:12
+#: ../web_wizard/apache2.wiz_.c:12 ../web_wizard/web.wiz_.c:12
 msgid "Configuring the Web Server"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:13
+#: ../web_wizard/apache2.wiz_.c:13 ../web_wizard/web.wiz_.c:13
 msgid "Web Server"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:14
+#: ../web_wizard/apache2.wiz_.c:14 ../web_wizard/web.wiz_.c:14
 msgid "Enable the Web Server for the Internet"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:15
+#: ../web_wizard/apache2.wiz_.c:15 ../web_wizard/web.wiz_.c:15
 msgid "User directory:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:16
+#: ../web_wizard/apache2.wiz_.c:16 ../web_wizard/web.wiz_.c:16
 msgid "This wizard will help you configuring the Web Server for your network."
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:17
+#: ../web_wizard/apache2.wiz_.c:17 ../web_wizard/web.wiz_.c:17
 msgid "Web wizard"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:18
+#: ../web_wizard/apache2.wiz_.c:18 ../web_wizard/web.wiz_.c:18
 msgid "Intranet web server:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:20
+#: ../web_wizard/apache2.wiz_.c:20 ../web_wizard/web.wiz_.c:20
 msgid ""
 "Type the name of the directory users should create in their homes (whitout "
 "~/) to get it available via http://www.yourserver.com/~user"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:25
+#: ../web_wizard/apache2.wiz_.c:25 ../web_wizard/web.wiz_.c:25
 msgid "activate user module"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:26
+#: ../web_wizard/apache2.wiz_.c:26 ../web_wizard/web.wiz_.c:26
 msgid "Don't check any box if you don't want to activate your Web Server."
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:27
+#: ../web_wizard/apache2.wiz_.c:27 ../web_wizard/web.wiz_.c:27
 msgid "Select the kind of Web service you want to activate:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:28
+#: ../web_wizard/apache2.wiz_.c:28 ../web_wizard/web.wiz_.c:28
 msgid ""
 "The wizard collected the following parameters needed to configure your Web "
 "Server"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:29
+#: ../web_wizard/apache2.wiz_.c:29 ../web_wizard/web.wiz_.c:29
 msgid "The wizard successfully configured your Intranet/Internet Web Server"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:30
+#: ../web_wizard/apache2.wiz_.c:30 ../web_wizard/web.wiz_.c:30
 msgid "Document Root:"
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:31
+#: ../web_wizard/apache2.wiz_.c:31 ../web_wizard/web.wiz_.c:31
 msgid "Type the path of the directory you want being the document root."
 msgstr ""
 
-#: ../web_wizard/web.wiz_.c:32
+#: ../web_wizard/apache2.wiz_.c:32 ../web_wizard/web.wiz_.c:32
 msgid "Web Server Configuration Wizard"
 msgstr ""