Revision: 6145
Author:   russblau
Date:     2008-12-12 20:24:40 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
Merge family files to trunk

Modified Paths:
--------------
    branches/rewrite/pywikibot/families/commons_family.py
    branches/rewrite/pywikibot/families/wikipedia_family.py
    branches/rewrite/pywikibot/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-6055
   + /trunk/pywikipedia/families:5896-6144

Modified: branches/rewrite/pywikibot/families/commons_family.py
===================================================================
--- branches/rewrite/pywikibot/families/commons_family.py       2008-12-12 
14:27:52 UTC (rev 6144)
+++ branches/rewrite/pywikibot/families/commons_family.py       2008-12-12 
20:24:40 UTC (rev 6145)
@@ -16,8 +16,8 @@
 
         self.interwiki_forward = 'wikipedia'
         self.disambiguationTemplates = {
-
-            'commons': [u'Disambig', u'Disambiguation', u'Razločitev']
+            'commons': [u'Disambig', u'Disambiguation', u'Razločitev',
+                        u'Begriffsklärung']
         }
         self.disambcatname = {
             'commons':  u'Disambiguation'

Modified: branches/rewrite/pywikibot/families/wikipedia_family.py
===================================================================
--- branches/rewrite/pywikibot/families/wikipedia_family.py     2008-12-12 
14:27:52 UTC (rev 6144)
+++ branches/rewrite/pywikibot/families/wikipedia_family.py     2008-12-12 
20:24:40 UTC (rev 6145)
@@ -37,7 +37,7 @@
             'kv', 'bi', 'xal', 'st', 'tn', 'ch', 'ak', 'bxr', 'ny', 'ab',
             'fj', 'tw', 'lbe', 'za', 'ff', 'tum', 'ha', 'sn', 'sg', 'lg',
             'ki', 'rn', 'chy', 'ng', 'ext', 'gan', 'hif', 'kaa', 'mdf',
-            'myv', 'sah', 'srn', 'szl',
+            'myv', 'sah', 'srn', 'szl', 'arz',
         ]
 
         for lang in self.languages_by_size:
@@ -59,13 +59,14 @@
             'be-x-old':  [u'Неадназначнасць', u'Неадназначнасьць', 
u'Disambig'],
             'bg':  [u'Пояснение', u'Disambig'],
             'bn':  [u'দ্ব্যর্থতা নিরসন', u'Disambig'],
-            'br':  [u'Hvlstumm', u'Digejañ'],
+            'br':  [u'Hvlstumm', u'Digejañ', u'Digejañ anvioù-badez'],
             'bs':  [u'Čvor'],
             'ca':  [u'Desambiguació', u'Disambig', u'Desambigua'],
             '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í',],
+            'cu':  [u'Мъногосъмыслиѥ', u'Disambig'],
             'cy':  [u'Anamrwysedd', u'Disambig', u'Gwahaniaethu'],
             'da':  [u'Flertydig'],
             'de':  [u'Begriffsklärung', u'BKS', u'Disambig'],
@@ -76,7 +77,7 @@
             'et':  [u'Täpsustuslehekülg', u'Täpsustus', u'Disambig'],
             'eu':  [u'Argipen', u'Disambig'],
             'ext': [u'Desambiguáncia'],
-            'fa':  [u'ابهام‌زدایی'],
+            'fa':  [u'ابهام‌زدایی',u'ابهام زدایی'],
             'fi':  [u'Täsmennyssivu', u'Disambig'],
             'fo':  [u'Fleiri týdningar'],
             # See http://fr.wikipedia.org/wiki/MediaWiki:Disambiguationspage
@@ -85,10 +86,9 @@
                     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'Patronymie', u'Personnes homonymes',
-                    u'Unités homonymes',
-                    u'Villes homonymes'],
+                    u'Isomérie', u'Homonymie de nom romain',u'Sigle',
+                    u'Paronymie', u'Patronyme', u'Personnes homonymes',
+                    u'Unités homonymes', u'Villes homonymes'],
             'frp': [u'Homonimos'],
             'fy':  [u'Tfs', u'Neibetsjuttings'],
             'ga':  [u'Idirdhealú', u'Disambig'],
@@ -140,7 +140,8 @@
             'pt':  [u'Desambiguação', u'Disambig', u'Desambig'],
             'rmy': [u'Dudalipen'],
             'ro':  [u'Dezambiguizare', u'Disambig', u'Hndis', u'Dez'],
-            'ru':  [u'Disambig', u'Неоднозначность', u'неоднозначность'],
+            'ru':  [u'Disambig', u'Неоднозначность', u'неоднозначность',
+                    u'Многозначность'],
             'scn': [u'Disambigua', u'Disambig', u'Sigla2', u'Sigla3'],
             'simple': [u'Disambig', u'Disambiguation', u'3CC',u'2CC'],
             'sh': [u'Višeznačna odrednica', u'Disambig', u'Razdvojba',
@@ -148,9 +149,9 @@
                   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'],
+            'sl':  [u'Disambig', u'Razločitev', u'Disambig-ship', 
u'Disambig-unit'],
             'sq':  [u'Kthjellim', u'Disambig'],
-            'sr':  [u'Вишезначна одредница', u'Disambig'],
+            'sr':  [u'Вишезначна одредница', u'Disambig', u'Вишезначна'],
             'srn': [u'Dp'],
             'su':  [u'Disambig'],
             'sv':  [u'Betydelselista', u'Disambig', u'Förgrening', u'Gaffel',
@@ -163,7 +164,7 @@
             'th':  [u'แก้กำกวม', u'Disambig'],
             'tl':  [u'Paglilinaw', u'Disambig'],
             'tr':  [u'Anlam ayrım', u'Disambig', u'Anlam ayrımı'],
-            'uk':  [u'DisambigG', u'Disambig'],
+            'uk':  [u'Неоднозначність',u'DisambigG', u'Disambig', 
u'DisambigN'],
             'vec': [u'Disambigua'],
             'vi':  [u'Trang định hướng', u'Định hướng', u'Disambig', u'Hndis'],
             'vls': [u'Db', u'Dp', u'Dpintro'],

Modified: branches/rewrite/pywikibot/family.py
===================================================================
--- branches/rewrite/pywikibot/family.py        2008-12-12 14:27:52 UTC (rev 
6144)
+++ branches/rewrite/pywikibot/family.py        2008-12-12 20:24:40 UTC (rev 
6145)
@@ -18,7 +18,7 @@
         self.name = None
             # Updated from 
http://meta.wikimedia.org/wiki/Interwiki_sorting_order
         self.alphabetic = [
-            'aa', 'af', 'ak', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc',
+            'aa', 'af', 'ak', 'als', 'am', 'ang', 'ab', 'ar', 'an', 'arc', 
'arz',
             'roa-rup', 'frp', 'as', 'ast', 'gn', 'av', 'ay', 'az', 'bm',
             'bn', 'zh-min-nan', 'map-bms', 'ba', 'be', 'be-x-old', 'bh',
             'bcl', 'bi', 'bar', 'bo', 'bs', 'br', 'bg', 'bxr', 'ca', 'cv',
@@ -540,7 +540,7 @@
         self.language_groups = {
             # languages using the arabic script (incomplete)
         'arab' : [
-                'ar', 'ps', 'sd', 'ur',
+                'ar', 'arz', 'ps', 'sd', 'ur',
                 # languages using multiple scripts, including arabic
             'kk', 'ku', 'tt', 'ug'
             ],
@@ -766,32 +766,47 @@
     redirect = {
         'ar': [u'تحويل'],
         'be-x-old': [u'перанакіраваньне'],
-        'bg': [u'виж'],
+        'bg': [u'виж', u'пренасочване'],
         'bs': [u'preusmjeri'],
-        'cy': [u'ail-cyfeirio'],
+        'cs': [u'PŘESMĚRUJ'],
+        'cy': [u'ail-cyfeirio', u'ailgyfeirio'],
         'el': [u'ΑΝΑΚΑΤΕΥΘΥΝΣΗ'],
+        'eo': [u'ALIDIREKTU'],
         'et': [u'suuna'],
         'fa': [u'تغییرمسیر'],
         'fi': [u'ohjaus', u'uudelleenohjaus'],
+        'fiu-vro': [u'saadaq'],
         'ga': [u'athsheoladh'],
         'he': [u'הפניה'],
+        'hr': [u'PREUSMJERI'],
         'hu': [u'átirányítás'],
+        'hy': [u'ՎԵՐԱՀՂՈՒՄ'],
         'id': [u'alih'],
         'is': [u'tilvísun'],
         'jv': [u'alih'],
         'ka': [u'გადამისამართება'],
         'kk': [u'айдау'],
         'ko': [u'넘겨주기'],
+        'mk': [u'пренасочување', u'види'],
+        'ml': [u'തിരിച്ചുവിടുക', u'തിരിച്ചുവിടല്‍'],
+        'mr': [u'पुनर्निर्देशन'],
         'mzn': [u'تغییرمسیر'],
+        'nds': [u'wiederleiden'],
+        'nds-nl': [u'DEURVERWIEZING'],
         'nl': [u'DOORVERWIJZING'],
         'nn': [u'omdiriger'],
+        'oc': [u'REDIRECCION'],
+        'pl': [u'TAM', u'PRZEKIERUJ'],
         'ru': [u'REDIRECT',             # localised version is not
                u'перенаправление',      # so usual, so put the default
                u'перенапр'],            # one as the most used.
         'sk': [u'presmeruj'],
         'sr': [u'преусмери', u'Преусмери'], # lowercase only doesn't work?
         'su': [u'redirected', u'alih'],
+        'sv': [u'OMDIRIGERING'],
         'tt': [u'yünältü'],
+        'uk': [u'ПЕРЕНАПРАВЛЕННЯ', u'ПЕРЕНАПР'],
+        'vi': [u'đổi'],
         'yi': [u'ווייטערפירן']
     }
 


Property changes on: branches/rewrite/pywikibot/family.py
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/pywikipedia/family.py:6057-6144



_______________________________________________
Pywikipedia-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l

Reply via email to