From 659f18cc4afbccbde2f59939fe73254ec20f98aa Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 2 Jan 2012 22:54:57 +0000
Subject: [PATCH] * Fix for r107559: set $namespaceGenderAliases to an empty
 array in all languages with fallback=ru but with overridden namespaceNames,
 so that user namespaces don't get converted to Russian. * Fix duplicated
 array keys from r107648.

---
 languages/messages/MessagesAb.php       | 3 +++
 languages/messages/MessagesBa.php       | 3 +++
 languages/messages/MessagesCe.php       | 3 +++
 languages/messages/MessagesCrh_cyrl.php | 2 ++
 languages/messages/MessagesCv.php       | 3 +++
 languages/messages/MessagesKrc.php      | 3 +++
 languages/messages/MessagesLbe.php      | 3 +++
 languages/messages/MessagesMhr.php      | 3 +++
 languages/messages/MessagesMrj.php      | 3 +++
 languages/messages/MessagesMyv.php      | 3 +++
 languages/messages/MessagesOs.php       | 3 +++
 languages/messages/MessagesRu.php       | 4 ++--
 languages/messages/MessagesSah.php      | 3 +++
 languages/messages/MessagesTt_cyrl.php  | 3 +++
 languages/messages/MessagesUdm.php      | 3 +++
 languages/messages/MessagesUk.php       | 3 +++
 languages/messages/MessagesXal.php      | 3 +++
 17 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/languages/messages/MessagesAb.php b/languages/messages/MessagesAb.php
index 7dc7f710a6..05130b440d 100644
--- a/languages/messages/MessagesAb.php
+++ b/languages/messages/MessagesAb.php
@@ -56,6 +56,9 @@ $namespaceAliases = array(
 	'Обсуждение_категории' => NS_CATEGORY_TALK
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $specialPageAliases = array(
 	'Categories'                => array( 'Акатегориақәа' ),
 	'Mycontributions'           => array( 'Архиарақәа' ),
diff --git a/languages/messages/MessagesBa.php b/languages/messages/MessagesBa.php
index c35cf5aee3..aeb65716f2 100644
--- a/languages/messages/MessagesBa.php
+++ b/languages/messages/MessagesBa.php
@@ -37,6 +37,9 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Категория_б-са_фекер_алышыу',
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $linkTrail = '/^((?:[a-z]|а|б|в|г|д|е|ё|ж|з|и|й|к|л|м|н|о|п|р|с|т|у|ф|х|ц|ч|ш|щ|ъ|ы|ь|э|ю|я|ә|ө|ү|ғ|ҡ|ң|ҙ|ҫ|һ|“|»)+)(.*)$/sDu';
 
 $messages = array(
diff --git a/languages/messages/MessagesCe.php b/languages/messages/MessagesCe.php
index e65f1fcd07..2bb555ce7e 100644
--- a/languages/messages/MessagesCe.php
+++ b/languages/messages/MessagesCe.php
@@ -58,6 +58,9 @@ $namespaceAliases = array(
 	'Тобан_дийца'      => NS_CATEGORY_TALK
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $magicWords = array(
 	'redirect'                => array( '0', '#дlасахьажайар\'', '\'#хьажайо\'', '\'#REDIRECT', '#перенаправление', '#перенапр', '#REDIRECT' ),
 	'notoc'                   => array( '0', '__БАЦ_ЧУЛАЦАМ__', '__БАЦ_ЧУЛ__', '__БЕЗ_ОГЛАВЛЕНИЯ__', '__БЕЗ_ОГЛ__', '__NOTOC__' ),
diff --git a/languages/messages/MessagesCrh_cyrl.php b/languages/messages/MessagesCrh_cyrl.php
index 07bbc07159..5339983e85 100644
--- a/languages/messages/MessagesCrh_cyrl.php
+++ b/languages/messages/MessagesCrh_cyrl.php
@@ -62,6 +62,8 @@ $namespaceAliases = array(
 	'Kategoriya_muzakeresi' => NS_CATEGORY_TALK
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
 
 $datePreferences = array(
     'default',
diff --git a/languages/messages/MessagesCv.php b/languages/messages/MessagesCv.php
index ca74b69b12..e8f862f31a 100644
--- a/languages/messages/MessagesCv.php
+++ b/languages/messages/MessagesCv.php
@@ -37,6 +37,9 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Категорине_сӳтсе_явмалли',
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $linkTrail = '/^([a-zа-яĕçăӳ"»]+)(.*)$/sDu';
 
 $messages = array(
diff --git a/languages/messages/MessagesKrc.php b/languages/messages/MessagesKrc.php
index dc37541399..efa3c0a123 100644
--- a/languages/messages/MessagesKrc.php
+++ b/languages/messages/MessagesKrc.php
@@ -35,6 +35,9 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Категорияны_сюзюу',
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Джибериулени черт:',
diff --git a/languages/messages/MessagesLbe.php b/languages/messages/MessagesLbe.php
index c72fc1bb18..abc9e2c6ae 100644
--- a/languages/messages/MessagesLbe.php
+++ b/languages/messages/MessagesLbe.php
@@ -39,6 +39,9 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Категориялиясса_ихтилат',
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $linkTrail = '/^([a-zабвгдеёжзийклмнопрстуфхцчшщъыьэюяӀ1“»]+)(.*)$/sDu';
 
 $messages = array(
diff --git a/languages/messages/MessagesMhr.php b/languages/messages/MessagesMhr.php
index 85c5bd5a79..cbaef6d27b 100644
--- a/languages/messages/MessagesMhr.php
+++ b/languages/messages/MessagesMhr.php
@@ -59,6 +59,9 @@ $namespaceAliases = array(
 	'Категорийын_каҥашымаш'     => NS_CATEGORY_TALK,
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $specialPageAliases = array(
 	'Preferences'               => array( 'Келыштарымаш' ),
 	'Recentchanges'             => array( 'Пытартыш_тӧрлатымаш-влак' ),
diff --git a/languages/messages/MessagesMrj.php b/languages/messages/MessagesMrj.php
index 969b35ebb7..c62fb84eb6 100644
--- a/languages/messages/MessagesMrj.php
+++ b/languages/messages/MessagesMrj.php
@@ -41,6 +41,9 @@ $namespaceAliases = array(
 	'Категори_кӓнгӓшӹмӓш'   => NS_CATEGORY_TALK,
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Ажедмӓшвлӓм ыдыралаш',
diff --git a/languages/messages/MessagesMyv.php b/languages/messages/MessagesMyv.php
index 327e796177..454bfe1bd3 100644
--- a/languages/messages/MessagesMyv.php
+++ b/languages/messages/MessagesMyv.php
@@ -39,6 +39,9 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Категориядо кортамось',
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $specialPageAliases = array(
 	'Allmessages'               => array( 'ВесеПачтямнэть' ),
 	'Allpages'                  => array( 'ВесеЛопат' ),
diff --git a/languages/messages/MessagesOs.php b/languages/messages/MessagesOs.php
index 8599f3339b..3487498c0d 100644
--- a/languages/messages/MessagesOs.php
+++ b/languages/messages/MessagesOs.php
@@ -49,6 +49,9 @@ $namespaceAliases = array(
 	'Категорийы_тыххæй_дискусси'  => NS_CATEGORY_TALK,
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $magicWords = array(
 	'redirect'                => array( '0', '#РАРВЫСТ', '#перенаправление', '#перенапр', '#REDIRECT' ),
 	'img_right'               => array( '1', 'рахиз', 'справа', 'right' ),
diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php
index 431de0a768..20e1415209 100644
--- a/languages/messages/MessagesRu.php
+++ b/languages/messages/MessagesRu.php
@@ -101,8 +101,8 @@ $namespaceAliases = array(
 );
 
 $namespaceGenderAliases = array(
-	NS_USER      => array( 'female' => 'Участник', 'female' => 'Участница' ),
-	NS_USER_TALK => array( 'female' => 'Обсуждение_участника', 'female' => 'Обсуждение_участницы' ),
+	NS_USER      => array( 'male' => 'Участник', 'female' => 'Участница' ),
+	NS_USER_TALK => array( 'male' => 'Обсуждение_участника', 'female' => 'Обсуждение_участницы' ),
 );
 
 $dateFormats = array(
diff --git a/languages/messages/MessagesSah.php b/languages/messages/MessagesSah.php
index 874ff61998..235ac81fdb 100644
--- a/languages/messages/MessagesSah.php
+++ b/languages/messages/MessagesSah.php
@@ -37,6 +37,9 @@ $namespaceAliases = array(
 	'Ойуу_ырытыыта' => NS_FILE_TALK,
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Ыйынньыктары аннынан тардыы:',
diff --git a/languages/messages/MessagesTt_cyrl.php b/languages/messages/MessagesTt_cyrl.php
index 9356123985..c2b7df8028 100644
--- a/languages/messages/MessagesTt_cyrl.php
+++ b/languages/messages/MessagesTt_cyrl.php
@@ -108,6 +108,9 @@ $namespaceAliases = array(
 	'Törkem_bäxäse'    => NS_CATEGORY_TALK,
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $specialPageAliases = array(
 	'Activeusers'               => array( 'Актив_кулланучылар' ),
 	'Allmessages'               => array( 'Барлык_хатлар' ),
diff --git a/languages/messages/MessagesUdm.php b/languages/messages/MessagesUdm.php
index f01e81ff2f..31e471f19e 100644
--- a/languages/messages/MessagesUdm.php
+++ b/languages/messages/MessagesUdm.php
@@ -35,6 +35,9 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK    => 'Категория_сярысь_вераськон',
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $linkTrail = '/^([a-zа-яёӝӟӥӧӵ“»]+)(.*)$/sDu';
 $fallback8bitEncoding = 'windows-1251';
 $separatorTransformTable = array( ',' => ' ', '.' => ',' );
diff --git a/languages/messages/MessagesUk.php b/languages/messages/MessagesUk.php
index dc49680cf8..e146121bb5 100644
--- a/languages/messages/MessagesUk.php
+++ b/languages/messages/MessagesUk.php
@@ -81,6 +81,9 @@ $namespaceAliases = array(
 	'Обговорення_шаблона' => NS_TEMPLATE_TALK,
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $dateFormats = array(
 	'mdy time' => 'H:i',
 	'mdy date' => 'xg j, Y',
diff --git a/languages/messages/MessagesXal.php b/languages/messages/MessagesXal.php
index a426640dc5..ab0aa1ab28 100644
--- a/languages/messages/MessagesXal.php
+++ b/languages/messages/MessagesXal.php
@@ -52,6 +52,9 @@ $namespaceAliases = array(
 	'Янзин_тускар_ухалвр'     => NS_CATEGORY_TALK,
 );
 
+// Remove Russian aliases
+$namespaceGenderAliases = array();
+
 $messages = array(
 # User preference toggles
 'tog-underline'               => 'Заалһиг татас татх:',
-- 
2.20.1