aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/acp/common.php1
-rw-r--r--phpBB/language/en/acp/language.php8
-rw-r--r--phpBB/language/en/common.php16
3 files changed, 25 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index e22559e8cb..d796137bf3 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -415,6 +415,7 @@ $lang = array_merge($lang, array(
'LOG_LANGUAGE_PACK_DELETED' => '<b>Deleted language pack</b><br />&#187; %s',
'LOG_LANGUAGE_PACK_INSTALLED' => '<b>Installed language pack</b><br />&#187; %s',
'LOG_LANGUAGE_PACK_UPDATED' => '<b>Updated language pack details</b><br />&#187; %s',
+ 'LOG_LANGUAGE_FILE_REPLACED' => '<b>Replaced language file</b><br />&#187; %s',
'LOG_MASS_EMAIL' => '<b>Sent mass email</b><br />&#187; %s',
diff --git a/phpBB/language/en/acp/language.php b/phpBB/language/en/acp/language.php
index 26e1e86e5c..8cebfdf16a 100644
--- a/phpBB/language/en/acp/language.php
+++ b/phpBB/language/en/acp/language.php
@@ -37,10 +37,13 @@ $lang = array_merge($lang, array(
'FILE_CONTENTS' => 'File Contents',
'FILE_FROM_STORAGE' => 'File from storage folder',
+ 'TEST_CONNECTION' => 'Test Connection',
+
'HELP_FILES' => 'Help Files',
'INSTALLED_LANGUAGE_PACKS' => 'Installed language packs',
'INVALID_LANGUAGE_PACK' => 'The selected language pack seems to be not valid. Please verify the language pack and upload it again if necessary.',
+ 'INVALID_UPLOAD_METHOD' => 'The selected upload method is not valid, please choose a different method.',
'LANGUAGE_DETAILS_UPDATED' => 'Language details successfully updated',
'LANGUAGE_ENTRIES' => 'Language Entries',
@@ -74,12 +77,17 @@ $lang = array_merge($lang, array(
'SELECT_DOWNLOAD_FORMAT' => 'Select download format',
'SUBMIT_AND_DOWNLOAD' => 'Submit and Download File',
+ 'SUBMIT_AND_UPLOAD' => 'Submit and Upload File',
'THOSE_MISSING_LANG_FILES' => 'The following language files are missing from the %s language folder',
'THOSE_MISSING_LANG_VARIABLES' => 'The following language variables are missing from the <b>%s</b> language pack',
'UNINSTALLED_LANGUAGE_PACKS' => 'Uninstalled language packs',
+ 'UPLOAD_COMPLETED' => 'The upload has completed',
+ 'UPLOAD_METHOD' => 'Upload method',
+ 'UPLOAD_SETTINGS' => 'Upload settings',
+
'WRONG_LANGUAGE_FILE' => 'Selected language file is invalid',
));
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index fa6032b8dc..7d495a7444 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -92,6 +92,8 @@ $lang = array_merge($lang, array(
'CLICK_VIEW_PRIVMSG' => 'Click %sHere%s to visit your Inbox',
'CONFIRM' => 'Confirm',
'CONGRATULATIONS' => 'Congratulations to',
+ 'CONNECTION_FAILED' => 'Connection failed',
+ 'CONNECTION_SUCCESS' => 'Connection was successful!',
'COOKIES_DELETED' => 'All Board Cookies successfully deleted.',
'CURRENT_TIME' => 'The time is %s',
@@ -119,6 +121,7 @@ $lang = array_merge($lang, array(
'EMAIL_ADDRESS' => 'Email address',
'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.',
'ENABLED' => 'Enabled',
+ 'ERR_CONNECTING_SERVER' => 'Error connecting to the server',
'EXTENSION' => 'Extension',
'EXTENSION_DISABLED_AFTER_POSTING' => 'The extension <b>%s</b> has been deactivated and can no longer be displayed',
@@ -141,6 +144,19 @@ $lang = array_merge($lang, array(
'FORUM_RULES_LINK' => 'Please click to view the forum rules',
'FROM' => 'from',
+ 'FTP_HOST' => 'FTP Host',
+ 'FTP_HOST_EXPLAIN' => 'FTP Server used to connect your site',
+ 'FTP_PASSWORD' => 'FTP Password',
+ 'FTP_PASSWORD_EXPLAIN' => 'Password for your FTP Username',
+ 'FTP_PORT' => 'FTP Port',
+ 'FTP_PORT_EXPLAIN' => 'Port used to connect to your server',
+ 'FTP_ROOT_PATH' => 'Path to phpBB',
+ 'FTP_ROOT_PATH_EXPLAIN' => 'Path from the root to your phpBB board',
+ 'FTP_TIMEOUT' => 'FTP Timeout',
+ 'FTP_TIMEOUT_EXPLAIN' => 'The amount of time, in seconds, that the system will wait for a reply from your server',
+ 'FTP_USERNAME' => 'FTP Username',
+ 'FTP_USERNAME_EXPLAIN' => 'Username used to connect to your server',
+
'GO' => 'Go',
'GOTO_PAGE' => 'Goto page',
'GROUP' => 'Group',