aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-12-05 11:36:51 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-12-05 11:36:51 +0000
commit23de8dd0ce9249105711dfbf2d28e7042476af8b (patch)
tree47d86d92570cda72ea6e942e434f84a7b4bd6e1e
parent5c7dcec0738c8c99535a0789a357e4f92a8dad9f (diff)
downloadforums-23de8dd0ce9249105711dfbf2d28e7042476af8b.tar
forums-23de8dd0ce9249105711dfbf2d28e7042476af8b.tar.gz
forums-23de8dd0ce9249105711dfbf2d28e7042476af8b.tar.bz2
forums-23de8dd0ce9249105711dfbf2d28e7042476af8b.tar.xz
forums-23de8dd0ce9249105711dfbf2d28e7042476af8b.zip
make it obvious that even if the files got uploaded on an update that it is not finished yet... by replacing "Check files again" with "Continue update now"
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9177 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/adm/style/install_update.html2
-rw-r--r--phpBB/language/en/install.php3
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index 2448f1d39b..c0dc185361 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -63,7 +63,7 @@
<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
<fieldset class="submit-buttons">
- <input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
+ <input class="button1" type="submit" name="check_again" value="{L_CONTINUE_UPDATE}" />
</fieldset>
</form>
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 0549495b47..ac3e90543b 100644
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -379,7 +379,8 @@ $lang = array_merge($lang, array(
'COLLECTED_INFORMATION_EXPLAIN' => 'The list below shows information about the files needing an update. Please read the information in front of every status block to see what they mean and what you may need to do to perform a successful update.',
'COLLECTING_FILE_DIFFS' => 'Collecting file differences',
'COMPLETE_LOGIN_TO_BOARD' => 'You should now <a href="../ucp.php?mode=login">login to your board</a> and check if everything is working fine. Do not forget to delete, rename or move your install directory!',
- 'CONTINUE_UPDATE_NOW' => 'Continue the update process now',
+ 'CONTINUE_UPDATE_NOW' => 'Continue the update process now', // Shown within the database update script at the end if called from the updater
+ 'CONTINUE_UPDATE' => 'Continue update now', // Shown after file upload to indicate the update process is not yet finished
'CURRENT_FILE' => 'Beginning of current original file',
'CURRENT_VERSION' => 'Current version',