SVN: [6973] branches/rewrite/pywikibot - Pywikipedia-svn

19 Jun 2009

Revision: 6973
Author:   russblau
Date:     2009-06-19 17:39:55 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
Merge family files to trunk
Modified Paths:
--------------
    branches/rewrite/pywikibot/families/commons_family.py
    branches/rewrite/pywikibot/families/i18n_family.py
    branches/rewrite/pywikibot/families/incubator_family.py
    branches/rewrite/pywikibot/families/mediawiki_family.py
    branches/rewrite/pywikibot/families/meta_family.py
    branches/rewrite/pywikibot/families/species_family.py
    branches/rewrite/pywikibot/families/wikibooks_family.py
    branches/rewrite/pywikibot/families/wikinews_family.py
    branches/rewrite/pywikibot/families/wikipedia_family.py
    branches/rewrite/pywikibot/families/wikiquote_family.py
    branches/rewrite/pywikibot/families/wikisource_family.py
    branches/rewrite/pywikibot/families/wikiversity_family.py
    branches/rewrite/pywikibot/families/wiktionary_family.py
    branches/rewrite/pywikibot/family.py
Added Paths:
-----------
    branches/rewrite/pywikibot/families/mac_wikia_family.py
Property Changed:
----------------
    branches/rewrite/pywikibot/families/
    branches/rewrite/pywikibot/family.py
Property changes on: branches/rewrite/pywikibot/families
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/pywikipedia/families:5896-6197,6212-6858
   + /trunk/pywikipedia/families:5896-6197,6212-6972
Modified: branches/rewrite/pywikibot/families/commons_family.py
===================================================================

--- branches/rewrite/pywikibot/families/commons_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/commons_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -39,8 +39,11 @@
         }
def version(self, code):
-        return '1.15alpha'
+        return '1.16alpha'
+    def dbName(self, code):
+        return 'commonswiki_p'
+
     def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: branches/rewrite/pywikibot/families/i18n_family.py
===================================================================
--- branches/rewrite/pywikibot/families/i18n_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/i18n_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -16,4 +16,4 @@
         }
def version(self, code):
-        return "1.15alpha"
+        return "1.16alpha"
Modified: branches/rewrite/pywikibot/families/incubator_family.py
===================================================================
--- branches/rewrite/pywikibot/families/incubator_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/incubator_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -15,7 +15,7 @@
         }
def version(self, code):
-        return '1.15alpha'
+        return '1.16alpha'
def shared_image_repository(self, code):
         return ('commons', 'commons')
Copied: branches/rewrite/pywikibot/families/mac_wikia_family.py (from rev 6972, trunk/pywikipedia/families/mac_wikia_family.py)
===================================================================
--- branches/rewrite/pywikibot/families/mac_wikia_family.py	                        (rev 0)
+++ branches/rewrite/pywikibot/families/mac_wikia_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -0,0 +1,31 @@
+# -*- coding: utf-8  -*-
+import family, config
+
+class Family(family.Family):
+    def __init__(self):
+        family.Family.__init__(self)
+        self.name = 'mac_wikia'
+
+        self.langs = {
+            'de':'de.mac.wikia.com',
+            'en':'mac.wikia.com',
+            'es':'es.mac.wikia.com',
+            'fr':'fr.mac.wikia.com',
+            'id':'id.mac.wikia.com',
+            'it':'it.mac.wikia.com',
+            'zh':'zh.mac.wikia.com',
+            }
+
+        # A few selected big languages for things that we do not want to loop over
+        # all languages. This is only needed by the titletranslate.py module, so
+        # if you carefully avoid the options, you could get away without these
+        # for another wikimedia family.
+
+        self.languages_by_size = ['en','de']
+
+    def version(self, code):
+        return "1.14"
+
+    def scriptpath(self, code):
+        return ''
+
Modified: branches/rewrite/pywikibot/families/mediawiki_family.py
===================================================================
--- branches/rewrite/pywikibot/families/mediawiki_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/mediawiki_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -17,7 +17,7 @@
         }
def version(self, code):
-        return '1.15alpha'
+        return '1.16alpha'
def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: branches/rewrite/pywikibot/families/meta_family.py
===================================================================
--- branches/rewrite/pywikibot/families/meta_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/meta_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -14,9 +14,10 @@
             'meta': 'meta.wikimedia.org',
         }
         self.interwiki_forward = 'wikipedia'
+        self.cross_allowed = ['meta',]
def version(self,code):
-        return '1.15alpha'
+        return '1.16alpha'
def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: branches/rewrite/pywikibot/families/species_family.py
===================================================================
--- branches/rewrite/pywikibot/families/species_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/species_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -16,7 +16,7 @@
         self.interwiki_forward = 'wikipedia'
def version(self,code):
-        return '1.15alpha'
+        return '1.16alpha'
def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: branches/rewrite/pywikibot/families/wikibooks_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikibooks_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/wikibooks_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -12,16 +12,16 @@
         self.name = 'wikibooks'
self.languages_by_size = [
-            'en', 'de', 'fr', 'pt', 'hu', 'es', 'nl', 'ja', 'it', 'pl',
-            'sq', 'he', 'fi', 'vi', 'ru', 'hr', 'cs', 'da', 'sv', 'zh',
-            'mk', 'tr', 'sr', 'fa', 'tl', 'is', 'id', 'ta', 'ca', 'ar',
-            'no', 'ko', 'eo', 'ka', 'simple', 'bg', 'th', 'lt', 'gl', 'ro',
-            'sk', 'la', 'ia', 'ang', 'el', 'et', 'mr', 'sl', 'ur', 'oc',
-            'cv', 'ml', 'uk', 'ms', 'eu', 'lv', 'fy', 'hi', 'ie', 'tg',
-            'bn', 'hy', 'af', 'az', 'te', 'bs', 'pa', 'ky', 'be', 'ast',
-            'cy', 'sa', 'tt', 'mg', 'km', 'ku', 'si', 'co', 'zh-min-nan', 'sw',
-            'tk', 'ne', 'als', 'uz', 'vo', 'na', 'su', 'ps', 'mn', 'lb',
-            'kn', 'xh', 'kk', 'za', 'nds', 'wa', 'zu', 'my',
+            'en', 'de', 'fr', 'hu', 'pt', 'es', 'ja', 'nl', 'it', 'pl',
+            'sq', 'he', 'fi', 'vi', 'ru', 'cs', 'hr', 'da', 'zh', 'sv',
+            'mk', 'tr', 'th', 'sr', 'fa', 'tl', 'id', 'is', 'ca', 'ta',
+            'ar', 'no', 'ko', 'eo', 'ka', 'simple', 'bg', 'gl', 'lt', 'ro',
+            'sk', 'la', 'el', 'ia', 'ang', 'sl', 'et', 'mr', 'cv', 'ur',
+            'oc', 'ml', 'ms', 'uk', 'eu', 'fy', 'lv', 'ie', 'hi', 'tg',
+            'bn', 'hy', 'af', 'az', 'te', 'bs', 'ky', 'pa', 'be', 'sa',
+            'zh-min-nan', 'ast', 'cy', 'mg', 'tt', 'km', 'si', 'ku', 'co', 'sw',
+            'tk', 'ne', 'als', 'uz', 'vo', 'su', 'na', 'mn', 'lb', 'kn',
+            'ps', 'xh', 'kk', 'za', 'nds', 'wa', 'zu', 'my',
         ]
for lang in self.languages_by_size:
@@ -87,9 +87,11 @@
             'pl': alphabetic,
             'simple': alphabetic
         }
+        # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementat...
+        self.cross_allowed = ['fa','fy','it','ru','simple','zh']
def version(self, code):
-        return '1.15alpha'
+        return '1.16alpha'
def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: branches/rewrite/pywikibot/families/wikinews_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikinews_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/wikinews_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -13,8 +13,8 @@
self.languages_by_size = [
             'en', 'pl', 'de', 'it', 'sr', 'fr', 'pt', 'es', 'zh', 'sv',
-            'ja', 'ru', 'nl', 'he', 'fi', 'sd', 'cs', 'no', 'uk', 'ca',
-            'ar', 'hu', 'ro', 'bs', 'th', 'bg', 'ta',
+            'ja', 'ru', 'nl', 'he', 'fi', 'sd', 'ar', 'cs', 'no', 'uk',
+            'ca', 'hu', 'ro', 'th', 'bs', 'bg', 'ta',
         ]
for lang in self.languages_by_size:
@@ -41,11 +41,14 @@
             'pl': self.alphabetic,
         }
+        # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementat...
+        self.cross_allowed = ['cs','hu',]
+
     def code2encoding(self, code):
         return 'utf-8'
def version(self, code):
-        return '1.15alpha'
+        return '1.16alpha'
def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: branches/rewrite/pywikibot/families/wikipedia_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikipedia_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/wikipedia_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -13,31 +13,31 @@
self.languages_by_size = [
             'en', 'de', 'fr', 'pl', 'ja', 'it', 'nl', 'pt', 'es', 'ru',
-            'sv', 'zh', 'no', 'fi', 'ca', 'uk', 'tr', 'cs', 'ro', 'hu',
-            'vo', 'eo', 'sk', 'da', 'id', 'ko', 'ar', 'he', 'lt', 'vi',
-            'sl', 'sr', 'bg', 'et', 'fa', 'simple', 'hr', 'ht', 'new', 'nn',
-            'gl', 'th', 'te', 'el', 'eu', 'ceb', 'ms', 'ka', 'hi', 'la',
-            'bs', 'lb', 'mk', 'is', 'br', 'bpy', 'mr', 'sq', 'cy', 'az',
-            'sh', 'tl', 'lv', 'pms', 'bn', 'jv', 'be-x-old', 'oc', 'ta', 'io',
-            'be', 'su', 'nds', 'scn', 'an', 'nap', 'ku', 'ast', 'af', 'wa',
-            'sw', 'fy', 'zh-yue', 'qu', 'ksh', 'ur', 'cv', 'ml', 'tg', 'bat-smg',
-            'ga', 'vec', 'roa-tara', 'uz', 'gd', 'mi', 'kn', 'yo', 'pam', 'yi',
-            'nah', 'co', 'hsb', 'lmo', 'als', 'zh-min-nan', 'li', 'roa-rup', 'ia', 'hy',
-            'sa', 'nds-nl', 'tt', 'wuu', 'fo', 'war', 'nrm', 'vls', 'kk', 'am',
-            'rm', 'map-bms', 'pag', 'gu', 'glk', 'sah', 'os', 'dv', 'se', 'ne',
-            'diq', 'fur', 'sco', 'lij', 'nov', 'fiu-vro', 'gv', 'mn', 'bh', 'bar',
-            'ilo', 'mt', 'pi', 'gan', 'zh-classical', 'arz', 'km', 'frp', 'lad', 'csb',
-            'pdc', 'haw', 'ang', 'kw', 'to', 'mzn', 'bcl', 'si', 'ps', 'sc',
-            'ie', 'tk', 'szl', 'kv', 'gn', 'ln', 'mg', 'stq', 'crh', 'jbo',
-            'wo', 'my', 'tpi', 'hif', 'cbk-zam', 'ty', 'ky', 'zea', 'arc', 'ug',
-            'srn', 'ay', 'myv', 'ext', 'eml', 'hak', 'ig', 'or', 'pap', 'kg',
-            'kab', 'so', 'rmy', 'lo', 'pa', 'ba', 'ks', 'ce', 'udm', 'av',
-            'sm', 'kaa', 'tet', 'cu', 'sd', 'mdf', 'iu', 'dsb', 'got', 'na',
-            'nv', 'bm', 'bo', 'cdo', 'ee', 'chr', 'om', 'as', 'zu', 'pnt',
-            'ti', 'ts', 'pih', 'ab', 'ss', 'kl', 'bi', 'cr', 've', 'ch',
-            'xh', 'dz', 'ha', 'tn', 'bug', 'ik', 'bxr', 'st', 'rw', 'xal',
-            'chy', 'tw', 'za', 'ak', 'ny', 'fj', 'ff', 'sg', 'rn', 'lbe',
-            'ki', 'sn', 'lg', 'tum', 'ng',
+            'sv', 'zh', 'no', 'fi', 'ca', 'uk', 'tr', 'cs', 'hu', 'ro',
+            'vo', 'eo', 'da', 'sk', 'id', 'ar', 'ko', 'he', 'lt', 'vi',
+            'sl', 'sr', 'bg', 'et', 'fa', 'hr', 'simple', 'new', 'ht', 'nn',
+            'gl', 'th', 'te', 'el', 'ms', 'eu', 'ceb', 'hi', 'mk', 'ka',
+            'la', 'bs', 'lb', 'br', 'is', 'az', 'bpy', 'mr', 'sq', 'cy',
+            'sh', 'tl', 'lv', 'pms', 'be-x-old', 'bn', 'jv', 'oc', 'ta', 'io',
+            'be', 'an', 'nds', 'su', 'scn', 'nap', 'ku', 'af', 'ast', 'fy',
+            'sw', 'wa', 'zh-yue', 'bat-smg', 'qu', 'ur', 'cv', 'ml', 'ksh', 'tg',
+            'ga', 'vec', 'roa-tara', 'war', 'uz', 'gd', 'pam', 'kn', 'mi', 'gu',
+            'yi', 'yo', 'glk', 'lmo', 'nah', 'co', 'zh-min-nan', 'hsb', 'als', 'roa-rup',
+            'ia', 'li', 'hy', 'gan', 'kk', 'sah', 'tt', 'tk', 'sa', 'wuu',
+            'nds-nl', 'fo', 'os', 'vls', 'nrm', 'fiu-vro', 'am', 'rm', 'map-bms', 'pag',
+            'arz', 'dv', 'mn', 'se', 'diq', 'ne', 'gv', 'fur', 'sco', 'lij',
+            'bar', 'nov', 'bh', 'mt', 'ilo', 'pi', 'zh-classical', 'mzn', 'km','frp',
+            'csb', 'lad', 'ug', 'si', 'pdc', 'kw', 'ang', 'haw', 'bcl', 'sc',
+            'to', 'kv', 'mg', 'pa', 'ps', 'szl', 'ie', 'gn', 'my', 'ln',
+            'hif', 'stq', 'wo', 'jbo', 'crh', 'arc', 'tpi', 'ty', 'ext', 'cbk-zam',
+            'ky', 'eml', 'zea', 'srn', 'ay', 'myv', 'hak', 'ig', 'kg', 'pap',
+            'so', 'or', 'kab', 'lo', 'rmy', 'ba', 'ce', 'sm', 'udm', 'av',
+            'ks', 'cu', 'got', 'kaa', 'tet', 'dsb', 'sd', 'mdf', 'bo', 'iu',
+            'nv', 'na', 'bm', 'cdo', 'chr', 'as', 'ee', 'om', 'pnt', 'pih',
+            'zu', 'ab', 'ti', 'kl', 'ts', 'ss', 'bi', 'cr', 'dz', 've',
+            'za', 'ch', 'ha', 'xh', 'tn', 'bug', 'xal', 'st', 'rw', 'ik',
+            'bxr', 'chy', 'tw', 'ak', 'ny', 'fj', 'ff', 'sn', 'sg', 'lbe',
+            'rn', 'ki', 'lg', 'tum', 'ng',
         ]
for lang in self.languages_by_size:
@@ -118,7 +118,7 @@
                        u'分類彈去',
                        u'分類跳轉',),
         }
-        
+
         self.disambiguationTemplates = {
             # set value to None, instead of a list, to retrieve names from
             # the live wiki ([[MediaWiki:Disambiguationspage]]
@@ -138,13 +138,14 @@
             'bn':  [u'দ্ব্যর্থতা নিরসন', u'Disambig'],
             'br':  [u'Hvlstumm', u'Digejañ', u'Digejañ anvioù-badez'],
             'bs':  [u'Čvor'],
-            'ca':  [u'Desambiguació', u'Disambig', u'Desambigua', 
-                    u'acrònim'],
+            'ca':  [u'Desambiguació', u'Disambig', u'Desambigua',
+                    u'acrònim', u'onomàstica'],
             'ceb': [u'Giklaro'],
             'cdo': [u'Gì-ngiê'],
             'cs':  [u'Rozcestník', u'Rozcestník - 2 znaky', u'Rozcestník - Příjmení',
                     u'Rozcestník - místopisné jméno', u'Disambig', u'Rozcestník - příjmení',
-                    u'Rozcestník - sakrální stavba', u'Rozcestník - kostel'],
+                    u'Rozcestník - sakrální stavba', u'Rozcestník - kostel',
+                    u'Rozcestník - 3 znaky'],
             'cu':  [u'Мъногосъмыслиѥ', u'Disambig'],
             'cy':  [u'Anamrwysedd', u'Disambig', u'Gwahaniaethu'],
             'da':  [u'Flertydig'],
@@ -159,16 +160,7 @@
             'fa':  [u'ابهام‌زدایی',u'ابهام زدایی'],
             'fi':  [u'Täsmennyssivu', u'Disambig'],
             'fo':  [u'Fleiri týdningar'],
-            # See http://fr.wikipedia.org/wiki/MediaWiki:Disambiguationspage
-            'fr':  [u'Homonymie', u'Arrondissements homonymes', u'Disambig',
-                    u'Bandeau standard pour page d'homonymie',
-                    u'Batailles homonymes', u'Cantons homonymes',
-                    u'Homonymie de clubs sportifs', u'Homonymie dynastique',
-                    u'Homonymie de comtés', u'Internationalisation',
-                    u'Isomérie', u'Homonymie de nom romain',
-                    u'Paronymie', u'Patronyme', u'Personnes homonymes',
-                    u'Unités homonymes', u'Villes homonymes', u'Homonymie bateau',
-                    u'Toponymie'],
+            'fr':  None,
             'frp': [u'Homonimos'],
             'fy':  [u'Tfs', u'Neibetsjuttings'],
             'ga':  [u'Idirdhealú', u'Disambig'],
@@ -185,7 +177,7 @@
             'ia':  [u'Disambiguation', u'Disambig'],
             'id':  [u'Disingkat',u'Disambig', u'Disambig nama', u'Disambig tempat', u'Disambig-bandara', u'Disambiguasi', u'Disambig suku'],
             'io':  [u'Homonimo', u'Disambig'],
-            'is':  [u'Aðgreining', u'Disambig'],
+            'is':  None,
             'it':  [u'Disambigua', u'Sigla2', u'Sigla3', u'Sigla4', u'Cogni'],
             'ja':  [u'Aimai', u'Dab', u'曖昧さ回避', u'Disambig'],
             'ka':  [u'მრავალმნიშვნელოვანი', u'მრავმნიშ'],
@@ -224,24 +216,21 @@
             'rmy': [u'Dudalipen'],
             'ro':  [u'Dezambiguizare', u'Disambig', u'Hndis', u'Dez'],
             'ru':  [u'Disambig', u'Неоднозначность', u'неоднозначность',
-                    u'Многозначность'],
+                    u'Многозначность', u'Фамилия'],
             'scn': [u'Disambigua', u'Disambig', u'Sigla2', u'Sigla3'],
-            'simple': [u'Disambig', u'Disambiguation', u'3CC',u'2CC'],
+            'simple': None,
             'sh': [u'Višeznačna odrednica', u'Disambig', u'Razdvojba',
                   u'Razvrstavanje', u'VZO', u'Višeznačnost',
                   u'Homograf',
                   u'Radzvojba', u'Čvor'],
             'sk':  [u'Disambig', u'Rozlišovacia stránka', u'Disambiguation'],
-            'sl':  [u'Disambig', u'Razločitev', u'Disambig-ship', u'Disambig-unit'],
+            'sl':  None,
             'sq':  [u'Kthjellim', u'Disambig'],
             'sr':  [u'Вишезначна одредница', u'Disambig', u'Вишезначна',
                     u'Višeznačna odrednica'],
             'srn': [u'Dp'],
             'su':  [u'Disambig'],
-            'sv':  [u'Betydelselista', u'Disambig', u'Förgrening', u'Gaffel',
-                    u'Efternamn', u'Gren', u'Förgreningssida', u'3LC',
-                    u'Trebokstavsförkortning', u'TLAdisambig', u'4LA',
-                    u'Trebokstavsförgrening'],
+            'sv':  None,
             'sw':  [u'Maana'],
             'ta':  [u'பக்கவழி நெறிப்படுத்தல்'],
             'te':  [u'అయోమయ నివృత్తి', u'వివరమైన అయోమయ నివృత్తి'],
@@ -261,7 +250,7 @@
             'yi':  [u'באדייטען'],
             'zea': [u'dp', u'Deurverwiespagina'],
             'zh':  [u'Disambig', u'消歧义', u'消歧义页', u'消歧義'],
-            'zh-classical':  [u'Disambig', u'釋義', u'消歧義', u''],
+            'zh-classical':  [u'Disambig', u'釋義', u'消歧義'],
             'zh-min-nan': [u'Khu-pia̍t-ia̍h', 'KhPI', u'Disambig'],
             'zh-yue': [u'搞清楚', u'Disambig'],
         }
@@ -341,6 +330,23 @@
             'zh-min-nan': u'Khu-pia̍t-ia̍h',
             }
+        # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementat...
+        self.cross_allowed = [
+            'ab','af','ak','am','ang','arc','arz','as','av','ay','az','ba','bar','bcl',
+            'be-x-old','be','bg','bh','bi','bm','bo','bpy','bug','bxr','cbk-zam',
+            'cdo','ce','ch','chy','co','crh','cr','csb','cu','diq','dsb','dz',
+            'ee','eml','eu','ext','fa','ff','fj','fo','frp','fur','gan','ga','glk',
+            'gn','got','gu','gv','ha','hak','haw','hif','hi','hsb','ht','hu','hy',
+            'ia','id','ie','ig','ik','ilo','iow','is','iu','jbo','jv','kaa','kab','ka','kg','ki',
+            'kl','km','kn','ko','ks','ku','kv','kw','ky','lad','lbe','lg','li','lij',
+            'lmo','ln','lo','lv','map-bms','mdf','mg','mk','mn','mt','myv','my','mzn','nah',
+            'na','nap','nds-nl','ne','new','nl','nov','nrm','nv','ny','om','or','os','pam','pap',
+            'pa','pdc','pnt','ps','qu','rm','rmy','rn','roa-rup','roa-tara','sah',
+            'sa','sc','sco','sd','se','sg','sh','simple','si','sk','sm','sn','so',
+            'srn','stq','st','su','sw','szl','ta','te','tet','tg','ti','tn','to',
+            'tpi','ts','tt','tum','tw','ty','ug','uz','ve','vls','wa','war','wo','wuu',
+            'xal','xh','yi','yo','za','zh','zu'
+        ]
         # On most Wikipedias page names must start with a capital letter, but some
         # languages don't use this.
@@ -445,10 +451,11 @@
self.crossnamespace[0] = {
             '_default': {
-                'pt': [102], 
-                'als': [104], 
+                'pt': [102],
+                'als': [104],
                 'en': [12],
-                'es': [104], 
+                'es': [104],
+                'fi': [4],
                 'fr': [104],
                 'hr': [102],
                 'lt': [104],
@@ -457,27 +464,34 @@
         self.crossnamespace[1] = {
             '_default': {
                 'pt': [103],
-                'als': [105], 
+                'als': [105],
                 'en': [13],
                 'es': [105],
+                'fi': [5],
                 'fr': [105],
                 'hr': [103],
                 'lt': [105],
             },
         }
+        self.crossnamespace[4] = {
+            'fi': {'_default': [0]}
+        }
+        self.crossnamespace[5] = {
+            'fi': {'_default': [1]}
+        }
         self.crossnamespace[102] = {
             'pt': {
                 '_default': [0],
-                'als': [0, 104], 
-                'es': [0, 104], 
-                'fr': [0, 104], 
+                'als': [0, 104],
+                'es': [0, 104],
+                'fr': [0, 104],
                 'lt': [0, 104]
             },
             'hr': {
                 '_default': [0],
-                'als': [0, 104], 
-                'es': [0, 104], 
-                'fr': [0, 104], 
+                'als': [0, 104],
+                'es': [0, 104],
+                'fr': [0, 104],
                 'lt': [0, 104]
             },
         }
@@ -503,7 +517,7 @@
                 'pt': [0, 102],
                 'hr': [0, 102],
             },
-            'es': { 
+            'es': {
                 '_default': [0],
                 'pt': [0, 102],
                 'hr': [0, 102],
@@ -513,7 +527,7 @@
                 'pt': [0, 102],
                 'hr': [0, 102],
             },
-            'lt': { 
+            'lt': {
                 '_default': [0],
                 'pt': [0, 102],
                 'hr': [0, 102],
@@ -562,13 +576,13 @@
             return self.known_families
def version(self, code):
-        return '1.15alpha'
+        return '1.16alpha'
def dbName(self, code):
         # returns the name of the MySQL database
         # for historic reasons, the databases are called xxwiki instead of
         # xxwikipedia for Wikipedias.
-        return '%swiki' % code
+        return '%swiki_p' % code
def code2encodings(self, code):
         """Return a list of historical encodings for a specific language
Modified: branches/rewrite/pywikibot/families/wikiquote_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikiquote_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/wikiquote_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -12,13 +12,13 @@
         self.name = 'wikiquote'
self.languages_by_size = [
-            'en', 'it', 'de', 'pl', 'pt', 'sk', 'ru', 'bg', 'bs', 'es',
-            'sl', 'tr', 'he', 'fr', 'cs', 'zh', 'lt', 'id', 'uk', 'fa',
-            'hu', 'sv', 'el', 'nl', 'no', 'ja', 'fi', 'ca', 'nn', 'ka',
-            'et', 'simple', 'ku', 'ar', 'hr', 'eo', 'hy', 'ro', 'gl', 'ko',
-            'ml', 'li', 'is', 'af', 'sr', 'th', 'da', 'sq', 'te', 'vi',
-            'eu', 'la', 'az', 'br', 'hi', 'be', 'ast', 'uz', 'ang', 'zh-min-nan',
-            'lb', 'mr', 'su', 'ur', 'ta', 'wo', 'ky', 'kn', 'gu', 'cy',
+            'en', 'it', 'de', 'pl', 'pt', 'sk', 'ru', 'bg', 'es', 'bs',
+            'sl', 'tr', 'he', 'lt', 'fr', 'cs', 'zh', 'uk', 'hu', 'id',
+            'fa', 'sv', 'el', 'no', 'nl', 'ja', 'fi', 'eo', 'hy', 'et',
+            'ca', 'nn', 'simple', 'ka', 'ar', 'ku', 'hr', 'ko', 'ro', 'gl',
+            'ml', 'li', 'is', 'sr', 'af', 'th', 'te', 'da', 'sq', 'vi',
+            'eu', 'az', 'la', 'br', 'hi', 'be', 'ast', 'uz', 'ang', 'zh-min-nan',
+            'lb', 'mr', 'su', 'ur', 'ta', 'wo', 'kn', 'ky', 'gu', 'cy',
             'am', 'co', 'kk',
         ]
@@ -26,9 +26,10 @@
             self.langs[lang] = '%s.wikiquote.org' % lang
self.disambiguationTemplates = {
-            '_default': [u''],
-            'ka':       [u'მრავალმნიშვნელოვანი', u'მრავმნიშ'],
-            'pt':       [u'Desambiguação'],
+            '_default': [],
+            'fr': ['Homonymie'],
+            'ka': [u'მრავალმნიშვნელოვანი', u'მრავმნიშ'],
+            'pt': [u'Desambiguação'],
             }
# attop is a list of languages that prefer to have the interwiki
@@ -45,6 +46,11 @@
         # List of languages that want the category on_one_line.
         self.category_on_one_line = []
+        # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementat...
+        self.cross_allowed = [
+            'af','am','ang','ar','ast','az','ca','da','fa','it',
+            'ka','ko','la','nn','no','ro','simple','sv','vi','zh'
+        ]
         # Which languages have a special order for putting interlanguage links,
         # and what order is it? If a language is not in interwiki_putfirst,
         # alphabetical order on language code is used. For languages that are in
@@ -101,7 +107,7 @@
         }
def version(self, code):
-        return '1.15alpha'
+        return '1.16alpha'
def code2encodings(self, code):
         """
Modified: branches/rewrite/pywikibot/families/wikisource_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikisource_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/wikisource_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -12,19 +12,17 @@
         self.name = 'wikisource'
self.languages_by_size = [
-            'en', 'pt', 'fr', 'zh', 'es', 'de', 'ru', 'it', 'fa', 'ar',
-            'hu', 'th', 'pl', 'he', 'cs', 'ro', 'hr', 'te', 'fi', 'tr',
-            'nl', 'sv', 'sr', 'la', 'uk', 'ja', 'sl', 'li', 'ml', 'is',
-            'bs', 'el', 'ko', 'id', 'ca', 'bn', 'no', 'hy', 'da', 'az',
-            'vi', 'ta', 'et', 'yi', 'mk', 'bg', 'kn', 'lt', 'cy', 'sk',
-            'gl', 'zh-min-nan', 'fo',
+            'en', 'pt', 'fr', 'zh', 'es', 'de', 'ru', 'he', 'it', 'ar',
+            'fa', 'hu', 'pl', 'th', 'cs', 'ro', 'hr', 'te', 'fi', 'tr',
+            'nl', 'sv', 'sl', 'sr', 'la', 'uk', 'ja', 'li', 'el', 'ml',
+            'ko', 'is', 'bs', 'id', 'ca', 'bn', 'hy', 'yi', 'az', 'mk',
+            'no', 'da', 'vi', 'et', 'ta', 'bg', 'lt', 'kn', 'gl', 'cy',
+            'sk', 'zh-min-nan', 'fo',
         ]
-        self.langs = {
-            '-': 'wikisource.org',
-        }
         for lang in self.languages_by_size:
             self.langs[lang] = '%s.wikisource.org' % lang
+            self.langs['-'] = 'wikisource.org'
self.alphabetic = ['ang','ar','az','bg','bs','ca','cs','cy',
                       'da','de','el','en','es','et','fa','fi',
@@ -35,8 +33,8 @@
self.obsolete = {
             'ang': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Old...
-            
-            
+
+
             'dk': 'da',
             'ht': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Hai...
             'jp': 'ja',
@@ -56,9 +54,22 @@
             'pl': self.alphabetic,
             'simple': self.alphabetic
         }
+        # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementat...
+        self.cross_allowed = [
+            'el','fa','it','ko','no','zh'
+        ]
+    def scriptpath(self, code):
+        if config.SSL_connection:
+            if code == '-':
+                return '/wikipedia/sources/w'
+            else:
+                return '/%s/%s/w' % (self.name, code)
+        else:
+            return '/w'
+
     def version(self, code):
-        return '1.15alpha'
+        return '1.16alpha'
def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: branches/rewrite/pywikibot/families/wikiversity_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikiversity_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/wikiversity_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -12,17 +12,16 @@
         self.name = 'wikiversity'
self.languages_by_size = [
-            'en', 'fi', 'fr', 'es', 'de', 'it', 'el', 'cs', 'ja', 'pt'
+            'en', 'fr', 'de', 'cs', 'es', 'it', 'pt', 'el', 'fi',
+            'ja',
         ]
-        self.langs = {
-            'beta': 'beta.wikiversity.org',
-        }
         for lang in self.languages_by_size:
             self.langs[lang] = '%s.wikiversity.org' % lang
+            self.langs['beta'] = 'beta.wikiversity.org'
def version(self,code):
-        return '1.15alpha'
+        return '1.16alpha'
def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: branches/rewrite/pywikibot/families/wiktionary_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wiktionary_family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/families/wiktionary_family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -12,21 +12,21 @@
         self.name = 'wiktionary'
self.languages_by_size = [
-            'fr', 'en', 'tr', 'vi', 'ru', 'io', 'el', 'pl', 'lt', 'zh',
-            'fi', 'hu', 'ta', 'it', 'sv', 'de', 'ko', 'pt', 'nl', 'ku',
-            'lo', 'es', 'ja', 'id', 'te', 'gl', 'bg', 'ro', 'vo', 'ar',
-            'et', 'no', 'li', 'ca', 'sr', 'is', 'fa', 'af', 'uk', 'scn',
-            'br', 'th', 'fy', 'oc', 'he', 'sl', 'simple', 'hy', 'sq', 'tt',
-            'cs', 'la', 'zh-min-nan', 'da', 'ast', 'sw', 'ur', 'kk', 'hsb', 'ky',
-            'ml', 'hr', 'ang', 'eo', 'hi', 'gn', 'az', 'ia', 'co', 'ga',
-            'sk', 'csb', 'st', 'ms', 'nds', 'kl', 'wo', 'sd', 'ug', 'ti',
-            'mk', 'tl', 'an', 'my', 'gu', 'km', 'ka', 'cy', 'ts', 'qu',
-            'bs', 'fo', 'rw', 'am', 'mr', 'kn', 'eu', 'su', 'tk', 'chr',
-            'lv', 'mn', 'nah', 'ie', 'yi', 'wa', 'be', 'om', 'gd', 'zu',
-            'mg', 'iu', 'pa', 'bn', 'si', 'nn', 'mi', 'tpi', 'dv', 'mt',
-            'ps', 'jv', 'so', 'tg', 'roa-rup', 'ha', 'ik', 'gv', 'sh', 'ss',
-            'kw', 'sa', 'ay', 'uz', 'na', 'ne', 'jbo', 'tn', 'sg', 'lb',
-            'ks', 'fj', 'ln', 'sm', 'za', 'dz', 'als',
+            'fr', 'en', 'tr', 'lt', 'vi', 'ru', 'io', 'el', 'pl', 'zh',
+            'fi', 'no', 'hu', 'it', 'ta', 'sv', 'de', 'ko', 'lo', 'pt',
+            'nl', 'ku', 'es', 'ja', 'id', 'te', 'et', 'ro', 'gl', 'bg',
+            'vo', 'ar', 'uk', 'ca', 'is', 'sr', 'fa', 'af', 'li', 'scn',
+            'sw', 'fy', 'th', 'br', 'oc', 'he', 'simple', 'cs', 'sl', 'hy',
+            'sq', 'tt', 'la', 'zh-min-nan', 'da', 'ast', 'ur', 'kk', 'ml', 'hsb',
+            'ky', 'hr', 'wo', 'ang', 'eo', 'hi', 'tk', 'gn', 'ia', 'ga',
+            'az', 'co', 'sk', 'csb', 'st', 'ms', 'nds', 'kl', 'sd', 'ug',
+            'ti', 'mk', 'tl', 'an', 'my', 'gu', 'kn', 'ka', 'km', 'lv',
+            'ts', 'cy', 'qu', 'wa', 'fo', 'bs', 'am', 'rw', 'mr', 'eu',
+            'su', 'chr', 'mn', 'nah', 'ie', 'yi', 'om', 'be', 'gd', 'mg',
+            'sh', 'zu', 'iu', 'bn', 'nn', 'pa', 'si', 'mt', 'mi', 'tpi',
+            'dv', 'ps', 'jv', 'tg', 'so', 'roa-rup', 'ik', 'ha', 'gv', 'ss',
+            'kw', 'sa', 'ay', 'uz', 'na', 'ne', 'jbo', 'tn', 'sm', 'sg',
+            'lb', 'ks', 'fj', 'ln', 'za', 'dz', 'als',
         ]
for lang in self.languages_by_size:
@@ -36,6 +36,11 @@
         # letter on ALL Wiktionaries.
         self.nocapitalize = self.langs.keys()
+        # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementat...
+        self.cross_allowed = [
+            'ang','bg','bn','eo','fa','fy','gd','ia','ie','jv','ka','lt','mk',
+            'nl','no','sk','th','ti','ts','uk','vo','za','zh-min-nan','zh',
+        ]
         self.obsolete = {
             'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Afa...
             'ab': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Abk...
@@ -103,7 +108,7 @@
         self.interwiki_attop = ['pl']
def version(self, code):
-        return '1.15alpha'
+        return '1.16alpha'
def shared_image_repository(self, code):
         return ('commons', 'commons')
Modified: branches/rewrite/pywikibot/family.py
===================================================================
--- branches/rewrite/pywikibot/family.py	2009-06-19 07:20:57 UTC (rev 6972)
+++ branches/rewrite/pywikibot/family.py	2009-06-19 17:39:55 UTC (rev 6973)
@@ -480,7 +480,8 @@
         self.disambiguationTemplates = {
             '_default': []
         }
-
+        # A list with the name in the cross-language flag permissions
+        self.cross_allowed = []
         # A list with the name of the category containing disambiguation
         # pages for the various languages. Only one category per language,
         # and without the namespace, so add things like:
@@ -658,7 +659,12 @@
 "ERROR: title for disambig template in language %(language_code)s unknown"
                            % {'language_code': code})
-    # Redirect code can be translated.
+    # Localised magic words for language code 'xyz' can be found in
+    # the MediaWiki source code in the file
+    # /mediawiki/trunk/phase3/languages/messages/MessagesXyz.php
+    # in the 'magicwords' array
+    
+    # Localised redirect codes
# Note that redirect codes are case-insensitive, so it is enough
     # to enter the code in lowercase here.
@@ -668,86 +674,157 @@
     # => if default redirect keyword used for a language is not 'redirect',
     #    it is not necessary to add 'redirect' at the end of the list
     redirect = {
+        'ab': [u'перенаправление', u'перенапр', u'redirect'],
+        'ace': [u'alih'],
         'af': [u'aanstuur'],
+        'aln': [u'ridrejto'],
         'als': [u'weiterleitung'],
         'an': [u'redirección'],
         'ar': [u'تحويل'],
+        'arn': [u'redirección'],
         'arz': [u'تحويل'],
-        'av': [u'перенаправление'],
+        'av': [u'перенаправление', u'перенапр'],
+        'ay': [u'redirección'],
+        'ba': [u'перенаправление', u'перенапр'],
         'bar': [u'weiterleitung'],
+        'bcc': [u'تغییرمسیر'],
         'be-tarask': [u'перанакіраваньне'],
         'be-x-old': [u'перанакіраваньне'],
         'bg': [u'виж', u'пренасочване'],
+        'bm': [u'redirection'],
+        'bqi': [u'تغییرمسیر'],
+        'br': [u'adkas'],
         'bug': [u'alih'],
-        'br': [u'adkas'],
         'bs': [u'preusmjeri'],
+        'cbk-zam': [u'redirección'],
+        'ce': [u'перенаправление', u'перенапр'],
         'cs': [u'přesměruj'],
         'cu': [u'прѣнаправлєниѥ'],
+        'cv': [u'перенаправление', u'перенапр'],
         'cy': [u'ail-cyfeirio', u'ailgyfeirio'],
         'de': [u'weiterleitung'],
+        'de-at': [u'weiterleitung'],
+        'de-ch': [u'weiterleitung'],
+        'de-formal': [u'weiterleitung'],
+        'dsb': [u'weiterleitung'],
         'el': [u'ανακατευθυνση'],
+        'eml': [u'rinvia', u'rinvio'],
         'eo': [u'alidirektu'],
         'es': [u'redirección'],
         'et': [u'suuna'],
         'eu': [u'birzuzendu'],
         'fa': [u'تغییرمسیر'],
+        'ff': [u'redirection'],
         'fi': [u'ohjaus', u'uudelleenohjaus'],
         'fiu-vro': [u'saadaq'],
         'fr': [u'redirection'],
+        'frp': [u'redirection'],
+        'fur': [u'rinvia', u'rinvio'],
         'ga': [u'athsheoladh'],
+        'gag': [u'yönlendirme'],
         'gl': [u'redirección'],
+        'glk': [u'تغییرمسیر'],
+        'gn': [u'redirección'],
+        'gsw': [u'weiterleitung'],
         'he': [u'הפניה'],
         'hr': [u'preusmjeri'],
+        'hsb': [u'weiterleitung'],
+        'ht': [u'redirection'],
         'hu': [u'átirányítás'],
         'hy': [u'վերահղում'],
         'id': [u'alih'],
+        'inh': [u'перенаправление', u'перенапр'],
         'is': [u'tilvísun'],
+        'it': [u'rinvia', u'rinvio'],
         'ja': [u'転送', u'リダイレクト'],
         'jv': [u'alih'],
         'ka': [u'გადამისამართება'],
+        'kaa': [u'aýdaw', u'айдау'],
         'kk': [u'айдау'],
+        'kk-arab': [u'ايداۋ'],
+        'kk-cyrl': [u'АЙДАУ'],
+        'kk-latn': [u'aýdaw', u'айдау'],
+        'km': [u'\u1794\u1789\u17d2\u1787\u17bc\u1793\u1794\u1793\u17d2\u178f',
+               u'\u1794\u17d2\u178f\u17bc\u179a\u1791\u17b8\u178f\u17b6\u17c6\u1784',
+               u'\u1794\u17d2\u178a\u17bc\u179a\u1785\u17c6\u178e\u1784\u1787\u17be\u1784'],
         'ko': [u'넘겨주기'],
         'ksh': [u'ömleidung'],
+        'kv': [u'перенаправление', u'перенапр'],
+        'lad': [u'redirección'],
+        'lb': [u'weiterleitung'],
+        'lbe': [u'перенаправление', u'перенапр'],
         'li': [u'doorverwijzing'],
+        'lij': [u'rinvia', u'rinvio'],
+        'lld': [u'rinvia', u'rinvio'],
+        'lmo': [u'rinvia', u'rinvio'],
+        'ln': [u'redirection'],
         'lt': [u'peradresavimas'],
+        'map-bms': [u'alih'],
+        'mg': [u'redirection'],
+        'mhr': [u'перенаправление', u'перенапр'],
         'mk': [u'пренасочување', u'види'],
         'ml': [u'തിരിച്ചുവിടുക', u'തിരിച്ചുവിടല്‍'],
+        'mo': [u'redirecteaza'],
         'mr': [u'पुनर्निर्देशन'],
         'mt': [u'rindirizza'],
         'mwl': [u'ancaminar'],
+        'myv': [u'перенаправление', u'перенапр'],
         'mzn': [u'تغییرمسیر'],
         'nah': [u'redirección'],
-        'nds': [u'wiederleiden'],
-        'nds-nl': [u'deurverwiezing'],
+        'nds': [u'wiederleiden', u'weiterleitung'],
+        'nds-nl': [u'deurverwiezing', u'doorverwijzing'],
         'new': [u'पुनर्निर्देश'],
         'nl': [u'doorverwijzing'],
         'nn': [u'omdiriger'],
+        'no': [u'omdirigering'],
         'oc': [u'redireccion'],
+        'os': [u'рарвыст', u'перенаправление', u'перенапр'],
         'pdc': [u'weiterleitung'],
-        'pl': [u'redirect', u'patrz', u'tam', u'przekieruj'],
+        'pl': [u'patrz', u'przekieruj', u'tam'],
+        'pms': [u'rinvia', u'rinvio'],
+        'pt-br': [u'redirecionamento'],
         'qu': [u'redirección'],
+        'rmy': [u'redirecteaza'],
         'ro': [u'redirecteaza'],
-        'ru': [u'redirect', u'перенаправление', u'перенапр'],
-        'sa': [u'#पुनर्निदेशन'],
-        'sah': [u'перенаправление'],
+        'ru': [u'перенаправление', u'перенапр'],
+        'sa': [u'पुनर्निदेशन'],
+        'sah': [u'перенаправление', u'перенапр'],
+        'scn': [u'rinvia', u'rinvio'],
+        'sd': [u'چوريو'],
+        'sg': [u'redirection'],
+        'shi': [u'تحويل'],
         'si': [u'යළියොමුව'],
         'sk': [u'presmeruj'],
+        'sl': [u'preusmeritev'],
+        'sli': [u'weiterleitung'],
         'sq': [u'ridrejto'],
         'sr': [u'преусмери', u'преусмери'],
-        'srn': [u'stir'],
+        'sr-ec': [u'преусмери'],
+        'sr-el': [u'preusmeri'],
+        'srn': [u'stir', u'doorverwijzing'],
         'stq': [u'weiterleitung'],
-        'su': [u'redirected', u'alih'],
+        'su': [u'alih'],
         'sv': [u'omdirigering'],
-        'szl': [u'redirect', u'tam', u'patrz'],
+        'szl': [u'patrz', u'przekieruj', u'tam'],
         'ta': [u'வழிமாற்று'],
         'te': [u'దారిమార్పు'],
         'th': [u'เปลี่ยนทาง'],
         'tr': [u'yönlendirme'],
         'tt': [u'yünältü'],
-        'uk': [u'перенаправлення', u'перенапр'],
+        'tt-latn': [u'yünältü'],
+        'tt-cyrl': [u'перенаправление', u'перенапр'],
+        'ty': [u'redirection'],
+        'udm': [u'перенаправление', u'перенапр'],
+        'uk': [u'перенаправлення', u'перенаправление', u'перенапр'],
+        'vec': [u'rinvia', u'rinvio'],
+        'vep': [u'suuna'],
         'vi': [u'đổi', u'đổi'],
-        'vro': [u'saadaq'],
-        'yi': [u'ווייטערפירן']
+        'vls': [u'doorverwijzing'],
+        'vro': [u'saadaq', u'suuna'],
+        'wa': [u'redirection'],
+        'wo': [u'redirection'],
+        'yi': [u'הפניה', u'ווייטערפירן'],
+        'zea': [u'doorverwijzing']
     }
# So can be pagename code
@@ -755,7 +832,7 @@
         'bg': [u'СТРАНИЦА'],
         'he': [u'שם הדף'],
         'kk': [u'БЕТАТАУЫ'],
-        'nn': ['SIDENAMN','SIDENAVN'],
+        'nn': ['SIDENAMN', 'SIDENAVN'],
         'ru': [u'НАЗВАНИЕСТРАНИЦЫ'],
         'sr': [u'СТРАНИЦА'],
         'tt': [u'BİTİSEME']
@@ -764,7 +841,7 @@
     pagenamee = {
         'he': [u'שם הדף מקודד'],
         'kk': [u'БЕТАТАУЫ2'],
-        'nn': ['SIDENAMNE','SIDENAVNE'],
+        'nn': ['SIDENAMNE', 'SIDENAVNE'],
         'ru': [u'НАЗВАНИЕСТРАНИЦЫ2'],
         'sr': [u'СТРАНИЦЕ']
     }
Property changes on: branches/rewrite/pywikibot/family.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/pywikipedia/family.py:6057-6854
   + /trunk/pywikipedia/family.py:6057-6972

    