Siebrand has submitted this change and it was merged.

Change subject: Fix incorrect find and replace
......................................................................


Fix incorrect find and replace

Follow-up to Change-Id: Id97cc19152d8f82e2c1e7525de00be519bb1b599. No idea
what went wrong here... Thanks for spotting.

Change-Id: Ib224f6c5903234232aaeed5c57c4590fdaf6c9c5
---
M settings/Settings.i18n.php
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Siebrand: Verified; Looks good to me, approved



diff --git a/settings/Settings.i18n.php b/settings/Settings.i18n.php
index 48ac8d0..c5f029c 100644
--- a/settings/Settings.i18n.php
+++ b/settings/Settings.i18n.php
@@ -198,7 +198,7 @@
        'configure-setting-wgWhitelistRead' => 'Pages anonymous user may see',
        'configure-setting-wgEmailAuthentication' => 'Require authentication of 
email addresses for email functions',
        'configure-setting-wgEmergencyContact' => 'Site administrator email 
address',
-       'configure-setting-wgEnableEmail' => 'Enable emailfeatures',
+       'configure-setting-wgEnableEmail' => 'Enable email features',
        'configure-setting-wgEnableUserEmail' => 'Enable user-to-user email',
        'configure-setting-wgNoReplyAddress' => 'Dummy address which should be 
accepted during email send action',
        'configure-setting-wgPasswordSender' => 'Password reminder email 
address',
@@ -618,12 +618,12 @@
        'configure-setting-wgBlockDisablesLogin' => 'Disallow blocked users to 
login',
        'configure-setting-wgSysopEmailBans' => 'Allow administrators to ban 
users from accessing [[Special:EmailUser]]',
        'configure-setting-wgEnotifFromEditor' => 'Email notifications appear 
to be coming from the page editor (not from wiki server)',
-       'configure-setting-wgEnotifImpersonal' => 'Send a generic email instead 
of a personalised emailfor each user',
-       'configure-setting-wgEnotifMaxRecips' => 'Maximum number of users to 
eemailat once when using impersonal email',
+       'configure-setting-wgEnotifImpersonal' => 'Send a generic email instead 
of a personalised email for each user',
+       'configure-setting-wgEnotifMaxRecips' => 'Maximum number of users to 
email at once when using impersonal email',
        'configure-setting-wgEnotifMinorEdits' => 'Email notifications also for 
"minor edits" (user preference is shown and user needs to opt-in)',
-       'configure-setting-wgEnotifRevealEditorAddress' => "Reply-to address of 
emailnotifications may be filled with page editor's address (user preference is 
shown and user needs to opt-in)",
+       'configure-setting-wgEnotifRevealEditorAddress' => "Reply-to address of 
email notifications may be filled with page editor's address (user preference 
is shown and user needs to opt-in)",
        'configure-setting-wgEnotifUseJobQ' => 'Send emails via the job queue',
-       'configure-setting-wgEnotifUseRealName' => 'Use real name instead of 
username in email"from" field',
+       'configure-setting-wgEnotifUseRealName' => 'Use real name instead of 
username in email "from" field',
        'configure-setting-wgEnotifUserTalk' => 'Email notifications can be 
sent for first change on a user_talk page (user preference is shown and user 
needs to opt-in)',
        'configure-setting-wgEnotifWatchlist' => 'Email notifications can be 
sent for the first change on watched pages (user preference is shown and user 
needs to opt-in)',
        'configure-setting-wgUsersNotifiedOnAllChanges' => 'Usernames who will 
be sent a notification email for every change which occurs on a wiki',

-- 
To view, visit https://gerrit.wikimedia.org/r/51166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib224f6c5903234232aaeed5c57c4590fdaf6c9c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Configure
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to