From dca6aaca5c13a4a9f3fd386d65cb44122cedaaf7 Mon Sep 17 00:00:00 2001 From: Gilles-Philippe Morin Date: Tue, 13 Jan 2015 22:10:21 -0500 Subject: "Recent changes" becomes "Recent Changes" To improve consistency: it is surrounded by "Update Profile" and "Media Manager". --- inc/lang/en/lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index fb455f85f..92eb636ed 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -27,7 +27,7 @@ $lang['btn_top'] = 'Back to top'; $lang['btn_newer'] = '<< more recent'; $lang['btn_older'] = 'less recent >>'; $lang['btn_revs'] = 'Old revisions'; -$lang['btn_recent'] = 'Recent changes'; +$lang['btn_recent'] = 'Recent Changes'; $lang['btn_upload'] = 'Upload'; $lang['btn_cancel'] = 'Cancel'; $lang['btn_index'] = 'Sitemap'; -- cgit v1.2.3 From 51cc540cb2e5c3cb76827d83253b5824a74e93ec Mon Sep 17 00:00:00 2001 From: Gilles-Philippe Morin Date: Sun, 18 Jan 2015 11:56:10 -0500 Subject: "Login" and "Logout" become "Log In" and "Log Out" This change improves consistency with neighboring links such as "Update Profile" and "Register", which are two action verbs. "Login" and "Logout" were nouns and not verbs. Title case capitalization is applied because of "Update Profile". --- inc/lang/en/lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 92eb636ed..a5347e026 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -32,8 +32,8 @@ $lang['btn_upload'] = 'Upload'; $lang['btn_cancel'] = 'Cancel'; $lang['btn_index'] = 'Sitemap'; $lang['btn_secedit'] = 'Edit'; -$lang['btn_login'] = 'Login'; -$lang['btn_logout'] = 'Logout'; +$lang['btn_login'] = 'Log In'; +$lang['btn_logout'] = 'Log Out'; $lang['btn_admin'] = 'Admin'; $lang['btn_update'] = 'Update'; $lang['btn_delete'] = 'Delete'; -- cgit v1.2.3 From e605e04172dda4a182be04c15e8f4cc9f5f17093 Mon Sep 17 00:00:00 2001 From: flammy Date: Thu, 12 Mar 2015 18:15:20 +0100 Subject: Added file-in-use reference to page Added english translation for file-in-use reference --- inc/lang/en/lang.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index a5347e026..8fff8037f 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -363,6 +363,7 @@ $lang['media_perm_read'] = 'Sorry, you don\'t have enough rights to read f $lang['media_perm_upload'] = 'Sorry, you don\'t have enough rights to upload files.'; $lang['media_update'] = 'Upload new version'; $lang['media_restore'] = 'Restore this version'; +$lang['media_acl_warning'] = 'This list might not be complete due to ACL restrictions and hidden pages.'; $lang['currentns'] = 'Current namespace'; $lang['searchresult'] = 'Search Result'; -- cgit v1.2.3 From 247faa0e1e35a1aea8f23606e74a3d667333ae6b Mon Sep 17 00:00:00 2001 From: Patrick Brown Date: Fri, 3 Apr 2015 21:56:27 -0400 Subject: Remove unused language strings --- inc/lang/en/lang.php | 4 ---- 1 file changed, 4 deletions(-) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index a5347e026..81d8a94bf 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -39,7 +39,6 @@ $lang['btn_update'] = 'Update'; $lang['btn_delete'] = 'Delete'; $lang['btn_back'] = 'Back'; $lang['btn_backlink'] = 'Backlinks'; -$lang['btn_backtomedia'] = 'Back to Mediafile Selection'; $lang['btn_subscribe'] = 'Manage Subscriptions'; $lang['btn_profile'] = 'Update Profile'; $lang['btn_reset'] = 'Reset'; @@ -159,7 +158,6 @@ $lang['rssfailed'] = 'An error occurred while fetching this feed: '; $lang['nothingfound'] = 'Nothing was found.'; $lang['mediaselect'] = 'Media Files'; -$lang['fileupload'] = 'Media File Upload'; $lang['uploadsucc'] = 'Upload successful'; $lang['uploadfail'] = 'Upload failed. Maybe wrong permissions?'; $lang['uploadwrong'] = 'Upload denied. This file extension is forbidden!'; @@ -256,8 +254,6 @@ $lang['qb_chars'] = 'Special Chars'; $lang['upperns'] = 'jump to parent namespace'; -$lang['admin_register'] = 'Add new user'; - $lang['metaedit'] = 'Edit Metadata'; $lang['metasaveerr'] = 'Writing metadata failed'; $lang['metasaveok'] = 'Metadata saved'; -- cgit v1.2.3 From d49d4260ee0fed5eabc3773440fc1073a87c56dd Mon Sep 17 00:00:00 2001 From: Patrick Brown Date: Sat, 4 Apr 2015 00:34:33 -0400 Subject: Remove no longer needed language string --- inc/lang/en/lang.php | 1 - 1 file changed, 1 deletion(-) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 81d8a94bf..3f11a1ee4 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -290,7 +290,6 @@ $lang['subscr_style_list'] = 'list of changed pages since last email (e /* auth.class language support */ $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.'; /* installer strings */ $lang['i_chooselang'] = 'Choose your language'; -- cgit v1.2.3 From db9faf025cf129d15a086a803e8056e977975d76 Mon Sep 17 00:00:00 2001 From: Patrick Brown Date: Wed, 6 May 2015 01:30:59 -0400 Subject: Report more meaningful errors when an auth backend fails. closes #1093 --- inc/lang/en/lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'inc/lang/en/lang.php') diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 3f11a1ee4..2bbf61000 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -75,6 +75,7 @@ $lang['regmissing'] = 'Sorry, you must fill in all fields.'; $lang['reguexists'] = 'Sorry, a user with this login already exists.'; $lang['regsuccess'] = 'The user has been created and the password was sent by email.'; $lang['regsuccess2'] = 'The user has been created.'; +$lang['regfail'] = 'The user could not be created.'; $lang['regmailfail'] = 'Looks like there was an error on sending the password mail. Please contact the admin!'; $lang['regbadmail'] = 'The given email address looks invalid - if you think this is an error, contact the admin'; $lang['regbadpass'] = 'The two given passwords are not identical, please try again.'; @@ -90,6 +91,7 @@ $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['proffail'] = 'User profile was not updated.'; $lang['pwdforget'] = 'Forgotten your password? Get a new one'; $lang['resendna'] = 'This wiki does not support password resending.'; -- cgit v1.2.3