Created
January 26, 2015 21:18
-
-
Save nickvergessen/818ca6d4c958fb1e1043 to your computer and use it in GitHub Desktop.
language changes 3.1.2 to 3.1.3-RC1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php | |
| index 91fc121..fdbc4ae 100644 | |
| --- a/phpBB/language/en/acp/common.php | |
| +++ b/phpBB/language/en/acp/common.php | |
| @@ -558,6 +558,7 @@ $lang = array_merge($lang, array( | |
| 'LOG_LOCK_POST' => '<strong>Locked post</strong><br />» %s', | |
| 'LOG_MERGE' => '<strong>Merged posts</strong> into topic<br />» %s', | |
| 'LOG_MOVE' => '<strong>Moved topic</strong><br />» from %1$s to %2$s', | |
| + 'LOG_MOVED_TOPIC' => '<strong>Moved topic</strong><br />» %s', | |
| 'LOG_PM_REPORT_CLOSED' => '<strong>Closed PM report</strong><br />» %s', | |
| 'LOG_PM_REPORT_DELETED' => '<strong>Deleted PM report</strong><br />» %s', | |
| 'LOG_POST_APPROVED' => '<strong>Approved post</strong><br />» %s', | |
| diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php | |
| index 8654a9e..1ade2d6 100644 | |
| --- a/phpBB/language/en/acp/permissions.php | |
| +++ b/phpBB/language/en/acp/permissions.php | |
| @@ -54,7 +54,7 @@ $lang = array_merge($lang, array( | |
| <br /> | |
| - <p>For further information on setting up and managing permissions on your phpBB3 board, please see <a href="https://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p> | |
| + <p>For further information on setting up and managing permissions on your phpBB3 board, please see the section on <a href="https://www.phpbb.com/support/docs/en/3.1/ug/quickstart/permissions/">Setting permissions of our Quick Start Guide</a>.</p> | |
| ', | |
| 'ACL_NEVER' => 'Never', | |
| diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php | |
| index 98412cb..bda965b 100644 | |
| --- a/phpBB/language/en/acp/search.php | |
| +++ b/phpBB/language/en/acp/search.php | |
| @@ -84,7 +84,7 @@ $lang = array_merge($lang, array( | |
| 'FULLTEXT_SPHINX_WRONG_DATABASE' => 'The sphinx search for phpBB supports MySQL and PostgreSQL only.', | |
| 'FULLTEXT_SPHINX_CONFIG_FILE' => 'Sphinx config file', | |
| 'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN' => 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon. Replace the [dbuser] and [dbpassword] placeholders with your database credentials.', | |
| - 'FULLTEXT_SPHINX_NO_CONFIG_DATA' => 'The sphinx data and config directory paths are not defined. Please define them to generate the config file.', | |
| + 'FULLTEXT_SPHINX_NO_CONFIG_DATA' => 'The sphinx data directory path is not defined. Please define the path and submit to generate the config file.', | |
| 'GENERAL_SEARCH_SETTINGS' => 'General search settings', | |
| 'GO_TO_SEARCH_INDEX' => 'Go to search index page', | |
| diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php | |
| index 107de9c..dd22e84 100644 | |
| --- a/phpBB/language/en/install.php | |
| +++ b/phpBB/language/en/install.php | |
| @@ -80,7 +80,7 @@ $lang = array_merge($lang, array( | |
| 'CONTINUE_OLD_CONVERSION' => 'Continue previously started conversion', | |
| 'CONVERT' => 'Convert', | |
| 'CONVERT_COMPLETE' => 'Conversion completed', | |
| - 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.1. 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/documentation/3.0/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=46">support forums</a>.', | |
| + 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.1. 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.1/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">support forums</a>.', | |
| 'CONVERT_INTRO' => 'Welcome to the phpBB Unified Convertor Framework', | |
| 'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.', | |
| 'CONVERT_NEW_CONVERSION' => 'New conversion', | |
| @@ -192,7 +192,7 @@ $lang = array_merge($lang, array( | |
| <h2>Convert an existing board to phpBB3</h2> | |
| <p>The phpBB Unified Convertor Framework supports the conversion of phpBB 2.0.x and other board systems to phpBB3. If you have an existing board that you wish to convert, please <a href="%2$s">proceed to the convertor</a>.</p> | |
| <h2>Go live with your phpBB3!</h2> | |
| - <p>Clicking the button below will take you to a form for submitting statistical data to phpBB in your Administration Control Panel (ACP). We would appreciate it if you could help us by sending that information. Afterwards you should take some time to examine the options available to you. Remember that help is available online via the <a href="https://www.phpbb.com/support/documentation/3.0/">Documentation</a>, <a href="%3$s">README</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=46">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>', | |
| + <p>Clicking the button below will take you to a form for submitting statistical data to phpBB in your Administration Control Panel (ACP). We would appreciate it if you could help us by sending that information. Afterwards you should take some time to examine the options available to you. Remember that help is available online via the <a href="https://www.phpbb.com/support/docs/en/3.1/ug/">Documentation</a>, <a href="%3$s">README</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">Support Forums</a>.</p><p><strong>Please delete, move or rename the install directory before using your board. While this directory exists, only the Administration Control Panel (ACP) will be accessible.</strong>', | |
| 'INSTALL_INTRO' => 'Welcome to Installation', | |
| 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB3 onto your server.</p><p>In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:</p> | |
| @@ -274,7 +274,7 @@ $lang = array_merge($lang, array( | |
| 'MAKE_FOLDER_WRITABLE' => 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<strong>%s</strong>.', | |
| 'MAKE_FOLDERS_WRITABLE' => 'Please make sure that these folders exist and are writable by the webserver then try again:<br />»<strong>%s</strong>.', | |
| - 'MYSQL_SCHEMA_UPDATE_REQUIRED' => 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2$s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="https://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="https://www.phpbb.com/community/viewforum.php?f=46">our support forums</a>.', | |
| + 'MYSQL_SCHEMA_UPDATE_REQUIRED' => 'Your MySQL database schema for phpBB is outdated. phpBB detected a schema for MySQL 3.x/4.x, but the server runs on MySQL %2$s.<br /><strong>Before you proceed the update, you need to upgrade the schema.</strong><br /><br />Please refer to the <a href="https://www.phpbb.com/kb/article/doesnt-have-a-default-value-errors/">Knowledge Base article about upgrading the MySQL schema</a>. If you encounter problems, please use <a href="https://www.phpbb.com/community/viewforum.php?f=466">our support forums</a>.', | |
| 'NAMING_CONFLICT' => 'Naming conflict: %s and %s are both aliases<br /><br />%s', | |
| 'NEXT_STEP' => 'Proceed to next step', | |
| @@ -345,7 +345,7 @@ $lang = array_merge($lang, array( | |
| 'SUB_LICENSE' => 'License', | |
| 'SUB_SUPPORT' => 'Support', | |
| 'SUCCESSFUL_CONNECT' => 'Successful connection', | |
| - 'SUPPORT_BODY' => 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=486">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>Extensions / Styles</h2><p>For issues relating to Extensions, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=451">Extensions Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=471">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/community/viewtopic.php?f=14&t=571070">The phpBB Welcome Package</a><br /><a href="https://www.phpbb.com/support/">Support Section</a><br /><a href="https://www.phpbb.com/support/documentation/3.1/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="https://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />', | |
| + 'SUPPORT_BODY' => 'Full support will be provided for the current stable release of phpBB3, free of charge. This includes:</p><ul><li>installation</li><li>configuration</li><li>technical questions</li><li>problems relating to potential bugs in the software</li><li>updating from Release Candidate (RC) versions to the latest stable version</li><li>converting from phpBB 2.0.x to phpBB3</li><li>converting from other discussion board software to phpBB3 (please see the <a href="https://www.phpbb.com/community/viewforum.php?f=486">Convertors Forum</a>)</li></ul><p>We encourage users still running beta versions of phpBB3 to replace their installation with a fresh copy of the latest version.</p><h2>Extensions / Styles</h2><p>For issues relating to Extensions, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=451">Extensions Forum</a>.<br />For issues relating to styles, templates and themes, please post in the appropriate <a href="https://www.phpbb.com/community/viewforum.php?f=471">Styles Forum</a>.<br /><br />If your question relates to a specific package, please post directly in the topic dedicated to the package.</p><h2>Obtaining Support</h2><p><a href="https://www.phpbb.com/community/viewtopic.php?f=14&t=571070">The phpBB Welcome Package</a><br /><a href="https://www.phpbb.com/support/">Support Section</a><br /><a href="https://www.phpbb.com/support/docs/en/3.1/ug/quickstart/">Quick Start Guide</a><br /><br />To ensure you stay up to date with the latest news and releases, why not <a href="https://www.phpbb.com/support/">subscribe to our mailing list</a>?<br /><br />', | |
| 'SYNC_FORUMS' => 'Starting to synchronise forums', | |
| 'SYNC_POST_COUNT' => 'Synchronising post_counts', | |
| 'SYNC_POST_COUNT_ID' => 'Synchronising post_counts from <var>entry</var> %1$s to %2$s.', | |
| diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php | |
| index ec5dd99..13e5bf7 100644 | |
| --- a/phpBB/language/en/search.php | |
| +++ b/phpBB/language/en/search.php | |
| @@ -71,6 +71,7 @@ $lang = array_merge($lang, array( | |
| 'NO_RECENT_SEARCHES' => 'No searches have been carried out recently.', | |
| 'NO_SEARCH' => 'Sorry but you are not permitted to use the search system.', | |
| 'NO_SEARCH_RESULTS' => 'No suitable matches were found.', | |
| + 'NO_SEARCH_LOAD' => 'Sorry but you cannot use search at this time. The server has high load. Please try again later.', | |
| 'NO_SEARCH_TIME' => array( | |
| 1 => 'Sorry but you cannot use search at this time. Please try again in %d second.', | |
| 2 => 'Sorry but you cannot use search at this time. Please try again in %d seconds.', |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment