From 2a7abf2d7fee6a2d6418e5ad4b79e37e6049bd92 Mon Sep 17 00:00:00 2001 From: Christopher Smith Date: Wed, 31 Jul 2013 18:14:26 +0200 Subject: FS#2751 - self deletion of user account --- inc/lang/en/lang.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'inc/lang/en') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index cdad6c9a6..d4acfad6e 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.
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.'; -- cgit v1.2.3 From 5a99d25b24f7e14f137084100f40325b7a2a71b4 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Thu, 1 Aug 2013 16:38:02 +0100 Subject: added aria attributes to edit mode --- inc/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/lang/en') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index cdad6c9a6..00e71d254 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -234,7 +234,7 @@ $lang['qb_extlink'] = 'External Link'; $lang['qb_hr'] = 'Horizontal Rule'; $lang['qb_ol'] = 'Ordered List Item'; $lang['qb_ul'] = 'Unordered List Item'; -$lang['qb_media'] = 'Add Images and other files'; +$lang['qb_media'] = 'Add Images and other files (opens in a new window)'; $lang['qb_sig'] = 'Insert Signature'; $lang['qb_smileys'] = 'Smileys'; $lang['qb_chars'] = 'Special Chars'; -- cgit v1.2.3 From b8983d3a45d16afc81d527fc2616f8c43bbf2c87 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Tue, 20 Aug 2013 21:18:30 -0700 Subject: Fix CodeSniffer violations Remove whitespace from end of lines to reduce the number of CodeSniffer violations. --- inc/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/lang/en') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 630ccb3ff..97ac36da9 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -84,7 +84,7 @@ $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['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.
This action can not be undone.'; $lang['profconfdeletemissing'] = 'Confirmation check box not ticked'; -- cgit v1.2.3 From 33f552fab34c9ddcc3b647aedcc86a6209c708af Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 3 Sep 2013 09:36:15 +0100 Subject: removed unused lang string (authmodfailed) --- inc/lang/en/lang.php | 1 - 1 file changed, 1 deletion(-) (limited to 'inc/lang/en') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 97ac36da9..d4ddf293a 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -287,7 +287,6 @@ $lang['subscr_style_digest'] = 'digest email of changes for each page (ev $lang['subscr_style_list'] = 'list of changed pages since last email (every %.2f days)'; /* auth.class language support */ -$lang['authmodfailed'] = 'Bad user authentication configuration. Please inform your Wiki Admin.'; $lang['authtempfail'] = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.'; $lang['authpwdexpire'] = 'Your password will expire in %d days, you should change it soon.'; -- cgit v1.2.3 From a1288caece2153c08e04252643c89815c1be2a66 Mon Sep 17 00:00:00 2001 From: Gerrit Uitslag Date: Thu, 31 Oct 2013 23:56:08 +0100 Subject: localize some meta header titels. Fixes FS#2409 --- inc/lang/en/lang.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'inc/lang/en') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index d4ddf293a..ab84c67f3 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -356,4 +356,8 @@ $lang['media_perm_upload'] = 'Sorry, you don\'t have enough rights to upload $lang['media_update'] = 'Upload new version'; $lang['media_restore'] = 'Restore this version'; +$lang['currentns'] = 'Current namespace'; +$lang['searchresult'] = 'Search Result'; +$lang['plainhtml'] = 'Plain HTML'; +$lang['wikimarkup'] = 'Wiki Markup'; //Setup VIM: ex: et ts=2 : -- cgit v1.2.3 From 74850f2906bbb3935065d28e3e22ac131766d6f2 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sat, 9 Nov 2013 19:51:29 +0000 Subject: added possibility to approve users to ACL policies in installer --- inc/lang/en/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/lang/en') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index ab84c67f3..c6bb0aa2d 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -315,6 +315,7 @@ $lang['i_policy'] = 'Initial ACL policy'; $lang['i_pol0'] = 'Open Wiki (read, write, upload for everyone)'; $lang['i_pol1'] = 'Public Wiki (read for everyone, write and upload for registered users)'; $lang['i_pol2'] = 'Closed Wiki (read, write, upload for registered users only)'; +$lang['i_policyapprove'] = 'Registered users need to be approved before allowing access (to a Public or Closed Wiki)'; $lang['i_retry'] = 'Retry'; $lang['i_license'] = 'Please choose the license you want to put your content under:'; $lang['i_license_none'] = 'Do not show any license information'; -- cgit v1.2.3 From 43c137edff65d5383d3e19fbbf50bc5045e4107a Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 17 Nov 2013 19:55:02 +0000 Subject: changed user approval option to disable registration option in installer --- inc/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/lang/en') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index c6bb0aa2d..7d52ca3db 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -315,7 +315,7 @@ $lang['i_policy'] = 'Initial ACL policy'; $lang['i_pol0'] = 'Open Wiki (read, write, upload for everyone)'; $lang['i_pol1'] = 'Public Wiki (read for everyone, write and upload for registered users)'; $lang['i_pol2'] = 'Closed Wiki (read, write, upload for registered users only)'; -$lang['i_policyapprove'] = 'Registered users need to be approved before allowing access (to a Public or Closed Wiki)'; +$lang['i_disablereg'] = 'Do not allow users to register themselves'; $lang['i_retry'] = 'Retry'; $lang['i_license'] = 'Please choose the license you want to put your content under:'; $lang['i_license_none'] = 'Do not show any license information'; -- cgit v1.2.3 From ab9346edc1621443d00551060b6db2d544ad3a71 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Sun, 17 Nov 2013 20:53:46 +0000 Subject: swapped logic for allowing/disabling registration in installer --- inc/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/lang/en') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 7d52ca3db..17a75803f 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -315,7 +315,7 @@ $lang['i_policy'] = 'Initial ACL policy'; $lang['i_pol0'] = 'Open Wiki (read, write, upload for everyone)'; $lang['i_pol1'] = 'Public Wiki (read for everyone, write and upload for registered users)'; $lang['i_pol2'] = 'Closed Wiki (read, write, upload for registered users only)'; -$lang['i_disablereg'] = 'Do not allow users to register themselves'; +$lang['i_allowreg'] = 'Allow users to register themselves'; $lang['i_retry'] = 'Retry'; $lang['i_license'] = 'Please choose the license you want to put your content under:'; $lang['i_license_none'] = 'Do not show any license information'; -- cgit v1.2.3