Revision: 6859
Author:   russblau
Date:     2009-05-08 18:37:38 +0000 (Fri, 08 May 2009)

Log Message:
-----------
Merge family file changes from trunk

Modified Paths:
--------------
    branches/rewrite/pywikibot/families/incubator_family.py
    branches/rewrite/pywikibot/families/meta_family.py
    branches/rewrite/pywikibot/families/species_family.py
    branches/rewrite/pywikibot/families/wikipedia_family.py

Property Changed:
----------------
    branches/rewrite/pywikibot/families/


Property changes on: branches/rewrite/pywikibot/families
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/pywikipedia/families:5896-6197,6212-6649
   + /trunk/pywikipedia/families:5896-6197,6212-6858

Modified: branches/rewrite/pywikibot/families/incubator_family.py
===================================================================
--- branches/rewrite/pywikibot/families/incubator_family.py     2009-05-08 
15:23:29 UTC (rev 6858)
+++ branches/rewrite/pywikibot/families/incubator_family.py     2009-05-08 
18:37:38 UTC (rev 6859)
@@ -15,7 +15,7 @@
         }
 
     def version(self, code):
-        return '1.13alpha'
+        return '1.15alpha'
 
     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-05-08 15:23:29 UTC 
(rev 6858)
+++ branches/rewrite/pywikibot/families/meta_family.py  2009-05-08 18:37:38 UTC 
(rev 6859)
@@ -16,7 +16,7 @@
         self.interwiki_forward = 'wikipedia'
 
     def version(self,code):
-        return '1.13alpha'
+        return '1.15alpha'
 
     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-05-08 
15:23:29 UTC (rev 6858)
+++ branches/rewrite/pywikibot/families/species_family.py       2009-05-08 
18:37:38 UTC (rev 6859)
@@ -16,7 +16,7 @@
         self.interwiki_forward = 'wikipedia'
 
     def version(self,code):
-        return '1.13alpha'
+        return '1.15alpha'
 
     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-05-08 
15:23:29 UTC (rev 6858)
+++ branches/rewrite/pywikibot/families/wikipedia_family.py     2009-05-08 
18:37:38 UTC (rev 6859)
@@ -138,11 +138,13 @@
             'bn':  [u'দ্ব্যর্থতা নিরসন', u'Disambig'],
             'br':  [u'Hvlstumm', u'Digejañ', u'Digejañ anvioù-badez'],
             'bs':  [u'Čvor'],
-            'ca':  [u'Desambiguació', u'Disambig', u'Desambigua'],
+            'ca':  [u'Desambiguació', u'Disambig', u'Desambigua', 
+                    u'acrònim'],
             '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 - místopisné jméno', u'Disambig', 
u'Rozcestník - příjmení',
+                    u'Rozcestník - sakrální stavba', u'Rozcestník - kostel'],
             'cu':  [u'Мъногосъмыслиѥ', u'Disambig'],
             'cy':  [u'Anamrwysedd', u'Disambig', u'Gwahaniaethu'],
             'da':  [u'Flertydig'],
@@ -175,7 +177,7 @@
             'haw': [u'Huaʻōlelo puana like'],
             'he':  [u'פירושונים', u'Disambig'],
             'hi':  [u'बहुविकल्पी शब्द', u'Disambig',],
-            'hr':  [u'Disambig', u'Razdvojba'],
+            'hr':  [u'Disambig', u'Razdvojba', u'razdvojba1'],
             'hsb': [u'Wjacezmyslnosć', u'Disambig'],
             'ht':  [u'Menm non', u'Disambig'],
             'hu':  [u'Egyert', u'Disambig', u'Egyért', u'Egyért-redir'],
@@ -247,7 +249,8 @@
             'th':  [u'แก้กำกวม', u'Disambig', u'คำกำกวม'],
             'tl':  [u'Paglilinaw', u'Disambig'],
             'tr':  [u'Anlam ayrım', u'Disambig', u'Anlam ayrımı',
-                    u'Kişi adları (anlam ayrımı)', u'Yerleşim yerleri (anlam 
ayrımı)'],
+                    u'Kişi adları (anlam ayrımı)', u'Yerleşim yerleri (anlam 
ayrımı)',
+                    u'kısaltmalar (anlam ayrımı)'],
             'uk':  [u'Неоднозначність',u'DisambigG', u'Disambig', u'DisambigN',
                     u'Багатозначність'],
             'vec': [u'Disambigua'],



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

Reply via email to