diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-09 17:55:25 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-09 17:55:25 +0200 |
| commit | b6232aa9b213fbf62f5ce351bc79220daf243cc6 (patch) | |
| tree | 0e169650c4b0bb9476b5f0f917bff6952b574e4d /phpBB/language/en/common.php | |
| parent | 0c5af536f1de55b6ee30ab9f193b6ea7637ac5b1 (diff) | |
| parent | 92f43c5371f1f37bd6d77ade2fc5e2804b5cc49f (diff) | |
| download | forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.tar forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.tar.gz forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.tar.bz2 forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.tar.xz forums-b6232aa9b213fbf62f5ce351bc79220daf243cc6.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus
* github-nickvergessen/ticket/10073: (36 commits)
[ticket/10073] Fix button descriptions
[ticket/10073] Do not check disable boxes by default
[ticket/10073] Store values with config_text in the ACP
[ticket/10073] Move config values to config_text
[ticket/10073] Fix request usage
[ticket/10073] Deduplicate template variable names
[ticket/10073] Get service from container
[ticket/10073] Fix more "Contact Us" strings
[ticket/10073] Move template code into the template
[ticket/10073] Make contact page available when board is disabled
[ticket/10073] Change name of the ACP module
[ticket/10073] Deduplicate posting buttons code in ACP
[ticket/10073] Use phpbb_validate_email to verify email address
[ticket/10073] Add tests for new validate_email()
[ticket/10073] Split email validation from email ban and taken checks
[ticket/10073] Deduplicate the if statement
[ticket/10073] Fallback to board_contact when contact page is disabled
[ticket/10073] Remove language string from rebase conflict
[ticket/10073] Add ACP module to add bbcode text for contact admin info
[ticket/10073] Add new configs to the schema
...
Diffstat (limited to 'phpBB/language/en/common.php')
| -rw-r--r-- | phpBB/language/en/common.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 2020783100..91be876514 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -171,6 +171,7 @@ $lang = array_merge($lang, array( 'CONNECTION_SUCCESS' => 'Connection was successful!', 'CONTACT' => 'Contact', 'CONTACT_USER' => 'Contact %s', + 'CONTACT_US' => 'Contact us', 'COOKIES_DELETED' => 'All board cookies successfully deleted.', 'CURRENT_TIME' => 'It is currently %s', @@ -668,8 +669,8 @@ $lang = array_merge($lang, array( 'SELECT_ALL_CODE' => 'Select all', 'SELECT_DESTINATION_FORUM' => 'Please select a destination forum', 'SELECT_FORUM' => 'Select a forum', - 'SEND_EMAIL' => 'Email', // Used for submit buttons - 'SEND_EMAIL_USER' => 'Email %s', + 'SEND_EMAIL' => 'Send email', // Used for submit buttons + 'SEND_EMAIL_USER' => 'Send email to %s', 'SEND_PRIVATE_MESSAGE' => 'Send private message', 'SETTINGS' => 'Settings', 'SIGNATURE' => 'Signature', @@ -732,7 +733,7 @@ $lang = array_merge($lang, array( 'TOO_SHORT_USER_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_USERNAME' => 'The username you entered is too short.', 'TOO_SHORT_EMAIL' => 'The email address you entered is too short.', - + 'TOO_SHORT_EMAIL_CONFIRM' => 'The email address confirmation you entered is too short.', 'TOO_SMALL' => 'The value you entered is too small.', 'TOO_SMALL_MAX_RECIPIENTS' => 'The value of <strong>Maximum number of allowed recipients per private message</strong> setting you entered is too small.', |