* Not optional messages.

* Reorganizing the messages in messages.inc.
* Update for he.

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 52124d6..33fed8b 100644 (file)
--- 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 6b7e0b4..d32459d 100644 (file)
--- 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 c0caaa4..ebb1cb4 100644 (file)
--- 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 aab7647..f10be64 100644 (file)
--- 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',