diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-11 17:37:56 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-11 17:37:56 +0200 |
| commit | bad90dafbfe8a093a518b90b82a01d4e63e757f2 (patch) | |
| tree | e97a0d694ba8926910f8afb512302907fb1d6e32 /phpBB/language | |
| parent | 91df95a90dd3266f4beeb7df7534f75882909581 (diff) | |
| parent | 70978e96d34ddf3bea24c363800e9fc920c3120b (diff) | |
| download | forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.tar forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.tar.gz forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.tar.bz2 forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.tar.xz forums-bad90dafbfe8a093a518b90b82a01d4e63e757f2.zip | |
Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus
* github-marc1706/ticket/12822:
[ticket/12822] Fix test runs of avatar manager_test
[ticket/12822] Add method for deleting avatars and use confirm_box
[ticket/12822] Remove "None" option from avatar select boxes
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 4ce69e0b85..783faa8fad 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -167,6 +167,7 @@ $lang = array_merge($lang, array( 'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as it appears. All letters are case insensitive.', 'CONFIRM_CODE_WRONG' => 'The confirmation code you entered was incorrect.', 'CONFIRM_OPERATION' => 'Are you sure you wish to carry out this operation?', + 'CONFIRM_AVATAR_DELETE' => 'Are you sure you wish to delete this avatar?', 'CONGRATULATIONS' => 'Congratulations to', 'CONNECTION_FAILED' => 'Connection failed.', 'CONNECTION_SUCCESS' => 'Connection was successful!', @@ -481,7 +482,6 @@ $lang = array_merge($lang, array( 'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.', 'NO_AUTH_OPERATION' => 'You do not have the necessary permissions to complete this operation.', 'NO_AVATARS' => 'No avatars currently available', - 'NO_AVATAR_SELECTED' => 'You have not selected any avatar.', 'NO_CONNECT_TO_SMTP_HOST' => 'Could not connect to smtp host : %1$s : %2$s', 'NO_BIRTHDAYS' => 'No birthdays today', 'NO_EMAIL_MESSAGE' => 'Email message was blank.', |