From 90e53113c9cf6a55c7e53f679b7029fd9fb9f65a Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Sun, 25 Dec 2011 23:58:49 +0000
Subject: [PATCH] Localisation updates for namespace names for core from
 http://translatewiki.net.

---
 languages/messages/MessagesFrp.php    | 17 +++++++------
 languages/messages/MessagesIg.php     | 36 +++++++++++++++++++--------
 languages/messages/MessagesMk.php     |  7 +++---
 languages/messages/MessagesMzn.php    | 34 ++++++++++++++-----------
 languages/messages/MessagesNds_nl.php | 27 ++++++++++++--------
 languages/messages/MessagesOr.php     | 21 ++++++++++------
 languages/messages/MessagesOs.php     | 15 ++++++-----
 languages/messages/MessagesQug.php    | 19 ++++++++++++++
 languages/messages/MessagesSa.php     |  3 ++-
 languages/messages/MessagesSr_ec.php  | 12 ++++++---
 languages/messages/MessagesWar.php    | 19 ++++++++++++++
 languages/messages/MessagesYue.php    |  9 +++----
 12 files changed, 149 insertions(+), 70 deletions(-)

diff --git a/languages/messages/MessagesFrp.php b/languages/messages/MessagesFrp.php
index 6b65c96108..672054db1b 100644
--- a/languages/messages/MessagesFrp.php
+++ b/languages/messages/MessagesFrp.php
@@ -26,8 +26,8 @@ $namespaceNames = array(
 	NS_MEDIA            => 'Mèdia',
 	NS_SPECIAL          => 'Spèciâl',
 	NS_TALK             => 'Discussion',
-	NS_USER             => 'Utilisator',
-	NS_USER_TALK        => 'Discussion_utilisator',
+	NS_USER             => 'Usanciér',
+	NS_USER_TALK        => 'Discussion_usanciér',
 	NS_PROJECT_TALK     => 'Discussion_$1',
 	NS_FILE             => 'Fichiér',
 	NS_FILE_TALK        => 'Discussion_fichiér',
@@ -42,13 +42,14 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Discutar' => NS_TALK,
+	'Discutar'              => NS_TALK,
+	'Utilisator'            => NS_USER,
 	'Discussion_Utilisator' => NS_USER_TALK,
-	'Émâge' => NS_FILE,
-	'Discussion_Émâge' => NS_FILE_TALK,
-	'Discussion_Modèlo' => NS_TEMPLATE_TALK,
-	'Discussion_Éde' => NS_HELP_TALK,
-	'Discussion_Catègorie' => NS_CATEGORY_TALK
+	'Émâge'                 => NS_FILE,
+	'Discussion_Émâge'      => NS_FILE_TALK,
+	'Discussion_Modèlo'     => NS_TEMPLATE_TALK,
+	'Discussion_Éde'        => NS_HELP_TALK,
+	'Discussion_Catègorie'  => NS_CATEGORY_TALK
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesIg.php b/languages/messages/MessagesIg.php
index c75403c413..59c79ece4a 100644
--- a/languages/messages/MessagesIg.php
+++ b/languages/messages/MessagesIg.php
@@ -12,22 +12,36 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA            => 'Nká',
+	NS_MEDIA            => 'Midia',
 	NS_SPECIAL          => 'Ihü_kárírí',
 	NS_TALK             => 'Okwu',
-	NS_USER             => 'Ọ\'bànifé',
-	NS_USER_TALK        => 'Okwu_ọ\'bànifé',
+	NS_USER             => 'Ọbanife',
+	NS_USER_TALK        => 'Okwu_ọbanife',
 	NS_PROJECT_TALK     => 'Okwu_$1',
-	NS_FILE             => 'Ákwúkwó_orünotu',
-	NS_FILE_TALK        => 'Okwu_ákwúkwó_orünotu',
-	NS_MEDIAWIKI        => 'NkáWiki',
-	NS_MEDIAWIKI_TALK   => 'Okwu_NkáWiki',
+	NS_FILE             => 'Usòrò',
+	NS_FILE_TALK        => 'Okwu_usòrò',
+	NS_MEDIAWIKI        => 'MidiaWiki',
+	NS_MEDIAWIKI_TALK   => 'Okwu_MidiaWiki',
 	NS_TEMPLATE         => 'Àtụ',
 	NS_TEMPLATE_TALK    => 'Okwu_àtụ',
-	NS_HELP             => 'Nkwádọ',
-	NS_HELP_TALK        => 'Okwu_nkwádọ',
-	NS_CATEGORY         => 'Ébéonọr',
-	NS_CATEGORY_TALK    => 'Okwu_ébéonọr',
+	NS_HELP             => 'Nkwadọ',
+	NS_HELP_TALK        => 'Okwu_nkwadọ',
+	NS_CATEGORY         => 'Òtù',
+	NS_CATEGORY_TALK    => 'Okwu_òtù',
+);
+
+$namespaceAliases = array(
+	'Nká'                  => NS_MEDIA,
+	'Ọ\'bànifé'            => NS_USER,
+	'Okwu_ọ\'bànifé'       => NS_USER_TALK,
+	'Ákwúkwó_orünotu'      => NS_FILE,
+	'Okwu_ákwúkwó_orünotu' => NS_FILE_TALK,
+	'NkáWiki'              => NS_MEDIAWIKI,
+	'Okwu_NkáWiki'         => NS_MEDIAWIKI_TALK,
+	'Nkwádọ'               => NS_HELP,
+	'Okwu_nkwádọ'          => NS_HELP_TALK,
+	'Ébéonọr'              => NS_CATEGORY,
+	'Okwu_ébéonọr'         => NS_CATEGORY_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesMk.php b/languages/messages/MessagesMk.php
index e45002ebbf..a307e2341c 100644
--- a/languages/messages/MessagesMk.php
+++ b/languages/messages/MessagesMk.php
@@ -21,7 +21,7 @@
  */
 
 $namespaceNames = array(
-	NS_MEDIA            => 'Медија',
+	NS_MEDIA            => 'Медиум',
 	NS_SPECIAL          => 'Специјална',
 	NS_TALK             => 'Разговор',
 	NS_USER             => 'Корисник',
@@ -40,8 +40,9 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Специјални' => NS_SPECIAL,
-	'Слика' => NS_FILE,
+	'Медија'            => NS_MEDIA,
+	'Специјални'        => NS_SPECIAL,
+	'Слика'             => NS_FILE,
 	'Разговор_за_слика' => NS_FILE_TALK,
 );
 
diff --git a/languages/messages/MessagesMzn.php b/languages/messages/MessagesMzn.php
index a1d6230e17..e1d4dc7bd6 100644
--- a/languages/messages/MessagesMzn.php
+++ b/languages/messages/MessagesMzn.php
@@ -24,46 +24,52 @@ $fallback8bitEncoding = 'windows-1256';
 $rtl = true;
 
 $namespaceNames = array(
-	NS_MEDIA            => 'مه‌دیا',
+	NS_MEDIA            => 'مدیا',
 	NS_SPECIAL          => 'شا',
+	NS_MAIN             => '',
 	NS_TALK             => 'Ú¯Ù¾',
 	NS_USER             => 'کارور',
 	NS_USER_TALK        => 'کارور_گپ',
 	NS_PROJECT_TALK     => '$1_Ú¯Ù¾',
 	NS_FILE             => 'پرونده',
 	NS_FILE_TALK        => 'پرونده_گپ',
-	NS_MEDIAWIKI        => 'مه‌دیاویکی',
-	NS_MEDIAWIKI_TALK   => 'مه‌دیاویکی_گپ',
+	NS_MEDIAWIKI        => 'مدیاویکی',
+	NS_MEDIAWIKI_TALK   => 'مدیاویکی_گپ',
 	NS_TEMPLATE         => 'شابلون',
 	NS_TEMPLATE_TALK    => 'شابلون_گپ',
-	NS_HELP             => 'رانه‌ما',
-	NS_HELP_TALK        => 'رانه‌مائه_گپ',
+	NS_HELP             => 'رانما',
+	NS_HELP_TALK        => 'رانما_گپ',
 	NS_CATEGORY         => 'رج',
 	NS_CATEGORY_TALK    => 'رج_گپ',
 );
 
 $namespaceAliases = array(
+	'مه‌دیا'         => NS_MEDIA,
 	'مدیا'          => NS_MEDIA,
 	'ویژه'          => NS_SPECIAL,
-	'بحث'            => NS_TALK,
+	'بحث'           => NS_TALK,
 	'کاربر'         => NS_USER,
-	'بحث_کاربر'      => NS_USER_TALK,
-	'بحث_$1'         => NS_PROJECT_TALK,
+	'بحث_کاربر'     => NS_USER_TALK,
+	'بحث_$1'        => NS_PROJECT_TALK,
 	'تصویر'         => NS_FILE,
 	'پرونده'        => NS_FILE,
-	'بحث_تصویر'      => NS_FILE_TALK,
-	'بحث_پرونده'     => NS_FILE_TALK,
+	'بحث_تصویر'     => NS_FILE_TALK,
+	'بحث_پرونده'    => NS_FILE_TALK,
 	'مدیاویکی'      => NS_MEDIAWIKI,
 	'مه‌دیا ویکی'    => NS_MEDIAWIKI,
-	'بحث_مدیاویکی'   => NS_MEDIAWIKI_TALK,
+	'مه‌دیاویکی'     => NS_MEDIAWIKI,
+	'مه‌دیاویکی_گپ'  => NS_MEDIAWIKI_TALK,
+	'بحث_مدیاویکی'  => NS_MEDIAWIKI_TALK,
 	'مه‌دیا ویکی گپ' => NS_MEDIAWIKI_TALK,
 	'الگو'          => NS_TEMPLATE,
-	'بحث_الگو'       => NS_TEMPLATE_TALK,
+	'بحث_الگو'      => NS_TEMPLATE_TALK,
 	'راهنما'        => NS_HELP,
-	'بحث_راهنما'     => NS_HELP_TALK,
+	'رانه‌ما'        => NS_HELP,
+	'رانه‌مائه_گپ'   => NS_HELP_TALK,
+	'بحث_راهنما'    => NS_HELP_TALK,
 	'رانه‌مای گپ'    => NS_HELP_TALK,
 	'رده'           => NS_CATEGORY,
-	'بحث_رده'        => NS_CATEGORY_TALK,
+	'بحث_رده'       => NS_CATEGORY_TALK,
 );
 
 $magicWords = array(
diff --git a/languages/messages/MessagesNds_nl.php b/languages/messages/MessagesNds_nl.php
index a54b1f8bc2..ea53b1e522 100644
--- a/languages/messages/MessagesNds_nl.php
+++ b/languages/messages/MessagesNds_nl.php
@@ -22,30 +22,35 @@ $fallback = 'nl';
 
 $namespaceNames = array(
 	NS_MEDIA            => 'Media',
-	NS_SPECIAL          => 'Speciaal',
+	NS_SPECIAL          => 'Spesiaal',
 	NS_TALK             => 'Overleg',
 	NS_USER             => 'Gebruker',
 	NS_USER_TALK        => 'Overleg_gebruker',
 	NS_PROJECT_TALK     => 'Overleg_$1',
-	NS_FILE             => 'Ofbeelding',
-	NS_FILE_TALK        => 'Overleg_ofbeelding',
+	NS_FILE             => 'Bestaand',
+	NS_FILE_TALK        => 'Overleg_bestaand',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Overleg_MediaWiki',
 	NS_TEMPLATE         => 'Mal',
 	NS_TEMPLATE_TALK    => 'Overleg_mal',
 	NS_HELP             => 'Hulpe',
 	NS_HELP_TALK        => 'Overleg_hulpe',
-	NS_CATEGORY         => 'Kattegerie',
-	NS_CATEGORY_TALK    => 'Overleg_kattegerie',
+	NS_CATEGORY         => 'Kategorie',
+	NS_CATEGORY_TALK    => 'Overleg_kategorie',
 );
 
 $namespaceAliases = array(
-	'Speciaol'          => NS_SPECIAL,
-	'Sjabloon'          => NS_TEMPLATE,
-	'Overleg_sjabloon'  => NS_TEMPLATE_TALK,
-	'Categorie'         => NS_CATEGORY,
-	'Overleg_categorie' => NS_CATEGORY_TALK,
-	'Overleg_help'      => NS_HELP_TALK,
+	'Speciaol'           => NS_SPECIAL,
+	'Speciaal'           => NS_SPECIAL,
+	'Sjabloon'           => NS_TEMPLATE,
+	'Overleg_sjabloon'   => NS_TEMPLATE_TALK,
+	'Ofbeelding'         => NS_FILE,
+	'Overleg_ofbeelding' => NS_FILE_TALK,
+	'Categorie'          => NS_CATEGORY,
+	'Overleg_categorie'  => NS_CATEGORY_TALK,
+	'Kattegerie'         => NS_CATEGORY,
+	'Overleg_categorie'  => NS_CATEGORY_TALK,
+	'Overleg_kattegerie' => NS_HELP_TALK,
 );
 
 $dateFormats = array(
diff --git a/languages/messages/MessagesOr.php b/languages/messages/MessagesOr.php
index 74eb9b1a8a..c49d9fb094 100644
--- a/languages/messages/MessagesOr.php
+++ b/languages/messages/MessagesOr.php
@@ -40,17 +40,17 @@ $namespaceNames = array(
 	NS_MEDIA            => 'ମାଧ୍ୟମ',
 	NS_SPECIAL          => 'ବିଶେଷ',
 	NS_TALK             => 'ଆଲୋଚନା',
-	NS_USER             => 'ବ୍ୟବାହାରକାରୀ',
-	NS_USER_TALK        => 'ବ୍ୟବାହାରକାରୀଙ୍କ_ଆଲୋଚନା',
-	NS_PROJECT_TALK     => 'ଉଇକିପିଡ଼ିଆ_ଆଲୋଚନା',
+	NS_USER             => 'ବ୍ୟବହାରକାରୀ',
+	NS_USER_TALK        => 'ବ୍ୟବହାରକାରୀଙ୍କ_ଆଲୋଚନା',
+	NS_PROJECT_TALK     => '$1_ଆଲୋଚନା',
 	NS_FILE             => 'ଫାଇଲ',
 	NS_FILE_TALK        => 'ଫାଇଲ_ଆଲୋଚନା',
 	NS_MEDIAWIKI        => 'ମିଡ଼ିଆଉଇକି',
 	NS_MEDIAWIKI_TALK   => 'ମିଡ଼ିଆଉଇକି_ଆଲୋଚନା',
-	NS_TEMPLATE         => 'ଟେମ୍ପଲେଟ',
-	NS_TEMPLATE_TALK    => 'ଟେମ୍ପଲେଟ_ଆଲୋଚନା',
-	NS_HELP             => 'ସାହାଯ୍ୟ',
-	NS_HELP_TALK        => 'ସାହାଯ୍ୟ_ଆଲୋଚନା',
+	NS_TEMPLATE         => 'ଛାଞ୍ଚ',
+	NS_TEMPLATE_TALK    => 'ଛାଞ୍ଚ_ଆଲୋଚନା',
+	NS_HELP             => 'ସହଯୋଗ',
+	NS_HELP_TALK        => 'ସହଯୋଗ_ଆଲୋଚନା',
 	NS_CATEGORY         => 'ଶ୍ରେଣୀ',
 	NS_CATEGORY_TALK    => 'ଶ୍ରେଣୀ_ଆଲୋଚନା',
 );
@@ -58,10 +58,17 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'ବ୍ୟବହାରକାରି'          => NS_USER,
 	'ବ୍ୟବହାରକାରିଁକ_ଆଲୋଚନା' => NS_USER_TALK,
+	'ବ୍ୟବାହାରକାରୀ'          => NS_USER,
+	'ବ୍ୟବାହାରକାରୀଙ୍କ_ଆଲୋଚନା' => NS_USER_TALK,
+	'ଉଇକିପିଡ଼ିଆ_ଆଲୋଚନା' => NS_PROJECT_TALK,
 	'ଟେଁପଲେଟ'             => NS_TEMPLATE,
 	'ଟେଁପଲେଟ_ଆଲୋଚନା'     => NS_TEMPLATE_TALK,
+	'ଟେମ୍ପଲେଟ'             => NS_TEMPLATE,
+	'ଟେମ୍ପଲେଟ_ଆଲୋଚନା'     => NS_TEMPLATE_TALK,
 	'ବିଭାଗ'                => NS_CATEGORY,
 	'ବିଭାଗିୟ_ଆଲୋଚନା'      => NS_CATEGORY_TALK,
+	'ସାହାଯ୍ୟ'                => NS_HELP,
+	'ସାହାଯ୍ୟ_ଆଲୋଚନା'      => NS_HELP_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesOs.php b/languages/messages/MessagesOs.php
index a17cf4d64e..bb92f06628 100644
--- a/languages/messages/MessagesOs.php
+++ b/languages/messages/MessagesOs.php
@@ -17,16 +17,16 @@
 $fallback = 'ru';
 
 $namespaceNames = array(
-	NS_MEDIA            => 'Media',
+	NS_MEDIA            => 'Медиа',
 	NS_SPECIAL          => 'Сæрмагонд',
 	NS_TALK             => 'Тæрхон',
 	NS_USER             => 'Архайæг',
 	NS_USER_TALK        => 'Архайæджы_ныхас',
-	NS_PROJECT_TALK     => 'Дискусси_$1',
-	NS_FILE             => 'Ныв',
-	NS_FILE_TALK        => 'Нывы_тæрхон',
+	NS_PROJECT_TALK     => '{{GRAMMAR:genitive|$1}}_тæрхон',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => 'Файлы_тæрхон',
 	NS_MEDIAWIKI        => 'MediaWiki',
-	NS_MEDIAWIKI_TALK   => 'Тæрхон_MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki-йы_тæрхон',
 	NS_TEMPLATE         => 'Шаблон',
 	NS_TEMPLATE_TALK    => 'Шаблоны_тæрхон',
 	NS_HELP             => 'Æххуыс',
@@ -38,14 +38,17 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'Дискусси'                    => NS_TALK,
 	'Архайæджы_дискусси'          => NS_USER_TALK,
+	'Дискусси_$1'                 => NS_PROJECT_TALK,
+	'Ныв'                         => NS_FILE,
+	'Нывы_тæрхон'                 => NS_FILE_TALK,
 	'Нывы_тыххæй_дискусси'        => NS_FILE_TALK,
 	'Дискусси_MediaWiki'          => NS_MEDIAWIKI_TALK,
+	'Тæрхон_MediaWiki'            => NS_MEDIAWIKI_TALK,
 	'Шаблоны_тыххæй_дискусси'     => NS_TEMPLATE_TALK,
 	'Æххуысы_тыххæй_дискусси'     => NS_HELP_TALK,
 	'Категорийы_тыххæй_дискусси'  => NS_CATEGORY_TALK,
 );
 
-
 $magicWords = array(
 	'redirect'              => array( '0', '#РАРВЫСТ', '#перенаправление', '#перенапр', '#REDIRECT' ),
 	'img_right'             => array( '1', 'рахиз', 'справа', 'right' ),
diff --git a/languages/messages/MessagesQug.php b/languages/messages/MessagesQug.php
index a8ff476b27..c05d288224 100644
--- a/languages/messages/MessagesQug.php
+++ b/languages/messages/MessagesQug.php
@@ -14,6 +14,25 @@
 
 $fallback = 'qu, es';
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Midya',
+	NS_SPECIAL          => 'Sapak',
+	NS_TALK             => 'Rimanakuy',
+	NS_USER             => 'Rurak',
+	NS_USER_TALK        => 'Rurakpa_rimanakuy',
+	NS_PROJECT_TALK     => '$1-pa_rimanakuy',
+	NS_FILE             => 'Rikcha',
+	NS_FILE_TALK        => 'Rikchapa_rimanakuy',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'MediaWikipa_rimanakuy',
+	NS_TEMPLATE         => 'Plantilla',
+	NS_TEMPLATE_TALK    => 'Plantillapa_rimanakuy',
+	NS_HELP             => 'Yanapa',
+	NS_HELP_TALK        => 'Yanapapak_rimanakuy',
+	NS_CATEGORY         => 'Samiyachiy',
+	NS_CATEGORY_TALK    => 'Samiyachiy_rimanakuy',
+);
+
 $messages = array(
 # Dates
 'sunday'        => 'Hawkay',
diff --git a/languages/messages/MessagesSa.php b/languages/messages/MessagesSa.php
index ce126ba51e..664184a566 100644
--- a/languages/messages/MessagesSa.php
+++ b/languages/messages/MessagesSa.php
@@ -42,7 +42,7 @@ $linkPrefixExtension = false;
 
 $namespaceNames = array(
 	NS_MEDIA            => 'माध्यमम्',
-	NS_SPECIAL          => 'विशेष',
+	NS_SPECIAL          => 'विशेषम्',
 	NS_TALK             => 'सम्भाषणम्',
 	NS_USER             => 'योजकः',
 	NS_USER_TALK        => 'योजकसम्भाषणम्',
@@ -61,6 +61,7 @@ $namespaceNames = array(
 
 $namespaceAliases = array(
 	'माध्यम'             => NS_MEDIA,
+	'विशेष'              => NS_SPECIAL,
 	'संभाषणं'            => NS_TALK,
 	'योजकसंभाषणं'        => NS_USER_TALK,
 	'$1संभाषणं'         => NS_PROJECT_TALK,
diff --git a/languages/messages/MessagesSr_ec.php b/languages/messages/MessagesSr_ec.php
index 653078c8bc..1bebd8ceda 100644
--- a/languages/messages/MessagesSr_ec.php
+++ b/languages/messages/MessagesSr_ec.php
@@ -34,10 +34,10 @@ $namespaceNames = array(
 	NS_USER             => 'Корисник',
 	NS_USER_TALK        => 'Разговор_са_корисником',
 	NS_PROJECT_TALK     => 'Разговор_о_$1',
-	NS_FILE             => 'Датотека',
-	NS_FILE_TALK        => 'Разговор_о_датотеци',
-	NS_MEDIAWIKI        => 'Медијавики',
-	NS_MEDIAWIKI_TALK   => 'Разговор_о_Медијавикију',
+	NS_FILE             => 'Фајл',
+	NS_FILE_TALK        => 'Разговор_о_фајлу',
+	NS_MEDIAWIKI        => 'МедијаВики',
+	NS_MEDIAWIKI_TALK   => 'Разговор_о_МедијаВикију',
 	NS_TEMPLATE         => 'Шаблон',
 	NS_TEMPLATE_TALK    => 'Разговор_о_шаблону',
 	NS_HELP             => 'Помоћ',
@@ -67,6 +67,10 @@ $namespaceAliases = array(
 
 	'Слика'                   => NS_FILE,
 	'Разговор_о_слици'        => NS_FILE_TALK,
+	"Датотека"                => NS_FILE,
+	"Разговор_о_датотеци"     => NS_FILE_TALK,
+	"Медијавики"              => NS_MEDIAWIKI,
+	"Разговор_о_Медијавикију" => NS_MEDIAWIKI_TALK,
 	'МедијаВики'              => NS_MEDIAWIKI,
 	'Разговор_о_МедијаВикију' => NS_MEDIAWIKI_TALK,
 );
diff --git a/languages/messages/MessagesWar.php b/languages/messages/MessagesWar.php
index c5938aa22b..bc2d835af8 100644
--- a/languages/messages/MessagesWar.php
+++ b/languages/messages/MessagesWar.php
@@ -13,6 +13,25 @@
  * @author לערי ריינהארט
  */
 
+$namespaceNames = array(
+	NS_MEDIA            => 'Medya',
+	NS_SPECIAL          => 'Pinaurog',
+	NS_TALK             => 'Hiruhimangraw',
+	NS_USER             => 'Gumaramit',
+	NS_USER_TALK        => 'Hiruhimangaw_hiton_gumaramit',
+	NS_PROJECT_TALK     => 'Hiruhimangraw_hiton_$1',
+	NS_FILE             => 'Fayl',
+	NS_FILE_TALK        => 'Hiruhimangraw_hiton_fayl',
+	NS_MEDIAWIKI        => 'MediaWiki',
+	NS_MEDIAWIKI_TALK   => 'Hiruhimangraw_hiton_MediaWiki',
+	NS_TEMPLATE         => 'Batakan',
+	NS_TEMPLATE_TALK    => 'Hiruhimangraw_hiton_batakan',
+	NS_HELP             => 'Bulig',
+	NS_HELP_TALK        => 'Hiruhimangaw_hiton_bulig',
+	NS_CATEGORY         => 'Kaarangay',
+	NS_CATEGORY_TALK    => 'Hiruhimangraw_hiton_kaarangay',
+);
+
 $specialPageAliases = array(
 	'Allpages'                  => array( 'NgatananngaPakli' ),
 	'Categories'                => array( 'Mga Kategorya' ),
diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index d572928c60..e3b4fd0b1c 100644
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -21,11 +21,11 @@ $namespaceNames = array(
 	NS_TALK             => '傾偈',
 	NS_USER             => '用戶',
 	NS_USER_TALK        => '用戶傾偈',
-	NS_PROJECT_TALK     => '$1_傾偈',
+	NS_PROJECT_TALK     => '$1傾偈',
 	NS_FILE             => '文件',
 	NS_FILE_TALK        => '文件傾偈',
 	NS_MEDIAWIKI        => 'MediaWiki',
-	NS_MEDIAWIKI_TALK   => 'MediaWiki_傾偈',
+	NS_MEDIAWIKI_TALK   => 'MediaWiki傾偈',
 	NS_TEMPLATE         => '模',
 	NS_TEMPLATE_TALK    => '模傾偈',
 	NS_HELP             => '幫手',
@@ -46,9 +46,7 @@ $namespaceAliases = array(
 	"用户 对话" 		=> NS_USER_TALK,
 	"用戶 討論" 		=> NS_USER_TALK,
 	"用户 讨论" 		=> NS_USER_TALK,
-	# This has never worked so it's unlikely to annoy anyone if I disable it -- TS
-	# "{$wgMetaNamespace} 討論" => NS_PROJECT_TALK,
-	# "{$wgMetaNamespace} 讨论" => NS_PROJECT_TALK,
+	'$1_傾偈'		=> NS_PROJECT_TALK,
 	"檔" 			=> NS_FILE,
 	"檔案" 			=> NS_FILE,
 	"æ¡£" 			=> NS_FILE,
@@ -67,6 +65,7 @@ $namespaceAliases = array(
 	"图 讨论" 		=> NS_FILE_TALK,
 	"圖像 討論" 		=> NS_FILE_TALK,
 	"图像 讨论" 		=> NS_FILE_TALK,
+	'MediaWiki_傾偈'	=> NS_FILE_TALK,
 	"模 討論" 		=> NS_TEMPLATE_TALK,
 	"模 讨论" 		=> NS_TEMPLATE_TALK,
 	"幫助" 			=> NS_HELP,
-- 
2.20.1