diff options
| author | 3Di <three3di@hotmail.it> | 2019-03-23 05:09:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-23 05:09:17 +0100 |
| commit | 6921565efe4674c51eb08326313cfca3349eedd5 (patch) | |
| tree | dabee12a9a81fe778be6769c5f1abc5be36ab9cf /phpBB/language | |
| parent | 6c1664f6d3b85c1b4d620870444c8f4b82b08e57 (diff) | |
| parent | 0d04f53f374db12a1a285992a9c789a836848b3e (diff) | |
| download | forums-6921565efe4674c51eb08326313cfca3349eedd5.tar forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.gz forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.bz2 forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.xz forums-6921565efe4674c51eb08326313cfca3349eedd5.zip | |
Merge branch '3.2.x' into ticket/15948
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/groups.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/email/report_pm.txt | 2 | ||||
| -rw-r--r-- | phpBB/language/en/posting.php | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index c3a5ae9e44..5d68132a34 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -111,6 +111,7 @@ $lang = array_merge($lang, array( 'GROUP_USERS_ADDED' => 'New users added to group successfully.', 'GROUP_USERS_EXIST' => 'The selected users are already members.', 'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully.', + 'GROUP_USERS_INVALID' => 'No users were added to the group as the following usernames do not exist: %s', 'LEGEND_EXPLAIN' => 'These are the groups which are displayed in the group legend:', 'LEGEND_SETTINGS' => 'Legend settings', diff --git a/phpBB/language/en/email/report_pm.txt b/phpBB/language/en/email/report_pm.txt index a101a014ff..a6b8086a9a 100644 --- a/phpBB/language/en/email/report_pm.txt +++ b/phpBB/language/en/email/report_pm.txt @@ -1,4 +1,4 @@ -Subject: Private Message report - "{TOPIC_TITLE}" +Subject: Private Message report - "{SUBJECT}" Hello {USERNAME}, diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 7c415b3457..11ea6483e1 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -145,6 +145,7 @@ $lang = array_merge($lang, array( 'LOAD_DRAFT_EXPLAIN' => 'Here you are able to select the draft you want to continue writing. Your current post will be cancelled, all current post contents will be deleted. View, edit and delete drafts within your User Control Panel.', 'LOGIN_EXPLAIN_BUMP' => 'You need to login in order to bump topics within this forum.', 'LOGIN_EXPLAIN_DELETE' => 'You need to login in order to delete posts within this forum.', + 'LOGIN_EXPLAIN_SOFT_DELETE' => 'You need to login in order to soft-delete posts within this forum.', 'LOGIN_EXPLAIN_POST' => 'You need to login in order to post within this forum.', 'LOGIN_EXPLAIN_QUOTE' => 'You need to login in order to quote posts within this forum.', 'LOGIN_EXPLAIN_REPLY' => 'You need to login in order to reply to topics within this forum.', |