summaryrefslogtreecommitdiffstats
path: root/template/en/default/setup
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-01-11 07:11:04 +0100
committerDave Lawrence <dlawrence@mozilla.com>2012-01-11 07:11:04 +0100
commit4a58678de6f0cd1e25b2b3d2f3dd42e0f973f324 (patch)
tree030d3faa56c7d92f3a4d13917f9f7685ce3f1788 /template/en/default/setup
parente23fa261d61319ece1ccfe87a64cf860b02f0eaa (diff)
parent320b36d4a9aa69e0fa806cd25c84c42d5a36966e (diff)
downloadbugzilla-4a58678de6f0cd1e25b2b3d2f3dd42e0f973f324.tar.gz
bugzilla-4a58678de6f0cd1e25b2b3d2f3dd42e0f973f324.tar.xz
merged with bugzilla/4.2
Diffstat (limited to 'template/en/default/setup')
-rw-r--r--template/en/default/setup/strings.txt.pl14
1 files changed, 8 insertions, 6 deletions
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 6faf7844c..36c3fe252 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -60,7 +60,7 @@ EOT
commands_optional => 'COMMANDS TO INSTALL OPTIONAL MODULES:',
commands_required => <<EOT,
COMMANDS TO INSTALL REQUIRED MODULES (You *must* run all these commands
-and then re-run this script):
+and then re-run checksetup.pl):
EOT
continue_without_answers => <<'END',
Re-run checksetup.pl in interactive mode (without an 'answers' file)
@@ -139,12 +139,14 @@ END
ERROR: Using install-module.pl requires that you install "make".
END
lc_new_vars => <<'END',
-This version of Bugzilla contains some variables that you may want to
-change and adapt to your local settings. Please edit the file
-##localconfig## and then rerun checksetup.pl.
+This version of Bugzilla contains some variables that you may want to
+change and adapt to your local settings. The following variables are
+new to ##localconfig## since you last ran checksetup.pl:
-The following variables are new to ##localconfig## since you last ran
-checksetup.pl: ##new_vars##
+##new_vars##
+
+Please edit the file ##localconfig## and then re-run checksetup.pl
+to complete your installation.
END
lc_old_vars => <<'END',
The following variables are no longer used in ##localconfig##, and