From 8f9b00e50aa7ef33c43bdf8d5bdef3ba842ba7da Mon Sep 17 00:00:00 2001
From: Kevin Israel <pleasestand@live.com>
Date: Thu, 5 Dec 2013 03:25:53 -0500
Subject: [PATCH] Remove unused messages 'resetprefs' and 'timezoneoffset'

Follows-up r49790 (155ddf6de4a2).

I would have also deleted 'searchresultshead' had it not been for the fact
that the SemanticDrilldown extension still uses it (albeit incorrectly).
So for now, I am leaving that message in, adding a note that the message
is deprecated.

Change-Id: I4485c6fbe4fc7640c9cb2d765738fbec6bee26ab
---
 languages/messages/MessagesEn.php  | 2 --
 languages/messages/MessagesQqq.php | 2 +-
 maintenance/language/messages.inc  | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1bd59b28b8..ba2220c7d9 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1920,7 +1920,6 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'prefs-email'                   => 'Email options',
 'prefs-rendering'               => 'Appearance',
 'saveprefs'                     => 'Save',
-'resetprefs'                    => 'Clear unsaved changes',
 'restoreprefs'                  => 'Restore all default settings (in all sections)',
 'prefs-editing'                 => 'Editing',
 'rows'                          => 'Rows:',
@@ -1941,7 +1940,6 @@ Anyone who knows it will be able to read your watchlist, so do not share it.
 'localtime'                     => 'Local time:',
 'timezoneuseserverdefault'      => 'Use wiki default ($1)',
 'timezoneuseoffset'             => 'Other (specify offset)',
-'timezoneoffset'                => 'Offset¹:',
 'servertime'                    => 'Server time:',
 'guesstimezone'                 => 'Fill in from browser',
 'timezoneregion-africa'         => 'Africa',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index 5571758348..b58ee53a24 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -3045,7 +3045,7 @@ When changing this message, please also update {{msg-mw|vector-editwarning-warni
 {{Identical|Row}}',
 'columns' => 'Used on [[Special:Preferences]], "Editing" section in the "Size of editing window" fieldset.
 {{Identical|Column}}',
-'searchresultshead' => 'This is the label of the tab in [[Special:Preferences|my preferences]] which contains options for searching the wiki.
+'searchresultshead' => 'Replaced by {{msg-mw|prefs-searchoptions}}, though may still be used in some extensions. DEPRECATED.
 
 {{Identical|Search}}',
 'resultsperpage' => "Option on the 'Search options' tab of [[Special:Preferences]]",
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 947dfe913d..e7168443ae 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1048,7 +1048,6 @@ $wgMessageStructure = array(
 		'prefs-email',
 		'prefs-rendering',
 		'saveprefs',
-		'resetprefs',
 		'restoreprefs',
 		'prefs-editing',
 		'rows',
@@ -1067,7 +1066,6 @@ $wgMessageStructure = array(
 		'localtime',
 		'timezoneuseserverdefault',
 		'timezoneuseoffset',
-		'timezoneoffset',
 		'servertime',
 		'guesstimezone',
 		'timezoneregion-africa',
-- 
2.20.1