diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-08-02 21:52:50 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-08-02 21:52:50 +0200 |
| commit | 395e7d8e1e303ae87be5d88abc67947b89e1a5a4 (patch) | |
| tree | 4e91abd30543ca241c8528ab75d6a2264c43d151 /inc/lang/en | |
| parent | 5b230a45afb9bb825ba148e699bdcbfc57957fb4 (diff) | |
| parent | 836a17626793ab95d666c62e9c21b3df2568eeb4 (diff) | |
| download | rpg-395e7d8e1e303ae87be5d88abc67947b89e1a5a4.tar.gz rpg-395e7d8e1e303ae87be5d88abc67947b89e1a5a4.tar.bz2 | |
Merge branch 'pull-request-245'
* pull-request-245:
coding corrections. correct type hint, remove unused variable assignment
HTTPClient don't pull too much bytes when no content-length is given
de/de-informal: localization updates (delete user function)
unit tests for self deleting of user accounts
FS#2751 - self deletion of user account
Conflicts:
inc/lang/de-informal/lang.php
inc/lang/de/lang.php
Diffstat (limited to 'inc/lang/en')
| -rw-r--r-- | inc/lang/en/lang.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 00e71d254..630ccb3ff 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -51,6 +51,7 @@ $lang['btn_revert'] = 'Restore'; $lang['btn_register'] = 'Register'; $lang['btn_apply'] = 'Apply'; $lang['btn_media'] = 'Media Manager'; +$lang['btn_deleteuser'] = 'Remove My Account'; $lang['loggedinas'] = 'Logged in as'; $lang['user'] = 'Username'; @@ -63,6 +64,7 @@ $lang['fullname'] = 'Real name'; $lang['email'] = 'E-Mail'; $lang['profile'] = 'User Profile'; $lang['badlogin'] = 'Sorry, username or password was wrong.'; +$lang['badpassconfirm'] = 'Sorry, the password was wrong'; $lang['minoredit'] = 'Minor Changes'; $lang['draftdate'] = 'Draft autosaved on'; // full dformat date will be added $lang['nosecedit'] = 'The page was changed in the meantime, section info was out of date loaded full page instead.'; @@ -81,6 +83,11 @@ $lang['profna'] = 'This wiki does not support profile modificatio $lang['profnochange'] = 'No changes, nothing to do.'; $lang['profnoempty'] = 'An empty name or email address is not allowed.'; $lang['profchanged'] = 'User profile successfully updated.'; +$lang['profnodelete'] = 'This wiki does not support deleting users'; +$lang['profdeleteuser'] = 'Delete Account'; +$lang['profdeleted'] = 'Your user account has been deleted from this wiki'; +$lang['profconfdelete'] = 'I wish to remove my account from this wiki. <br/> This action can not be undone.'; +$lang['profconfdeletemissing'] = 'Confirmation check box not ticked'; $lang['pwdforget'] = 'Forgotten your password? Get a new one'; $lang['resendna'] = 'This wiki does not support password resending.'; |