Merge remote-tracking branch 'upstream/master'

diff --git a/lib-php/TokenSpecialTerm.php b/lib-php/TokenSpecialTerm.php
index cdd04e6c41dccf6ae8646816849244a1b39b50e0..475ae71ba184349242d20143a67538186a0535a6 100644 (file)
--- a/lib-php/TokenSpecialTerm.php
+++ b/lib-php/TokenSpecialTerm.php
@@ -69,19 +69,31 @@ class SpecialTerm
      */
     public function extendSearch($oSearch, $oPosition)
     {
-        $iSearchCost = 2;
+        $iSearchCost = 0;
 
         $iOp = $this->iOperator;
         if ($iOp == \Nominatim\Operator::NONE) {
-            if ($oSearch->hasName() || $oSearch->getContext()->isBoundedSearch()) {
+            if ($oPosition->isFirstToken()
+                || $oSearch->hasName()
+                || $oSearch->getContext()->isBoundedSearch()
+            ) {
                 $iOp = \Nominatim\Operator::NAME;
+                $iSearchCost += 3;
             } else {
                 $iOp = \Nominatim\Operator::NEAR;
-                $iSearchCost += 2;
+                $iSearchCost += 4;
+                if (!$oPosition->isFirstToken()) {
+                    $iSearchCost += 3;
+                }
             }
-        } elseif (!$oPosition->isFirstToken() && !$oPosition->isLastToken()) {
+        } elseif ($oPosition->isFirstToken()) {
             $iSearchCost += 2;
+        } elseif ($oPosition->isLastToken()) {
+            $iSearchCost += 4;
+        } else {
+            $iSearchCost += 6;
         }
+
         if ($oSearch->hasHousenumber()) {
             $iSearchCost ++;
         }

diff --git a/settings/country-names/an.yaml b/settings/country-names/an.yaml
deleted file mode 100644 (file)
index 3ab1b23..0000000
--- a/settings/country-names/an.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: 
-    default: De Nederlandse Antillen
-    af: Nederlandse Antille
-    an: Antillas Neerlandesas
-    ar: جزر الأنتيل
-    be: Нідэрландскія Антылы
-    bg: Холандски Антили
-    br: Antilhez Nederlandat
-    bs: Holandski Antili
-    ca: Antilles Neerlandeses
-    cs: Nizozemské Antily
-    cy: Antilles yr Iseldiroedd
-    da: Nederlandske Antiller
-    de: Niederländische Antillen
-    dv: ނެދަލޭންޑު އެންޓިލޭ
-    el: Ολλανδικές Αντίλλες
-    en: Netherlands Antilles
-    eo: Nederlandaj Antiloj
-    es: Antillas Neerlandesas;Antillas Holandesas;Indias Occidentales Holandesas
-    et: Hollandi Antillid
-    eu: Holandarren Antillak
-    fa: آنتیل هلند
-    fi: Alankomaiden Antillit
-    fo: Niðurlendsku Antillurnar
-    fr: Antilles néerlandaises
-    fy: Nederlânske Antillen
-    ga: Aintillí na hÍsiltíre
-    gl: Antillas Neerlandesas
-    he: האנטילים ההולנדיים
-    hi: नीदरलैंड एंटीलीज़
-    hr: Nizozemski Antili
-    hu: Holland Antillák
-    ia: Antillas Nederlandese
-    id: Antillen Belanda
-    io: Nederlandana Antili
-    is: Hollensku Antillaeyjar
-    it: Antille Olandesi
-    ja: オランダ領アンティル
-    jv: Antillen Walanda
-    ka: ნიდერლანდის ანტილები
-    kk: Антийлер
-    ko: 네덜란드령 안틸레스
-    kw: Antillys Iseldiryek
-    la: Antillae Nederlandiae
-    lb: Hollännesch Antillen
-    li: Nederlandse Antille
-    ln: Antiya ya Holanda
-    lt: Nyderlandų Antilai
-    lv: Antiļas
-    mn: Нидерландын Антиллийн Арлууд
-    mr: नेदरलँड्स अँटिल्स
-    ms: Antillen Belanda
-    nn: Dei nederlandske Antillane
-    "no": De nederlandske Antillene
-    pl: Antyle Holenderskie
-    pt: Antilhas Holandesas
-    ro: Antilele Olandeze
-    ru: Нидерландские Антилы
-    sh: Nizozemski Antili
-    sk: Holandské Antily
-    sl: Nizozemski Antili
-    sr: Холандски Антили
-    sv: Nederländska Antillerna
-    sw: Antili za Kiholanzi
-    ta: நெதர்லாந்து அண்டிலிசு
-    tg: Антил Ҳоланд
-    th: เนเธอร์แลนด์แอนทิลลิส
-    tr: Hollanda Antilleri
-    uk: Нідерландські Антильські острови
-    vi: Antille thuộc Hà Lan
-    zh: 荷属安的列斯

diff --git a/settings/country-names/aq.yaml b/settings/country-names/aq.yaml
deleted file mode 100644 (file)
index eb310e3..0000000
--- a/settings/country-names/aq.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Antarctica

diff --git a/settings/country-names/as.yaml b/settings/country-names/as.yaml
deleted file mode 100644 (file)
index fabf618..0000000
--- a/settings/country-names/as.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: American Samoa

diff --git a/settings/country-names/aw.yaml b/settings/country-names/aw.yaml
deleted file mode 100644 (file)
index 3746b4d..0000000
--- a/settings/country-names/aw.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Aruba

diff --git a/settings/country-names/ax.yaml b/settings/country-names/ax.yaml
deleted file mode 100644 (file)
index eb5c189..0000000
--- a/settings/country-names/ax.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Aland Islands

diff --git a/settings/country-names/bl.yaml b/settings/country-names/bl.yaml
deleted file mode 100644 (file)
index d8aa1f9..0000000
--- a/settings/country-names/bl.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Saint Barthélemy

diff --git a/settings/country-names/bq.yaml b/settings/country-names/bq.yaml
deleted file mode 100644 (file)
index cdb38e5..0000000
--- a/settings/country-names/bq.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: "\N"

diff --git a/settings/country-names/bv.yaml b/settings/country-names/bv.yaml
deleted file mode 100644 (file)
index 6dc3bfd..0000000
--- a/settings/country-names/bv.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Bouvet Island

diff --git a/settings/country-names/cc.yaml b/settings/country-names/cc.yaml
deleted file mode 100644 (file)
index c5090a0..0000000
--- a/settings/country-names/cc.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: 
-    default: Cocos (Keeling) Islands
-    af: Cocos (Keeling) Eilande
-    ar: جزر كوكوس (كيلينغ)
-    be: Какосавыя (Кілінг) астравы
-    br: Inizi Kokoz
-    ca: Illes Cocos
-    da: Cocosøerne
-    de: Kokosinseln
-    el: Νησιά Κόκος
-    en: Cocos (Keeling) Islands
-    eo: Kokosinsuloj
-    es: Islas Cocos (Keeling)
-    et: Kookossaared
-    eu: Cocos (Keeling) uharteak
-    fa: جزایر کوکوس
-    fi: Kookossaaret
-    fr: Îles Cocos
-    fy: de Kokoseilannen
-    he: איי קוקוס (קילינג)
-    hr: Kokosovi otoci
-    hu: Kókusz (Keeling)-szigetek
-    id: Kepulauan Cocos (Keeling)
-    is: Kókoseyjar
-    it: Isole Cocos e Keeling
-    lt: Kokoso (Keelingo) salos
-    lv: Kokosu (Kīlinga) salas
-    mn: Кокосын (Кийлингийн) Арлууд
-    nl: Cocoseilanden
-    pl: Wyspy Kokosowe
-    ru: Кокосовые острова
-    sl: Kokosovi otoki
-    sv: Kokosöarna
-    tr: Cocos (Keeling) Adaları
-    uk: Кокосові острови
-    vi: Quần đảo Cocos (Keeling)
-    zh: 科科斯（基林）群島

diff --git a/settings/country-names/cw.yaml b/settings/country-names/cw.yaml
deleted file mode 100644 (file)
index 800bce3..0000000
--- a/settings/country-names/cw.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 
-    default: Curaçao
-    en: Curaçao
-    es: Curazao
-    fr: Curaçao
-    ru: Кюрасао
-    sv: Curaçao

diff --git a/settings/country-names/cx.yaml b/settings/country-names/cx.yaml
deleted file mode 100644 (file)
index 19e26e3..0000000
--- a/settings/country-names/cx.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: 
-    default: Christmas Island
-    af: Christmas-eiland
-    ar: جزيرة الميلاد
-    bg: Рождество
-    br: Enez Nedeleg
-    bs: Božićno ostrvo
-    ca: Illa Christmas
-    cs: Vánoční ostrov
-    cy: Ynys y Nadolig
-    da: Juleøen
-    de: Weihnachtsinsel
-    el: Νήσος των Χριστουγέννων
-    eo: Kristnaskinsulo
-    es: Isla de Navidad
-    et: Jõulusaar
-    eu: Christmas uhartea
-    fa: جزیره کریسمس
-    fi: Joulusaari
-    fr: Île Christmas
-    fy: Krysteilân
-    ga: Oileán na Nollag
-    gl: Illa de Nadal
-    he: טריטוריית האי חג המולד
-    hi: क्रिसमस आईलैंड
-    hr: Božićni otok
-    hu: Karácsony-sziget
-    id: Pulau Natal
-    is: Jólaeyja
-    it: Isola del Natale
-    ja: クリスマス島
-    ka: შობის კუნძული
-    kk: Кристмас аралы
-    ko: 크리스마스 섬
-    kw: Ynys Nadelik
-    lb: Chrëschtdagsinsel
-    lt: Kalėdų sala
-    lv: Ziemsvētku sala
-    mn: Зул Сарын Арал
-    mr: क्रिसमस द्वीप
-    ms: Pulau Krismas
-    nl: Christmaseiland
-    nn: Christmasøya
-    "no": Christmasøya
-    pl: Wyspa Bożego Narodzenia
-    pt: Ilha Christmas
-    ro: Insula Crăciunului
-    ru: Остров Рождества
-    sh: Božićni otok
-    sk: Vianočný ostrov
-    sl: Božični otoki
-    sr: Божићно Острво
-    sv: Julön
-    sw: Kisiwa cha Krismasi
-    ta: கிறிஸ்துமசு தீவு
-    th: เกาะคริสต์มาส
-    tr: Christmas Adası
-    uk: Острів Різдва
-    vi: Đảo Christmas
-    wo: Dunu Christmas
-    zh: 圣诞岛

diff --git a/settings/country-names/gf.yaml b/settings/country-names/gf.yaml
deleted file mode 100644 (file)
index 1e05958..0000000
--- a/settings/country-names/gf.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: 
-    default: Guyane Française
-    af: Frans-Guyana
-    ar: غيانا
-    br: Gwiana c’hall
-    ca: Guaiana Francesa
-    cy: Guyane
-    da: Fransk Guyana
-    de: Französisch-Guayana
-    el: Γαλλική Γουιάνα
-    en: French Guiana
-    eo: Gujano
-    es: Guayana Francesa
-    et: Prantsuse Guajaana
-    fa: گویان فرانسه
-    fi: Ranskan Guayana
-    fr: Guyane française
-    fy: Frânsk Guyana
-    ga: Guáin na Fraince
-    gd: Guiana Fhrangach
-    he: גיאנה הצרפתית
-    hr: Francuska Gvajana
-    hu: Francia Guyana
-    id: Guyana Perancis
-    is: Franska Gvæjana
-    it: Guyana francese
-    la: Guiana Francica
-    li: Frans Guyana
-    lt: Prancūzijos Gviana
-    lv: Franču Gviāna
-    mn: Франц Гвиана
-    nl: Frans-Guyana
-    pl: Gujana Francuska
-    ru: Французская Гвиана
-    sl: Francoska Gvajana
-    sv: Franska Guyana
-    th: เฟรนช์เกียนา
-    tr: Fransız Guyanası
-    uk: Французька Гвіана
-    vi: Guyane thuộc Pháp
-    zh: 法属圭亚那

diff --git a/settings/country-names/gp.yaml b/settings/country-names/gp.yaml
deleted file mode 100644 (file)
index 0f2f7a4..0000000
--- a/settings/country-names/gp.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: 
-    default: Guadeloupe
-    ar: غوادلوب
-    be: Гвадэлупа
-    br: Gwadeloup
-    ca: Illa de Guadalupe
-    da: Guadeloupe
-    el: Γουαδελούπη
-    en: Guadeloupe
-    eo: Gvadelupo
-    es: Guadalupe
-    fa: گوادلوپ
-    fi: Guadeloupe
-    fr: Guadeloupe
-    fy: Guadelûp
-    ga: Guadalúip
-    he: גוואדלופ
-    hr: Gvadalupa
-    hu: Guadeloupe
-    is: Gvadelúpeyjar
-    it: Guadalupa
-    la: Guadalupa
-    lt: Gvadelupa
-    lv: Gvadelupa
-    mn: Гуаделупе
-    pl: Gwadelupa
-    ru: Гваделупа
-    sv: Guadeloupe
-    th: กวาเดอลูป
-    uk: Гваделупа
-    zh: 瓜德罗普

diff --git a/settings/country-names/gu.yaml b/settings/country-names/gu.yaml
deleted file mode 100644 (file)
index f83ce6b..0000000
--- a/settings/country-names/gu.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Guam

diff --git a/settings/country-names/hk.yaml b/settings/country-names/hk.yaml
deleted file mode 100644 (file)
index 17e0370..0000000
--- a/settings/country-names/hk.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Hong Kong

diff --git a/settings/country-names/hm.yaml b/settings/country-names/hm.yaml
deleted file mode 100644 (file)
index b3ccac7..0000000
--- a/settings/country-names/hm.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Heard Island and MaxDonald Islands

diff --git a/settings/country-names/mf.yaml b/settings/country-names/mf.yaml
deleted file mode 100644 (file)
index 53c4ce5..0000000
--- a/settings/country-names/mf.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Saint Martin

diff --git a/settings/country-names/mo.yaml b/settings/country-names/mo.yaml
deleted file mode 100644 (file)
index 62f35d5..0000000
--- a/settings/country-names/mo.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Macao

diff --git a/settings/country-names/mp.yaml b/settings/country-names/mp.yaml
deleted file mode 100644 (file)
index 136ec99..0000000
--- a/settings/country-names/mp.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Northern Mariana Islands

diff --git a/settings/country-names/mq.yaml b/settings/country-names/mq.yaml
deleted file mode 100644 (file)
index e038d6b..0000000
--- a/settings/country-names/mq.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: 
-    default: Martinique
-    ar: مارتينيك
-    be: Марцініка
-    br: Martinik
-    ca: Martinica
-    da: Martinique
-    el: Μαρτινίκα
-    en: Martinique
-    eo: Martiniko
-    es: Martinica
-    fa: مارتینیک
-    fi: Martinique
-    fr: Martinique
-    fy: Martinyk
-    he: מרטיניק
-    hr: Martinik
-    hu: Martinique
-    id: Martinik
-    is: Martinique
-    it: Martinica
-    la: Martinica
-    lt: Martinika
-    lv: Martinika
-    mn: Мартиник
-    pl: Martynika
-    ru: Мартиника
-    sv: Martinique
-    uk: Мартиніка
-    zh: 馬提尼克

diff --git a/settings/country-names/nc.yaml b/settings/country-names/nc.yaml
deleted file mode 100644 (file)
index cb5d3fb..0000000
--- a/settings/country-names/nc.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: 
-    default: Nouvelle-Calédonie
-    af: Nieu-Caledonia
-    ar: كاليدونيا الجديدة
-    be: Новая Каледонія
-    br: Kaledonia Nevez
-    ca: Nova Caledònia
-    cy: Caledonia Newydd
-    da: Ny Kaledonien
-    de: Neukaledonien
-    el: Νέα Καληδονία
-    en: New Caledonia
-    eo: Nov-Kaledonio
-    es: Nueva Caledonia
-    fa: کالدونیای جدید
-    fi: Uusi-Kaledonia
-    fr: Nouvelle-Calédonie
-    ga: An Nua-Chaladóin
-    he: קלדוניה החדשה
-    hr: Nova Kaledonija
-    hu: Új-Kaledónia
-    id: Kaledonia Baru
-    is: Nýja-Kaledónía
-    it: Nuova Caledonia
-    la: Nova Caledonia
-    lt: Naujoji Kaledonija
-    lv: Jaunkaledonija
-    mn: Шинэ Каледони
-    nl: Nieuw-Caledonië
-    pl: Nowa Kaledonia
-    ru: Новая Каледония
-    sl: Nova Kaledonija
-    sv: Nya Kaledonien
-    th: นิวแคลิโดเนีย
-    tr: Yeni Kaledonya
-    uk: Нова Каледонія
-    zh: 新喀里多尼亚

diff --git a/settings/country-names/nf.yaml b/settings/country-names/nf.yaml
deleted file mode 100644 (file)
index ded79bb..0000000
--- a/settings/country-names/nf.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: 
-    default: Norfolk Island
-    af: Norfolkeiland
-    ar: جزيرة نورفولك
-    be: Норфалк
-    br: Enez Norfolk
-    ca: Illa Norfolk
-    cy: Ynys Norfolk
-    da: Norfolk-øen
-    de: Norfolkinsel
-    en: Norfolk Island
-    eo: Norfolkinsulo
-    es: Isla Norfolk
-    et: Norfolki saar
-    fi: Norfolkinsaari
-    fr: Île Norfolk
-    fy: Norfolk
-    ga: Oileán Norfolk
-    he: האי נורפוק
-    hr: Otok Norfolk
-    hu: Norfolk-sziget
-    id: Pulau Norfolk
-    is: Norfolkeyja
-    it: Isola Norfolk
-    la: Insula Norfolcia
-    lt: Norfolko sala
-    lv: Norfolkas sala
-    mn: Норфолк Арал
-    nl: Norfolk
-    pl: Wyspa Norfolk
-    ru: Остров Норфолк
-    sv: Norfolkön
-    tr: Norfolk Adası
-    uk: Острів Норфолк
-    vi: Đảo Norfolk
-    zh: 诺福克岛

diff --git a/settings/country-names/pf.yaml b/settings/country-names/pf.yaml
deleted file mode 100644 (file)
index 506d677..0000000
--- a/settings/country-names/pf.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: 
-    default: Polynésie française
-    af: Franse Polynesië
-    an: Polinesia Franzesa
-    ar: بولونيزيا الفرنسية
-    az: Fransa Polineziyası
-    be: Французская Палінезія
-    bg: Френска Полинезия
-    br: Polinezia Frañs
-    bs: Francuska Polinezija
-    ca: Polinèsia Francesa
-    cs: Francouzská Polynésie
-    cy: Polynesia Ffrengig
-    da: Fransk Polynesien
-    de: Französisch-Polynesien
-    dv: ފަރަންސޭސި ޕޮލިނޭޝިއާ
-    el: Γαλλική Πολυνησία
-    en: French Polynesia
-    eo: Franca Polinezio
-    es: Polinesia Francesa
-    et: Prantsuse Polüneesia
-    eu: Frantziar Polinesia
-    fa: پلی‌نزی فرانسه
-    fi: Ranskan Polynesia
-    fr: Polynésie française
-    fy: Frânsk Polyneezje
-    ga: Polainéis na Fraince
-    gd: French Polynesia
-    gl: Polinesia francesa
-    he: פולינזיה הצרפתית
-    hi: फ्रेंच पोलीनेशिया
-    hr: Francuska Polinezija
-    hu: Francia Polinézia
-    id: Polinesia Perancis
-    io: Franca Polinezia
-    is: Franska Pólýnesía
-    it: Polinesia francese
-    ja: フランス領ポリネシア
-    jv: Polinesia Perancis
-    kk: Франция Полинезиясы
-    ko: 프랑스령 폴리네시아
-    kw: Polynesi Frynkek
-    la: Polynesia Francica
-    lb: Franséisch-Polynesien
-    lt: Prancūzijos Polinezija
-    lv: Franču Polinēzija
-    mi: Porinīhia Wīwī
-    mk: Француска Полинезија
-    mn: Францын Полинез
-    mr: फ्रेंच पॉलिनेशिया
-    ms: Polinesia Perancis
-    nl: Frans-Polynesië
-    nn: Fransk Polynesia
-    "no": Fransk Polynesia
-    oc: Polinesia Francesa
-    os: Францы Полинези
-    pl: Polinezja Francuska
-    pt: Polinésia Francesa
-    qu: Phransis Pulinisya
-    ro: Polinezia Franceză
-    ru: Французская Полинезия
-    se: Frankriikka Polynesia
-    sh: Francuska Polinezija
-    sk: Francúzska Polynézia
-    sl: Francoska Polinezija
-    sr: Француска Полинезија
-    sv: Franska Polynesien
-    sw: Polynesia ya Kifaransa
-    ta: பிரெஞ்சு பொலினீசியா
-    th: เฟรนช์โปลินีเซีย
-    tr: Fransız Polinezyası
-    ty: Pōrīnetia Farāni
-    ug: Fransiyige Qarashliq Polinéziye
-    uk: Французька Полінезія
-    vi: Polynésie thuộc Pháp
-    wo: Polineesi gu Faraas
-    zh: 法属波利尼西亚

diff --git a/settings/country-names/pm.yaml b/settings/country-names/pm.yaml
deleted file mode 100644 (file)
index 876110b..0000000
--- a/settings/country-names/pm.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: 
-    default: Saint-Pierre-et-Miquelon
-    af: Saint-Pierre et Miquelon
-    be: Святы П’ер і Міквелон
-    da: Saint Pierre og Miquelon
-    de: Saint-Pierre und Miquelon
-    en: Saint Pierre and Miquelon
-    eo: Sankta-Piero kaj Mikelono
-    es: San Pedro y Miguelón
-    fi: Saint-Pierre ja Miquelon
-    fr: Saint-Pierre-et-Miquelon
-    hr: Sveti Petar i Mikelon
-    hu: Saint-Pierre és Miquelon
-    lt: Sen Pjeras ir Mikelonas
-    lv: Senpjēra un Mikelona
-    mn: Сент Пьер ба Микелон
-    sv: Saint-Pierre och Miquelon
-    tr: Saint-Pierre ve Miquelon
-    uk: Сен-П'єр і Мікелон

diff --git a/settings/country-names/pr.yaml b/settings/country-names/pr.yaml
deleted file mode 100644 (file)
index ad5c34c..0000000
--- a/settings/country-names/pr.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Puerto Rico

diff --git a/settings/country-names/re.yaml b/settings/country-names/re.yaml
deleted file mode 100644 (file)
index 21da86d..0000000
--- a/settings/country-names/re.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: 
-    default: Réunion
-    af: Réunion
-    ar: ريونيون
-    be: Руньён
-    br: Ar Reunion
-    ca: Illa de la Reunió
-    da: Reunion
-    el: Ρεϊνιόν
-    eo: Reunio
-    es: La Reunión
-    fa: رئونیون
-    fi: Réunion
-    fr: La Réunion
-    he: ראוניון
-    hu: Réunion
-    is: Réunion
-    it: Riunione
-    la: Reunio
-    lt: Reunionas
-    lv: Reinjona
-    mn: Реюньон
-    pl: Reunion
-    ru: Реюньон
-    sl: Reunion
-    sv: Réunion
-    th: เรอูนียง
-    uk: Реюньйон
-    zh: 留尼汪

diff --git a/settings/country-names/sj.yaml b/settings/country-names/sj.yaml
deleted file mode 100644 (file)
index f8ff8ec..0000000
--- a/settings/country-names/sj.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Svalbard and Jan Mayen

diff --git a/settings/country-names/sx.yaml b/settings/country-names/sx.yaml
deleted file mode 100644 (file)
index cbea3c0..0000000
--- a/settings/country-names/sx.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Sint Maarten

diff --git a/settings/country-names/tf.yaml b/settings/country-names/tf.yaml
deleted file mode 100644 (file)
index 81bc153..0000000
--- a/settings/country-names/tf.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: 
-    default: Terres australes et antarctiques françaises
-    af: Franse Suidelike en Antarktiese Gebiede
-    an: Territorios Australs Franzeses
-    ar: الأراضي الجنوبية الفرنسية
-    be: Французскія Паўднёвыя тэрыторыі
-    bg: Френски южни и антарктически територии
-    br: Douaroù Aostral hag Antarktikel Frañs
-    ca: Terres Australs i Antàrtiques Franceses
-    cs: Francouzská jižní a antarktická území
-    da: Franske sydlige og Antarktiske territorier
-    de: Französische Süd- und Antarktisgebiete
-    el: Γαλλικά νότια και ανταρκτικά εδάφη
-    en: French Southern Lands
-    eo: Francaj Sudaj Teritorioj
-    es: Tierras Australes y Antárticas Francesas
-    eu: Frantziaren lurralde austral eta antartikoak
-    fi: Ranskan eteläiset ja antarktiset alueet
-    fr: Terres australes et antarctiques françaises
-    fy: Frânske Súdlike en Antarktyske Lannen
-    gl: Terras Austrais e Antárticas Francesas
-    hr: Francuski južni i antarktički teritoriji
-    hu: Francia déli és antarktiszi területek
-    id: Daratan Selatan dan Antarktika Perancis
-    is: Frönsku suðlægu landsvæðin
-    it: Terre Australi e Antartiche Francesi
-    ja: フランス領南方・南極地域
-    ko: 프랑스령 남부와 남극 지역
-    kw: Tiryow Deghow hag Antarktik Frynkek
-    lt: Prancūzijos Pietų Sritys
-    lv: Francijas Dienvidjūru un Antarktikas Zemes
-    nl: Franse Zuidelijke en Antarctische Gebieden
-    "no": De franske sørterritorier
-    oc: Tèrras Australas e Antarticas Francesas
-    pl: Francuskie Terytoria Południowe i Antarktyczne
-    pt: Terras Austrais e Antárticas Francesas
-    ro: Teritoriile australe şi antarctice franceze
-    ru: Французские Южные и Антарктические территории
-    sh: Francuske Južne Teritorije
-    sk: Francúzske južné a antarktické územia
-    sl: Francoske južne in antarktične dežele
-    sr: Француске јужне и антарктичке земље
-    sv: Franska sydterritorierna
-    ta: பிரெஞ்சு தென்னக நிலங்களும் அண்டாடிக் நிலமும்
-    tr: Fransız Güney ve Antarktika Toprakları
-    uk: Французькі Південні та Антарктичні території
-    vi: Vùng đất phía Nam và châu Nam Cực thuộc Pháp
-    zh: 法属南部领地

diff --git a/settings/country-names/um.yaml b/settings/country-names/um.yaml
deleted file mode 100644 (file)
index 8de08ff..0000000
--- a/settings/country-names/um.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: United States Minor Outlying Islands

diff --git a/settings/country-names/vi.yaml b/settings/country-names/vi.yaml
deleted file mode 100644 (file)
index b12702b..0000000
--- a/settings/country-names/vi.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: United States Virgin Islands

diff --git a/settings/country-names/wf.yaml b/settings/country-names/wf.yaml
deleted file mode 100644 (file)
index 253665d..0000000
--- a/settings/country-names/wf.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-name: 
-    default: Wallis-et-Futuna
-    af: Wallis-en-Futuna
-    an: Wallis e Futuna
-    ar: جزر واليس وفوتونا
-    be: Уоліс і Футуна
-    bg: Уолис и Футуна
-    br: Wallis ha Futuna
-    ca: Wallis i Futuna
-    cs: Wallis a Futuna
-    cy: Wallis a Futuna
-    da: Wallis og Futuna
-    de: Wallis und Futuna
-    dv: ވާލީ އަދި ފުތޫނާ
-    el: Ουώλλις και Φουτούνα
-    en: Wallis and Futuna Islands
-    eo: Valiso kaj Futuno
-    es: Wallis y Futuna
-    et: Wallis ja Futuna
-    eu: Wallis eta Futuna
-    fa: والیس و فوتونا
-    fi: Wallis- ja Futunasaaret
-    fr: Wallis-et-Futuna
-    fy: Wallis en Fûtûna
-    ga: Vailís agus Futúna
-    gl: Wallis e Futuna
-    he: ואליס ופוטונה
-    hr: Wallis i Futuna
-    hu: Wallis és Futuna
-    id: Wallis dan Futuna
-    io: Wallis e Futuna Insuli
-    is: Wallis- og Fútúnaeyjar
-    it: Wallis e Futuna
-    ja: ウォリス・フツナ
-    jv: Wallis lan Futuna
-    ko: 왈리스 퓌튀나
-    kw: Wallis ha Futuna
-    la: Vallis et Futuna
-    lb: Wallis a Futuna
-    lt: Walliso ir Futuna salos
-    lv: Volisa un Futuna
-    mn: Уоллис ба Футуна
-    mr: वालिस व फुतुना
-    ms: Wallis dan Futuna
-    nl: Wallis en Futuna
-    nn: Wallis- og Futunaøyane
-    "no": Wallis- og Futunaøyene
-    oc: Wallis e Futuna
-    pl: Wallis i Futuna
-    pt: Wallis e Futuna
-    ro: Wallis şi Futuna
-    ru: Уоллис и Футуна
-    se: Wallis ja Futuna
-    sh: Wallis i Futuna
-    sk: Wallis a Futuna
-    sl: Wallis in Futuna
-    sm: Wallis and Futuna
-    sr: Валис и Футуна
-    sv: Wallis- och Futunaöarna
-    sw: Wallis na Futuna
-    ta: வலிசும் புட்டூனாவும்
-    th: หมู่เกาะวาลลิสและหมู่เกาะฟุตูนา
-    tr: Wallis ve Futuna Adaları
-    ug: Wallis we Futuna Taqim Aralliri
-    uk: Волліс і Футуна
-    vi: Wallis và Futuna
-    wo: Wallis ak Futuna
-    zh: 瓦利斯和富图纳群岛

diff --git a/settings/country-names/yt.yaml b/settings/country-names/yt.yaml
deleted file mode 100644 (file)
index 945bfc2..0000000
--- a/settings/country-names/yt.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 
-    default: Mayotte

diff --git a/settings/country_settings.yaml b/settings/country_settings.yaml
index b0bacdfcc5d4dc60c944d4a14cfaf9e455a897d8..667684c670a0dacb46b1d052f4a4f82547c3ed83 100644 (file)
--- a/settings/country_settings.yaml
+++ b/settings/country_settings.yaml
@@ -61,13 +61,6 @@ am:
       pattern: "dddd"
 
 
-# Netherlands Antilles (De Nederlandse Antillen)
-an:
-    partition: 58
-    languages: nl, en, pap
-    names: !include country-names/an.yaml
-
-
 # Angola (Angola)
 ao:
     partition: 85
@@ -76,14 +69,6 @@ ao:
     postcode: no
 
 
-#  (Antarctica)
-aq:
-    partition: 181
-    languages: en, es, fr, ru
-    names: !include country-names/aq.yaml
-    postcode: no
-
-
 # Argentina (Argentina)
 ar:
     partition: 39
@@ -93,13 +78,6 @@ ar:
       pattern: "l?dddd(?:lll)?"
 
 
-#  (American Samoa)
-as:
-    partition: 182
-    languages: en, sm
-    names: !include country-names/as.yaml
-
-
 # Austria (Österreich)
 at:
     partition: 245
@@ -118,21 +96,6 @@ au:
       pattern: "dddd"
 
 
-#  (Aruba)
-aw:
-    partition: 183
-    languages: nl, pap
-    names: !include country-names/aw.yaml
-    postcode: no
-
-
-#  (Aland Islands)
-ax:
-    partition: 184
-    languages: sv
-    names: !include country-names/ax.yaml
-
-
 # Azerbaijan (Azərbaycan)
 az:
     partition: 119
@@ -221,13 +184,6 @@ bj:
     postcode: no
 
 
-#  (Saint Barthélemy)
-bl:
-    partition: 204
-    languages: fr
-    names: !include country-names/bl.yaml
-
-
 # Bermuda (Bermuda)
 bm:
     partition: 176
@@ -256,13 +212,6 @@ bo:
     postcode: no
 
 
-# Caribbean Netherlands (Caribisch Nederland)
-bq:
-    partition: 250
-    languages: nl
-    names: !include country-names/bq.yaml
-
-
 # Brazil (Brasil)
 br:
     partition: 121
@@ -290,13 +239,6 @@ bt:
       pattern: "ddddd"
 
 
-#  (Bouvet Island)
-bv:
-    partition: 185
-    languages: "no"
-    names: !include country-names/bv.yaml
-
-
 # Botswana (Botswana)
 bw:
     partition: 122
@@ -332,13 +274,6 @@ ca:
       output: \1 \2
 
 
-# Cocos (Keeling) Islands (Cocos (Keeling) Islands)
-cc:
-    partition: 118
-    languages: en
-    names: !include country-names/cc.yaml
-
-
 # Democratic Republic of the Congo (République démocratique du Congo)
 cd:
     partition: 229
@@ -450,20 +385,6 @@ cv:
       pattern: "dddd"
 
 
-# Curaçao (Curaçao)
-cw:
-    partition: 248
-    languages: nl, en
-    names: !include country-names/cw.yaml
-
-
-# Christmas Island (Christmas Island)
-cx:
-    partition: 177
-    languages: en
-    names: !include country-names/cx.yaml
-
-
 # Cyprus (Κύπρος - Kıbrıs)
 cy:
     partition: 114
@@ -683,13 +604,6 @@ ge:
       pattern: "dddd"
 
 
-# French Guiana (Guyane Française)
-gf:
-    partition: 231
-    languages: fr
-    names: !include country-names/gf.yaml
-
-
 # Guernsey (Guernsey)
 gg:
     partition: 77
@@ -745,13 +659,6 @@ gn:
       pattern: "ddd"
 
 
-# Guadeloupe (Guadeloupe)
-gp:
-    partition: 232
-    languages: fr
-    names: !include country-names/gp.yaml
-
-
 # Equatorial Guinea (Guinea Ecuatorial)
 gq:
     partition: 12
@@ -789,13 +696,6 @@ gt:
       pattern: "ddddd"
 
 
-# Guam (Guam)
-gu:
-    partition: 187
-    languages: en, ch
-    names: !include country-names/gu.yaml
-
-
 # Guinea-Bissau (Guiné-Bissau)
 gw:
     partition: 8
@@ -813,20 +713,6 @@ gy:
     postcode: no
 
 
-#  (Hong Kong)
-hk:
-    partition: 188
-    languages: zh-hant, en
-    names: !include country-names/hk.yaml
-
-
-#  (Heard Island and MaxDonald Islands)
-hm:
-    partition: 189
-    languages: en
-    names: !include country-names/hm.yaml
-
-
 # Honduras (Honduras)
 hn:
     partition: 56
@@ -1229,13 +1115,6 @@ me:
       pattern: "ddddd"
 
 
-# Saint Martin (Saint Martin)
-mf:
-    partition: 203
-    languages: fr
-    names: !include country-names/mf.yaml
-
-
 # Madagascar (Madagasikara)
 mg:
     partition: 164
@@ -1289,28 +1168,6 @@ mn:
       pattern: "ddddd"
 
 
-# Macao (Macao)
-mo:
-    partition: 191
-    languages: zh-hant, pt
-    names: !include country-names/mo.yaml
-    postcode: no
-
-
-# Northern Mariana Islands (Northern Mariana Islands)
-mp:
-    partition: 192
-    languages: ch, en
-    names: !include country-names/mp.yaml
-
-
-# Martinique (Martinique)
-mq:
-    partition: 233
-    languages: fr
-    names: !include country-names/mq.yaml
-
-
 # Mauritania (موريتانيا)
 mr:
     partition: 149
@@ -1398,13 +1255,6 @@ na:
       pattern: "ddddd"
 
 
-# New Caledonia (Nouvelle-Calédonie)
-nc:
-    partition: 234
-    languages: fr
-    names: !include country-names/nc.yaml
-
-
 # Niger (Niger)
 ne:
     partition: 226
@@ -1414,13 +1264,6 @@ ne:
       pattern: "dddd"
 
 
-# Norfolk Island (Norfolk Island)
-nf:
-    partition: 100
-    languages: en, pih
-    names: !include country-names/nf.yaml
-
-
 # Nigeria (Nigeria)
 ng:
     partition: 218
@@ -1519,13 +1362,6 @@ pe:
       pattern: "ddddd"
 
 
-# French Polynesia (Polynésie française)
-pf:
-    partition: 202
-    languages: fr
-    names: !include country-names/pf.yaml
-
-
 # Papua New Guinea (Papua Niugini)
 pg:
     partition: 71
@@ -1563,13 +1399,6 @@ pl:
       output: \1-\2
 
 
-# Saint Pierre and Miquelon (Saint-Pierre-et-Miquelon)
-pm:
-    partition: 236
-    languages: fr
-    names: !include country-names/pm.yaml
-
-
 # Pitcairn Islands (Pitcairn Islands)
 pn:
     partition: 113
@@ -1580,13 +1409,6 @@ pn:
       output: \1 \2
 
 
-# Puerto Rico (Puerto Rico)
-pr:
-    partition: 193
-    languages: es, en
-    names: !include country-names/pr.yaml
-
-
 # Palestinian Territory (Palestinian Territory)
 ps:
     partition: 194
@@ -1631,13 +1453,6 @@ qa:
     postcode: no
 
 
-#  (Réunion)
-re:
-    partition: 235
-    languages: fr
-    names: !include country-names/re.yaml
-
-
 # Romania (România)
 ro:
     partition: 170
@@ -1745,13 +1560,6 @@ si:
       pattern: "dddd"
 
 
-#  (Svalbard and Jan Mayen)
-sj:
-    partition: 197
-    languages: "no"
-    names: !include country-names/sj.yaml
-
-
 # Slovakia (Slovensko)
 sk:
     partition: 172
@@ -1831,13 +1639,6 @@ sv:
       pattern: "dddd"
 
 
-#  (Sint Maarten)
-sx:
-    partition: 249
-    languages: nl, en
-    names: !include country-names/sx.yaml
-
-
 # Syria (سوريا)
 sy:
     partition: 104
@@ -1873,13 +1674,6 @@ td:
     postcode: no
 
 
-# French Southern Lands (Terres australes et antarctiques françaises)
-tf:
-    partition: 132
-    languages: fr
-    names: !include country-names/tf.yaml
-
-
 # Togo (Togo)
 tg:
     partition: 243
@@ -2009,15 +1803,6 @@ ug:
     postcode: no
 
 
-#  (United States Minor Outlying Islands)
-um:
-    partition: 198
-    languages: en
-    names: !include country-names/um.yaml
-    postcode:
-      pattern: "96898"
-
-
 # United States (United States)
 us:
     partition: 2
@@ -2083,13 +1868,6 @@ vg:
       output: VG\1
 
 
-#  (United States Virgin Islands)
-vi:
-    partition: 199
-    languages: en
-    names: !include country-names/vi.yaml
-
-
 # Vietnam (Việt Nam)
 vn:
     partition: 75
@@ -2107,13 +1885,6 @@ vu:
     postcode: no
 
 
-# Wallis and Futuna Islands (Wallis-et-Futuna)
-wf:
-    partition: 238
-    languages: fr
-    names: !include country-names/wf.yaml
-
-
 # Samoa (Sāmoa)
 ws:
     partition: 131
@@ -2138,13 +1909,6 @@ ye:
     postcode: no
 
 
-# Mayotte (Mayotte)
-yt:
-    partition: 200
-    languages: fr
-    names: !include country-names/yt.yaml
-
-
 # South Africa (South Africa)
 za:
     partition: 76