diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-13 11:28:21 +0100 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-13 11:28:21 +0100 |
commit | 8a61e4b4c0a490125409cd8990a92e0fe6edebdf (patch) | |
tree | d465f2f8143ff4c81ddfc98fba3a889a5f21c1e0 /phpBB/language/en | |
parent | bd33855e7b580895b8f97cb5f73a48bc296f6c41 (diff) | |
parent | 21961a25ba4c8057afb1e41473827f5d69d2f318 (diff) | |
download | forums-8a61e4b4c0a490125409cd8990a92e0fe6edebdf.tar forums-8a61e4b4c0a490125409cd8990a92e0fe6edebdf.tar.gz forums-8a61e4b4c0a490125409cd8990a92e0fe6edebdf.tar.bz2 forums-8a61e4b4c0a490125409cd8990a92e0fe6edebdf.tar.xz forums-8a61e4b4c0a490125409cd8990a92e0fe6edebdf.zip |
Merge remote-tracking branch 'crizz0/ticket/8785' into develop
* crizz0/ticket/8785:
[ticket/8785] Deletes additional add and add_bcc buttons
[ticket/8785] Fixed problem with add empty.png and travis will now pass
[ticket/8785] and again a fresh line
[ticket/8785] Just one blank line
[ticket/8785] pm_layout.html back to more standard code
[ticket/8785] <hr /> will only displayed when needed
[ticket/8785] Adds blank lines at file end
[ticket/8785] Adds a new optical improvement, new file and fixes html bugs
[ticket/8785] Adds two <hr /> to seperate recipients and BCC
[ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px
[ticket/8785] Little spaces mistake
[ticket/8785] Rebuilding posting_editor pm head + new language vars
Diffstat (limited to 'phpBB/language/en')
-rw-r--r-- | phpBB/language/en/ucp.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 58bb1d4b3a..40c8bd9f8e 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -476,7 +476,11 @@ $lang = array_merge($lang, array( 'TIMEZONE' => 'Timezone', 'TIMEZONE_DATE_SUGGESTION' => 'Suggestion: %s', 'TIMEZONE_INVALID' => 'The timezone you selected is invalid.', - 'TO' => 'To', + 'TO' => 'Recipient', + 'TO_MASS' => 'Recipients', + 'TO_ADD' => 'Add recipient', + 'TO_ADD_MASS' => 'Add recipients', + 'TO_ADD_GROUPS' => 'Add groups', 'TOO_MANY_RECIPIENTS' => 'You tried to send a private message to too many recipients.', 'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.', |