From 46317c3190e95cca62cd5d932bd6bc4b45e75d23 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sat, 18 Sep 2010 16:24:06 -0700
Subject: Bug 586244: Make mod_headers and mod_expires optional r=glob,
 a=mkanat

---
 template/en/default/setup/strings.txt.pl | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'template/en/default')

diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 350c701aa..f03869205 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -28,6 +28,11 @@
 
 %strings = (
     any  => 'any',
+    apachectl_failed => <<END,
+WARNING: We could not check the configuration of Apache. This sometimes
+happens when you are not running checksetup.pl as ##root##. To see the
+problem we ran into, run: ##command##
+END
     bad_executable => 'not a valid executable: ##bin##',
     blacklisted => '(blacklisted)',
     bz_schema_exists_before_220 => <<'END',
@@ -260,6 +265,18 @@ EOT
 # Note: When translating these "modules" messages, don't change the formatting
 # if possible, because there is hardcoded formatting in 
 # Bugzilla::Install::Requirements to match the box formatting.
+    modules_message_apache => <<END,
+***********************************************************************
+* APACHE MODULES                                                      *
+***********************************************************************
+* Normally, when Bugzilla is upgraded, all Bugzilla users have to     *
+* clear their browser cache or Bugzilla will break. If you enable     *
+* certain modules in your Apache configuration (usually called        *
+* httpd.conf or apache2.conf) then your users will not have to clear  *
+* their caches when you upgrade Bugzilla. The modules you need to     *
+* enable are:                                                         *
+*                                                                     *
+END
     modules_message_db => <<EOT,
 ***********************************************************************
 * DATABASE ACCESS                                                     *
-- 
cgit v1.2.3-24-g4f1b