--- a/share/hedgewars/Data/Names/IndianChief.cfg	Sat Sep 23 09:35:45 2017 +0200
+++ b/share/hedgewars/Data/Names/IndianChief.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -1,1 +1,1 @@
-indian
+native_american

--- a/share/hedgewars/Data/Names/Viking.cfg	Sat Sep 23 09:35:45 2017 +0200
+++ b/share/hedgewars/Data/Names/Viking.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -1,1 +1,3 @@
+nordic
+nordic
 generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/angel.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+angel
+biblical
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/angel.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,159 @@
+Aarin
+Abasdarhon
+Abdiel
+Adellum
+Adnachiel
+Adoel
+Ahiah
+Ambriel
+Amitiel
+Anahita
+Anak
+Anaphiel
+Ansiel
+Aphaeleon
+Appolyon
+Araqiel
+Araquiel
+Arariel
+Araton
+Ariuk
+Asmodel
+Asteraoth
+Azazel
+Azrael
+Balthioul
+Barattiel
+Boamiel
+Cadriel
+Cassiel
+Cathetel
+Cerviel
+Charoum
+Cherubim
+Dabriel
+Daniel
+Dardariel
+Dazielle
+Domiel
+Douma
+Dubbiel
+Elyon
+Empyrean
+Forfax
+Gadiel
+Gadreel
+Gadriel
+Gagiel
+Galgaliel
+Gazardiel
+Germael
+Hadariel
+Hadramiel
+Hadraniel
+Hamael
+Hamon
+Haniel
+Hayliel
+Hayyel
+Herchel
+Iahhel
+Iaoel
+Inian
+Iofiel
+Ithuriel
+Jabril
+Jamaerah
+Joshua
+Kabshiel
+Kafziel
+Kakabel
+Kezef
+Lahabiel
+Madan
+Mahanaim
+Malik
+Mariuk
+Maroth
+Mattia
+Micah
+Michael
+Mihr
+Mikhal
+Morael
+Munkar
+Nathanael
+Nelchael
+Nisroc
+Omael
+Omniel
+Onafiel
+Ongkanon
+Ophiel
+Orphamiel
+Pamyel
+Paschar
+Peliel
+Phaleg
+Prentum
+Qaddisin
+Qaspiel
+Quabriel
+Rabdos
+Radueriel
+Rampel
+Rasiel
+Rogziel
+Rufeal
+Sabathiel
+Salathiel
+Samandriel
+Samkiel
+Sandalphon
+Saniel
+Sareash
+Semalion
+Semsapiel
+Semyaza
+Seraph
+Seraphiel
+Shamsiel
+Shepherd
+Sizouze
+Sorath
+Tabris
+Taharial
+Tamiel
+Tearney
+Telantes
+Theliel
+Tubiel
+Ubaviel
+Usiu
+Valoel
+Verchiel
+Xathanael
+Yabbashael
+Yahoel
+Yerachmiel
+Zaapiel
+Zaazenach
+Zabkiel
+Zakzakiel
+Zaphiel
+Zarall
+Zazriel
+Zehanpuryu
+Zephon
+Zophiel
+Zuriel
+Holy
+Blessed
+Saint
+Godly
+Spirit
+Shine
+Light
+Lumine
+Lumina
+Mirage

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/biblical.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,325 @@
+Aaron
+Abdiel
+Abel
+Abiah
+Abiathar
+Abiel
+Abilene
+Abiram
+Abner
+Abraham
+Abram
+Absalom
+Adam
+Adama
+Adiel
+Adin
+Adlai
+Adonijah
+Adriel
+Ahio
+Ajah
+Alexander
+Alian
+Allon
+Alpha
+Amad
+Amariah
+Amaziah
+Amittai
+Amon
+Amos
+Anaiah
+Anayah
+Andrew
+Andronicus
+Aquila
+Arad
+Areli
+Ariel
+Arioch
+Armoni
+Artemas
+Asa
+Asher
+Azaliah
+Azariah
+Barabbas
+Barak
+Barnabas
+Bartholmew
+Baruch
+Benjamin
+Berachiah
+Berechiah
+Boaz
+Cain
+Calamus
+Caleb
+Canaan
+Cedron
+Chenaniah
+Christian
+Clement
+Coniah
+Corban
+Cornelius
+Cyprus
+Cyrus
+Dan
+Daniel
+Darius
+Dathan
+David
+Demas
+Dimnah
+Dodavah
+Ebenezer
+Edrei
+El`azar
+Elah
+Elasah
+Elealeh
+Eleazar
+Elhanan
+Eli
+Elias
+Eliezer
+Elijah
+Elisha
+Elisheba
+Elkanah
+Elnaam
+Elnathan
+Emmanuel
+Enan
+Enoch
+Ephraim
+Erastus
+Esau
+Eshton
+Ethan
+Euphrates
+Ezekiel
+Ezra
+Felix
+Festus
+Gabriel
+Gamaliel
+Gideon
+Gilboa
+Gilead
+Hamath
+Hanan
+Haran
+Hazael
+Hazaiah
+Hebron
+Hezekiah
+Hiram
+Hosea
+Immanuel
+Isaac
+Isaiah
+Ishmael
+Ishtob
+Ismachiah
+Ismaiah
+Israel
+Ithiel
+Jaazaniah
+Jabal
+Jachin
+Jacob
+Jadon
+Jahaziah
+Jahaziel
+Jahmai
+Jairus
+Jakin
+Jalon
+James
+Jamin
+Janna
+Janoah
+Japheth
+Jared
+Jaresiah
+Jarmuth
+Jasher
+Jason
+Javan
+Jedidah
+Jedidiah
+Jehoiakim
+Jehoram
+Jehoshua
+Jeremiah
+Jeremy
+Jeriah
+Jericho
+Jeshaiah
+Jeshiah
+Jeshua
+Jeshuah
+Jesse
+Jesus
+Jethro
+Jezreel
+Joab
+Joachim
+Joaquin
+Joash
+Job
+Joel
+Johanan
+Johannan
+John
+Jonah
+Jonathan
+Jordan
+Joseph
+Joshua
+Josiah
+Jotham
+Jubal
+Judah
+Jude
+Julian
+Julius
+Justus
+Kadesh
+Kadmiel
+Kedar
+Kemuel
+Kenan
+Kenaniah
+Kir
+Kohath
+Korah
+Kristian
+Laban
+Lazarus
+Lemuel
+Levi
+Linus
+Lucas
+Lucius
+Luke
+Lysanias
+Malachi
+Malchiah
+Malchiel
+Malchus
+Manasseh
+Manoah
+Marcus
+Mark
+Mattathias
+Matthew
+Matthias
+Mattithiah
+Menahem
+Meshach
+Methuselah
+Micah
+Micaiah
+Micha
+Michael
+Mordecai
+Mose
+Moses
+Moshe
+Naaman
+Nadab
+Nahaliel
+Naham
+Nathan
+Nathanael
+Nathanel
+Nathaniel
+Nedabiah
+Nehemiah
+Neriah
+Nicholas
+Nicodemas
+Nicolas
+Noah
+Obadiah
+Obed
+Omar
+Oren
+Othniel
+Pagiel
+Parmenus
+Patrobus
+Paul
+Pediah
+Peres
+Perez
+Peter
+Philemon
+Philetus
+Philip
+Phillip
+Rama
+Ramah
+Ramiah
+Raphael
+Rei
+Reuben
+Reuel
+Rueben
+Rufus
+Salathiel
+Salem
+Samson
+Samuel
+Saul
+Sergius
+Seth
+Shalem
+Shalom
+Shaphan
+Shecaniah
+Shem
+Shemaiah
+Shiloh
+Silas
+Simeon
+Simon
+Sirion
+Solomon
+Stephen
+Steven
+Tartan
+Tekoa
+Tekoah
+Thaddaeus
+Thaddeus
+Theophilus
+Thomas
+Timon
+Timotheus
+Timothy
+Titus
+Tobiah
+Tobias
+Trophimus
+Uriah
+Urias
+Uzziah
+Vaniah
+Yakim
+Zachariah
+Zachary
+Zadok
+Zebadiah
+Zebedee
+Zebulun
+Zechariah
+Zedekiah
+Zelotes
+Zephaniah
+Zimri
+Zion

--- a/share/hedgewars/Data/Names/indian.txt	Sat Sep 23 09:35:45 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,424 +0,0 @@
-Alsoomse
-Chayton
-Sahkyo
-Aiyanna
-Shideezhi
-Naira
-Bilagaana
-Witashnah
-Nadie
-Hesutu
-Tahkeome
-Abukcheech
-Honon
-Hehewuti
-Rowtag
-Tisseewoonatis
-Koko
-Liwanu
-Kimi
-Mahkah
-Kotori
-Ominotago
-Hurit
-Mapiya
-Askuwheteau
-Moki
-Wakanda
-Wohehiv
-Liluye
-Ohitekah
-Howahkan
-Hania
-Pahana
-Honaw
-Demonthin
-Tayanita
-Kiwidinok
-Alaqua
-Talutah
-Isi
-Hassun
-Angwusnasomtaqa
-Adahy
-Nahcomence
-Aiyana
-Una
-Wicapi wakan
-Melkedoodum
-Pachua
-Molimo
-Heskovizenako
-Tahmelapachme
-Ptaysanwee
-Ogaleesha
-Ahanu
-Pavati
-Kuruk
-Shizhe'e
-Etchemin
-Magaskawee
-Ohanzee
-Kosumi
-Mahpee
-Masichuvio
-Ehawee
-Wicasa
-Hotah
-Ayawamat
-Zitkala
-Sani
-Shuman
-Winona
-Chua
-Sewati
-Sihu
-Totsi
-Salali
-Taigi
-Megedagik
-Hokolesqua
-Powaqa
-Qaletaqa
-Wanageeska
-Moema
-Meturato
-Maka
-Sunukkuhkau
-Uzumati
-Matwau
-Chansomps
-Howi
-Sowi'ngwa
-Yamka
-Gad
-Suletu
-Mansi
-Doli
-Odakota
-Wuyi
-Nahimana
-Hakidonmuya
-Shiriki
-Pauwau
-Tokala
-Kesegowaase
-Tihkoosue
-Cha'risa
-Kaneonuskatew
-Lomahongva
-Ayasha
-Nukpana
-Chuchip
-Otoahnacto
-Wokaihwokomas
-Taini
-Kasa
-Enapay
-Anpaytoo
-Amadahy
-Etlelooaat
-Kimimela
-Zihna
-Keegsquaw
-Kisecawchuck
-Sokanon
-Odahingum
-Shadi
-Tuwa
-Hinto
-Urika
-Huyana
-Nina
-Awinita
-Matchitisiw
-Misu
-Ashkii
-Tenskwatawa
-Kimama
-Onatah
-Kachina
-Talulla
-Lokni
-Lansa
-Nittawosew
-Niyol
-Napayshni
-Nayeli
-Makkapitew
-Pamuya
-Catahecassa
-Mona
-Eluwilussit
-Orenda
-Abedabun
-Lapu
-Yanisin
-Kuwanlelenta
-Tiponi
-Amitola
-Aponi
-Tiva
-Tatanka-ptecila
-Pannoowau
-Wikvaya
-Chaschunka
-Adsila
-Yas
-Quanah
-Takoda
-Makawee
-Tse
-Wematin
-Pajackok
-Kohana
-Chochuschuvio
-Namid
-Wauna
-Kolichiyaw
-Awentia
-Kuckunniwi
-Peta
-Taipa
-Sikyahonaw
-Huritt
-Otaktay
-Kwatoko
-Pivane
-Donoma
-Pakwa
-Nosh
-Enkoodabooaoo
-Wenona
-Makkitotosimew
-Ayelen
-Kohkahycumest
-Ayashe
-Sicheii
-Mantotohpa
-Tupi
-Tsiishchili
-Polikwaptiwa
-Tangakwunu
-Wahchintonka
-Mundoo
-Achak
-Heammawihio
-Tolinka
-Tasunke
-Chankoowashtay
-Telutci
-Goyathlay
-Posala
-Macawi
-Ahote
-Nukpana
-Rayen
-Hastiin
-Nahiossi
-Togquos
-Calfuray
-Chumani
-Shilah
-Mochni
-Kawacatoose
-Weayaya
-Len
-Cheveyo
-Gahege
-Wachiwi
-Waquini
-Honani
-Noshi
-Shiye
-Pakuna
-Hototo
-Naalnish
-Shikoba
-Muscowequan
-Oota dabun
-Chunta
-Nuttah
-Papina
-Kai
-Matoskah
-Aucaman
-Nawkaw
-Kachada
-Vokivocummast
-Powwaw
-Mimiteh
-Vohkinne
-Ciqala
-Wuti
-Gudahi
-Skah
-Chu'si
-Choovio
-Shimasani
-Cha'tima
-Kateri
-Sinopa
-Avonaco
-Chumana
-Kwahu
-Ocumwhowurst
-Tallulah
-Wambli-waste
-Nootau
-Aponivi
-Kestejoo
-Methoataske
-Honiahaka
-Sooleawa
-Nastas
-Hahkethomemah
-Istaqa
-Chogan
-Hevataneo
-Waki
-Wenonah
-Chowilawu
-Ocunnowhurst
-Wahchinksapa
-Kaliska
-Ahiga
-Hiamovi
-T'iis
-Wihakayda
-Keme
-Honovi
-Tadewi
-Kanti
-Bidziil
-Ohcumgache
-Alameda
-Sitala
-Sayen
-Sike
-Wapasha
-Makya
-Voisttitoevetz
-Tooantuh
-Ailen
-Meoquanee
-Chochmingwu
-Mukki
-Migina
-Enkoodabaoo
-Isi
-Niichaad
-Sheshebens
-Antinanco
-Wanahton
-Wahkan
-Malila
-Sikyatavo
-Pocahontas
-Omusa
-Editon
-Tohopka
-Omawnakw
-Numees
-Poloma
-Lenmana
-Chochmo
-Nizhoni
-Yoki
-Shima
-Kuwanyamtiwa
-Nidawi
-Keezheekoni
-Wanikiya
-Muna
-Aylen
-Chepi
-Muata
-Misae
-Takala
-Chochokpi
-Kele
-Quidel
-Paytah
-Yiska
-Maiara
-Gaagii
-Kokyangwuti
-Wickaninnish
-Jaci
-Nahuel
-Migisi
-Taregan
-Sanuye
-Tamaya
-Nascha
-Chusi
-Awanata
-Otoahhastis
-Voistitoevitz
-Matchitehew
-Njlon
-Abequa
-Ata'halne
-Yahto
-Ooljee
-Chosovi
-Machakw
-Soyala
-Nova
-Kangee
-Minninnewah
-Abooksigun
-Lootah
-Vaiveahtoish
-Nixkamich
-Wayra
-Helushka
-Yazhi
-Hantaywee
-Qochata
-Choviohoya
-Tocho
-Leyati
-Cha'akmongwi
-Mongwau
-Lise
-Sik'is
-Tallula
-Matunaaga
-Takhi
-Litonya
-Askook
-Lalawethika
-Viho
-Wahanassatta
-Takchawee
-Ahtahkakoop
-Teetonka
-Segenam
-Kaya
-Tecumseh
-Saqui
-Wikimak
-Maza blaska
-Sucki
-Machk
-Galilahi
-Nita
-Sitsi
-Wambleeska
-Kuwanyauma
-Weeko
-Abeque
-Chosposi
-Cowessess
-Niabi
-Talullah
-Hawiovi
-Pules
-Vipponah
-Antiman
-Shikoba
-Kitchi
-Hok'ee
-Tablita

--- a/share/hedgewars/Data/Names/knight.cfg	Sat Sep 23 09:35:45 2017 +0200
+++ b/share/hedgewars/Data/Names/knight.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -1,1 +1,2 @@
+knight
 generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/knight.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,102 @@
+Army
+Battle Cleaver
+Bearhead
+Bearhelm
+Black Knight
+Boar
+Bone Bane
+Bone Rage
+Bull
+Champion
+Colossal
+Colossus
+Conqueror
+Coyote
+Cruel
+Deathmane
+Dire
+Dire One
+Dog
+Doomhammer
+Dragonslayer
+Dread
+Eternal Hunger
+Exalted
+Fearless
+Feisty
+Feral
+Firepelt
+Firestarter
+Ford
+Freak
+Giantfist
+Gianthallow
+Giant Mane
+Goldmane
+Grandfury
+Grandhide
+Greatchaser
+Great Grimace
+Honorless
+Hurricane
+Insane
+Knight
+Knightingale
+Light Sword
+Lionheart
+Lone Wolf
+Mammoth
+Mammoth Brow
+Mammothfang
+Mammoth Might
+Molten pelt
+Moltenshield
+Monster
+Mutant
+Ni
+Night Eye
+Nighthelm
+Owl
+Ox
+Paragon
+Phantom
+Phoenix
+Pyro
+Rage Strike
+Redcut
+Redmantle
+Redthorn
+Rock Helm
+Rumbleroar
+Sadist
+Scarred One
+Serpent
+Shadowblood
+Shadowhide
+Shadowmight
+Sharpbane
+Shiny Armor
+Silentpelt
+Silverbrow
+Singlecut
+Skullmantle
+Slayer
+Spider
+Steel Blow
+Stormcut
+Stout Fist
+Surgeon
+Swiftgrip
+Swift song
+Swine
+Thief
+Vermin
+Voidblood
+Voidhammer
+Voidhide
+Vulture
+White Knight
+Wildling
+Wolfbreaker
+Wolfhammer
+Wolfhide

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/morbid.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,241 @@
+Agororor
+Angurimm
+Aran
+Atuncha
+Bathazgla
+Bauin
+Baurgodu
+Bavaia
+Beldriro
+Belogiro
+Beroror
+Bethath
+Black
+Blood
+Body Counter
+Brasest
+Browast
+Brutal
+Cagulini
+Calathugorc
+Canging
+Cathmal
+Caurtham
+Cauru
+Cazgoth
+Chair
+Chakod
+Chaugori
+Cherodu
+Chingotu
+Chuazg
+Cragas
+Cratost
+Cutter
+Damage
+Danger
+Dark
+Darkness
+Death
+Degurgo
+Doom
+Doublekill
+Drasest
+Durcar
+Drowest
+Drurgi
+Drurin
+Dugura
+Egondetuntu
+Egunturingo
+Egwethar
+Elangond
+Encaurt
+Engul
+Enguldel
+Ergog
+Eriror
+Erku
+Erme
+Eroror
+Ertula
+Erzil
+Ethmau
+Ethulat
+Evil
+Fabangilau
+Falirca
+Fang
+Fauarcalu
+Faungba
+Favalal
+Fazgbango
+Geman
+Giri
+Glongin
+Godugl
+Gore
+Grazan
+Grenen
+Grrrr
+Guina
+Guluglathma
+Gurdr
+Gwetulan
+Habarotu
+Haglindr
+Hagoth
+Hair
+Hakalila
+Hathulam
+Haulalkod
+Headhunter
+Headshot
+Healthtaker
+Heavy
+Hegotur
+Hela
+Heturtha
+Hiand
+Hmmendurai
+Horns
+Hunter
+Hurirava
+Hurt
+Iangi
+Iath
+Ilalir
+Imalorodu
+Imego
+Immergoro
+Incan
+Inside Out
+Irngrorncau
+Ituli
+Iturgi
+Kadol
+Kamast
+Kaulinan
+Kaurotug
+Kava
+Kenern
+Kesest
+Kewal
+Kill
+Killer
+Kolam
+Koturg
+Krogast
+Kronast
+Laimab
+Laurar
+Life Sucker
+Lilat
+Limilori
+Lkaelau
+Lrchan
+Lrnal
+Mabang
+Marth
+Mass
+Melazgo
+Merirgl
+Metalhead
+Milanim
+Milrdrchal
+Mirimon
+Mogori
+Mogulab
+Moliri
+Mongirod
+Muncher
+Murderer
+Nandulko
+Nathang
+Nauloril
+Nglkor
+Ngort
+Ngrg
+Ngurg
+Obengw
+Odri
+Oglk
+Ogurchma
+Ogurng
+Oliau
+Olroturor
+Oraroru
+Ordugldu
+Orgind
+Orglavaul
+Orimmor
+Orogoro
+Orthalugiror
+Orthm
+Otugorur
+Oturcalo
+Pain
+Paingiver
+Ratast
+Rates
+Razgl
+Rcaturcavan
+Rcha
+Rduruau
+Red Spikes
+Rglurgo
+Riabatui
+Riakorulira
+Rinaelroru
+Rngb
+Rogar
+Rolar
+Rorcall
+Rorong
+Rotha
+Rtulir
+Rurorg
+Sades
+Samorturmma
+Sarth
+Satar
+Shaungor
+Shitu
+Shmorc
+Shulatun
+Slasher
+Slaughterer
+Slonrurr
+Snatcher
+Spikes of Doom
+Srezen
+Stogen
+Tadol
+Taker
+Than
+Thmo
+Todost
+Tulingug
+Turircau
+Uingothalana
+Uirithegld
+Ulugli
+Ungllath
+Urinagor
+Urirauli
+Uturuglu
+Vaetu
+Vaianarg
+Vamarm
+Vamornt
+Vandethm
+Varu
+Veins
+Vogerm
+Vrater
+Weglindetu
+Wegorn
+Welamo
+Wencalaulr
+Wethavaugrca
+Wetua

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/native_american.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,419 @@
+Abedabun
+Abequa
+Abeque
+Abooksigun
+Abukcheech
+Achak
+Adahy
+Adsila
+Ahanu
+Ahiga
+Ahote
+Ahtahkakoop
+Ailen
+Aiyana
+Aiyanna
+Alameda
+Alaqua
+Alsoomse
+Amadahy
+Amitola
+Anpaytoo
+Antiman
+Antinanco
+Aponi
+Aponivi
+Ashkii
+Askook
+Askuwheteau
+Ata'halne
+Aucaman
+Avonaco
+Awanata
+Awentia
+Awinita
+Ayasha
+Ayashe
+Ayawamat
+Ayelen
+Aylen
+Bidziil
+Bilagaana
+Calfuray
+Catahecassa
+Cha'akmongwi
+Chankoowashtay
+Chansomps
+Cha'risa
+Chaschunka
+Cha'tima
+Chayton
+Chepi
+Cheveyo
+Chochmingwu
+Chochmo
+Chochokpi
+Chochuschuvio
+Chogan
+Choovio
+Chosovi
+Chosposi
+Choviohoya
+Chowilawu
+Chua
+Chuchip
+Chumana
+Chumani
+Chunta
+Chusi
+Chu'si
+Ciqala
+Cowessess
+Demonthin
+Doli
+Donoma
+Editon
+Ehawee
+Eluwilussit
+Enapay
+Enkoodabaoo
+Enkoodabooaoo
+Etchemin
+Etlelooaat
+Gaagii
+Gad
+Gahege
+Galilahi
+Goyathlay
+Gudahi
+Hahkethomemah
+Hakidonmuya
+Hania
+Hantaywee
+Hassun
+Hastiin
+Hawiovi
+Heammawihio
+Hehewuti
+Helushka
+Heskovizenako
+Hesutu
+Hevataneo
+Hiamovi
+Hinto
+Hokee
+Hokolesqua
+Honani
+Honaw
+Honiahaka
+Honon
+Honovi
+Hotah
+Hototo
+Howahkan
+Howi
+Hurit
+Huritt
+Huyana
+Isi
+Istaqa
+Jaci
+Kachada
+Kachina
+Kai
+Kaliska
+Kaneonuskatew
+Kangee
+Kanti
+Kasa
+Kateri
+Kawacatoose
+Kaya
+Keegsquaw
+Keezheekoni
+Kele
+Keme
+Kesegowaase
+Kestejoo
+Kimama
+Kimi
+Kimimela
+Kisecawchuck
+Kitchi
+Kiwidinok
+Kohana
+Kohkahycumest
+Koko
+Kokyangwuti
+Kolichiyaw
+Kosumi
+Kotori
+Kuckunniwi
+Kuruk
+Kuwanlelenta
+Kuwanyamtiwa
+Kuwanyauma
+Kwahu
+Kwatoko
+Lalawethika
+Lansa
+Lapu
+Len
+Lenmana
+Leyati
+Liluye
+Lise
+Litonya
+Liwanu
+Lokni
+Lomahongva
+Lootah
+Macawi
+Machakw
+Machk
+Magaskawee
+Mahkah
+Mahpee
+Maiara
+Maka
+Makawee
+Makkapitew
+Makkitotosimew
+Makya
+Malila
+Mansi
+Mantotohpa
+Mapiya
+Masichuvio
+Matchitehew
+Matchitisiw
+Matoskah
+Matunaaga
+Matwau
+Maza blaska
+Megedagik
+Melkedoodum
+Meoquanee
+Methoataske
+Meturato
+Migina
+Migisi
+Mimiteh
+Minninnewah
+Misae
+Misu
+Mochni
+Moema
+Moki
+Molimo
+Mona
+Mongwau
+Muata
+Mukki
+Muna
+Mundoo
+Muscowequan
+Naalnish
+Nadie
+Nahcomence
+Nahimana
+Nahiossi
+Nahuel
+Naira
+Namid
+Napayshni
+Nascha
+Nastas
+Nawkaw
+Nayeli
+Niabi
+Nidawi
+Niichaad
+Nina
+Nita
+Nittawosew
+Nixkamich
+Niyol
+Nizhoni
+Njlon
+Nootau
+Nosh
+Noshi
+Nova
+Nukpana
+Numees
+Nuttah
+Ocumwhowurst
+Ocunnowhurst
+Odahingum
+Odakota
+Ogaleesha
+Ohanzee
+Ohcumgache
+Ohitekah
+Omawnakw
+Ominotago
+Omusa
+Onatah
+Ooljee
+Oota dabun
+Orenda
+Otaktay
+Otoahhastis
+Otoahnacto
+Pachua
+Pahana
+Pajackok
+Pakuna
+Pakwa
+Pamuya
+Pannoowau
+Papina
+Pauwau
+Pavati
+Paytah
+Peta
+Pivane
+Pocahontas
+Polikwaptiwa
+Poloma
+Posala
+Powaqa
+Powwaw
+Ptaysanwee
+Pules
+Qaletaqa
+Qochata
+Quanah
+Quidel
+Rayen
+Rowtag
+Sahkyo
+Salali
+Sani
+Sanuye
+Saqui
+Sayen
+Segenam
+Sewati
+Shadi
+Sheshebens
+Shideezhi
+Shikoba
+Shilah
+Shima
+Shimasani
+Shiriki
+Shiye
+Shizhee
+Shuman
+Sicheii
+Sihu
+Sike
+Sikis
+Sikyahonaw
+Sikyatavo
+Sinopa
+Sitala
+Sitsi
+Skah
+Sokanon
+Sooleawa
+Sowi'angwa
+Soyala
+Sucki
+Suletu
+Sunukkuhkau
+Tablita
+Tadewi
+Tahkeome
+Tahmelapachme
+Taigi
+Taini
+Taipa
+Takala
+Takchawee
+Takhi
+Takoda
+Tallula
+Tallulah
+Talulla
+Talullah
+Talutah
+Tamaya
+Tangakwunu
+Taregan
+Tasunke
+Tatanka-ptecila
+Tayanita
+Tecumseh
+Teetonka
+Telutci
+Tenskwatawa
+Tihis
+Tihkoosue
+Tiponi
+Tiva
+Tocho
+Togquos
+Tohopka
+Tokala
+Tolinka
+Tooantuh
+Totsi
+Tse
+Tsiishchili
+Tupi
+Tuwa
+Una
+Urika
+Uzumati
+Vaiveahtoish
+Viho
+Vipponah
+Vohkinne
+Voistitoevitz
+Voisttitoevetz
+Vokivocummast
+Wachiwi
+Wahanassatta
+Wahchinksapa
+Wahchintonka
+Wahkan
+Wakanda
+Waki
+Wambleeska
+Wambli-waste
+Wanageeska
+Wanahton
+Wanikiya
+Wapasha
+Waquini
+Wauna
+Wayra
+Weayaya
+Weeko
+Wematin
+Wenona
+Wenonah
+Wicapi wakan
+Wicasa
+Wickaninnish
+Wihakayda
+Wikimak
+Wikvaya
+Winona
+Witashnah
+Wohehiv
+Wokaihwokomas
+Wuti
+Wuyi
+Yahto
+Yamka
+Yanisin
+Yas
+Yazhi
+Yiska
+Yoki
+Zihna
+Zitkala

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/nordic.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,247 @@
+Absalon
+Adam
+Adar
+Ador
+Adrian
+Aegir
+Alban
+Albert
+Aldor
+Alf
+Algot
+Allen
+Alois
+Alrek
+Alvin
+Ambjorn
+Andor
+Andras
+Andre
+Annul
+Anthonius
+Arctander
+Arnfred
+Aske
+Aslak
+Asmus
+Asulf
+Baard
+Basse
+Belest
+Ben
+Bent
+Berginius
+Bernhard
+Bertel
+Berthel
+Bertin
+Besse
+Bjornard
+Bo
+Boje
+Borge
+Borje
+Botvid
+Bronnil
+Brynte
+Carl
+Christen
+Clifford
+Corey
+Cyrill
+Dagbart
+Dagbjart
+Dagfred
+Dagnar
+Dani
+Dann
+Dennis
+Dick
+Dieter
+Dominic
+Dovre
+Edbjorn
+Edin
+Edolf
+Edvin
+Eghart
+Eimar
+Eivind
+Elgar
+Elis
+Endre
+Ervin
+Ewen
+Falkvor
+Fanjel
+Faste
+Flavius
+Flemming
+Franck
+Fridar
+Froy
+Germann
+Gerry
+Giermund
+Gjuke
+Godmann
+Gregorius
+Grunde
+Guddor
+Gudleiv
+Gulf
+Gullmund
+Gunnar
+Gunnfrod
+Gunnulf
+Hagerup
+Halfdan
+Harkjell
+Hasse
+Heike
+Heini
+Herbjorn
+Hilovard
+Hjuke
+Holger
+Holmkjell
+Inge
+Ingemann
+Ingmund
+Ingvard
+Irjan
+Jackie
+Jahn
+Jannik
+Jehans
+Jenvald
+Jim
+Jimmi
+Johan
+Johnny
+Jol
+Jomar
+Jonn
+Jose
+Josef
+Julius
+Kaius
+Karsten
+Kjerrand
+Krister
+Kristian
+Kyrre
+Larsinius
+Laurits
+Laust
+Lave
+Leif
+Leikvin
+Lenny
+Leon
+Lorentz
+Lotar
+Luciano
+Lucien
+Ludvik
+Ludwik
+Lunde
+Magnus
+Malvin
+Marc
+Marcus
+Martin
+Matheo
+Matthias
+Mauritz
+Max
+Melian
+Michel
+Mikael
+Mike
+Mogens
+Moises
+Moris
+Morten
+Nick
+Nicky
+Nils
+Nis
+Normund
+Norolf
+Norstein
+Oddkjell
+Odmar
+Olaf
+Olav
+Oliver
+Olle
+Olver
+Ornulv
+Oscar
+Osov
+Osvald
+Otten
+Otter
+Owe
+Oyel
+Oyuv
+Paulhard
+Racin
+Randinus
+Rasmen
+Rasmin
+Reiar
+Reidar
+Reiner
+René
+Ricard
+Rol
+Roy
+Run
+Sandi
+Sebastian
+Severin
+Sigfinn
+Sigfus
+Sigurd
+Singvald
+Sirus
+Snaere
+Snerre
+Stanislav
+Sten
+Steve
+Svavar
+Sven
+Syver
+Taale
+Tarik
+Teis
+Teo
+Terkjel
+Thom
+Thomas
+Thommy
+Thor
+Timo
+Tjaerand
+Tobias
+Toivo
+Tom
+Tommy
+Torarin
+Torres
+Torsten
+Torvid
+Torvild
+Tue
+Ulrik
+Vagn
+Vellum
+Vendel
+Vidkunn
+Viking
+Ville
+Wilfred
+Wincent
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_charmander.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+pokehogs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_chikorita.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+pokehogs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_diglett.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+pokehogs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_jigglypuff.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+pokehogs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_lugia.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+pokehogs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_mudkip.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+pokehogs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_pikachu.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+pokehogs

--- a/share/hedgewars/Data/Names/poke_slowpoke.cfg	Sat Sep 23 09:35:45 2017 +0200
+++ b/share/hedgewars/Data/Names/poke_slowpoke.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -1,1 +1,1 @@
-generic
+pokehogs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_squirtle.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+pokehogs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/poke_voltorb.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+pokehogs

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/pokehogs.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,637 @@
+Adamon
+Adozard
+Adumon
+Aduzard
+Ageychu
+Airachu
+Airemon
+Airizard
+Airomon
+Airychu
+Airyrtle
+Albalix
+Aldochu
+Aleertle
+Alligath
+Alligatric
+Alligeler
+Allily
+Alphatross
+Anezard
+Angezard
+Angochu
+Anichu
+Anklezard
+Ankleumon
+Anomon
+Apricode
+Aquaking
+Aquaster
+Aquatena
+Ardamon
+Ardimon
+Ardomon
+Arizard
+Armaduno
+Asemon
+Ashirtle
+Ashmeleon
+Ashtile
+Asychu
+Atamon
+Athazard
+Athertle
+Athochu
+Atozard
+Atyrtle
+Aughamon
+Aughozard
+Aughumon
+Awechu
+Badgath
+Badgerbil
+Ballachu
+Balley
+Ballimon
+Ballirtle
+Bambinosaur
+Barracola
+Barracyle
+Beamish
+Beatone
+Beefartle
+Beefechu
+Beefemon
+Belertle
+Belimon
+Bellilla
+Binub
+Bipod
+Blastora
+Bonander
+Boneachu
+Boneamon
+Boneezard
+Boneichu
+Boneizard
+Boneomon
+Boneuchu
+Boneychu
+Boneyzard
+Buffasire
+Bumamon
+Bumbleechu
+Bumbleemon
+Bumbleimon
+Bumbleochu
+Bumemon
+Bumezard
+Bumimon
+Bumirtle
+Bumizard
+Bumozard
+Bumportle
+Bumpuzard
+Bumpymon
+Bumpyrtle
+Bumymon
+Buruzard
+Camosquito
+Caterpia
+Celestiger
+Cerortle
+Chaimon
+Chairtle
+Chamelite
+Chamenyte
+Chamesion
+Chamezel
+Chaortle
+Chartle
+Chazard
+Chee
+Cheechu
+Cheemon
+Cheeseirtle
+Cheeseomon
+Cheortle
+Chimonite
+Chimpadrill
+Chimpanzung
+Chimpapix
+Chimpola
+Chimybara
+Clodartle
+Clodozard
+Clotechu
+Clotortle
+Clotyrtle
+Clownimon
+Clownychu
+Cobraring
+Cornamon
+Cornazard
+Cornechu
+Cornurtle
+Cornymon
+Crocodair
+Crocord
+Crocosion
+Crocoth
+Danachu
+Danartle
+Danechu
+Danichu
+Danirtle
+Daremon
+Darertle
+Daryrtle
+Delozard
+Demonkey
+Denomon
+Derp
+Derpizard
+Dewoda
+Dinopip
+Dinoscythe
+Dinosotto
+Dipamon
+Dipezard
+Dipichu
+Dolphuna
+Doltemon
+Doltezard
+Doltichu
+Doltochu
+Doltuzard
+Doltyrtle
+Doofachu
+Doofazard
+Doofortle
+Doofurtle
+Doomzelle
+Dorkazard
+Dorkirtle
+Dorkochu
+Dorkomon
+Dorkuzard
+Drachu
+Dragolix
+Dranub
+Dratuff
+Drayzard
+Drummingbird
+Dumbazard
+Dumbemon
+Dumbochu
+Dumbumon
+Dynartle
+Dynurtle
+Eaglide
+Earthatee
+Echazard
+Eldirtle
+Elechawk
+Elecmeleon
+Elecowary
+Electrican
+Electripion
+Electrisel
+Electriwing
+Electroth
+Elmichu
+Emamon
+Emimon
+Emomon
+Emozard
+Emurtle
+Endortle
+Enertle
+Engimon
+Enochu
+Enthazard
+Enthomon
+Enthyzard
+Enuchu
+Enuzard
+Enyzard
+Erechu
+Eromon
+Essertle
+Estizard
+Estymon
+Estyzard
+Etozard
+Etumon
+Faceachu
+Faceamon
+Faceechu
+Faceemon
+Faceimon
+Faceirtle
+Faceochu
+Faceomon
+Faceozard
+Faceurtle
+Falcopip
+Fastpoke
+Fiephant
+Fierbil
+Fierrilla
+Fingerochu
+Fingeruzard
+Flamemingo
+Flamimic
+Flaminyte
+Flamoss
+Fluffabura
+Fluray
+Footertle
+Fumbleartle
+Fumbleemon
+Fumbleochu
+Fumbleortle
+Fumbleumon
+Fumbleychu
+Fumbleyzard
+Garortle
+Garymon
+Garyrtle
+Gazebyss
+Gazena
+Gazenium
+Gazung
+Ghaochu
+Ghartle
+Ghophin
+Ghowing
+Gigglo
+Giraffle
+Girarak
+Glacimite
+Glaciroach
+Gladuar
+Gnuke
+Goldela
+Goldodo
+Golemite
+Golepion
+Goofazard
+Goofizard
+Goofomon
+Goofyzard
+Gorinite
+Grumbleartle
+Grumbleechu
+Grumbleuzard
+Grumbleyzard
+Hatichu
+Hatizard
+Hatomon
+Hatuzard
+Headechu
+Headichu
+Hedgehawk
+Hedgemon
+Herbarak
+Herbaros
+Herbican
+Hiberton
+Hiddo
+Hippony
+Hippopoth
+Hogizard
+Hogmon
+Hograzard
+Honimon
+Horroboon
+Horrophin
+Huntadillo
+Huntapi
+Hunterpillar
+Hyely
+Hyepet
+Hypewing
+Hypossum
+Ightachu
+Ightichu
+Ildachu
+Ildartle
+Ildyzard
+Imachu
+Imichu
+Imizard
+Inamon
+Inaurtle
+Ineirtle
+Ingotter
+Ingozard
+Irirtle
+Irychu
+Isimon
+Issazard
+Itamon
+Itartle
+Itochu
+Kalartle
+Kalirtle
+Kalumon
+Kalyzard
+Kangafree
+Kelartle
+Kelertle
+Kimozard
+Kinetadillo
+Kinimon
+Kinochu
+Knightingale
+Knockamon
+Knockertle
+Knockeruchu
+Knockerymon
+Knockeryrtle
+Knockeryzard
+Knockichu
+Knockomon
+Knuckleertle
+Knuckleizard
+Knuckleyrtle
+Koalena
+Koaron
+Komodaza
+Komoditar
+Laserpent
+Lemithe
+Leopithe
+Leopyss
+Lerezard
+Loafazard
+Loafichu
+Loafirtle
+Loafochu
+Loafomon
+Loafortle
+Loafozard
+Loafumon
+Lorezard
+Lorimon
+Lorizard
+Lorozard
+Lumpirtle
+Lumpomon
+Lumpuchu
+Lumpychu
+Lumpymon
+Lunkamon
+Lunkechu
+Lunkezard
+Lunkirtle
+Lunkochu
+Lunkortle
+Lyeartle
+Lyeirtle
+Magiboon
+Maginea
+Magizelle
+Magpine
+Manaloon
+Manaron
+Marshypus
+Mascotton
+Meatechu
+Meatirtle
+Meatomon
+Meatortle
+Meatozard
+Meatyzard
+Megacuda
+Mermantis
+Mockroach
+Moltish
+Morechu
+Moremon
+Morymon
+Mosamon
+Mosqama
+Muckamon
+Muckirtle
+Muckomon
+Muckozard
+Munchechu
+Munchemon
+Munchizard
+Munchuzard
+Munchyrtle
+Niturtle
+Numbartle
+Numbemon
+Numbichu
+Numbochu
+Numbortle
+Numburtle
+Numbyrtle
+Numbyzard
+Nyizard
+Nyochu
+Nysartle
+Nysozard
+Octopuds
+Octoros
+Oddelope
+Oldemon
+Omartle
+Omumon
+Onemon
+Onochu
+Orcabbage
+Orirtle
+Orumon
+Osochu
+Ostroth
+Oughichu
+Oystaring
+Pandops
+Panthug
+Pelicuzz
+Pelinite
+Pengith
+Penguna
+Peruzard
+Pinazard
+Pinechu
+Pinemon
+Pinezard
+Pinortle
+Pinuchu
+Pinychu
+Poluchu
+Psychound
+Puffezard
+Puffozard
+Puffychu
+Quachu
+Quaileaf
+Quaymon
+Queachu
+Queochu
+Queortle
+Quickeen
+Quickpie
+Quiling
+Raccoconut
+Rakazard
+Rakuchu
+Ramaby
+Rammingo
+Rampecker
+Rayichu
+Rhinena
+Rhinocou
+Rhinoplume
+Rhinotar
+Rilychu
+Riotter
+Risemon
+Risizard
+Rockosaur
+Rodezard
+Rodomon
+Rothyzard
+Rynizard
+Salamaniac
+Salaphy
+Sandutor
+Sardeeno
+Sayirtle
+Scorpair
+Scorpidily
+Serachu
+Serumon
+Shamite
+Shapip
+Shelphant
+Shyazard
+Shyichu
+Shyirtle
+Shyortle
+Silveropotamus
+Skelachu
+Skelechu
+Skelepion
+Skelomon
+Skelortle
+Skullachu
+Skullazard
+Skullirtle
+Skullymon
+Slowacle
+Slowdine
+Slowwhale
+Snarkartle
+Snarkichu
+Snarkimon
+Sneezeirtle
+Sneezeizard
+Sneezeomon
+Sneezeuchu
+Sneezeyrtle
+Soyster
+Specibia
+Specirilla
+Spibat
+Spiditar
+Spiney
+Starish
+Stingrage
+Stunzelle
+Sulachu
+Sulartle
+Sulimon
+Taiazard
+Taimon
+Tairtle
+Tasamon
+Tasortle
+Termair
+Terrium
+Terrorb
+Terroth
+Terruar
+Therychu
+Thimblechu
+Thortoise
+Tigena
+Tinuzard
+Tinyzard
+Tomatoad
+Tonazard
+Tonezard
+Tonichu
+Torertle
+Toromon
+Turechu
+Turtusk
+Turuchu
+Turuzard
+Twerpachu
+Twerpizard
+Twerpuchu
+Twerpyrtle
+Twitechu
+Twitychu
+Umamon
+Umartle
+Undartle
+Undemon
+Undertle
+Undizard
+Urnichu
+Urnomon
+Uskechu
+Uskemon
+Uskirtle
+Uskuzard
+Ustamon
+Ustyzard
+Venomapi
+Verachu
+Veruzard
+Vesazard
+Volting
+Voltray
+Voltzelle
+Vorartle
+Voruchu
+Vultoom
+Wadechu
+Wadezard
+Wadirtle
+Wadochu
+Wadumon
+Wallasaur
+Wallatone
+Warartle
+Warortle
+Warpie
+Weasaid
+Weaseaf
+Weaseal
+Weasotic
+Whaleaf
+Whirlfly
+Whirlium
+Wimpichu
+Wimpomon
+Wimpuchu
+Wimpumon
+Wipeartle
+Wipeomon
+Wipeortle
+Wipeurtle
+Wipeychu
+Wolvetle
+Worechu
+Woremon
+Yerazard
+Yerimon
+Yerirtle

--- a/share/hedgewars/Data/Names/scif_swDarthvader.cfg	Sat Sep 23 09:35:45 2017 +0200
+++ b/share/hedgewars/Data/Names/scif_swDarthvader.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -1,1 +1,1 @@
-generic
+scif_swDarthvader

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/scif_swDarthvader.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,76 @@
+Assault Chief
+Asthmatic
+Black Beauty
+Black Boss
+Black Chief
+Black Hat
+Black Helmet
+Black King
+Black Leader
+Black Queen
+Boss
+Captain John
+Captain Albert
+Chief Master
+Commandeer
+Council Chief
+Dark
+Dark Fader
+Dark Lord
+Darkness
+Dark One
+Dark Vapor
+Darth Dan
+Darth Hog
+Darth Invader
+Darthly
+Dr Dark
+Dr Darth
+Dreamcrusher
+Emperor
+Empress
+Galactic Emperor
+High Command
+Laser Swordsmaster
+Lord Black
+Lord Darkness
+Lord Darth
+Lord Helmet
+Lord Hog
+Lord Nightmare
+Master
+Master Chief
+Master of Galaxy
+Overlord
+Overmind
+Protector
+Regina
+Sith Lord
+Space King
+Space Lord
+Space Ruler
+Top Hog
+Top Leader
+Vaporizer
+Darth Card
+Darth Dis
+Darth Xein
+Darth Qydd
+Darth Nuiph
+Darth Scizzeth
+Darth Trelfi
+Darth Scael
+Darth Vox
+Darth Zat
+Darth Kihl
+Darth Prorn
+Darth Bruyt
+Darth Gluekru
+Darth Attok
+Darth Hater
+Darth Bone
+Darth Dawn
+Darth Hes
+Darth Verd
+Darth Kir
+Darth Vapor

--- a/share/hedgewars/Data/Names/scif_swStormtrooper.cfg	Sat Sep 23 09:35:45 2017 +0200
+++ b/share/hedgewars/Data/Names/scif_swStormtrooper.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -1,1 +1,1 @@
-generic
+scif_swStormtrooper

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/scif_swStormtrooper.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,42 @@
+Stormtrooper
+Wormstooper
+Soldier
+Infanterist
+Rank
+Combatant
+Senner
+Trooper
+White Guard
+White Helmet
+Guard
+Space Hog
+Plastic Suit
+Grunt
+Space Grunt
+Scooper
+Runner
+Loader
+Lasergunner
+Gunner
+Hogface
+Battlecrusher
+Ground Pounder
+Infantryhog
+Foot Soldier
+Laser Fighter
+Laser Grunt
+Laser Swordshog
+Phase Gunner
+Combat Unit
+Invader
+Darth’s Minion
+Assault
+Raider
+Reese
+Cantrell
+Assault Trooper
+Glover
+Ortega
+Mighty
+Aurora
+White Fighter
\ No newline at end of file

--- a/share/hedgewars/Data/Names/types.ini	Sat Sep 23 09:35:45 2017 +0200
+++ b/share/hedgewars/Data/Names/types.ini	Sat Sep 23 19:49:41 2017 +0200
@@ -1681,11 +1681,11 @@
 Mandate
 United We Stand
 United
-Troup of Good
+Troop of Good
 Bluetroopers
 Blue Helmets
 Team Blue
-Tactial Troup
+Tactial Troop
 Underminers
 Blueland
 Azure Nation
@@ -1700,7 +1700,7 @@
 war_UNPeacekeeper02
 #####
 Desert Storm
-Desert Troup
+Desert Troop
 Sahel
 Savanna
 Desert
@@ -1751,7 +1751,7 @@
 Hedgehog Nation
 Best Nation
 Royal Army
-Royal Troup
+Royal Troop
 Expedition Corps
 Queenland
 Kingland
@@ -1868,6 +1868,9 @@
 The Hog
 The Pig
 The Dragon
+Alliance
+Winter Knights
+Summer Knights
 #####
 knight
 #####

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war.txt	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,221 @@
+Acker
+Ackles
+Alberti
+Allbritton
+Alleman
+Alpers
+Appell
+Apperson
+Arenas
+Avants
+Averette
+Bahena
+Balas
+Ballard
+Bang
+Basso
+Beaudette
+Begaye
+Benefield
+Bennefield
+Bergen
+Blaser
+Blomquist
+Boom
+Bosco
+Brazeal
+Breneman
+Bueno
+Byron
+Calender
+Candler
+Cannon
+Cantrelle
+Carlow
+Carns
+Cassinelli
+Castruita
+Caywood
+Chappelle
+Chism
+Chynoweth
+Cobos
+Cochran
+Coley
+Collado
+Collinson
+Colter
+Combatant
+Comeaux
+Crafford
+Crandall
+Credle
+Dapolito
+Dietrick
+Dillenbeck
+Dorrell
+Duenas
+Durrell
+Dyck
+Dykstra
+Eagle
+Ebel
+Eckel
+Elledge
+Ellen
+Ellers
+Emmons
+Enders
+Esker
+Explode
+Eye
+Fetterolf
+Fill
+Finch
+Fleener
+Forester
+Fritsche
+Fullenwider
+Fussell
+Gains
+Gajewski
+Garten
+Gibbens
+Giesler
+Gloss
+Godin
+Goforth
+Grabowski
+Gravois
+Grenade
+Grennan
+Griggs
+Gugino
+Guill
+Gun
+Gunner
+Hagaman
+Haider
+Hakes
+Hassett
+Helmet
+Hiott
+Hollars
+Hopkins
+Hunter
+Hyde
+Infanterist
+Izzi
+Joo
+Juel
+Kaboom
+Kilbane
+Klocke
+Kroh
+Kyger
+Lasseter
+Latimore
+Lauderback
+Lefebre
+Leslie
+Lettinga
+Liverman
+Lobel
+Lockridge
+Logue
+Loken
+Luera
+Manigo
+Marling
+Maske
+Mcalpin
+Mccarville
+Mckittrick
+Mclane
+Mclemore
+Mcroy
+Melle
+Mendivil
+Mera
+Michalec
+Mifflin
+Milliman
+Monzon
+Mortar
+Murakami
+Musich
+Neuner
+Newman
+Nickens
+Nuke
+Ogburn
+Ogg
+Ogles
+Onstad
+Osburn
+Parkin
+Person
+Pilkington
+Plank
+Plaza
+Poplin
+Port
+Preslar
+Prestidge
+Pyatt
+Quirion
+Rachel
+Rank
+Rimmer
+Rode
+Romine
+Rosebrock
+Rustad
+Saddler
+Salamone
+Sangster
+Sapper
+Schwein
+Sciacca
+Scriven
+Senner
+Sereno
+Severa
+Shams
+Shooter
+Shot
+Shotgun
+Showers
+Siller
+Sisler
+Smidt
+Soileau
+Soldier
+Stembridge
+Stich
+Stoodley
+Strine
+Tallant
+Tenaglia
+Tinney
+Tomko
+Towe
+Treaster
+Troche
+Trooper
+Troutman
+Tye
+Vandenbosch
+Verhoeven
+Viloria
+Warhead
+Weapon
+Weese
+Weist
+Westbury
+Westlake
+Wicker
+Wittner
+Yost
+Zaremba
+Bazooka
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_UNPeacekeeper01.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_UNPeacekeeper02.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_airwarden02.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_airwarden03.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_americanww2helmet.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,1 @@
+war

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_britmedic.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_britpthhelmet.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_britsapper.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_desertgrenadier1.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_desertgrenadier2.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_desertgrenadier4.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_desertgrenadier5.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_desertmedic.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_desertofficer.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_desertsapper1.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_desertsapper2.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_frenchww1gasmask.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_frenchww1helmet.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_germanww1helmet2.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_germanww1tankhelm.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_germanww2medic.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_germanww2pith.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_grenadier1.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_trenchfrench01.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_trenchfrench02.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_trenchgrenadier1.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_trenchgrenadier2.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/Names/war_trenchgrenadier3.cfg	Sat Sep 23 19:49:41 2017 +0200
@@ -0,0 +1,3 @@
+war
+war
+generic