Russian translation update to Language.php 1.772

[lhc/web/wiklou.git] / languages / Language.php

diff --git a/languages/Language.php b/languages/Language.php
index 9b5f86e..998485f 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -265,9 +265,6 @@ $wgLanguageNamesEn =& $wgLanguageNames;
 # hyphen (-). If you need more characters, you may be able to change
 # the regex in MagicWord::initRegex
 
-# required for copyrightwarning
-global $wgRightsText;
-
 /* private */ $wgAllMessagesEn = array(
 /*
 The sidebar for MonoBook is generated from this message, lines that do not
@@ -572,7 +569,7 @@ Please report this to an administrator, making note of the URL.',
 'badarticleerror' => 'This action cannot be performed on this page.',
 'cannotdelete' => 'Could not delete the page or file specified. (It may have already been deleted by someone else.)',
 'badtitle'             => 'Bad title',
-'badtitletext' => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title.',
+'badtitletext' => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title. It may contain one more characters which cannot be used in titles.',
 'perfdisabled' => 'Sorry! This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.',
 'perfdisabledsub' => 'Here is a saved copy from $1:', # obsolete?
 'perfcached' => 'The following data is cached and may not be completely up to date:',
@@ -633,6 +630,7 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen
 'yourvariant'  => 'Variant',
 'yournick'             => 'Nickname:',
 'badsig'               => 'Invalid raw signature; check HTML tags.',
+'badsig2'              => 'Your signature contains one or more reserved expressions; please remove them.',
 'email'                        => 'E-mail',
 'emailforlost' => '<div style="width:30em">* Optional. An e-mail lets others contact you on this site without revealing your address, and lets us send you a new password if you forget it.<br /><br />Your real name will be used to give you attribution for your work.</div>',
 'prefs-help-email-enotif' => 'This address is also used to send you e-mail notifications if you enabled the options.',
@@ -1108,6 +1106,9 @@ this old version, (rev) = revert to this old version.
 #
 'unwatchedpages' => 'Unwatched pages',
 
+# List redirects
+'listredirects' => 'List redirects',
+
 # Statistics
 #
 'statistics'   => 'Statistics',
@@ -1136,10 +1137,10 @@ That comes to '''$5''' average edits per page, and '''$6''' views per edit.",
 'doubleredirects'      => 'Double redirects',
 'doubleredirectstext'  => "Each row contains links to the first and second redirect, as well as the first line of the second redirect text, usually giving the \"real\" target page, which the first redirect should point to.",
 'doubleredirectsarrow' => '→',
-'brokenredirects'      => 'Broken Redirects',
-'brokenredirectstext'  => 'The following redirects link to a non-existing pages.',
-'selflinks'            => 'Pages with Self Links',
-'selflinkstext'                    => 'The following pages contain a link to themselves, which they should not.',
+'brokenredirects'      => 'Broken redirects',
+'brokenredirectstext'  => 'The following redirects link to non-existent pages:',
+'selflinks'            => 'Self-linking pages',
+'selflinkstext'                    => 'The following pages link to themselves:',
 'mispeelings'           => 'Pages with misspellings',
 'mispeelingstext'               => "The following pages contain a common misspelling, which are listed on $1. The correct spelling might be given (like this).",
 'mispeelingspage'       => 'List of common misspellings',
@@ -1610,6 +1611,8 @@ history lines, or just the current version with the info about the last edit.
 
 In the latter case you can also use a link, e.g. [[{{ns:Special}}:Export/{{Mediawiki:mainpage}}]] for the page {{Mediawiki:mainpage}}.',
 'exportcuronly'        => 'Include only the current revision, not the full history',
+'exportnohistory' => "----
+'''Note:''' exporting the full history of pages through this form has been disabled due to performance reasons.",
 
 # Namespace 8 related
 
@@ -2101,7 +2104,7 @@ is collapsed. Others will be hidden by default.
 'edit-externally' => 'Edit this file using an external application',
 'edit-externally-help' => 'See the [http://meta.wikimedia.org/wiki/Help:External_editors setup instructions] for more information.',
 
-# 'all' in various places, this might be different for inflicted languages
+# 'all' in various places, this might be different for inflected languages
 'recentchangesall' => 'all',
 'imagelistall' => 'all',
 'watchlistall1' => 'all',
@@ -2884,7 +2887,7 @@ class Language {
         * @return string
         */
        function convertPlural( $count, $wordform1, $wordform2, $wordform3) {
-               return $count == 1 ? $wordform1 : $wordform2;
+               return $count == '1' ? $wordform1 : $wordform2;
        }
 
        /**
@@ -2894,6 +2897,22 @@ class Language {
         * @see LanguageFi.php for example implementation
         */
        function translateBlockExpiry( $str ) {
+
+               $scBlockExpiryOptions = wfMsg( 'ipboptions' );
+
+               if ( $scBlockExpiryOptions == '-') {
+                       return $str;
+               }
+
+               foreach (explode(',', $scBlockExpiryOptions) as $option) {
+                       if ( strpos($option, ":") === false )
+                               continue;
+                       list($show, $value) = explode(":", $option);
+                       if ( strcmp ( $str, $value) == 0 )
+                               return '<span title="' . htmlspecialchars($str). '">' .
+                                       htmlspecialchars( trim( $show ) ) . '</span>';
+               }
+
                return $str;
        }