Created
August 23, 2015 16:07
-
-
Save nickvergessen/d51b56b3df199dcf2ab8 to your computer and use it in GitHub Desktop.
language changes 3.1.5 to 3.1.6-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/extensions.php b/phpBB/language/en/acp/extensions.php | |
| index bacb33c..e5d6789 100644 | |
| --- a/phpBB/language/en/acp/extensions.php | |
| +++ b/phpBB/language/en/acp/extensions.php | |
| @@ -68,6 +68,12 @@ $lang = array_merge($lang, array( | |
| 'EXTENSION_NAME' => 'Extension Name', | |
| 'EXTENSION_ACTIONS' => 'Actions', | |
| 'EXTENSION_OPTIONS' => 'Options', | |
| + 'EXTENSION_INSTALL_HEADLINE'=> 'Installing an extension', | |
| + 'EXTENSION_INSTALL_EXPLAIN' => '<ol> | |
| + <li>Download an extension from phpBB’s extensions database</li> | |
| + <li>Unzip the extension and upload it to the <samp>ext/</samp> directory of your phpBB board</li> | |
| + <li>Enable the extension, here in the Extensions manager</li> | |
| + </ol>', | |
| 'EXTENSION_UPDATE_HEADLINE' => 'Updating an extension', | |
| 'EXTENSION_UPDATE_EXPLAIN' => '<ol> | |
| <li>Disable the extension</li> | |
| @@ -119,6 +125,8 @@ $lang = array_merge($lang, array( | |
| 'FORCE_UNSTABLE' => 'Always check for unstable versions', | |
| 'EXTENSIONS_VERSION_CHECK_SETTINGS' => 'Version check settings', | |
| + 'BROWSE_EXTENSIONS_DATABASE' => 'Browse extensions database', | |
| + | |
| 'META_FIELD_NOT_SET' => 'Required meta field %s has not been set.', | |
| 'META_FIELD_INVALID' => 'Meta field %s is invalid.', | |
| )); | |
| diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php | |
| index f46e78e..d14491a 100644 | |
| --- a/phpBB/language/en/acp/language.php | |
| +++ b/phpBB/language/en/acp/language.php | |
| @@ -73,4 +73,6 @@ $lang = array_merge($lang, array( | |
| 'THOSE_MISSING_LANG_VARIABLES' => 'The following language variables are missing from the “%s” language pack', | |
| 'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs', | |
| + | |
| + 'BROWSE_LANGUAGE_PACKS_DATABASE' => 'Browse language packs database', | |
| )); | |
| diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php | |
| index e6b05c8..0d91eb3 100644 | |
| --- a/phpBB/language/en/acp/styles.php | |
| +++ b/phpBB/language/en/acp/styles.php | |
| @@ -83,4 +83,6 @@ $lang = array_merge($lang, array( | |
| 'STYLE_USED_BY' => 'Used by (including robots)', | |
| 'UNINSTALL_DEFAULT' => 'You cannot uninstall the default style.', | |
| + | |
| + 'BROWSE_STYLES_DATABASE' => 'Browse styles database', | |
| )); | |
| diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php | |
| index 0a8d305..989e5fc 100644 | |
| --- a/phpBB/language/en/help_bbcode.php | |
| +++ b/phpBB/language/en/help_bbcode.php | |
| @@ -90,7 +90,7 @@ $help = array( | |
| ), | |
| array( | |
| 0 => 'Linking to another site', | |
| - 1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=http://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>http://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="http://www.phpbb.com/">http://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading http://. For example typing www.phpbb.com into your message will automatically lead to <a href="http://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.' | |
| + 1 => 'phpBB BBCode supports a number of ways of creating URIs (Uniform Resource Indicators) better known as URLs.<ul><li>The first of these uses the <strong>[url=][/url]</strong> tag, whatever you type after the = sign will cause the contents of that tag to act as a URL. For example to link to phpBB.com you could use:<br /><br /><strong>[url=https://www.phpbb.com/]</strong>Visit phpBB!<strong>[/url]</strong><br /><br />This would generate the following link, <a href="https://www.phpbb.com/">Visit phpBB!</a> Please notice that the link opens in the same window or a new window depending on the users browser preferences.</li><li>If you want the URL itself displayed as the link you can do this by simply using:<br /><br /><strong>[url]</strong>https://www.phpbb.com/<strong>[/url]</strong><br /><br />This would generate the following link, <a href="https://www.phpbb.com/">https://www.phpbb.com/</a></li><li>Additionally, phpBB features something called <i>Magic Links</i>, this will turn any syntactically correct URL into a link without you needing to specify any tags or even the leading https://. For example typing www.phpbb.com into your message will automatically lead to <a href="https://www.phpbb.com/">www.phpbb.com</a> being output when you view the message.</li><li>The same thing applies equally to email addresses, you can either specify an address explicitly for example:<br /><br /><strong>[email]</strong>no.one@domain.adr<strong>[/email]</strong><br /><br />which will output <a href="mailto:no.one@domain.adr">no.one@domain.adr</a> or you can just type no.one@domain.adr into your message and it will be automatically converted when you view.</li></ul>As with all the BBCode tags you can wrap URLs around any of the other tags such as <strong>[img][/img]</strong> (see next entry), <strong>[b][/b]</strong>, etc. As with the formatting tags it is up to you to ensure the correct open and close order is following, for example:<br /><br /><strong>[url=https://www.phpbb.com/][img]</strong>https://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/url][/img]</strong><br /><br />is <span style="text-decoration: underline">not</span> correct which may lead to your post being deleted so take care.' | |
| ), | |
| array( | |
| 0 => '--', | |
| @@ -98,7 +98,7 @@ $help = array( | |
| ), | |
| array( | |
| 0 => 'Adding an image to a post', | |
| - 1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=http://www.phpbb.com/][img]</strong>http://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="http://www.phpbb.com/"><img src="http://www.phpbb.com/theme/images/logos/blue/160x52.png" alt="" /></a>' | |
| + 1 => 'phpBB BBCode incorporates a tag for including images in your posts. Two very important things to remember when using this tag are: many users do not appreciate lots of images being shown in posts and secondly the image you display must already be available on the internet (it cannot exist only on your computer for example, unless you run a webserver!). To display an image you must surround the URL pointing to the image with <strong>[img][/img]</strong> tags. For example:<br /><br /><strong>[img]</strong>https://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img]</strong><br /><br />As noted in the URL section above you can wrap an image in a <strong>[url][/url]</strong> tag if you wish, e.g.<br /><br /><strong>[url=https://www.phpbb.com/][img]</strong>https://www.phpbb.com/theme/images/logos/blue/160x52.png<strong>[/img][/url]</strong><br /><br />would generate:<br /><br /><a href="https://www.phpbb.com/"><img src="https://www.phpbb.com/theme/images/logos/blue/160x52.png" alt="" /></a>' | |
| ), | |
| array( | |
| 0 => 'Adding attachments into a post', |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment