diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-05-29 16:42:37 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-05-29 16:42:37 +0200 |
| commit | 9ead56acb3a64f2a6ac20336e02c0a976935bd3b (patch) | |
| tree | 9ef5ca1dd2927a0d22edad2a244758e1c5e9c2d1 /phpBB/language | |
| parent | efa96e1817847b94abe6d6d0f3f4a8563339f745 (diff) | |
| parent | 041b7be77ecd4e52048b94b4e47ad8268716a032 (diff) | |
| download | forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.tar forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.tar.gz forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.tar.bz2 forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.tar.xz forums-9ead56acb3a64f2a6ac20336e02c0a976935bd3b.zip | |
Merge remote-tracking branch 'github-dhruv/ticket/10308' into develop-olympus
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 eda9659795..785283faea 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -124,6 +124,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.', |