diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-05-29 16:40:00 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-05-29 16:40:00 +0200 |
| commit | 8438b61cef7ad80f8e4544f8f2cf25a5860c9da0 (patch) | |
| tree | 9e5aa04742a9477733136f19811262066f1a8e6d /phpBB/language | |
| parent | 657942ec29c0e433aa59d9554430c13663657864 (diff) | |
| parent | 041b7be77ecd4e52048b94b4e47ad8268716a032 (diff) | |
| download | forums-8438b61cef7ad80f8e4544f8f2cf25a5860c9da0.tar forums-8438b61cef7ad80f8e4544f8f2cf25a5860c9da0.tar.gz forums-8438b61cef7ad80f8e4544f8f2cf25a5860c9da0.tar.bz2 forums-8438b61cef7ad80f8e4544f8f2cf25a5860c9da0.tar.xz forums-8438b61cef7ad80f8e4544f8f2cf25a5860c9da0.zip | |
Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop
By Dhruv Goel
via Dhruv Goel
* github-dhruv/ticket/10308:
[ticket/10308] fixes indentation
[ticket/10308] fixes language variable name
[ticket/10308] makes variable boolean
[ticket/10308] fixes sql query, limit it to 1
[ticket/10308] fixes user deletion if no posts
[ticket/10308] renames language key to USER_NO_POSTS_DELETE
[ticket/10308] fix language and user's total posts
[ticket/10308] fixes language entity.
[ticket/10308] Displays message to user if there are no posts.
[ticket/10308] disable retain/ delete posts option when deleting a user
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/users.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 4496fdba7c..45cf36469b 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -123,6 +123,7 @@ $lang = array_merge($lang, array( 'USER_GROUP_SPECIAL' => 'Pre-defined groups user is a member of', 'USER_LIFTED_NR' => 'Successfully removed the user’s newly registered status.', 'USER_NO_ATTACHMENTS' => 'There are no attached files to display.', + 'USER_NO_POSTS_TO_DELETE' => 'The user has no posts to retain or delete.', 'USER_OUTBOX_EMPTIED' => 'Successfully emptied user’s private message outbox.', 'USER_OUTBOX_EMPTY' => 'The user’s private message outbox was already empty.', 'USER_OVERVIEW_UPDATED' => 'User details updated.', |