diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-04-29 17:08:49 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-04-29 17:08:49 +0200 |
| commit | 40351fae96de34312ca960abc5048c835f50e3ef (patch) | |
| tree | 83adee6a90e348142a19b20a645880f76f162f54 /phpBB/language/en/ucp.php | |
| parent | 0b6accf1acd32b08c84906276717b3bdd43335a4 (diff) | |
| parent | 23b3667978bb9177c8ffb6877904e117a18693fa (diff) | |
| download | forums-40351fae96de34312ca960abc5048c835f50e3ef.tar forums-40351fae96de34312ca960abc5048c835f50e3ef.tar.gz forums-40351fae96de34312ca960abc5048c835f50e3ef.tar.bz2 forums-40351fae96de34312ca960abc5048c835f50e3ef.tar.xz forums-40351fae96de34312ca960abc5048c835f50e3ef.zip | |
Merge pull request #2364 from nickvergessen/ticket/12456
[ticket/12456] Missing new lines at the end of file in language files
* nickvergessen/ticket/12456:
[ticket/12456] Add , after the last array element
[ticket/12456] Fix duplicated empty lines in language files
[ticket/12456] Fix missing new lines at the end of email templates
Diffstat (limited to 'phpBB/language/en/ucp.php')
| -rw-r--r-- | phpBB/language/en/ucp.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 5148589471..79d2b9fa3a 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -603,14 +603,14 @@ $lang = array_merge($lang, array( 'PLACE_INTO_FOLDER' => 'Place into folder', 'MARK_AS_READ' => 'Mark as read', 'MARK_AS_IMPORTANT' => 'Mark message', - 'DELETE_MESSAGE' => 'Delete message' + 'DELETE_MESSAGE' => 'Delete message', ), 'PM_CHECK' => array( 'SUBJECT' => 'Subject', 'SENDER' => 'Sender', 'MESSAGE' => 'Message', 'STATUS' => 'Message status', - 'TO' => 'Sent To' + 'TO' => 'Sent To', ), 'PM_RULE' => array( 'IS_LIKE' => 'is like', @@ -626,10 +626,9 @@ $lang = array_merge($lang, array( 'ANSWERED' => 'answered', 'FORWARDED' => 'forwarded', 'TO_GROUP' => 'to my default usergroup', - 'TO_ME' => 'to me' + 'TO_ME' => 'to me', ), - 'GROUPS_EXPLAIN' => 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you additional permissions to view content or increase your capabilities in other areas.', 'GROUP_LEADER' => 'Leaderships', 'GROUP_MEMBER' => 'Memberships', |