mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-05 00:13:29 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2020-01-03 11:07:45 +01:00
commit fb47ac5f33
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/language/en/common.php
View File

@ -274,10 +274,10 @@ $lang = array_merge($lang, array(
'FILESYSTEM_CANNOT_CREATE_SYMLINK' => 'Unable to create a symlink',
'FILESYSTEM_CANNOT_CREATE_DIRECTORY' => 'Unable to create directory',
'FILESYSTEM_CANNOT_DELETE_FILES' => 'Unable to delete files from the system',
'FILESYSTEM_CANNOT_DUMP_FILE' => 'Unable to dump file',
'FILESYSTEM_CANNOT_DUMP_FILE' => 'Unable to dump into file',
'FILESYSTEM_CANNOT_MIRROR_DIRECTORY' => 'Unable to mirror directory',
'FILESYSTEM_CANNOT_RENAME_FILE' => 'Unable to rename a file from the system',
'FILESYSTEM_CANNOT_TOUCH_FILES' => 'Unable to determine if the file exists',
'FILESYSTEM_CANNOT_TOUCH_FILES' => 'Unable to create file or change file timestamps',
'FTP_FSOCK_HOST' => 'FTP host',
'FTP_FSOCK_HOST_EXPLAIN' => 'FTP server used to connect your site.',

4
phpBB/language/en/install.php
View File

@ -370,7 +370,7 @@ $lang = array_merge($lang, array(
<li>Follow the steps to update the database and let that run to completion.</li>
<li>Via FTP or SSH delete the <code class="inline">/install</code> folder from the root of your board installation.<br><br></li>
</ol>
<p>You now have a new up to date board containing all your users and posts. Follow up tasks:</p>
<ul style="margin-left: 20px; font-size: 1.1em;">
<li>Update your language pack</li>
@ -564,7 +564,7 @@ $lang = array_merge($lang, array(
// Finish conversion
'CONVERT_COMPLETE' => 'Conversion completed',
'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 4.0. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/docs/en/3.3/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">support forums</a>.',
'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 4.0. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/docs/en/3.3/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=661">support forums</a>.',
'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.',