From 728682223b232f978cbf15ff3ccae80eac45cda3 Mon Sep 17 00:00:00 2001
From: Rotem Liss <rotem@users.mediawiki.org>
Date: Fri, 27 Jun 2008 14:28:32 +0000
Subject: [PATCH] * Not optional messages. * Reorganizing the messages in
 messages.inc. * Update for he.

---
 languages/messages/MessagesEn.php     | 6 +++---
 languages/messages/MessagesHe.php     | 5 +++++
 maintenance/language/messageTypes.inc | 3 ---
 maintenance/language/messages.inc     | 4 +++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 52124d6b25..33fed8bb34 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -838,9 +838,9 @@ $2',
 The reason given is ''$2''.",
 
 # Virus scanner
-'virus-badscanner'     => "Bad configuration: unknown virus scanner: <i>$1</i>",
-'virus-scanfailed'     => "scan failed (code $1)",
-'virus-unknownscanner' => "unknown antivirus:",
+'virus-badscanner'     => 'Bad configuration: unknown virus scanner: <i>$1</i>',
+'virus-scanfailed'     => 'scan failed (code $1)',
+'virus-unknownscanner' => 'unknown antivirus:',
 
 # Login and logout pages
 'logouttitle'                => 'User logout',
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 6b7e0b44dd..d32459d340 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -677,6 +677,11 @@ $2',
 'ns-specialprotected'  => 'לא ניתן לערוך דפים מיוחדים.',
 'titleprotected'       => 'לא ניתן ליצור דף זה, כיוון שהמשתמש [[User:$1|$1]] הגן עליו מפני יצירה בנימוק "$2".',
 
+# Virus scanner
+'virus-badscanner'     => 'הגדרות שגויות: סורק הווירוסים אינו ידוע: <i>$1</i>',
+'virus-scanfailed'     => 'הסריקה נכשלה (קוד: $1)',
+'virus-unknownscanner' => 'אנטי־וירוס בלתי ידוע:',
+
 # Login and logout pages
 'logouttitle'                => 'יציאה מהחשבון',
 'logouttext'                 => 'יצאתם זה עתה מהחשבון. באפשרותכם להמשיך ולעשות שימוש ב{{grammar:תחילית|{{SITENAME}}}} באופן אנונימי, או לשוב ולהיכנס לאתר עם שם משתמש זהה או אחר.',
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index c0caaa4978..ebb1cb4d40 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -313,9 +313,6 @@ $wgOptionalMessages = array(
 	'autocomment-prefix',
 	'listgrouprights-right-display',
 	'timezone-utc',
-	'virus-badscanner',
-	'virus-scanfailed',
-	'virus-unknownscanner',
 );
 
 /** EXIF messages, which may be set as optional in several checks, but are generally mandatory */
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index aab7647f09..f10be64f98 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -356,7 +356,8 @@ $wgMessageStructure = array(
 		'customcssjsprotected',
 		'ns-specialprotected',
 		'titleprotected',
-		'virus-badscanner',
+	),
+	'virus' => array(
 		'virus-badscanner',
 		'virus-scanfailed',
 		'virus-unknownscanner',
@@ -2639,6 +2640,7 @@ XHTML id names.",
 	'nstab'               => "Short words for each namespace, by default used in the namespace tab in monobook",
 	'main'                => 'Main script and global functions',
 	'errors'              => 'General errors',
+	'virus'               => 'Virus scanner',
 	'login'               => 'Login and logout pages',
 	'resetpass'           => 'Password reset dialog',
 	'toolbar'             => 'Edit page toolbar',
-- 
2.20.1