Created
June 11, 2015 17:07
-
-
Save nickvergessen/ff7024c312a7b23f9e1e to your computer and use it in GitHub Desktop.
language changes 3.1.4 to 3.1.5-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 28cdc88..bacb33c 100644 | |
--- a/phpBB/language/en/acp/extensions.php | |
+++ b/phpBB/language/en/acp/extensions.php | |
@@ -75,7 +75,7 @@ $lang = array_merge($lang, array( | |
<li>Upload the new files</li> | |
<li>Enable the extension</li> | |
</ol>', | |
- 'EXTENSION_REMOVE_HEADLINE' => 'Completly removing an extension from your board', | |
+ 'EXTENSION_REMOVE_HEADLINE' => 'Completely removing an extension from your board', | |
'EXTENSION_REMOVE_EXPLAIN' => '<ol> | |
<li>Disable the extension</li> | |
<li>Delete the extension’s data</li> | |
diff --git a/phpBB/language/en/captcha_recaptcha.php b/phpBB/language/en/captcha_recaptcha.php | |
index 18438ab..df2ad4e 100644 | |
--- a/phpBB/language/en/captcha_recaptcha.php | |
+++ b/phpBB/language/en/captcha_recaptcha.php | |
@@ -47,6 +47,6 @@ $lang = array_merge($lang, array( | |
'RECAPTCHA_PRIVATE' => 'Private reCaptcha key', | |
'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. Keys can be obtained on <a href="http://www.google.com/recaptcha">www.google.com/recaptcha</a>.', | |
- 'RECAPTCHA_EXPLAIN' => 'In an effort to prevent automatic submissions, we require that you enter both of the words displayed into the text field underneath.', | |
+ 'RECAPTCHA_EXPLAIN' => 'In an effort to prevent automatic submissions, we require that you type the text displayed into the field underneath.', | |
'RECAPTCHA_SOCKET_ERROR' => 'There was a problem connecting to the RECAPTCHA service: could not open socket. Try again later.', | |
)); | |
diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php | |
index f5a5681..244a5fa 100644 | |
--- a/phpBB/language/en/migrator.php | |
+++ b/phpBB/language/en/migrator.php | |
@@ -52,6 +52,13 @@ $lang = array_merge($lang, array( | |
'MIGRATION_SCHEMA_DONE' => 'Installed Schema: %1$s; Time: %2$.2f seconds', | |
'MIGRATION_SCHEMA_RUNNING' => 'Installing Schema: %s.', | |
+ 'MIGRATION_INVALID_DATA_MISSING_CONDITION' => 'A migration is invalid. An if statement helper is missing a condition.', | |
+ 'MIGRATION_INVALID_DATA_MISSING_STEP' => 'A migration is invalid. An if statement helper is missing a valid call to a migration step.', | |
+ 'MIGRATION_INVALID_DATA_CUSTOM_NOT_CALLABLE' => 'A migration is invalid. A custom callable function could not be called.', | |
+ 'MIGRATION_INVALID_DATA_UNKNOWN_TYPE' => 'A migration is invalid. An unknown migration tool type was encountered.', | |
+ 'MIGRATION_INVALID_DATA_UNDEFINED_TOOL' => 'A migration is invalid. An undefined migration tool was encountered.', | |
+ 'MIGRATION_INVALID_DATA_UNDEFINED_METHOD' => 'A migration is invalid. An undefined migration tool method was encountered.', | |
+ | |
'MODULE_ERROR' => 'An error occurred while creating a module: %s', | |
'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s', | |
'MODULE_NOT_EXIST' => 'A required module does not exist: %s', |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment