[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/po/wesnoth ca.po cs.po da.po de.po el_G...
|
From: |
Yann Dirson |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth/po/wesnoth ca.po cs.po da.po de.po el_G... |
|
Date: |
Sun, 12 Dec 2004 10:30:50 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 04/12/12 15:19:49
Modified files:
po/wesnoth : ca.po cs.po da.po de.po el_GR.po es.po eu.po
fi.po fr.po hu.po it.po nl.po no.po pl.po
pt_BR.po ru.po sk.po sl.po sv.po wesnoth.pot
Log message:
update-po
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/ca.po.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/cs.po.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/da.po.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/de.po.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/el_GR.po.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/es.po.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/eu.po.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/fi.po.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/fr.po.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/hu.po.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/it.po.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/nl.po.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/no.po.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/pl.po.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/pt_BR.po.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/ru.po.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/sk.po.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/sl.po.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/sv.po.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/wesnoth.pot.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
Patches:
Index: wesnoth/po/wesnoth/ca.po
diff -u wesnoth/po/wesnoth/ca.po:1.25 wesnoth/po/wesnoth/ca.po:1.26
--- wesnoth/po/wesnoth/ca.po:1.25 Wed Dec 8 20:47:28 2004
+++ wesnoth/po/wesnoth/ca.po Sun Dec 12 15:19:48 2004
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-12-08 21:34+0100\n"
"Last-Translator: Jordà Polo <address@hidden>\n"
"Language-Team: <address@hidden>\n"
@@ -55,7 +55,7 @@
msgid "Traits"
msgstr "Trets"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Unitats"
@@ -847,93 +847,81 @@
msgid "Default"
msgstr "Per defecte"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Aleatori"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,Lleials"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,Rebels"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,Del nord"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,No morts"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Aliança Knalgan"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Dracs"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Mapa aleatori"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Reincorporacions"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "No morts"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,Aliança Knalgan"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Drac del cel"
+
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Clà ssic"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Humans"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Humans"
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Elfs"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elfs"
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,Orcs"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orcs"
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Nans"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Castell nan"
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
msgstr ""
-#: data/multiplayer.cfg:196
+#: data/multiplayer.cfg:211
msgid "Age of Heroes"
msgstr "L'Era dels Herois"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Lleials"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Rebels"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Del nord"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,No morts"
-
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Aliança Knalgan"
-
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "La Gran Guerra"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&elvish-lord.png,Aliança de la Llum"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Mag de la Llum"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-lich.png,Aliança de la Foscor"
#: data/scenario-test.cfg:38
@@ -1493,8 +1481,8 @@
"attack options menu after the damage and strike numbers for the bow attack."
msgstr ""
"Les unitats tenen l'habilitat de blocar els cops. Les possibilitats de que "
-"això passi es basen en l'habilitat d'aturar cops del defensor. Apareixen a
la "
-"llista d'opcions d'atac després del mal i el nombre de cops."
+"això passi es basen en l'habilitat d'aturar cops del defensor. Apareixen a "
+"la llista d'opcions d'atac després del mal i el nombre de cops."
#: data/scenarios/tutorial/Basic_Training.cfg:152
msgid "Will my fighter hit every time when he attacks?"
@@ -1718,7 +1706,8 @@
msgid ""
"Now you will be subject to a more difficult test. You must defeat me in mock "
"battle."
-msgstr "Ara sereu sotmès a una prova més dura. M'haureu de derrotar en una
batalla."
+msgstr ""
+"Ara sereu sotmès a una prova més dura. M'haureu de derrotar en una batalla."
#: data/scenarios/tutorial/Traits_and_Specialties.cfg:43
msgid ""
@@ -1983,7 +1972,8 @@
msgstr ""
#: data/scenarios/tutorial/Traits_and_Specialties.cfg:160
-msgid "Many units have a specialty which changes the rules of play in some
way."
+msgid ""
+"Many units have a specialty which changes the rules of play in some way."
msgstr ""
#: data/scenarios/tutorial/Traits_and_Specialties.cfg:164
@@ -2227,66 +2217,54 @@
msgid "Canyon"
msgstr "Gorja"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menú"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Accions"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Fi del torn"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "HP"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "XP"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "Or"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "llogarets"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "unitats"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "manteniment"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "guanys"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "nivell"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "moviments"
@@ -2355,7 +2333,8 @@
msgstr ""
#: data/tips.cfg:9
-msgid "Units stationed in villages heal 8 hitpoints at the beginning of their
turn."
+msgid ""
+"Units stationed in villages heal 8 hitpoints at the beginning of their turn."
msgstr ""
#: data/tips.cfg:10
@@ -2404,7 +2383,8 @@
msgstr ""
#: data/tips.cfg:17
-msgid "Do not be afraid to retreat and regroup, it is often the key to
victory."
+msgid ""
+"Do not be afraid to retreat and regroup, it is often the key to victory."
msgstr ""
#: data/tips.cfg:18
@@ -2658,7 +2638,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "lideratge"
@@ -2688,7 +2668,8 @@
"the poison instead of healing."
msgstr ""
"Regenera:\n"
-"La unitat es cura a ella mateixa 8 punts de vida per torn. Si estÃ
enverinada, eliminarà el verà en comptes de curar-se."
+"La unitat es cura a ella mateixa 8 punts de vida per torn. Si està "
+"enverinada, eliminarà el verà en comptes de curar-se."
#: data/translations/english.cfg:71 data/units/Great_Troll.cfg:7
#: data/units/Tentacle.cfg:7 data/units/Troll.cfg:7
@@ -2726,7 +2707,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "fermesa"
@@ -2849,22 +2830,6 @@
"Aquesta unitat pot convertir els seus enemics en pedra. Les unitats "
"petrificades no es poden moure ni atacar."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elfs"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Humans"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orcs"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "No morts"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "El pont de $name, L'encreuament de $name"
@@ -2915,7 +2880,8 @@
msgstr ""
#: data/translations/english.cfg:142
-msgid
"$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
+msgid ""
+"$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
msgstr ""
#: data/units/Ancient_Lich.cfg:3
@@ -3040,7 +3006,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3055,6 +3021,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3115,7 +3082,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3190,13 +3157,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3214,11 +3182,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3229,7 +3197,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "punyalada"
@@ -3314,7 +3282,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3323,9 +3292,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "espasa"
@@ -3418,7 +3387,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3436,7 +3406,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3528,8 +3498,8 @@
msgstr ""
"Les Aranyes gegants són normalment ubicades per la tradició als llocs més "
"profunds de Knalga, on causen tot tipus de mals... Poden mossegar els "
-"enemics, injectant-los verÃ, i llançar tel·les arà cnides per tal de "
-"alentir-los."
+"enemics, injectant-los verÃ, i llançar tel·les arà cnides per tal de
alentir-"
+"los."
#: data/units/Cave_Spider.cfg:28
msgid "web"
@@ -3564,7 +3534,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3580,8 +3551,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "carrega"
@@ -3600,7 +3571,7 @@
msgid "gaze"
msgstr ""
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "pedra"
@@ -3812,7 +3783,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr ""
@@ -3945,8 +3916,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr ""
@@ -4159,8 +4131,8 @@
msgstr ""
"Els Mosqueters nans donen cobertura al exèrcit nan amb suport de llarga "
"distà ncia, un suport molt necessitat pels potents però lents guerrers. El "
-"seus mosquets són més lents i sorollossos que els elegants i "
-"rà pids arcs èlfics, però la seva potència de foc i d'atac és
insuperable."
+"seus mosquets són més lents i sorollossos que els elegants i rà pids arcs "
+"èlfics, però la seva potència de foc i d'atac és insuperable."
#: data/units/Dwarvish_Thunderer.cfg:40
msgid "thunderstick"
@@ -4426,7 +4398,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "tirador"
@@ -4634,7 +4606,8 @@
msgstr "Bola de foc"
#: data/units/Fireball.cfg:16
-msgid "A Fireball. This is not to be used for anything else than a
'Move_Unit_Fake'!"
+msgid ""
+"A Fireball. This is not to be used for anything else than a 'Move_Unit_Fake'!"
msgstr ""
#: data/units/Footpad.cfg:3
@@ -4775,8 +4748,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4820,7 +4795,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4925,22 +4900,26 @@
"voladores descobreixen un nou món en els cels..."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Alabarder"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"Són el resultat de promocionar els millors d'entre tots els soldats. La seva
"
"arma és lenta d'utilitzar, però són capaços de produir ferides letals. A "
"més, els alabarders sempre ataquen primer en combat, encara que estiguin "
"defensant."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "alabarda"
@@ -4967,7 +4946,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "MatÃ"
@@ -4983,10 +4963,10 @@
"they do double damage, but also receive double damage when struck. Rebels "
"against Asheviere's tyranny often use Horsemen against her."
msgstr ""
-"Els genets són tropes rà pides i poderoses en l'atac. Entrenats des de "
-"la seva infantesa per a muntar, poden fer una cà rrega sobre els seus enemics
per "
-"tal d'infringir el doble de mal; no obstant, també rebran en aquest cas el "
-"doble de ferides en ser atacats."
+"Els genets són tropes rà pides i poderoses en l'atac. Entrenats des de la "
+"seva infantesa per a muntar, poden fer una cà rrega sobre els seus enemics "
+"per tal d'infringir el doble de mal; no obstant, també rebran en aquest cas "
+"el doble de ferides en ser atacats."
#: data/units/Initiate.cfg:3
msgid "Initiate"
@@ -5010,6 +4990,24 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Llançador de javelina sirènid"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"Com els espadatxins i els soldats, els llancers conformen la base dels "
+"exèrcits dels humans. Són joves entrenats de forma bà sica amb les armes i "
+"són usats com a carn de canó a primera lÃnia de batalla."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Cavaller"
@@ -5111,8 +5109,8 @@
msgstr ""
"El Mag és feble, però potent. Es mou amb lentitud i es defensivament "
"vulnerable, però els seus atacs mà gics sempre tenen una alta probabilitat "
-"d'encert. Per aquesta raó, el Mag és una elecció excel·lent per afrontar
enemics "
-"defensant terrenys favorables."
+"d'encert. Per aquesta raó, el Mag és una elecció excel·lent per afrontar "
+"enemics defensant terrenys favorables."
#: data/units/Mage.cfg:36 data/units/Mage.cfg:103
msgid "missile"
@@ -5142,10 +5140,11 @@
"units."
msgstr ""
"El Mag de la Llum és un perfecte aliat en la lluita pels qui combaten en "
-"nom del Bé, i un terrible adversari per les forces del Mal. Ãs capaç de
curar "
-"els seus aliats, i els poders de la llum són tan grans en ell que als "
-"voltants de la seva figura mai serà de nit. Quan una unitat lluita al seu
costat, lluitarà com si fos de dia a l'alba i "
-"al vespre, i com si encara no s'hagués fet fos durant la nit."
+"nom del Bé, i un terrible adversari per les forces del Mal. Ãs capaç de "
+"curar els seus aliats, i els poders de la llum són tan grans en ell que als "
+"voltants de la seva figura mai serà de nit. Quan una unitat lluita al seu "
+"costat, lluitarà com si fos de dia a l'alba i al vespre, i com si encara no "
+"s'hagués fet fos durant la nit."
#: data/units/Mage_of_Light.cfg:45 data/units/Mage_of_Light.cfg:105
#: data/units/Mermaid_Diviner.cfg:34 data/units/Mermaid_Priestess.cfg:32
@@ -5311,7 +5310,7 @@
msgid "Mounted Captain"
msgstr "Capità muntat"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5331,6 +5330,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Lluitador noble"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Guerrer sirènid"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Rossegador de fang"
@@ -5493,9 +5510,9 @@
"While they can be easily outrun or outsmarted, their strength is not to be "
"underestimated."
msgstr ""
-"Els Ogres són gegants estúpids que normalment viuen sols a llocs "
-"salvatges. Encara que poden ser fà cilment evitats, la seva força no ha de "
-"ser subestimada."
+"Els Ogres són gegants estúpids que normalment viuen sols a llocs salvatges.
"
+"Encara que poden ser fà cilment evitats, la seva força no ha de ser "
+"subestimada."
#: data/units/Ogre.cfg:19 data/units/Young_Ogre.cfg:18
#, fuzzy
@@ -5765,18 +5782,20 @@
msgid "Pikeman"
msgstr "Piquer"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Els piquers són l'èlit dels llancers, aquells soldats més experimentats
que "
"canvien les seves llances per llargues piques. Els piquers són un adversari "
"temible per les unitats de cavalleria."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "pica"
@@ -5875,7 +5894,7 @@
msgid "Royal Guard"
msgstr "Guà rdia Reial"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -5886,10 +5905,6 @@
"crÃtiques i, fins ara, sempre han gaudit de rotunds éxits en les seves "
"empreses."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr ""
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6030,8 +6045,10 @@
msgstr "Serp marina"
#: data/units/Sea_Serpent.cfg:16
-msgid "Sea Serpents are gigantic monsters, capable of capsizing boats by
themselves."
-msgstr "La Serp marina és un monstre enorme, capaç de sotsobrar qualsevol
embarcació."
+msgid ""
+"Sea Serpents are gigantic monsters, capable of capsizing boats by themselves."
+msgstr ""
+"La Serp marina és un monstre enorme, capaç de sotsobrar qualsevol
embarcació."
#: data/units/Sergeant.cfg:3
msgid "Sergeant"
@@ -6169,11 +6186,12 @@
msgstr "Llancer"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"Com els espadatxins i els soldats, els llancers conformen la base dels "
"exèrcits dels humans. Són joves entrenats de forma bà sica amb les armes i "
@@ -6195,7 +6213,7 @@
msgid "Swordsman"
msgstr "EspadatxÃ"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6639,15 +6657,15 @@
msgid "Close"
msgstr "Tanca"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr ""
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr ""
@@ -6655,7 +6673,17 @@
msgid "none"
msgstr "cap"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr ""
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr ""
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "mal base"
@@ -6667,61 +6695,61 @@
msgid "attacker vulnerability vs"
msgstr "vulnerabilitat de l'atacant contra"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr ""
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "mal total"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "resistència del defensor contra"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "vulnerabilitat del defensor contra"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr ""
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "enverinat"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr ""
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr ""
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr ""
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr ""
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr ""
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr ""
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr ""
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr ""
@@ -6769,7 +6797,7 @@
msgid "Campaign"
msgstr "Campanya"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Multijugador"
@@ -6781,7 +6809,7 @@
msgid "replay"
msgstr "repetició"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Torn"
@@ -6793,7 +6821,7 @@
msgid "Difficulty"
msgstr "Dificultat"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Versió"
@@ -6849,25 +6877,15 @@
msgstr "Perfil"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "nivell"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Moviments"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr ""
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr ""
-
#: src/display.cpp:883
msgid "healthy"
msgstr ""
@@ -6884,11 +6902,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Voleu desar la repetició d'aquest escenari?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Nom:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "No ha estat possible desar la partida."
@@ -6918,7 +6936,8 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr " ,Obtenir més campanyes..."
#: src/game.cpp:954
@@ -6949,11 +6968,11 @@
msgid "Could not connect to host."
msgstr "No ha estat possible connectar al servidor."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Error"
@@ -6965,135 +6984,149 @@
msgid "Error communicating with the server."
msgstr "Error de comunicació amb el servidor."
-#: src/game.cpp:1053
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Nom"
+
+#: src/game.cpp:1056
#, fuzzy
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",Nom,Versió,Autor,Descà rregues"
+msgid "Author"
+msgstr "espines"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "Sirena"
+
+#: src/game.cpp:1077
#, fuzzy
msgid "B"
msgstr "kB"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "kB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr ""
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr ""
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "No hi ha campanyes disponibles per descarregar en aquest servidor."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Trieu la campanya que voleu descarregar."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr ""
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Descarregant campanya..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Campanya instal·lada"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "La campanya ha estat instal·lada correctament."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr ""
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr ""
-#: src/game.cpp:1145
-msgid "There was a problem creating the files necessary to install this
campaign."
+#: src/game.cpp:1156
+msgid ""
+"There was a problem creating the files necessary to install this campaign."
msgstr ""
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr ""
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Termes"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Resposta"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Unir-se al servidor oficial"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr ""
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Unir-se"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr ""
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Servir partida en xarxa"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr ""
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr ""
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
#, fuzzy
msgid "Human vs AI"
msgstr "Humans"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Nom"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Idioma"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Trieu el vostre idioma"
@@ -7113,11 +7146,7 @@
msgid "attacks"
msgstr "atacs"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Nom"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Tipus"
@@ -7168,7 +7197,8 @@
#: src/help.cpp:1303
#, fuzzy
msgid "This terrain acts as $terrains for movement and defense purposes."
-msgstr "Aquest terreny actua com $terrains pel que fa al moviment i la
defensa."
+msgstr ""
+"Aquest terreny actua com $terrains pel que fa al moviment i la defensa."
#: src/help.cpp:1305
#, fuzzy
@@ -7252,7 +7282,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Llogarets"
@@ -7312,7 +7342,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr ""
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7346,7 +7376,7 @@
msgid "No multiplayer sides."
msgstr ""
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Crea partida"
@@ -7396,64 +7426,64 @@
msgid "Receiving game list..."
msgstr "Rebent la llista de partides..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Or"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Esperant començar la partida..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "Connectar amb el servidor"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Trieu el servidor a connectar"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Connectant al servidor remot..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr ""
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Rebent les dades de la partida..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "No hi ha bà ndols disponibles en aquesta partida."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Trieu el vostre bà ndol:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Aquesta partida ha estat cancel·lada."
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "El bà ndol que heu triat ja no està disponible."
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Voleu veure la repetició de la partida fins al moment de desar-la?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "LÃder:"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Reclutaments:"
@@ -7552,7 +7582,7 @@
msgstr "Color"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Or"
@@ -7560,23 +7590,23 @@
msgid "Waiting for network players to join"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr ""
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Observa partida"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Surt"
@@ -7643,241 +7673,238 @@
msgid "It is now your turn"
msgstr "Ãs el teu torn."
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Atacant"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Defensor"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "CÃ lcul de mal"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr ""
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "contra"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Atac enemic"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Trieu l'arma"
-#: src/playturn.cpp:1213
-msgid "You have not started your turn yet. Do you really want to end your
turn?"
+#: src/playturn.cpp:1200
+msgid ""
+"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Renomena unitat"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Partida desada"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "La partida ha estat desada."
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "LÃder"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Manteniment"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Beneficis"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Recluta"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Seleccioneu unitat"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "No teniu prou diners per reclutar aquesta unitat."
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Acomiada unitat"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Reincorpora"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Missatge"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Envia només als aliats"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Posició"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Llista d'unitats"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Reclutaments"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Reincorporacions"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Avançaments"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Pèrdues"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Morts"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Mal infligit"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Mal rebut"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr ""
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr ""
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "EstadÃstiques"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Cerca"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "prompt^Comanda:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Registre del xat"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Posa etiqueta"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Etiqueta"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Aborta partida"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -8037,3 +8064,54 @@
msgid "Deletion of the file failed."
msgstr ""
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Aleatori"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,Lleials"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,Rebels"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,Del nord"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,No morts"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Aliança Knalgan"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Dracs"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Humans"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Elfs"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,Orcs"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Nans"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Lleials"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Rebels"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Del nord"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,No morts"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&elvish-lord.png,Aliança de la Llum"
+
+#, fuzzy
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",Nom,Versió,Autor,Descà rregues"
Index: wesnoth/po/wesnoth/cs.po
diff -u wesnoth/po/wesnoth/cs.po:1.19 wesnoth/po/wesnoth/cs.po:1.20
--- wesnoth/po/wesnoth/cs.po:1.19 Sun Dec 5 00:12:15 2004
+++ wesnoth/po/wesnoth/cs.po Sun Dec 12 15:19:48 2004
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-09-30 12:32+0200\n"
"Last-Translator: David NeÄas <address@hidden>\n"
"Language-Team: Czech\n"
@@ -50,7 +50,7 @@
msgid "Traits"
msgstr "Vlastnosti"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Jednotky"
@@ -844,94 +844,81 @@
msgid "Default"
msgstr "StandardnÃ"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Náhodný"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,Loajalisté"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,Rebelové"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,SeveÅané"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,NemrtvÃ"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Knalganská aliance"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Draci"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Náhodná mapa"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "PÅivoláno"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "NemrtvÃ"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,Knalganská aliance"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Nebeský drak"
+
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Klasická"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Lidé"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Elfové"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Lidé"
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,SkÅeti"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elfové"
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,TrpaslÃci"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "SkÅeti"
-#: data/multiplayer.cfg:182
+#: data/multiplayer.cfg:171
#, fuzzy
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "JeÅ¡tÄrácký vÄÅ¡tec"
+msgid "Dwarves"
+msgstr "TrpasliÄÃ pustina"
+
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "JeÅ¡tÄrák"
-#: data/multiplayer.cfg:196
+#: data/multiplayer.cfg:211
msgid "Age of Heroes"
msgstr "VÄk hrdinů"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Loajalisté"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Rebelové"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,SeveÅané"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,NemrtvÃ"
-
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Knalganská aliance"
-
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Velká válka"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Aliance svÄtla"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Mág svÄtla"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Aliance temnot"
#: data/scenario-test.cfg:38
@@ -2348,66 +2335,54 @@
msgid "Canyon"
msgstr "žádná"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menu"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Akce"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "UkonÄi kolo"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "Životů"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "Zkušenost"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "zlatých"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "vesnic"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "jednotek"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "výdaje"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "pÅÃjmy"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "úroveÅ"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "pohyby"
@@ -2855,7 +2830,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "velenÃ"
@@ -2921,7 +2896,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "pevnÄ stojÃcÃ"
@@ -3043,22 +3018,6 @@
"Tento útok promÄnà protivnÃka v kámen. Jednotky promÄnÄné v kámen se
nemohou "
"hýbat ani útoÄit."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elfové"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Lidé"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "SkÅeti"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "NemrtvÃ"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "Most $name,Brod $name"
@@ -3236,7 +3195,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3251,6 +3210,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3310,7 +3270,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3386,13 +3346,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3410,11 +3371,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3425,7 +3386,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "zezadu"
@@ -3511,7 +3472,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3520,9 +3482,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "meÄ"
@@ -3612,7 +3574,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3630,7 +3593,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3764,7 +3727,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3780,8 +3744,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "výpad"
@@ -3803,7 +3767,7 @@
msgid "gaze"
msgstr "pohled"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
#, fuzzy
msgid "stone"
@@ -4040,7 +4004,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "ohnivý dech"
@@ -4173,8 +4137,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "prvnà úder"
@@ -4665,7 +4630,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "odstÅelovaÄ"
@@ -5034,10 +4999,13 @@
msgstr "Goblin nabodávaÄ"
#: data/units/Goblin_Impaler.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
"Goblini majà sklony pokoušet se vynahradit svoji obecnou tupost, slabost a "
"nedostatek propracovaných zbranà zdrcenÃm nepÅátel svým pouhým
poÄtem. Toto "
@@ -5082,9 +5050,10 @@
msgstr "Goblin s oÅ¡tÄpem"
#: data/units/Goblin_Spearman.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5198,21 +5167,25 @@
"létajÃcÃch zvÃÅat."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "HalapartnÃk"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"NejlepÅ¡Ã z vojáků se vybÃrajÃ, aby se stali halapartnÃky. Jejich
zbraÅ, i "
"když je o nÄco pomalejÅ¡Ã než meÄ, může udeÅit se smrtÃcà silou a
dÃky své "
"délce vždy udeÅà jako prvnÃ, i když se bránÃ."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "halapartna"
@@ -5241,7 +5214,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Dopoledne"
@@ -5290,6 +5264,25 @@
"váleÄným kladivem. Kdyby nebyli tak pomalà a vzácnÃ, ovládali by tito
mocnà "
"bojovnÃci celý kontinent."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Kavalerista-Å¡lechtic"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"PÄšáci s oÅ¡tÄpem tvoÅà jádro lidských armád. Tito mladà vojáci
dostanou "
+"základnà výcvik a jsou postaveni do prvnÃch Åad, aby zajistili
pÅevážnou "
+"Äást boje. DÃky délce svých oÅ¡tÄpů v boji vždy udeÅà jako prvnÃ,
i když se "
+"bránÃ."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "RytÃÅ"
@@ -5606,7 +5599,7 @@
msgid "Mounted Captain"
msgstr "Hory"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5627,6 +5620,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "VzneÅ¡ený bojovnÃk"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "JeÅ¡tÄrácký bojovnÃk"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Blátožrout"
@@ -6096,18 +6107,20 @@
msgid "Pikeman"
msgstr "KopinÃk"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"KopinÃci jsou zkuÅ¡nÄjÅ¡Ã vojáci, kteÅà vymÄnili oÅ¡tÄpy za dlouhá
kopÃ. DÃky "
"délce svých kopà v boji vždy udeÅà jako prvnÃ, i když se bránÃ.
ObzvláštnÄ "
"smrtÃcà jsou v boji s jÃzdou."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "kopÃ"
@@ -6205,7 +6218,7 @@
msgid "Royal Guard"
msgstr "Královská garda"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -6215,10 +6228,6 @@
"nejstatnÄjÅ¡Ãch z armády. Nasazujà se jen v kritických situacÃch, a v "
"uložených úkolech doposud vždy uspÄli."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "JeÅ¡tÄrák"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6538,11 +6547,12 @@
msgstr "PÄšák s oÅ¡tÄpem"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"PÄšáci s oÅ¡tÄpem tvoÅà jádro lidských armád. Tito mladà vojáci
dostanou "
"základnà výcvik a jsou postaveni do prvnÃch Åad, aby zajistili
pÅevážnou "
@@ -6568,7 +6578,7 @@
msgid "Swordsman"
msgstr "BojovnÃk s meÄem"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -7033,15 +7043,15 @@
msgid "Close"
msgstr "ZavÅÃt"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Nemáš vůdce, který by verboval Äi pÅivolával."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr "MusÃÅ¡ mÃt hrdinu v tvrzi, abys mohl nÄkoho naverbovat nebo
pÅivolat."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Nejsou žádné volné hrady, ve kterých by se daly verbovat
jednotky."
@@ -7049,7 +7059,17 @@
msgid "none"
msgstr "žádná"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "zblÃzka"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "na dálku"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "základnà poÅ¡kozenÃ"
@@ -7061,61 +7081,61 @@
msgid "attacker vulnerability vs"
msgstr "zranitelnost útoÄnÃka vs."
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Zdvojnásobeno"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "celkové poÅ¡kozenÃ"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "odolnost obránce vs."
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "zranitelnost obránce vs."
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "Zmenšeno na polovinu"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "otrávený"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "zpomalený"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "PÅepadenÃ!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "SpÅátelená jednotka spatÅena"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "NepÅátelská jednotka na dohled!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends spÅátelených jednotek spatÅeno"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies nepÅátelských jednotek na dohled!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Jednotky na dohled! ($friends spÅátelených, $enemies
nepÅátelských)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(stiskni $hotkey k pokraÄovánÃ)"
@@ -7163,7 +7183,7 @@
msgid "Campaign"
msgstr "TaženÃ"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Hra vÃce hráÄů"
@@ -7175,7 +7195,7 @@
msgid "replay"
msgstr "záznam"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Kolo"
@@ -7187,7 +7207,7 @@
msgid "Difficulty"
msgstr "ObtÞnost"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Verze"
@@ -7248,25 +7268,15 @@
msgstr "Profil"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "úroveÅ"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Kroků"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "zblÃzka"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "na dálku"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "zdravý"
@@ -7283,11 +7293,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Chceš uložit záznam této hry?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Jméno:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Hru se nepodaÅlo uložit"
@@ -7316,7 +7326,8 @@
msgstr "VstupnÄ výstupnà chyba souboru pÅi naÄÃtánà hry"
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr " ,ZÃskej dalÅ¡Ã taženÃ..."
#: src/game.cpp:954
@@ -7347,11 +7358,11 @@
msgid "Could not connect to host."
msgstr "Spojenà se hostitelem se nezdaÅilo."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Chyba"
@@ -7363,139 +7374,152 @@
msgid "Error communicating with the server."
msgstr "Chyba pÅi komunikaci se serverem."
-#: src/game.cpp:1053
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Jméno"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "ostny"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
+
+#: src/game.cpp:1058
#, fuzzy
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",Jméno,Verze,Autor,PoÄet staženÃ"
+msgid "Size"
+msgstr "oheÅ"
-#: src/game.cpp:1072
+#: src/game.cpp:1077
#, fuzzy
msgid "B"
msgstr "kB"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "kB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "ZveÅejni taženÃ: "
-#: src/game.cpp:1094
+#: src/game.cpp:1104
#, fuzzy
msgid "Delete campaign: "
msgstr "ZÃskej taženÃ"
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Na tomto serveru nejsou k dispozici nejsou žádná taženà ke
staženÃ."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Vyber si, kterou hru chceš stáhnout."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "ZÃskej taženÃ"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Stahuji taženi..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Taženà nainstalováno"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "Taženà bylo nainstalováno."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Chyba pÅi sÃÅ¥ové komunikaci."
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Vzdálený hostitel se odpojil."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr "VytvoÅenà souborů potÅebných k instalaci taženà neprobÄhlo v
poÅádku."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Äasový limit pro pÅipojenà vyprÅ¡el"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "Server odpovÄdÄl chybou: \""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "PodmÃnky"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "OdpovÄÄ"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "PÅipoj se na oficiálnà server"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "PÅipoj se na oficiálnà hernà server Wesnothu"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "PÅidej se ke hÅe"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr ""
-#: src/game.cpp:1238
+#: src/game.cpp:1249
#, fuzzy
msgid "Host Networked Game"
msgstr "SÃÅ¥ový hráÄ"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Hostuj hru bez použità serveru"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
#, fuzzy
msgid "Hotseat Game"
msgstr "VytvoÅ hru"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
#, fuzzy
msgid "Human vs AI"
msgstr "Lidé"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Jméno"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Jazyk"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Vyber si jazyk"
@@ -7515,11 +7539,7 @@
msgid "attacks"
msgstr "útoky"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Jméno"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Typ"
@@ -7654,7 +7674,7 @@
msgid "Bump Size"
msgstr "Hrbolatost"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Vesnic"
@@ -7714,7 +7734,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Povolit uživatelům, kteÅà nehrajÃ, pozorovat hru"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7748,7 +7768,7 @@
msgid "No multiplayer sides."
msgstr "Hra vÃce hráÄů nemá urÄené strany."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "VytvoÅ hru"
@@ -7800,65 +7820,65 @@
msgid "Receiving game list..."
msgstr "PÅijÃmánà seznamu her..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Zlatých"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Äekám, až hra zaÄne..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
#, fuzzy
msgid "Connect to Host"
msgstr "PÅipoj se na server"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Vyber si hostitele k pÅipojenÃ"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "PÅipojuji se k vzdálenému hostiteli..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "K tomuto serveru se musÃÅ¡ pÅihlásit"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "ZÃskávám data o hÅe..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "V této hÅe nejsou k disposici žádné strany."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Vyber si svoji stranu:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Hra byla zrušena"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "Strana, kterou sis zvoli, již nenà k disposici"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Zobrazit záznam hry až do okamžiku uložen�"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr ""
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Vůdce: "
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Verbuje: "
@@ -7957,7 +7977,7 @@
msgstr "Barva"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Zlatých"
@@ -7965,23 +7985,23 @@
msgid "Waiting for network players to join"
msgstr "Äekám, až se pÅipojà dalÅ¡Ã hráÄi"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Prázdná posice"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Prázdné posice"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Pozoruj hru"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Konec"
@@ -8048,56 +8068,52 @@
msgid "It is now your turn"
msgstr "Nynà je Åada na tobÄ"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "ÃtoÄnÃk"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Obránce"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "VýpoÄet poÅ¡kozenÃ"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "ZblÃzka"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "vs."
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "ZaútoÄ na nepÅÃtele"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Vyber zbraÅ"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr "ZatÃm jsi nezaÄal svoje kolo. ChceÅ¡ opravdu ukonÄit kolo?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr "NÄkteré jednotky ztratà kroky. ChceÅ¡ opravdu ukonÄit kolo?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Automatické uloženÃ"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr "Hru se nepodaÅilo uložit automaticky. Ulož ji, prosÃm, ruÄnÄ."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "PÅejmenuj"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -8105,43 +8121,43 @@
"Jména uložených her nemohou obsahovat dvojteÄky, lomÃtka nebo zpÄtná "
"lomÃtka. Zvol prosÃm jiné jméno."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Uloženo"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Hra byla uložena"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Vůdce"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Výdaje"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "PÅÃjmy"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Nemáš žádné jednotky, které bys mohl naverbovat."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Naverbuj"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Vyber jednotku"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Nemáš dost penÄz k naverbovánà této jednotky"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -8149,7 +8165,7 @@
"Můj pane, toto je zkuÅ¡ená jednotka, která již byla povýšena! UrÄitÄ
se jà "
"chceš zbavit?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -8157,19 +8173,19 @@
"Můj pane, tato jednotka má velkou nadÄji na povýšenÃ! UrÄitÄ se jÃ
chceš "
"zbavit?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "ho"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "ji"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Jsi oddÄlen od svých vojáků a nemůžeÅ¡ je pÅivolat"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8177,99 +8193,99 @@
"Nejsou k disposici žádnà vojáci k pÅivolánÃ\n"
"(musÃÅ¡ mÃt nÄkoho, kdo pÅežil z minulého scénáÅe)."
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "PotÅebuje alespoÅ $cost zlaťáků k pÅivolánà jednotky"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Propusť jednotku"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "PÅivolej"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Zpráva"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Pošli jen spojencům"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "UmÃstÄnÃ"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Seznam jednotek"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Naverbováno"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "PÅivoláno"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "PovýšenÃ"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Ztráty"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Zabito"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Způsobené poranÄnÃ"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Utržené poranÄnÃ"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Způsobené poranÄnà (odhad)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Utržené poranÄnà (odhad)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statistiky"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Najdi popisek nebo jednotku"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "PÅÃkaz:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Záznam rozhovoru"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "NenaÅ¡el jsem popisek ani jednotku obsahujÃcà â$searchâ."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "UmÃsti popisek"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Název"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -8277,23 +8293,23 @@
"PoruÅ¡il se soubÄh her a je zapotÅebà je ukonÄit. ChceÅ¡ uložit záznam
chyb "
"své hry?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "NahraÄ poÄÃtaÄovým hráÄem"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "NahraÄ mÃstnÃm hráÄem"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "PÅeruÅ¡ hru"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "NahraÄ"
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "opustil(a) hru. Co s tÃm chceÅ¡ dÄlat?"
@@ -8462,6 +8478,65 @@
msgid "Deletion of the file failed."
msgstr "Smazánà souboru se nezdaÅilo."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Náhodný"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,Loajalisté"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,Rebelové"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,SeveÅané"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,NemrtvÃ"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Knalganská aliance"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Draci"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Lidé"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Elfové"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,SkÅeti"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,TrpaslÃci"
+
+#, fuzzy
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "JeÅ¡tÄrácký vÄÅ¡tec"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Loajalisté"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Rebelové"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,SeveÅané"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,NemrtvÃ"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Aliance svÄtla"
+
+#, fuzzy
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",Jméno,Verze,Autor,PoÄet staženÃ"
+
+#~ msgid "Melee"
+#~ msgstr "ZblÃzka"
+
#~ msgid ""
#~ "This page outlines all you need to know to play Battle for Wesnoth. It "
#~ "covers how to play and the basic mechanics behind the game. For more "
Index: wesnoth/po/wesnoth/da.po
diff -u wesnoth/po/wesnoth/da.po:1.21 wesnoth/po/wesnoth/da.po:1.22
--- wesnoth/po/wesnoth/da.po:1.21 Sun Dec 5 00:12:15 2004
+++ wesnoth/po/wesnoth/da.po Sun Dec 12 15:19:48 2004
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: wesnoth\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-09-13 17:48+0200\n"
"Last-Translator: Mathias Bundgaard Svensson <address@hidden>\n"
"Language-Team: <address@hidden>\n"
@@ -50,7 +50,7 @@
msgid "Traits"
msgstr "Karaktertræk"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Enheder"
@@ -838,93 +838,81 @@
msgid "Default"
msgstr "Standard"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Tilfældig"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,Loyalister"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,Oprører"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,Nordlændinge"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,Levende døde"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Knalgan Alliancen"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Drakes"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Tilfældig bane"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Genindkaldelser"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
+
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "Levende-døde"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,Knalgan Alliancen"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Himmel Drake"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Klassisk"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Mennesker"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captian.png,Elvere"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,Orker"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Dværge"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,Ãgler"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Mennesker"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "Heltenes tid"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elvere"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Loyalister"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "<&elvish-marshal.png,Oprører"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Nordlændinge"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Levende-døde"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orker"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Knalgan Alliancen"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Dværgisk Ãdemark"
+
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Ãgle"
+
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "Heltenes tid"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Stor Krig"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Lysets Alliance"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Lysets Troldmand"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Mørkets Alliance"
#: data/scenario-test.cfg:38
@@ -2192,66 +2180,54 @@
msgid "Canyon"
msgstr "ingen"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menu"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Funktioner"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Slut Tur"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "HP"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "XP"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "guld"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "landsbyer"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "enheder"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "udgifter"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "inkomst"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "niveau"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "træk"
@@ -2697,7 +2673,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "leder-evner"
@@ -2763,7 +2739,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "urokkelig"
@@ -2886,22 +2862,6 @@
"Dette angreb laver målet om til sten. Enheder der bliver lavet til sten må "
"ikke bevæge sig eller angribe."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elvere"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Mennesker"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orker"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "Levende-døde"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "$name's Bro,$name's Korsvej"
@@ -3080,7 +3040,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3095,6 +3055,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3155,7 +3116,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3228,13 +3189,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3252,11 +3214,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3267,7 +3229,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "dolke i ryggen"
@@ -3350,7 +3312,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3359,9 +3322,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "sværd"
@@ -3447,7 +3410,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3465,7 +3429,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3590,7 +3554,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3606,8 +3571,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "gallopere"
@@ -3626,7 +3591,7 @@
msgid "gaze"
msgstr "stirren"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "sten"
@@ -3843,7 +3808,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "ild ånde"
@@ -3976,8 +3941,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "slå først"
@@ -4448,7 +4414,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "jagtskytte"
@@ -4807,8 +4773,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4851,7 +4819,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4955,20 +4923,24 @@
"flyvende bæster og opleve himlenes nye verden."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Hellebardist"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"De bedste blandt sværdmænd vælges til at blive hellebardører. På trods
af at "
"det er lidt langsommere end sværdet, kan deres våben slå dødbringende
slag."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "hellebard"
@@ -4997,7 +4969,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Morgen"
@@ -5040,6 +5013,24 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Rytter"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"Soldaten udgør grundlaget for menneskehærene. Disse unge soldater modtager "
+"grund-træning og bliver placeret i de forreste rækker for at konfrontere "
+"størstedelen af fjendens enheder i kamp."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Ridder"
@@ -5351,7 +5342,7 @@
msgid "Mounted Captain"
msgstr "Bjerge"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5372,6 +5363,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Ãdel Kriger"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Ãgle Kriger"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Mudderkravler"
@@ -5817,17 +5826,19 @@
msgid "Pikeman"
msgstr "Infanteri"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Infanteri er mere erfarne soldater, der har udskiftet deres spyd med ekstra "
"lange spyd. Infanteriet kan være dødbringende, når de kæmper mod
kavaleriet."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "langspyd"
@@ -5925,7 +5936,7 @@
msgid "Royal Guard"
msgstr "Royal Garde"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -5935,10 +5946,6 @@
"mest robuste fra hæren. Deres loyalitet sætter dem kun på arbejde i
kritiske "
"situationer, og indtil videre har de altid fuldført deres arbejde."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Ãgle"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6222,11 +6229,12 @@
msgstr "Soldat"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"Soldaten udgør grundlaget for menneskehærene. Disse unge soldater modtager "
"grund-træning og bliver placeret i de forreste rækker for at konfrontere "
@@ -6248,7 +6256,7 @@
msgid "Swordsman"
msgstr "Sværdmand"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6706,17 +6714,17 @@
msgid "Close"
msgstr "Luk"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Du har ikke en leder at rekrutere med."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Du må have din leder i et slotstårn for at kunne rekrutere eller
genindkalde "
"enheder."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Der er ingen ledige borgfelter hvor du kan rekrutere en enhed til."
@@ -6724,7 +6732,17 @@
msgid "none"
msgstr "ingen"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "nærkamp"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "langrækkende"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "basis skade"
@@ -6736,61 +6754,61 @@
msgid "attacker vulnerability vs"
msgstr "angribers svaghed mod"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Fordoblet"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "total skade"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "forsvarers modstandskraft mod"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "forsvarers svaghed mod"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "Halveret"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "forgiftet"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "nedsløvede"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Baghold!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Allieret enhed opdaget"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Fjendtlig enhed opdaget!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends Allierede enhed opdaget"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies Fjendtlige enhed opdaget!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Enheder opdaget! ($friends allierede, $enemies fjendtlige)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(tryk på $hotkey for at fortsætte)"
@@ -6838,7 +6856,7 @@
msgid "Campaign"
msgstr "Kampagne"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Multiplayer"
@@ -6850,7 +6868,7 @@
msgid "replay"
msgstr "replay"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Tur"
@@ -6862,7 +6880,7 @@
msgid "Difficulty"
msgstr "Svært"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Version"
@@ -6922,25 +6940,15 @@
msgstr "Profil"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "niveau"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Bevægelser"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "nærkamp"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "langrækkende"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "sund"
@@ -6957,11 +6965,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Vil du gemme en replay af dette scenarie?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Navn: "
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Spillet kunne ikke gemmes"
@@ -6991,7 +6999,8 @@
msgstr "Fil I/O Fejl under læsningen af spillet"
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr " ,FÃ¥ flere kampagner..."
#: src/game.cpp:954
@@ -7024,11 +7033,11 @@
msgid "Could not connect to host."
msgstr "Kunne ikke forbindes til hosten"
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Fejl"
@@ -7040,137 +7049,150 @@
msgid "Error communicating with the server."
msgstr "Fejl i kommunikationen med serveren."
-#: src/game.cpp:1053
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Navn"
+
+#: src/game.cpp:1056
#, fuzzy
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",Navn,Version,Udgiver,Antal Downloads"
+msgid "Author"
+msgstr "torne"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "ild"
+
+#: src/game.cpp:1077
#, fuzzy
msgid "B"
msgstr "kB"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "kB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Uddgiv kampagne: "
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "Slet kampagne: "
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Der er ingen kampagner der kan downloades fra denne server."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Vælg en kampagne at downloade."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Hent kampagne"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Downloader kampagne..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Kampagne Installeret"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "Kampagnen er blevet installeret."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Netværks-kommunikations-fejl."
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Fjern host afbrudt."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
"Der var et problem med at lave de filer der skal bruges til at installere "
"denne kampagne."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Forbindelsestiden løb ud."
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "Serveren svarede med en fejl:\""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr ""
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Svare"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Forbind til Officiel Server"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Log på den officielle Wesnoth multiplayer server"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Tilslut Spil"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Tilslut en server eller et hostet spil"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Bevært Netværks Spil"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Bevært et spil uden at bruge en server"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr "'Varm Stol' Spil"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr "Spil et multiplayer spil, hvor spillerne deler den samme computer"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Menneske mod Computer"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Login"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Sprog"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Vælg dit foretrukne sprog"
@@ -7190,11 +7212,7 @@
msgid "attacks"
msgstr "angreb"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Navn"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Type"
@@ -7331,7 +7349,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Landsbyer"
@@ -7392,7 +7410,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Tillad brugere der ikke spiller, at kigge på"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7426,7 +7444,7 @@
msgid "No multiplayer sides."
msgstr "Ingen multiplayer sider."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Lav Spil"
@@ -7478,64 +7496,64 @@
msgid "Receiving game list..."
msgstr "Henter spil liste..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Guld"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Venter på at spillet skal starte..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "Forbind til Server"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Vælg en vært at forbinde til"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Oprretter forbindelse..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Du må logge ind på serveren"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Henter spil data..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Der er ingen sider tilgængelige i dette spil."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Vælg din side:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Spillet er blevet annulleret"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "Den side du har valgt er ikke længere tilgængelig"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Vil et replay af spillet indtil gemme punktet?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Leder: "
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Rekruteringer. "
@@ -7634,7 +7652,7 @@
msgstr "Farve"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Guld"
@@ -7642,23 +7660,23 @@
msgid "Waiting for network players to join"
msgstr "Venter på at netværksspillere tilslutter sig"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Tom Plads"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Tomme Pladser"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Observer Spillet"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Afslut"
@@ -7727,59 +7745,55 @@
msgid "It is now your turn"
msgstr "Det er nu din tur"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Angriber"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Forsvarer"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Skades beregninger"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Nærkamp"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "mod"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Angrib Fjende"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Vælg våben"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
"Du har ikke startet din tur endnu. Vil du virkelig slutte den før den er "
"begyndt?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"Nogle enheder kan bevæge sig længere. Vil du virkelig afslutte din tur?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Auto-Gem"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr "Kunne ikke auto-gemme. Gem venligst spillet manuelt."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Omdøb Enhed"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -7787,43 +7801,43 @@
"Spilnavne må ikke indeholde koloner eller nogen form for skråstrege. Vælg "
"venligts et andet navn."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Gemt"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Spillet er blevet gemt"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Leder"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Udgifter"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Inkomst"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Du har ingen enheder at rekrutere."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Rekruter"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Vælg enhed"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Du har ikke nok guld til at rekrutere denne enhed"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -7831,7 +7845,7 @@
"Min herre, denne enhed er erfaren. Han er blevet forfremmet.Vil du virkelig "
"sætte $noun fri fra tjeneste?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -7839,19 +7853,19 @@
"My lord, denne enhed er tæt på at blive forfremmet! Vil du virkelig sætte "
"$noun fri fra tjeneste?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "hende"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "ham"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Du er adskilt fra dine soldater og kan ikke genindkalde dem"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -7859,121 +7873,121 @@
"Der er ingen soldat der kan genindkaldes\n"
"(Du må have trænede soldater fra et tidligere scenarie)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "Du må have mindst $cost guldstykker for at genindkalde en enhed."
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Send bort"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Genindkald"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Besked"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Send kun til allierede"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Lokalitet"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Enheds Liste"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Rekruteringer"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Genindkaldelser"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Forfremmelser"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Tab"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Drab"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Skade påført"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Skade taget"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Skade påført (forventet værdi)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Skade taget (forventet værdi)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statistikker"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Søg"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Kommando:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Chat Log"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Kunne ikke finde label eller enhed der indeholder strengen @search."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Sæt Label"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Label"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Erstart med en Computer."
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Erstat med lokal spiller"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Afslut spil"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Erstat med"
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "har forladt spillet. Hvad vil du?"
@@ -8143,6 +8157,64 @@
msgid "Deletion of the file failed."
msgstr "Slettelse af fil mislykkedes"
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Tilfældig"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,Loyalister"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,Oprører"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,Nordlændinge"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,Levende døde"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Knalgan Alliancen"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Drakes"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Mennesker"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captian.png,Elvere"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,Orker"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Dværge"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,Ãgler"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Loyalister"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "<&elvish-marshal.png,Oprører"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Nordlændinge"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Levende-døde"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Lysets Alliance"
+
+#, fuzzy
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",Navn,Version,Udgiver,Antal Downloads"
+
+#~ msgid "Melee"
+#~ msgstr "Nærkamp"
+
#~ msgid ""
#~ "This page outlines all you need to know to play Battle for Wesnoth. It "
#~ "covers how to play and the basic mechanics behind the game. For more "
Index: wesnoth/po/wesnoth/de.po
diff -u wesnoth/po/wesnoth/de.po:1.30 wesnoth/po/wesnoth/de.po:1.31
--- wesnoth/po/wesnoth/de.po:1.30 Sun Dec 12 13:32:07 2004
+++ wesnoth/po/wesnoth/de.po Sun Dec 12 15:19:48 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-12-12 13:45+0100\n"
"Last-Translator: Nils Kneuper <address@hidden>\n"
"Language-Team: none\n"
@@ -49,7 +49,7 @@
msgid "Traits"
msgstr "Charakteristiken"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Einheiten"
@@ -1164,93 +1164,81 @@
msgid "Default"
msgstr "Standard"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Zufall"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-general.png,Loyalisten"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-high-lord.png,Rebellen"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warlord.png,Nordmannen"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-lich.png,Untote"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Zufallskarte"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Einberufungen"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "Untote"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
msgstr "&dwarf-lord.png,Knalgan Allianz"
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-warrior.png,Draken"
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Himmelsdrake"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Klassik"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-general.png,Menschen"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-high-lord.png,Elfen"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warlord.png,Orks"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-lord.png,Zwerge"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,Saurianer"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Menschen"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "Zeit der Helden"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elfen"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Loyalisten"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-high-lord.png,Rebellen"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Nordmannen"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Untote"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orks"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Knalgan Allianz"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Zwergische Burg"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Saurianer"
+
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "Zeit der Helden"
+
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Der grosse Krieg"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Allianz des Lichts"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Magier des Lichtes"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Allianz der Finsternis"
#: data/scenario-test.cfg:38
@@ -2751,66 +2739,54 @@
msgid "Canyon"
msgstr "Schlucht"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Spiel"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Aktionen"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Zug beenden"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "LP"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "EP"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "Gold"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "Dörfer"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "Einheiten"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "Ausgaben"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "Einkommen"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "Stufe"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "BP"
@@ -3296,7 +3272,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "Führungsqualitäten"
@@ -3371,7 +3347,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "Unerschütterlich"
@@ -3506,22 +3482,6 @@
"und einer Statue gleicht. Ein solche Einheit kann sich weder bewegen noch "
"einen Angriff ausführen."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elfen"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Menschen"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orks"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "Untote"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "$name|s Brücke,$name|s Ãberquerung"
@@ -3702,7 +3662,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3717,6 +3677,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3777,7 +3738,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3853,13 +3814,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3877,11 +3839,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3892,7 +3854,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "hinterlistiger Angriff"
@@ -3978,7 +3940,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3987,9 +3950,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "Schwert"
@@ -4084,7 +4047,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -4102,7 +4066,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -4239,7 +4203,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -4255,8 +4220,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "Ansturm"
@@ -4278,7 +4243,7 @@
msgid "gaze"
msgstr "Blick"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "Versteinern"
@@ -4528,7 +4493,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "Feueratem"
@@ -4661,8 +4626,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "Erstschlag"
@@ -5174,7 +5140,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "SchieÃkunst"
@@ -5558,8 +5524,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -5610,7 +5578,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5726,15 +5694,19 @@
"Himmel."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Hellebardier"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"Die besten Soldaten werden ausgewählt um Hellebardiere zu werden. Mit Ihrer "
"Waffe können sie zwar nicht so schnell wie mit einem Schwert zuschlagen aber
"
@@ -5742,7 +5714,7 @@
"Reichweite der Waffe haben sie immer den ersten Schlag in einem Kampf, sogar "
"wenn sie sich Verteidigen."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "Hellebarde"
@@ -5771,7 +5743,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
msgid "morning star"
msgstr "Morgenstern"
@@ -5822,6 +5795,25 @@
"nur so wenige wären, würden diese mächtigen Soldaten den ganzen Kontinent "
"beherrschen."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Wassermann Speerwerfer"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"Speerträger sind das Kernstück der menschlichen Armeen. Die meist sehr "
+"jungen Soldaten bekommen eine Grundausbildung und stehen danach in den "
+"vordersten Reihen auf dem Schlachtfeld um einen GroÃteil der Kampfhandlungen
"
+"zu übernehmen."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Ritter"
@@ -6146,7 +6138,7 @@
msgid "Mounted Captain"
msgstr ""
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -6166,6 +6158,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Edler Kämpfer"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Wassermann Krieger"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Schlammkriecher"
@@ -6712,19 +6722,21 @@
msgid "Pikeman"
msgstr "Pikenträger"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Pikenträger sind gut ausgebildete Soldaten die ihre Speere gegen lange Piken
"
"eingetauscht haben. Sie sind besonders tödlich für Kavallerieeinheiten. "
"AuÃerdem haben sie immer den ersten Schlag in einem Kampf, selbst wenn sie "
"sich verteidigen."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "Pike"
@@ -6826,7 +6838,7 @@
msgid "Royal Guard"
msgstr "Leibgardist"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -6836,10 +6848,6 @@
"Kämpfern der Armee ausgewählt. Sie kommen meist nur in kritischen Missionen
"
"zum Einsatz und schlieÃen diese fast ausschlieÃlich siegreich ab."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Saurianer"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -7140,11 +7148,12 @@
msgstr "Speerträger"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"Speerträger sind das Kernstück der menschlichen Armeen. Die meist sehr "
"jungen Soldaten bekommen eine Grundausbildung und stehen danach in den "
@@ -7172,7 +7181,7 @@
msgid "Swordsman"
msgstr "Schwertkämpfer"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -7676,17 +7685,17 @@
msgid "Close"
msgstr "SchlieÃen"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr ""
"Euer Herrführer ist gefallen. Ihr könnt keine weiteren Einheiten ausbilden."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Euer Heerführer muss sich im Burgfried befinden um Einheiten auszubilden."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Es gibt keine freien Burgfelder zum rekrutieren von Einheiten."
@@ -7694,7 +7703,17 @@
msgid "none"
msgstr "nichts"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "Nahkampf"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "Fernkampf"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "Grundschaden"
@@ -7706,61 +7725,61 @@
msgid "attacker vulnerability vs"
msgstr "Verwundbarkeit des Angreifers gegen"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Verdoppelt"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "Gesamtschaden"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "Resistenz des Verteidigers gegen"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "Verwundbarkeit des Verteidigers gegen"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "Halbiert"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "vergiftet"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "verlangsamt"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Hinterhalt!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Verbündete Einheit gesichtet!"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Gegnerische Einheit gesichtet!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends verbündete Einheiten gesichtet!"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies gegnerische Einheiten gesichtet!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Einheiten gesichtet! ($friends verbündete, $enemies gegnerische)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(Drückt $hotkey um fortzufahren)"
@@ -7808,7 +7827,7 @@
msgid "Campaign"
msgstr "Kampagne"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Mehrspieler"
@@ -7820,7 +7839,7 @@
msgid "replay"
msgstr "wiederholg anzeigen"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Runde"
@@ -7832,7 +7851,7 @@
msgid "Difficulty"
msgstr "Schwierigkeitsgrad"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Version"
@@ -7893,25 +7912,15 @@
msgstr "Profil"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "Stufe"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "BP"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "Nahkampf"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "Fernkampf"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "gesund"
@@ -7928,11 +7937,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Möchtet Ihr den Spielverlauf dieses Szearios speichern?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Name:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Der Spielstand konnte nicht gespeichert werden"
@@ -7962,7 +7971,8 @@
msgstr "Dateifehler beim einlesen des Spieles."
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr " ,Weitere Kampagnen..."
#: src/game.cpp:954
@@ -7993,11 +8003,11 @@
msgid "Could not connect to host."
msgstr "Zum Gastgeber konnte keine Verbindung aufgebaut werden."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Fehler"
@@ -8009,135 +8019,149 @@
msgid "Error communicating with the server."
msgstr "Kommunikationsfehler mit dem Server."
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",Name,Version,Autor,Heruntergeladen, GröÃe"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Name"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "Dornen"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "Sirene"
+
+#: src/game.cpp:1077
msgid "B"
msgstr "B"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr "MB"
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Kampagne veröffentlichen:"
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "Kampagne löschen:"
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Auf diesem Server sind keine Kampagnen zum Herunterladen verfügabr"
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Wählt die Kampagne, die Ihr herunterladen wollt."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Kampagnen herunterladen"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Herunterladen der Kampagne..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Kampagne installiert"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "Die Kampagne wurde erfolgreich installiert."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Netzwerkverbindungsfehler"
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Der Gastgeber hat die Verbindung unterbrochen."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
"Es gab ein Problem beim erstellen der Dateien, die nötig sind, um diese "
"Kampagne zu installieren."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Zeitlimit der Verbindung überschritten"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "Der Server gab folgenden Fehler zurück: \""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Bedingungen"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Antwort"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Offiziellem Server beitreten"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Dem offiziellen Wesnoth Server beitreten"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Spiel beitreten"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Einem Server oder einer Mehrspielerpartie beitreten"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Netzwerkpartie eröffnen"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Eine Mehrspielerpartie ohne Zuhilfenahme eines Servers eröffnen"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr "Hotseat"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr "Eine Mehrspielerpartie am selben Rechner spielen"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Mensch gegen Computer"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr "Eine Partie gegen den Computer eröffnen"
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Euer Name"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Sprache"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Wählt die gewünschte Sprache"
@@ -8157,11 +8181,7 @@
msgid "attacks"
msgstr "Attacken"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Name"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Typ"
@@ -8298,7 +8318,7 @@
msgid "Bump Size"
msgstr "Hügelgrösse"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Dörfer"
@@ -8361,7 +8381,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Erlaubt es das Spiel als Unbeteiligter zu betrachten"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -8395,7 +8415,7 @@
msgid "No multiplayer sides."
msgstr "Keine Mehrspieler-Seiten"
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Partie eröffnen"
@@ -8448,65 +8468,65 @@
msgid "Receiving game list..."
msgstr "Partieliste wird empfangen..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
msgid "unit^Gold"
msgstr "Gold"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Warte auf Spielstart..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "Mit Gastgeber verbinden"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Wählt den Gastgeber, zu dem Ihr verbinden wollt"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Verbinde zum Server/Gastgeber..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Ih müsst Euch an diesem Server anmelden"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Empfange Spieldaten..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Es sind keine Plätze in dieser Partie verfügbar."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Wählt Eure Fraktion:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Das Spiel wurde vom Spielleiter abgebrochen."
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr ""
"Die Partei, für die ihr euch entschieden habt, ist nicht mehr länger "
"verfügbar."
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Wiederholung des Spieles bis zum Speicherpunkt anzeigen?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Herrführer:"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Einheiten:"
@@ -8605,7 +8625,7 @@
msgstr "Farbe"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Gold"
@@ -8613,23 +8633,23 @@
msgid "Waiting for network players to join"
msgstr "Warte auf weitere Mitspieler..."
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Verfügbarer Platz"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Verfügbare Plätze"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Spiel beobachten"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Beenden"
@@ -8698,62 +8718,58 @@
msgid "It is now your turn"
msgstr "Ihr seid an der Reihe"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Angreifer"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Verteidiger"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Schadensberechnung"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Nahkampf"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "gegen"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Gegner angreifen"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Waffe auswählen"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
"Ihr habt Euren Zug noch nicht begonnen. Wollt Ihr diese Runde wirklich schon "
"beenden?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"Einige Eurer Einheiten verfügen noch über Bewegungspunkte. Wollt Ihr Euren "
"Zug wirklich schon beenden?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Autospeichern"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
"Der Spielstand konnte nicht automatisch gespeichert werden. Ihr solltet den "
"Spielstand manuell speichern."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Einheit umbenennen"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -8761,43 +8777,43 @@
"Der Name eines Spielstands darf folgende Zeichen nicht enthalten: »/«,
»\\« "
"und »:«. Bitte verwendet einen anderen Namen."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Gespeichert"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Der Spielstand wurde gespeichert"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Herrführer"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Ausgaben"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Einkommen"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Es gibt keine Einheiten, die Ihr ausbilden könntet."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Ausbilden"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Einheit auswählen"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Ihr verfügt nicht über genug Gold, um diese Einheit auszubilden."
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -8805,7 +8821,7 @@
"Diese Einheit ist sehr erfahren und ist bereits mindestens eine Stufe "
"aufgestiegen. Wollt Ihr $noun wirklich entlassen?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -8813,19 +8829,19 @@
"Diese Einheit steht kurz vor dem Stufenaufstieg! Wollt Ihr $noun wirklich "
"entlassen?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "ihr"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "sein"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Ihr seid von Euren Soldaten getrennt und könnt diese nicht
einberufen."
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8833,103 +8849,103 @@
"Ihr verfügt über keine Truppen, die Ihr einberufen könntet.\n"
"(Ihr benötigt überlebende Veteranen aus früheren Szenarien)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
"Ihr benötigt mindestens $cost Goldstücke, um eine Einheit einberufen zu "
"können."
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Einheit entlassen"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Einberufen"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Nachricht"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Nur an Verbündete senden"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Standort"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Einheitenübersicht"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Ausgebildet"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Einberufungen"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Stufenaufstiege"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Verluste"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Tötungen"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Verursachter Schaden"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Erlittener Schaden"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Verursachter Schaden (EV)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Erlittener Schaden (EV)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statistiken"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Suchen"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Befehl:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Gesprächsprotokoll"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
"Eine Beschriftung oder Einheit, deren Name »$search« enthält, konnte nicht
"
"gefunden werden."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Beschriftung erstellen"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Beschriftung"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -8937,23 +8953,23 @@
"Das Spiel läuft nicht mehr syncron und muss beendet werden. Möchtet Ihr "
"einen Fehlerbericht dieses Spiels abspeichern?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Durch Computer ersetzen"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Durch lokalen Spieler ersetzen"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Spiel abbrechen"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Ersetzen durch "
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "hat das Spiel verlassen. Was wollt Ihr tun?"
@@ -9125,3 +9141,60 @@
#: src/widgets/file_chooser.cpp:126
msgid "Deletion of the file failed."
msgstr "Das Löschen der Datei ist fehlgeschlagen."
+
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Zufall"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-general.png,Loyalisten"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-high-lord.png,Rebellen"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Nordmannen"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-lich.png,Untote"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-lord.png,Knalgan Allianz"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-warrior.png,Draken"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-general.png,Menschen"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-high-lord.png,Elfen"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warlord.png,Orks"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-lord.png,Zwerge"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,Saurianer"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Loyalisten"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-high-lord.png,Rebellen"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Nordmannen"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Untote"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Allianz des Lichts"
+
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",Name,Version,Autor,Heruntergeladen, GröÃe"
+
+#~ msgid "Melee"
+#~ msgstr "Nahkampf"
Index: wesnoth/po/wesnoth/el_GR.po
diff -u wesnoth/po/wesnoth/el_GR.po:1.18 wesnoth/po/wesnoth/el_GR.po:1.19
--- wesnoth/po/wesnoth/el_GR.po:1.18 Sun Dec 5 00:12:15 2004
+++ wesnoth/po/wesnoth/el_GR.po Sun Dec 12 15:19:48 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.5-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-10-03 15:21+0200\n"
"Last-Translator: Konstantinos Karasavvas <address@hidden>\n"
"Language-Team: Greek <address@hidden>\n"
@@ -48,7 +48,7 @@
msgid "Traits"
msgstr ""
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "ÎονάδεÏ"
@@ -816,93 +816,76 @@
msgid "Default"
msgstr ""
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr ""
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "ÎκÏÏÏÏη ÎναίÏεÏηÏ"
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
msgstr ""
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr ""
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "ÎνακαλÎÏαÏε"
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
msgstr ""
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,ÎεκÏοζÏνÏανοι"
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr ""
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+msgid "Knalgan Alliance"
msgstr ""
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,ÎÏακοειδή"
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+msgid "Drakes"
+msgstr ""
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr ""
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,ÎνθÏÏÏοι"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,ÎÏÏικά"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,ÎÏκÏ"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Îάνοι"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
msgstr ""
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr ""
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "ÎÏÏικά"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
msgstr ""
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
+#: data/multiplayer.cfg:171
+msgid "Dwarves"
msgstr ""
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
msgstr ""
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,ÎεκÏοζÏνÏανοι"
-
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
msgstr ""
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr ""
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
+#: data/multiplayer.cfg:311
+msgid "Alliance of Light"
msgstr ""
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+msgid "Alliance of Darkness"
msgstr ""
#: data/scenario-test.cfg:38
@@ -2029,66 +2012,54 @@
msgid "Canyon"
msgstr ""
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr ""
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr ""
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "ΤÎÎ»Î¿Ï ÎÏÏοÏ
"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr ""
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr ""
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr ""
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr ""
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr ""
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr ""
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr ""
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr ""
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr ""
@@ -2425,7 +2396,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "ηγεÏία"
@@ -2484,7 +2455,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr ""
@@ -2573,22 +2544,6 @@
"may not move or attack."
msgstr ""
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "ÎÏÏικά"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr ""
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr ""
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr ""
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr ""
@@ -2760,7 +2715,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -2775,6 +2730,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -2833,7 +2789,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -2905,13 +2861,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -2929,11 +2886,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -2944,7 +2901,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr ""
@@ -3022,7 +2979,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3031,9 +2989,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "ÏÏαθί"
@@ -3118,7 +3076,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3136,7 +3095,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3257,7 +3216,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3273,8 +3233,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr ""
@@ -3293,7 +3253,7 @@
msgid "gaze"
msgstr ""
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr ""
@@ -3495,7 +3455,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr ""
@@ -3628,8 +3588,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr ""
@@ -4049,7 +4010,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "δεινÏÏ ÏκοÏεÏ
ÏήÏ"
@@ -4366,8 +4327,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4406,7 +4369,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4499,18 +4462,21 @@
msgstr ""
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
-msgstr ""
+#, fuzzy
+msgid "Halberdier"
+msgstr "αλαβάÏδα"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "αλαβάÏδα"
@@ -4536,7 +4502,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
msgid "morning star"
msgstr ""
@@ -4574,6 +4541,19 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+msgid "Javelineer"
+msgstr ""
+
+#: data/units/Javelineer.cfg:16
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "ÎÏÏÏÏηÏ"
@@ -4844,7 +4824,7 @@
msgid "Mounted Captain"
msgstr "ÎοÏ
νά"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -4864,6 +4844,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "ÎοÏ
νά"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "ÎοÏ
νά"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr ""
@@ -5268,15 +5266,16 @@
msgid "Pikeman"
msgstr ""
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "μακÏÏ Î´ÏÏÏ
"
@@ -5357,17 +5356,13 @@
msgid "Royal Guard"
msgstr ""
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
"always succeeded in their assigned tasks."
msgstr ""
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr ""
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -5638,8 +5633,8 @@
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
#: data/units/Spectre.cfg:3
@@ -5658,7 +5653,7 @@
msgid "Swordsman"
msgstr ""
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6065,15 +6060,15 @@
msgid "Close"
msgstr "ÎλείÏιμο"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr ""
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr ""
@@ -6081,7 +6076,17 @@
msgid "none"
msgstr ""
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "ÏÏμα με ÏÏμα"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "εξ αÏοÏÏάÏεÏÏ"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr ""
@@ -6093,61 +6098,61 @@
msgid "attacker vulnerability vs"
msgstr ""
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr ""
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr ""
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr ""
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr ""
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr ""
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr ""
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Îθεάθη Ïιλική μονάδα"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Îθεάθη εÏθÏική μονάδα!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "ÎθεάθηÏαν $friends ÏιλικÎÏ Î¼Î¿Î½Î¬Î´ÎµÏ"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "ÎθεάθηÏαν $friends εÏθÏικÎÏ Î¼Î¿Î½Î¬Î´ÎµÏ"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "ÎθεάθηÏαν μονάδεÏ! ($friends ÏιλικÎÏ, $enemies
εÏθÏικÎÏ)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr ""
@@ -6195,7 +6200,7 @@
msgid "Campaign"
msgstr "ÎκÏÏÏαÏεία"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "ÎικÏÏ
Î±ÎºÏ Î Î±Î¹Ïνίδι"
@@ -6207,7 +6212,7 @@
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "ÎÏÏοÏ"
@@ -6219,7 +6224,7 @@
msgid "Difficulty"
msgstr "ÎÏ
Ïκολία"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "ÎκδοÏη"
@@ -6272,25 +6277,15 @@
msgstr ""
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "εÏίÏεδο"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "ÎινήÏειÏ"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "ÏÏμα με ÏÏμα"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "εξ αÏοÏÏάÏεÏÏ"
-
#: src/display.cpp:883
msgid "healthy"
msgstr ""
@@ -6307,11 +6302,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "ÎÎλεÏε να αÏοθηκεÏÏεÏε Îνα replay αÏ
ÏοÏ
ÏοÏ
ÏεναÏίοÏ
;"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Îνομα:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "ΠαÏοθήκεÏ
Ïη ÏοÏ
ÏαιÏÎ½Î¹Î´Î¹Î¿Ï Î®Ïαν
αδÏναÏη"
@@ -6341,7 +6336,7 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+msgid "Get More Campaigns..."
msgstr ""
#: src/game.cpp:954
@@ -6372,11 +6367,11 @@
msgid "Could not connect to host."
msgstr "Î ÏÏνδεÏη με Ïον αÏομακÏÏ
ÏμÎνο Î/Î¥
αÏÎÏÏ
Ïε"
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr ""
@@ -6388,135 +6383,149 @@
msgid "Error communicating with the server."
msgstr ""
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Îνομα"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "αγκάθια"
+
+#: src/game.cpp:1057
+msgid "Downloads"
msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "ÎοÏίαÏ"
+
+#: src/game.cpp:1077
msgid "B"
msgstr ""
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr ""
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr ""
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr ""
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr ""
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr ""
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr ""
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr ""
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr ""
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr ""
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr ""
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr ""
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr ""
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "ΣÏ
νδεθείÏε με Ïον ÎÏίÏημο ÎξÏ
ÏηÏÎÏη"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr ""
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "ΣÏ
νδεθείÏε Ïε ÎικÏÏ
Î±ÎºÏ Î Î±Î¹Ïνίδι"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "ΣÏ
νδεθείÏε με Îναν εξÏ
ÏηÏÎÏη ή με
αÏομακÏÏ
ÏμÎνο Î/Î¥"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
#, fuzzy
msgid "Host Networked Game"
msgstr "ÎεκινήÏÏε ÎικÏÏ
Î±ÎºÏ Î Î±Î¹Ïνίδι"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr ""
-#: src/game.cpp:1239
+#: src/game.cpp:1250
#, fuzzy
msgid "Hotseat Game"
msgstr "ÎημιοÏ
Ïγία ΠαιÏνιδιοÏ"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr ""
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "ÎλÏÏÏα"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "ÎÏιλÎξÏε Ïη γλÏÏÏα ÏοÏ
ÏÏοÏιμάÏε"
@@ -6536,11 +6545,7 @@
msgid "attacks"
msgstr "εÏιθÎÏειÏ"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Îνομα"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "ΤÏÏοÏ"
@@ -6668,7 +6673,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "ΧÏÏιά"
@@ -6728,7 +6733,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr ""
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -6762,7 +6767,7 @@
msgid "No multiplayer sides."
msgstr ""
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "ÎημιοÏ
Ïγία ΠαιÏνιδιοÏ"
@@ -6812,65 +6817,65 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "ΧÏÏ
Ïά"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "ΠεÏιμÎνονÏÎ±Ï Î½Î± ξεκινήÏει Ïο
ÏαÏνίδι..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
#, fuzzy
msgid "Connect to Host"
msgstr "ΣÏ
νδεθείÏε με Îναν ÎξÏ
ÏηÏÎÏη"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr ""
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "ÎημιοÏ
Ïγία ÏÏνδεÏÎ·Ï Î¼Îµ αÏομακÏÏ
ÏμÎνο
Î/Î¥..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr ""
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr ""
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr ""
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "ÎÏιλÎξÏε ÏλεÏ
Ïά:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Το ÏαιÏνίδι ακÏ
ÏÏθηκε"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "Î ÏλεÏ
Ïά ÏοÏ
εÏιλÎξαÏε δεν είναι ÏλÎον
διαθÎÏιμη"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr ""
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr ""
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr ""
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr ""
@@ -6967,7 +6972,7 @@
msgstr "ΧÏÏμα"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "ΧÏÏ
Ïά"
@@ -6975,23 +6980,23 @@
msgid "Waiting for network players to join"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr ""
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr ""
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "ÎξοδοÏ"
@@ -7060,242 +7065,238 @@
msgid "It is now your turn"
msgstr "Îίναι η ÏειÏά ÏÎ±Ï Î½Î± ÏαίξεÏε"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "ÎÏιÏιθÎμενοÏ"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "ÎμÏ
νÏμενοÏ"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Î¥ÏολογιÏμοί ÎημιάÏ"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "ΣÏμα με ÏÏμα"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "ενανÏίÏν"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "ÎÏιλÎξÏε ÏÏλο"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr ""
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Το ÏαιÏνίδι αÏοθηκεÏÏηκε"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "ÎγÎÏηÏ"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "ΣÏ
νÏήÏηÏη"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "ÎιÏÏδημα"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "ΣÏÏαÏολÏγηÏη"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "ÎÏιλÎξÏε"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "ÎνάκληÏη"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "ÎήνÏ
μα"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr ""
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "ÎίÏÏα ÎονάδÏν"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "ΣÏÏαÏολογήÏαÏε"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "ÎνακαλÎÏαÏε"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Î ÏοάγαÏε"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "ΧάÏαÏε"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "ΣκοÏÏÏαÏε"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr ""
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr ""
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr ""
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "ΣÏαÏιÏÏικά"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "ÎαÏαίÏÏη ÏαιÏνιδιοÏ"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -7453,6 +7454,30 @@
msgid "Deletion of the file failed."
msgstr ""
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,ÎεκÏοζÏνÏανοι"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,ÎÏακοειδή"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,ÎνθÏÏÏοι"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,ÎÏÏικά"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,ÎÏκÏ"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Îάνοι"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,ÎεκÏοζÏνÏανοι"
+
+#~ msgid "Melee"
+#~ msgstr "ΣÏμα με ÏÏμα"
+
#~ msgid "pistol"
#~ msgstr "ÏιÏÏÏλι"
@@ -7471,9 +7496,6 @@
#~ msgid "Undo"
#~ msgstr "ÎναίÏεÏη"
-#~ msgid "Redo"
-#~ msgstr "ÎκÏÏÏÏη ÎναίÏεÏηÏ"
-
#~ msgid "Zoom In"
#~ msgstr "ÎεγÎθÏ
νÏη"
Index: wesnoth/po/wesnoth/es.po
diff -u wesnoth/po/wesnoth/es.po:1.30 wesnoth/po/wesnoth/es.po:1.31
--- wesnoth/po/wesnoth/es.po:1.30 Sun Dec 5 00:12:15 2004
+++ wesnoth/po/wesnoth/es.po Sun Dec 12 15:19:48 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.6-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-11-12 02:00+0200\n"
"Last-Translator: David MartÃnez Moreno <address@hidden>\n"
"Language-Team: David MartÃnez Moreno <address@hidden>\n"
@@ -48,7 +48,7 @@
msgid "Traits"
msgstr "Rasgos"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Unidades"
@@ -845,93 +845,82 @@
msgid "Default"
msgstr "Predeterminado"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Aleatorio"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,Leales"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,Rebeldes"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,Norteños"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,No muertos"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Alianza de Knalgan"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Dracos"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Mapa aleatorio"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Veteranos"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+#, fuzzy
+msgid "Northerners"
+msgstr "El invierno norteño"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "No muertos"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,Alianza de Knalgan"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Draco celeste"
+
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Clásico"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Humanos"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Elfos"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrio.png,Orcos"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Enanos"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,Saurio"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Humanos"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "La Era de los héroes"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elfos"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Leales"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Rebeldes"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Norteños"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Muertos vivientes"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orcos"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Alianza de Knalgan"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Castillo enano"
+
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Saurio"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "La Era de los héroes"
+
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "La Gran Guerra"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Alianza de la Luz"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Mago de la Luz"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Alianza de la Oscuridad"
#: data/scenario-test.cfg:38
@@ -2280,66 +2269,54 @@
msgid "Canyon"
msgstr "Cañón"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menú"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Acciones"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Fin de turno"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "PV"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "PX"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "oro"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "aldeas"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "unidades"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "mantenimiento"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "ingresos"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "nivel"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "movimiento"
@@ -2828,7 +2805,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "liderazgo"
@@ -2898,7 +2875,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "firme"
@@ -3020,22 +2997,6 @@
"Este ataque convierte al objetivo en una estatua...literalmente. Alguien "
"afectado por la petrificación no podrá moverse ni atacar."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elfos"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Humanos"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orcos"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "No muertos"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr ""
@@ -3212,7 +3173,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3227,6 +3188,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3287,7 +3249,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3362,13 +3324,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3386,11 +3349,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3401,7 +3364,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "puñalada"
@@ -3483,7 +3446,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3492,9 +3456,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "espada"
@@ -3590,7 +3554,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3608,7 +3573,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3741,7 +3706,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3757,8 +3723,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "carga"
@@ -3781,7 +3747,7 @@
msgid "gaze"
msgstr "mirada"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "piedra"
@@ -4007,7 +3973,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "aliento de fuego"
@@ -4151,8 +4117,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "primer golpe"
@@ -4640,7 +4607,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "tirador"
@@ -5015,8 +4982,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -5061,7 +5030,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5171,22 +5140,26 @@
"desde el lomo de estas bestias voladoras."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Alabardero"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"Los mejores entre todos los soldados son promocionados a alabarderos. Aunque "
"su arma es más lenta de manejar, es capaz de causar heridas letales, y "
"debido a su longitud, los alabarderos siempre golpean primero en combate, "
"incluso cuando se defienden."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "alabarda"
@@ -5214,7 +5187,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
msgid "morning star"
msgstr "maza de jinete"
@@ -5263,6 +5237,25 @@
"sus martillos. Si no fuera por su lentitud, seguramente estos soldados "
"dominarÃan todo el continente."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Lanzador de jabalinas sirénido"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"El lancero es la base de los ejércitos humanos. Estos jóvenes soldados "
+"reciben entrenamiento básico y se los usa en la primera lÃnea de batalla "
+"como carne de cañón. Debido a la longitud de sus lanzas, siempre golpean "
+"primero en combate, incluso cuando se defienden."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Caballero"
@@ -5569,7 +5562,7 @@
msgid "Mounted Captain"
msgstr "Capitán montado"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5589,6 +5582,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Luchador noble"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Guerrero sirénido"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Reptador de barro"
@@ -6072,19 +6083,21 @@
msgid "Pikeman"
msgstr "Piquero"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Los piqueros son lanceros más experimentados que cambian sus lanzas por "
"largas picas. Debido a la longitud de sus armas, siempre golpean primero en "
"combate, incluso cuando se defienden. Los piqueros pueden ser terribles "
"cuando combaten contra la caballerÃa."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "pica"
@@ -6183,7 +6196,7 @@
msgid "Royal Guard"
msgstr "Guardia Real"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -6193,10 +6206,6 @@
"fuertes y resistentes guerreros del ejército. Sólo aparecen en situaciones "
"crÃticas y, hasta ahora, siempre han tenido éxito en sus empresas."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Saurio"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6534,11 +6543,12 @@
msgstr "Lancero"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"El lancero es la base de los ejércitos humanos. Estos jóvenes soldados "
"reciben entrenamiento básico y se los usa en la primera lÃnea de batalla "
@@ -6565,7 +6575,7 @@
msgid "Swordsman"
msgstr "EspadachÃn"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -7055,16 +7065,16 @@
msgid "Close"
msgstr "Cerrar"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "No tienes un lÃder con el que reclutar."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Debes tener al lÃder en un torreón para reclutar o reincorporar unidades."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "No hay zonas de castillo libres para reclutar unidades."
@@ -7072,7 +7082,17 @@
msgid "none"
msgstr "ninguna"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "meleé"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "distancia"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "daño básico"
@@ -7084,61 +7104,61 @@
msgid "attacker vulnerability vs"
msgstr "debilidad del atacante contra"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Doblado"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "daño neto"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "resistencia del defensor contra"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "debilidad del defensor contra"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "A la mitad"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "envenenado"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "ralentizado"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "¡Emboscada!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "¡Aliado avistado!"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "¡Enemigo avistado!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends unidades aliadas avistadas"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "¡$enemies unidades enemigas avistadas!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Unidades avistadas ($friends aliadas, $enemies enemigas)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(pulse $hotkey para continuar)"
@@ -7186,7 +7206,7 @@
msgid "Campaign"
msgstr "Campaña"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Multijugador"
@@ -7198,7 +7218,7 @@
msgid "replay"
msgstr "repetición"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Turno"
@@ -7210,7 +7230,7 @@
msgid "Difficulty"
msgstr "Dificultad"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Versión"
@@ -7271,25 +7291,15 @@
msgstr "Perfil"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "nivel"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Movimientos"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "meleé"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "distancia"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "sano"
@@ -7306,11 +7316,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "¿Quiere guardar la repetición de este escenario?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Nombre:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "La partida no ha podido ser guardada"
@@ -7340,7 +7350,8 @@
msgstr "Error de E/S en el fichero mientras se intentaba su lectura."
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr ", Obtener más campañas..."
#: src/game.cpp:954
@@ -7373,11 +7384,11 @@
msgid "Could not connect to host."
msgstr "No ha sido posible conectar al servidor."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Error"
@@ -7389,134 +7400,148 @@
msgid "Error communicating with the server."
msgstr "Error de comunicación con el servidor."
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ", Nombre, Versión, Autor, Descargas, Tamaño"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Nombre"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "espinas"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
+
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "Sirena"
-#: src/game.cpp:1072
+#: src/game.cpp:1077
msgid "B"
msgstr "B"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr "MB"
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Publicar campaña: "
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "Borrar campaña"
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "No hay campañas disponibles para descargar de este servidor."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Escoja la campaña a descargar."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Obtener campaña"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Descargando campaña..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Campaña instalada"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "La campaña ha sido instalada.."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Error de comunicación de red."
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Equipo remoto desconectado."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
"Hubo un problema al crear los ficheros necesarios para instalar esta
campaña."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Conexión terminada"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "El servidor respondió con un error: \""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Términos"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Respuesta"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Unirse al servidor oficial"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Entrar al servidor multijugador oficial de Wesnoth"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Unirse a la partida"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Unirse a un servidor o a un juego"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Hospedar partida en red"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Hospedar una partida sin usar un servidor remoto"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr "Partida compartiendo silla"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr "Jugar en multijugador usando la misma máquina"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Humanos contra IA"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr "Jugar una partida contra oponentes con IA"
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Entrar"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Idioma"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Elija su idioma preferido"
@@ -7536,11 +7561,7 @@
msgid "attacks"
msgstr "ataques"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Nombre"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Tipo"
@@ -7672,7 +7693,7 @@
msgid "Bump Size"
msgstr "Elevación"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Aldeas"
@@ -7734,7 +7755,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Permite a usuarios que no juegan ver la partida"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7768,7 +7789,7 @@
msgid "No multiplayer sides."
msgstr "No hay bandos."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Crear partida"
@@ -7821,64 +7842,64 @@
msgid "Receiving game list..."
msgstr "Recibiendo lista de partidas..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Oro"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Esperando a que la partida empiece..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "Conectar al servidor del juego"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Escoja servidor al que conectar"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Conectando al servidor remoto..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Debe entrar en el servidor"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Obteniendo datos de la partida..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "No hay más bandos disponibles en este juego."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Escoja su bando:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "La partida ha sido cancelada."
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "El bando que ha escogido ya no está disponible."
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "¿Mostrar repetición del juego hasta el momento de ser guardado?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "LÃder: "
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Reclutas: "
@@ -7977,7 +7998,7 @@
msgstr "Color"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Oro"
@@ -7985,23 +8006,23 @@
msgid "Waiting for network players to join"
msgstr "Esperando a que se unan jugadores..."
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Plaza libre"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Plazas libres"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Observar juego"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Salir"
@@ -8070,60 +8091,56 @@
msgid "It is now your turn"
msgstr "Es su turno."
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Atacante"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Defensor"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Cálculos del daño"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Meleé"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "contra"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Atacar al enemigo"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Escoger arma"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr "Aún no ha empezado el turno. ¿Está seguro de que quiere terminarlo?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"Algunas unidades todavÃa tienen puntos de movimiento. ¿Quiere finalizar su "
"turno?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Autoguardado"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
"El juego no se ha podido guardar automáticamente. Por favor, guárdelo "
"manualmente."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Renombrar unidad"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -8131,43 +8148,43 @@
"El nombre de la partida guardada no puede contener dos puntos, o barras "
"inclinadas. Por favor, escoja un nombre diferente."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Guardado"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "El juego ha sido guardado."
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "LÃder"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Mantenimiento"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Ingresos"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "No tiene unidades disponibles para reclutar."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Reclutar"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Seleccionar unidad"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "No tiene suficiente oro para reclutar a esta unidad."
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -8175,7 +8192,7 @@
"¡Mi señor, esta unidad es veterana y tiene experiencia! ¿Realmente
queréis "
"licenciar a $noun?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -8183,19 +8200,19 @@
"¡Mi señor, está unidad está a punto de subir de nivel! ¿Realmente
queréis "
"licenciar a $noun?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "ella"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "él"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Está separado de sus soldados y no puede reincorporarlos."
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8203,100 +8220,100 @@
"No hay tropas disponibles para reincorporar.\n"
"(Debe tener veteranos supervivientes de escenarios previos.)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
"Ha de tener por lo menos $cost piezas de oro para reincorporar a una unidad."
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Licenciar unidad"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Reincorporar"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Mensaje"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Mandarlo sólo a aliados"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Lugar"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Lista de unidades"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Reclutas"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Veteranos"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Avances"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Pérdidas"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Muertos"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Daño infligido"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Daño recibido"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Daño infligido (VE)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Daño recibido (VE)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "EstadÃsticas"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Buscar"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Orden:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Registro de conversaciones"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "No se encontró una etiquieta o unidad con la cadena «$search»."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Poner etiqueta"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Etiqueta"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -8304,23 +8321,23 @@
"El juego no está sincronizado y tendrá que salir. ¿Quiere guardar un "
"registro de error de su partida?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Reemplazar con IA"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Reemplazar con jugador local"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Terminar juego"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Reemplazar con "
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "ha dejado el juego. ¿Qué quiere hacer?"
@@ -8489,6 +8506,63 @@
msgid "Deletion of the file failed."
msgstr "Ha habido algún fallo en el proceso de borrado."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Aleatorio"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,Leales"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,Rebeldes"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,Norteños"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,No muertos"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Alianza de Knalgan"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Dracos"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Humanos"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Elfos"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrio.png,Orcos"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Enanos"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,Saurio"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Leales"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Rebeldes"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Norteños"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Muertos vivientes"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Alianza de la Luz"
+
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ", Nombre, Versión, Autor, Descargas, Tamaño"
+
+#~ msgid "Melee"
+#~ msgstr "Meleé"
+
#~ msgid ""
#~ "This page outlines all you need to know to play Battle for Wesnoth. It "
#~ "covers how to play and the basic mechanics behind the game. For more "
@@ -9495,9 +9569,6 @@
#~ msgid "To arms!"
#~ msgstr "¡Tomad las armas!"
-#~ msgid "Northern Winter"
-#~ msgstr "El invierno norteño"
-
#~ msgid "Plunging into the Darkness"
#~ msgstr "Sumergiéndose en la oscuridad"
Index: wesnoth/po/wesnoth/eu.po
diff -u wesnoth/po/wesnoth/eu.po:1.21 wesnoth/po/wesnoth/eu.po:1.22
--- wesnoth/po/wesnoth/eu.po:1.21 Sun Dec 5 00:12:16 2004
+++ wesnoth/po/wesnoth/eu.po Sun Dec 12 15:19:48 2004
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-09-19 16:07+0200\n"
"Last-Translator: Alfredo Beaumont Sainz <address@hidden>\n"
"Language-Team: Basque\n"
@@ -48,7 +48,7 @@
msgid "Traits"
msgstr "Berezitasunak"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr ""
@@ -818,103 +818,78 @@
msgid "Default"
msgstr ""
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Ausazkoa"
-
-#: data/multiplayer.cfg:28
-#, fuzzy
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-general.png,Gizakiak"
-
-#: data/multiplayer.cfg:40
-#, fuzzy
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-high-lord.png,Elfoak"
-
-#: data/multiplayer.cfg:52
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
#, fuzzy
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warlord.png,Orkoak"
+msgid "Random"
+msgstr "Ausazko mapa"
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-#, fuzzy
-msgid "&undead-necromancer.png,Undead"
-msgstr "Itzaletako Aliantza"
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+msgid "Rebels"
msgstr ""
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-#, fuzzy
-msgid "&drake-flare.png,Drakes"
-msgstr "&dwarf-lord.png,Ipotxak"
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
-#: data/multiplayer.cfg:102
-msgid "Classic"
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
msgstr ""
-#: data/multiplayer.cfg:110
-#, fuzzy
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-general.png,Gizakiak"
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+msgid "Knalgan Alliance"
+msgstr ""
-#: data/multiplayer.cfg:122
-#, fuzzy
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-high-lord.png,Elfoak"
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+msgid "Drakes"
+msgstr ""
-#: data/multiplayer.cfg:134
-#, fuzzy
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warlord.png,Orkoak"
+#: data/multiplayer.cfg:109
+msgid "Classic"
+msgstr ""
-#: data/multiplayer.cfg:158
-#, fuzzy
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-lord.png,Ipotxak"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Gizakiak"
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
msgstr ""
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "Heroien Garaia"
-
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
msgstr ""
-#: data/multiplayer.cfg:216
+#: data/multiplayer.cfg:171
#, fuzzy
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-high-lord.png,Elfoak"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr ""
+msgid "Dwarves"
+msgstr "Ipotx Jauna"
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
msgstr ""
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr ""
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "Heroien Garaia"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr ""
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "Argiko Aliantza"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Argiaren Magoa"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "Itzaletako Aliantza"
#: data/scenario-test.cfg:38
@@ -2052,68 +2027,56 @@
msgid "Canyon"
msgstr ""
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr ""
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr ""
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr ""
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr ""
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr ""
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
#, fuzzy
msgid "gold"
msgstr "hotz"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
#, fuzzy
msgid "villages"
msgstr "Medilerroak"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr ""
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr ""
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr ""
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr ""
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr ""
@@ -2443,7 +2406,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr ""
@@ -2502,7 +2465,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr ""
@@ -2596,22 +2559,6 @@
"may not move or attack."
msgstr ""
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr ""
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Gizakiak"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr ""
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr ""
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr ""
@@ -2784,7 +2731,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -2799,6 +2746,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -2857,7 +2805,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -2929,13 +2877,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -2953,11 +2902,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -2968,7 +2917,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr ""
@@ -3046,7 +2995,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3055,9 +3005,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "ezpata"
@@ -3143,7 +3093,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3161,7 +3112,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3282,7 +3233,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3298,8 +3250,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr ""
@@ -3318,7 +3270,7 @@
msgid "gaze"
msgstr ""
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr ""
@@ -3521,7 +3473,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr ""
@@ -3654,8 +3606,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr ""
@@ -4082,7 +4035,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr ""
@@ -4403,8 +4356,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4443,7 +4398,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4537,18 +4492,20 @@
msgstr ""
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+msgid "Halberdier"
msgstr ""
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr ""
@@ -4575,7 +4532,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
msgid "morning star"
msgstr ""
@@ -4613,6 +4571,19 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+msgid "Javelineer"
+msgstr ""
+
+#: data/units/Javelineer.cfg:16
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Gerlaria"
@@ -4890,7 +4861,7 @@
msgid "Mounted Captain"
msgstr "Mendiak"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -4911,6 +4882,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Borrokalaria"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Orko Gudaria"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Loigizona"
@@ -5319,15 +5308,16 @@
msgid "Pikeman"
msgstr ""
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr ""
@@ -5409,17 +5399,13 @@
msgid "Royal Guard"
msgstr ""
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
"always succeeded in their assigned tasks."
msgstr ""
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr ""
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -5691,8 +5677,8 @@
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
#: data/units/Spectre.cfg:3
@@ -5711,7 +5697,7 @@
msgid "Swordsman"
msgstr ""
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6121,15 +6107,15 @@
msgid "Close"
msgstr "Itxi"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr ""
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr ""
@@ -6137,7 +6123,17 @@
msgid "none"
msgstr ""
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr ""
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr ""
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr ""
@@ -6149,61 +6145,61 @@
msgid "attacker vulnerability vs"
msgstr ""
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr ""
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr ""
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr ""
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr ""
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr ""
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr ""
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr ""
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr ""
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr ""
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr ""
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr ""
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr ""
@@ -6251,7 +6247,7 @@
msgid "Campaign"
msgstr "Kanpaina"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr ""
@@ -6263,7 +6259,7 @@
msgid "replay"
msgstr "errepikatu"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Txanda"
@@ -6275,7 +6271,7 @@
msgid "Difficulty"
msgstr "Zailtasuna"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr ""
@@ -6328,25 +6324,15 @@
msgstr ""
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "maila"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Mugimenduak"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr ""
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr ""
-
#: src/display.cpp:883
msgid "healthy"
msgstr ""
@@ -6363,11 +6349,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Izena:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Ezin izan da jokua gorde"
@@ -6395,8 +6381,9 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
-msgstr ""
+#, fuzzy
+msgid "Get More Campaigns..."
+msgstr "Kanpaina"
#: src/game.cpp:954
msgid "Download more campaigns from a server on Internet."
@@ -6426,11 +6413,11 @@
msgid "Could not connect to host."
msgstr ""
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr ""
@@ -6442,140 +6429,153 @@
msgid "Error communicating with the server."
msgstr ""
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr ""
+
+#: src/game.cpp:1056
+msgid "Author"
+msgstr ""
+
+#: src/game.cpp:1057
+msgid "Downloads"
msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "su"
+
+#: src/game.cpp:1077
msgid "B"
msgstr ""
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr ""
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
#, fuzzy
msgid "Publish campaign: "
msgstr "Elfo Kapitaina"
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr ""
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr ""
-#: src/game.cpp:1102
+#: src/game.cpp:1112
#, fuzzy
msgid "Choose the campaign to download."
msgstr "Aukeratu jolastu nahi duzun kanpaina:"
-#: src/game.cpp:1102
+#: src/game.cpp:1112
#, fuzzy
msgid "Get Campaign"
msgstr "Kanpaina"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
#, fuzzy
msgid "Campaign Installed"
msgstr "Kanpaina"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr ""
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr ""
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr ""
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr ""
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
#, fuzzy
msgid "Terms"
msgstr "Lur motak"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr ""
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr ""
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr ""
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr ""
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr ""
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr ""
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr ""
-#: src/game.cpp:1239
+#: src/game.cpp:1250
#, fuzzy
msgid "Hotseat Game"
msgstr "Jokua kargatu"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
#, fuzzy
msgid "Human vs AI"
msgstr "Gizakiak"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr ""
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Hizkuntza"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Aukeratu zure lehentasunezko hizkuntza"
@@ -6595,11 +6595,7 @@
msgid "attacks"
msgstr ""
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr ""
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr ""
@@ -6727,7 +6723,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr ""
@@ -6787,7 +6783,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr ""
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -6821,7 +6817,7 @@
msgid "No multiplayer sides."
msgstr ""
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr ""
@@ -6871,65 +6867,65 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Urrea"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr ""
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr ""
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr ""
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr ""
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr ""
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr ""
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr ""
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr ""
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr ""
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr ""
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr ""
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr ""
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
#, fuzzy
msgid "Leader: "
msgstr "Burua"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
#, fuzzy
msgid "Recruits: "
msgstr "Hurrengo unitatea"
@@ -7027,7 +7023,7 @@
msgstr ""
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Urrea"
@@ -7035,23 +7031,23 @@
msgid "Waiting for network players to join"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr ""
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr ""
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr ""
@@ -7118,242 +7114,238 @@
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr ""
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Unitatea berrizendatu"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Burua"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr ""
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr ""
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr ""
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr ""
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr ""
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr ""
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr ""
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr ""
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -7511,6 +7503,52 @@
msgid "Deletion of the file failed."
msgstr ""
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Ausazkoa"
+
+#, fuzzy
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-general.png,Gizakiak"
+
+#, fuzzy
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-high-lord.png,Elfoak"
+
+#, fuzzy
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Orkoak"
+
+#, fuzzy
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "Itzaletako Aliantza"
+
+#, fuzzy
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&dwarf-lord.png,Ipotxak"
+
+#, fuzzy
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-general.png,Gizakiak"
+
+#, fuzzy
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-high-lord.png,Elfoak"
+
+#, fuzzy
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warlord.png,Orkoak"
+
+#, fuzzy
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-lord.png,Ipotxak"
+
+#, fuzzy
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-high-lord.png,Elfoak"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "Argiko Aliantza"
+
#~ msgid "Next tip"
#~ msgstr "Hurrengo iradokizuna"
Index: wesnoth/po/wesnoth/fi.po
diff -u wesnoth/po/wesnoth/fi.po:1.19 wesnoth/po/wesnoth/fi.po:1.20
--- wesnoth/po/wesnoth/fi.po:1.19 Sun Dec 5 00:12:16 2004
+++ wesnoth/po/wesnoth/fi.po Sun Dec 12 15:19:48 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-08-08 15:00+0200\n"
"Last-Translator: Pasi Kallinen <address@hidden>\n"
"Language-Team: none\n"
@@ -48,7 +48,7 @@
msgid "Traits"
msgstr "Kyvyt"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Yksiköt"
@@ -827,104 +827,80 @@
msgid "Default"
msgstr "Oletus"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Satunnaisesti valittu"
-
-#: data/multiplayer.cfg:28
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
#, fuzzy
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-general.png,Lojalistit"
+msgid "Random"
+msgstr "Satunnaisesti luotu kartta"
-#: data/multiplayer.cfg:40
-#, fuzzy
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-high-lord.png,Kapinalliset"
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
-#: data/multiplayer.cfg:52
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
#, fuzzy
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warlord.png,Pohjalaiset"
+msgid "Rebels"
+msgstr "Kutsuntoja"
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-#, fuzzy
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-lich.png,Epäkuolleet"
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
-#: data/multiplayer.cfg:76
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "Epäkuolleet"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
#, fuzzy
-msgid "&dwarf-warrior.png,Knalgan Alliance"
+msgid "Knalgan Alliance"
msgstr "&dwarf-lord.png,Knalganin Liittoutuma"
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
#, fuzzy
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-warrior.png,Draket"
+msgid "Drakes"
+msgstr "Iskut"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Klassinen"
-#: data/multiplayer.cfg:110
-#, fuzzy
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-general.png,Ihmiset"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Ihmiset"
-#: data/multiplayer.cfg:122
-#, fuzzy
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-high-lord.png,Haltiat"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Haltiat"
-#: data/multiplayer.cfg:134
-#, fuzzy
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warlord.png,Ãrkit"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Ãrkit"
-#: data/multiplayer.cfg:158
-#, fuzzy
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-lord.png,Kääpiöt"
+#: data/multiplayer.cfg:171
+msgid "Dwarves"
+msgstr ""
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
msgstr ""
-#: data/multiplayer.cfg:196
+#: data/multiplayer.cfg:211
msgid "Age of Heroes"
msgstr "Sankareiden Aika"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Lojalistit"
-
-#: data/multiplayer.cfg:216
-#, fuzzy
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-high-lord.png,Kapinalliset"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Pohjalaiset"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Epäkuolleet"
-
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Knalganin Liittoutuma"
-
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Suuri Sota"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
msgstr "&white-mage.png,Valon Liitto"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Pimeyden Liitto"
#: data/scenario-test.cfg:38
@@ -2089,66 +2065,54 @@
msgid "Canyon"
msgstr "ei mitään"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Valikko"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Toiminnot"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Lopeta vuoro"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "Kesto (HP)"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "Kokemus (XP)"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "kultaa"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "kyliä"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "yksiköt"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "ylläpito"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "tulot"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "kokemustaso"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "liikkuminen"
@@ -2546,7 +2510,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "johtaminen"
@@ -2612,7 +2576,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "vankkumaton"
@@ -2735,22 +2699,6 @@
"Tämä hyökkäys kivettää kohteen. Kivetetyt yksiköt eivät voi liikkua
tai "
"hyökätä."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Haltiat"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Ihmiset"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Ãrkit"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "Epäkuolleet"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr ""
@@ -2922,7 +2870,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -2937,6 +2885,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -2995,7 +2944,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3067,13 +3016,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3091,11 +3041,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3106,7 +3056,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "puukotus"
@@ -3183,7 +3133,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3192,9 +3143,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "miekka"
@@ -3281,7 +3232,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3299,7 +3251,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3420,7 +3372,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3436,8 +3389,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "rynnäkkö"
@@ -3456,7 +3409,7 @@
msgid "gaze"
msgstr "katse"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "kivetys"
@@ -3658,7 +3611,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "tulihenkäys"
@@ -3792,8 +3745,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "ensi-isku"
@@ -4214,7 +4168,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "tarkka-ampuja"
@@ -4531,8 +4485,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4571,7 +4527,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4664,18 +4620,21 @@
msgstr ""
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
-msgstr ""
+#, fuzzy
+msgid "Halberdier"
+msgstr "hilpari"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "hilpari"
@@ -4701,7 +4660,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Aamupäivä"
@@ -4740,6 +4700,19 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+msgid "Javelineer"
+msgstr ""
+
+#: data/units/Javelineer.cfg:16
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr ""
@@ -5011,7 +4984,7 @@
msgid "Mounted Captain"
msgstr "Vuoristo"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5031,6 +5004,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Vuoristo"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Vuoristo"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr ""
@@ -5435,15 +5426,16 @@
msgid "Pikeman"
msgstr ""
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "peitsi"
@@ -5524,17 +5516,13 @@
msgid "Royal Guard"
msgstr ""
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
"always succeeded in their assigned tasks."
msgstr ""
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr ""
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -5808,8 +5796,8 @@
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
#: data/units/Spectre.cfg:3
@@ -5828,7 +5816,7 @@
msgid "Swordsman"
msgstr ""
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6236,17 +6224,17 @@
msgid "Close"
msgstr "Sulje"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Sinulla ei ole johtajaa joka voisi värvätä."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Sinulla täytyy olla johtaja linnakkeessa jos haluat värvätä tai kutsua "
"yksikköjä."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Linnassa ei ole tyhjää tilaa johon värvätä."
@@ -6254,7 +6242,17 @@
msgid "none"
msgstr "ei mitään"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "lähitaistelu"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "etätaistelu"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "perusvahinko"
@@ -6266,61 +6264,61 @@
msgid "attacker vulnerability vs"
msgstr "hyökkääjä on haavoittuva"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Kaksinkertaistettu"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "kokonaisvahinko"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "puolustaja vastustaa"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "puolustaja on haavoittuva"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "Puolitettu"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "myrkytetty"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "hidastettu"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Väijytys!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Ystävä nähty"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Vihollinen nähty!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends ystävää näköpiirissä"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies vihollista näköpiirissä!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Yksiköitä näköpiirissä! ($friends ystävällistä, $enemies
vihollista)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(paina $hotkey jatkaaksesi)"
@@ -6368,7 +6366,7 @@
msgid "Campaign"
msgstr "Kampanja"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Moninpeli"
@@ -6380,7 +6378,7 @@
msgid "replay"
msgstr "uusinta"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Vuoro"
@@ -6392,7 +6390,7 @@
msgid "Difficulty"
msgstr "Vaikeustaso"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "versio"
@@ -6453,25 +6451,15 @@
msgstr "Profiili"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "taso"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Liikkuminen"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "lähitaistelu"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "etätaistelu"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "terve"
@@ -6488,11 +6476,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Haluatko tallentaa uusinnan tästä skenaariosta?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Nimi:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Peliä ei voitu tallentaa"
@@ -6521,7 +6509,8 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr " ,Hae lisää kampanjoita..."
#: src/game.cpp:954
@@ -6552,11 +6541,11 @@
msgid "Could not connect to host."
msgstr "Yhteyttä isäntäkoneeseen ei saatu"
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Virhe"
@@ -6568,141 +6557,155 @@
msgid "Error communicating with the server."
msgstr ""
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Nimi"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "piikit"
+
+#: src/game.cpp:1057
+msgid "Downloads"
msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "tuli"
+
+#: src/game.cpp:1077
#, fuzzy
msgid "B"
msgstr "KB"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr ""
-#: src/game.cpp:1094
+#: src/game.cpp:1104
#, fuzzy
msgid "Delete campaign: "
msgstr "Hae kampanja"
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Yhtäkään kampanjaa ei ole haettavissa tältä palvelimelta."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Valitse haettava kampanja."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Hae kampanja"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Haetaan kampanjaa..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Kampanja on asennettu"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
#, fuzzy
msgid "The campaign has been installed."
msgstr "Peli on tallennettu"
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr ""
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Isäntäkone katkaisi yhteyden."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
#, fuzzy
msgid "Terms"
msgstr "Joukkue"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
#, fuzzy
msgid "Response"
msgstr "kivetys"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Ota yhteys viralliseen palvelimeen"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Kirjaudu Wesnothin viralliselle palvelimelle"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Liity peliin"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Ota yhteys palvelimelle tai isännöityyn peliin"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
#, fuzzy
msgid "Host Networked Game"
msgstr "Verkkopelaaja"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Isännöi peli ilman palvelinta"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
#, fuzzy
msgid "Hotseat Game"
msgstr "Luo peli"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
#, fuzzy
msgid "Human vs AI"
msgstr "Ihmiset"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Sisäänkirjautuminen"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Kieli"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Valitse haluamasi kieli"
@@ -6722,11 +6725,7 @@
msgid "attacks"
msgstr "hyökkäykset"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Nimi"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Tyyppi"
@@ -6864,7 +6863,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Kyliä"
@@ -6926,7 +6925,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Salli muiden käyttäjien tarkkailla pelin kulkua"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -6960,7 +6959,7 @@
msgid "No multiplayer sides."
msgstr "Ei moninpelin joukkueita"
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Luo peli"
@@ -7010,66 +7009,66 @@
msgid "Receiving game list..."
msgstr "Vastaanotetaan pelilistaa..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Kultaa"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Odotetaan pelin alkua..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
#, fuzzy
msgid "Connect to Host"
msgstr "Yhdistä palvelimeen"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Valitse isäntäkone johon yhdistetään"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Otetaan yhteys isäntäkoneeseen..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Tälle palvelimelle vaaditaan kirjautumista"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Haetaan pelin tietoja..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Tässä pelissä ei ole vapaita puolia."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Valitse puolesi"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Peli on peruutettu"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "Joukkue jonka valitsit ei ole enää käytettävissä"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Näytä pelin uusinta tallennuspisteeseen asti?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr ""
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
#, fuzzy
msgid "Leader: "
msgstr "Johtaja"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
#, fuzzy
msgid "Recruits: "
msgstr "Värväyksiä"
@@ -7169,7 +7168,7 @@
msgstr "Väri"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Kultaa"
@@ -7177,23 +7176,23 @@
msgid "Waiting for network players to join"
msgstr "Odotetaan verkkopelaajien liittymistä"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Tyhjä paikka"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Tyhjiä paikkoja"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Tarkkaile peliä"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Poistu"
@@ -7261,101 +7260,97 @@
msgid "It is now your turn"
msgstr "On sinun vuorosi"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Hyökkääjä"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Puolustaja"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Vahinkolaskelmat"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Lähitaistelu"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "vastaan"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Hyökkää vihollista"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Valitse ase"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
"Et ole vielä aloittanut vuoroasi. Haluatko todellakin lopettaa tämän
vuoron?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"Jokin yksiköistäsi voi vielä liikkua. Haluatko todellakin lopettaa
vuorosi?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Automaattinen tallennus"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
"Automaattinen tallennus epäonnistui. Yritä tallentaa peli manuaalisesti."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Nimeä yksikkö"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
msgstr "Tallenteen nimessä ei saa olla puolipistettä, kautta- tai
kenoviivaa."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Tallennettu"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Peli on tallennettu"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Johtaja"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Ylläpito"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Tulot"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Sinulla ei ole yksiköitä joita värvätä."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Värvää"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Valitse yksikkö"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Sinulla ei ole tarpeeksi kultaa sen yksikön värväämiseen"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -7363,7 +7358,7 @@
"Herrani, tämä yksikkö on veteraani! Haluatko todellakin vapauttaa $noun "
"palveluksesta?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -7371,20 +7366,20 @@
"Herrani, tämä yksikkö nousee kohta kokemustason! Haluatko todellakin "
"vapauttaa $noun palveluksesta?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "hänet"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "hänet"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
#, fuzzy
msgid "You are separated from your soldiers and may not recall them"
msgstr "Olet erossa sotilaistasi etkä voi kutsua heitä"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -7392,101 +7387,101 @@
"Sinulla ei ole veteraaneja edellisestä skenaariosta\n"
"jotka voisit kutsua palvelukseen"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
"Sinulla täytyy olla vähintään $cost kultapalaa voidaksesi kutsua yksikön
"
"takaisin"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Vapauta yksikkö palveluksesta"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Kutsu veteraaniyksikkö"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Viesti"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Lähetä vain ystäville"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Kohde"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Yksikkölista"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Värväyksiä"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Kutsuntoja"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Ylennyksiä"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Häviöitä"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Tappoja"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Tehty vahinko"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Otettu vahinko"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Tehty vahinko (Arvio)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Otettu vahinko (Arvio)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Tilastot"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Etsi"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Komento:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Keskustelun loki"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Yksikköä tai muistilappua nimeltä '$search' ei löytynyt."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Aseta muistilappu"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Nimi"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -7494,23 +7489,23 @@
"Pelit eivät ole synkronoitu, ja ne lopetetaan. Haluatko tallentaa virhelokin
"
"pelistäsi?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Korvaa tietokoneella"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Korvaa paikallisella pelaajalla"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Keskeytä peli"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Korvaa pelaajalla "
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "on poistunut pelistä. Mitä haluat tehdä?"
@@ -7677,6 +7672,65 @@
msgid "Deletion of the file failed."
msgstr "Tiedoston tuhoaminen epäonnistui."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Satunnaisesti valittu"
+
+#, fuzzy
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-general.png,Lojalistit"
+
+#, fuzzy
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-high-lord.png,Kapinalliset"
+
+#, fuzzy
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Pohjalaiset"
+
+#, fuzzy
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-lich.png,Epäkuolleet"
+
+#, fuzzy
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-lord.png,Knalganin Liittoutuma"
+
+#, fuzzy
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-warrior.png,Draket"
+
+#, fuzzy
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-general.png,Ihmiset"
+
+#, fuzzy
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-high-lord.png,Haltiat"
+
+#, fuzzy
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warlord.png,Ãrkit"
+
+#, fuzzy
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-lord.png,Kääpiöt"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Lojalistit"
+
+#, fuzzy
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-high-lord.png,Kapinalliset"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Pohjalaiset"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Epäkuolleet"
+
+#~ msgid "Melee"
+#~ msgstr "Lähitaistelu"
+
#~ msgid ""
#~ "This page outlines all you need to know to play Battle for Wesnoth. It "
#~ "covers how to play and the basic mechanics behind the game. For more "
Index: wesnoth/po/wesnoth/fr.po
diff -u wesnoth/po/wesnoth/fr.po:1.44 wesnoth/po/wesnoth/fr.po:1.45
--- wesnoth/po/wesnoth/fr.po:1.44 Sun Dec 5 00:12:16 2004
+++ wesnoth/po/wesnoth/fr.po Sun Dec 12 15:19:48 2004
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-11-25 23:50+0100\n"
"Last-Translator: Wesnoth French Translation Team <address@hidden>\n"
"Language-Team: Language fr\n"
@@ -50,7 +50,7 @@
msgid "Traits"
msgstr "Traits"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Unités"
@@ -1167,93 +1167,82 @@
msgid "Default"
msgstr "Par défaut"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Aléatoire"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,Loyalistes"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,Rebelles"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,Nordiques"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,Morts-Vivants"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Alliance Knalgane"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Drakes"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Carte aléatoire"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Vétérans rappelés"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+#, fuzzy
+msgid "Northerners"
+msgstr "Hiver au nord"
+
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "Morts-vivants"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "Une alliance elfe"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Drake du firmament"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Classique"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Humains"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Elfes"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,Orcs"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Nains"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,Saurien"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Humains"
+
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elfes"
+
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orcs"
+
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Château nain"
+
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Saurien"
-#: data/multiplayer.cfg:196
+#: data/multiplayer.cfg:211
msgid "Age of Heroes"
msgstr "Ãge des Héros"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Loyalistes"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Rebelles"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Nordiques"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Morts-Vivants"
-
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Alliance Knalgane"
-
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Grande Guerre"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Alliance de la Lumière"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Mage de lumière"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Alliance des Ténèbres"
#: data/scenario-test.cfg:38
@@ -2758,66 +2747,54 @@
msgid "Canyon"
msgstr "Canyon"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menu"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Actions"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Fin du tour"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "PV"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "XP"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "or"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "villages"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "unités"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "entretien"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "revenu"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "niveau"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "mouvement"
@@ -3283,7 +3260,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "commandement"
@@ -3356,7 +3333,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "innamovible"
@@ -3479,22 +3456,6 @@
"Cette attaque transforme la cible en pierre. Les unités ainsi pétrifiées
ne "
"peuvent plus ni se déplacer, ni attaquer."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elfes"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Humains"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orcs"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "Morts-vivants"
-
# XXX Une note pour les traducteurs :
# Ne pas chercher à traduire l'anglais exactement pour les noms de villages.
# à la place, générer des noms de lieu qui sonnent français, sans aucune
@@ -3689,7 +3650,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3704,6 +3665,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3765,7 +3727,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3842,13 +3804,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3866,11 +3829,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3881,7 +3844,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "coup dans le dos"
@@ -3967,7 +3930,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3976,9 +3940,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "épée"
@@ -4082,7 +4046,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -4100,7 +4065,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -4239,7 +4204,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -4255,8 +4221,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "charge"
@@ -4281,7 +4247,7 @@
msgid "gaze"
msgstr "regard"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "pierre"
@@ -4538,7 +4504,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "souffle ardent"
@@ -4724,8 +4690,9 @@
"utilisent de manière très efficace."
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "initiative"
@@ -5253,7 +5220,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "tir d'élite"
@@ -5648,10 +5615,13 @@
msgstr "Empaleur gobelin"
#: data/units/Goblin_Impaler.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
"Les gobelins ont tendance à essayer de compenser leur idiotie, leur "
"fragilité, et leur manque d'armes sophistiquées en utilisant d'écraser "
@@ -5698,9 +5668,10 @@
msgstr "Lancier gobelin"
#: data/units/Goblin_Spearman.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5820,22 +5791,26 @@
"découvrent le monde des cieux sur le dos de ces créatures volantes."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Hallebardier"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"Les meilleurs parmi les épéistes sont choisi pour devenir des
hallebardiers. "
"Certes un peu plus lentes que les épées, leurs armes peuvent donner des "
"coups mortels et, grâce à leur allonge, accordent aux hallebardiers le "
"premier coup lors des combats, même lorsqu'ils se défendent."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "hallebarde"
@@ -5870,7 +5845,8 @@
# mais il n'y a pas de terme français et cette traduction est généralement
# acceptée.
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
msgid "morning star"
msgstr "morgenstern"
@@ -5919,6 +5895,25 @@
"brutaux coups de marteau. S'ils n'étaient pas aussi rares et si lents sur "
"les champs de bataille, ces puissants soldats contrôleraient le continent."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Javeliniste ondin"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"Le lancier forme la base des armées humaines. Ces jeunes soldats ont reçu
un "
+"entraînement de base et sont envoyés sur les lignes de front pour former le
"
+"gros des troupes. Ã cause de la longueur de leurs lances, ils frappent les "
+"premiers en combat et ceci même s'ils se défendent."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Chevalier"
@@ -6250,7 +6245,7 @@
msgid "Mounted Captain"
msgstr "Capitaine monté"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -6278,6 +6273,29 @@
"déplacer à travers le champ de bataille avec vélocité, et peuvent fournir
"
"une assistance salutaire sur plusieurs fronts."
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Noble guerrier"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Guerrier ondin"
+
+#: data/units/Mounted_Warrior.cfg:17
+#, fuzzy
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+"Commandants des plaines, les commandants montés sont doués dans "
+"l'utilisation de l'épée et du morgenstern. Montés à cheval, ils peuvent
se "
+"déplacer à travers le champ de bataille avec vélocité, et peuvent fournir
"
+"une assistance salutaire sur plusieurs fronts."
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Golem de boue"
@@ -6785,19 +6803,21 @@
msgid "Pikeman"
msgstr "Piquier"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Les piquiers sont des soldats expérimentés qui ont troqué leurs lances "
"contre de longues piques. Grâce à l'allonge de leur arme, les piquiers "
"frappent toujours les premiers en combat, même lorsqu'ils se défendent. Ils
"
"sont particulièrement efficaces contre toute cavalerie."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "pique"
@@ -6902,7 +6922,7 @@
msgid "Royal Guard"
msgstr "Garde royal"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -6912,10 +6932,6 @@
"plus vigoureux de l'armée. Ils ne sont utilisés que dans des situations "
"critiques et jusqu'ici ils ont toujours réussi leur mission."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Saurien"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -7269,11 +7285,12 @@
msgstr "Lancier"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"Le lancier forme la base des armées humaines. Ces jeunes soldats ont reçu
un "
"entraînement de base et sont envoyés sur les lignes de front pour former le
"
@@ -7300,7 +7317,7 @@
msgid "Swordsman"
msgstr "Ãpéiste"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -7797,16 +7814,16 @@
msgid "Close"
msgstr "Fermer"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Vous n'avez pas de chef pour vous permettre de recruter des unités."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Votre chef doit se trouver sur un donjon pour pouvoir recruter des unités."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Il n'y a pas de place vacante dans le château pour recruter une
unité."
@@ -7814,7 +7831,17 @@
msgid "none"
msgstr "aucune"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "corps-Ã -corps"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "distant"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "dégâts de base"
@@ -7828,61 +7855,61 @@
msgid "attacker vulnerability vs"
msgstr "attaquant faible contre"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "dégats doublés"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "dégâts totaux"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "défenseur résistant au"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "défenseur faible contre"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "dégats réduits de moitié"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "empoisonné"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "ralentie"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Embuscade !"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Unité alliée en vue"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Unité ennemie en vue !"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends unité(s) alliée(s) en vue"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies unité(s) ennemie(s) en vue !"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Unités en vue ! ($friends alliée(s), $enemies ennemie(s))"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(appuyez sur $hotkey pour continuer)"
@@ -7930,7 +7957,7 @@
msgid "Campaign"
msgstr "Campagne"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Multi-joueurs"
@@ -7946,7 +7973,7 @@
msgid "replay"
msgstr "film"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Tour"
@@ -7958,7 +7985,7 @@
msgid "Difficulty"
msgstr "Difficulté"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Version"
@@ -8020,25 +8047,15 @@
msgstr "Profile"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "niveau"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Déplacements"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "corps-Ã -corps"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "distant"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "vigoureux"
@@ -8055,11 +8072,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Voulez-vous sauvegarder un replay de ce scénario ?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Nom :"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Le jeu ne peut pas être sauvegardé"
@@ -8089,7 +8106,8 @@
msgstr "Erreur d'E/S en chargeant le jeu"
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr " ,Récupérer d'autres campagnes..."
#: src/game.cpp:954
@@ -8125,11 +8143,11 @@
msgid "Could not connect to host."
msgstr "Impossible de se connecter au serveur."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Erreur"
@@ -8141,135 +8159,149 @@
msgid "Error communicating with the server."
msgstr "Erreur de communication avec le serveur."
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",Nom,Version,Auteur,Téléchargements,Taille"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Nom"
-#: src/game.cpp:1072
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "épines"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
+
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "Sirène"
+
+#: src/game.cpp:1077
msgid "B"
msgstr "o"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "Ko"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr "Mo"
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Diffuser la campagne : "
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "Effacer la campagne : "
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Ce serveur ne propose pas de campagne téléchargeable."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Choisissez la campagne à télécharger."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Charger la campagne"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Téléchargement de la campagne en cours..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Campagne installée"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "La campagne a été installée"
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Erreur de communication réseau;"
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Serveur distant déconnecté."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
"Il s'est produit un problème pendant la création des fichiers nécessaires
à "
"l'installation de cette campagne."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Tentative de connexion expirée"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "Le serveur a renvoyé une erreur : \""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Conditions"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Réponse"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Se connecter au serveur officiel"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Se connecter sur le serveur multi-joueur officiel de Wesnoth"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Se connecter à une partie"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Se connecter à un serveur ou une partie hébergée"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Héberger un jeu en réseau"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Héberger un jeu sans utiliser de serveur"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr "Jeu en chaise tournante"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr "Faire une partie multi-joueur en partageant la même machine"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Humain contre IA"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr "Jouer contre l'ordinateur"
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Connexion"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Langue"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Choisissez votre langue"
@@ -8289,11 +8321,7 @@
msgid "attacks"
msgstr "attaques"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Nom"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Type"
@@ -8426,7 +8454,7 @@
msgid "Bump Size"
msgstr "Taille des collines"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Villages"
@@ -8488,7 +8516,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Permettre aux personnes qui ne jouent pas d'observer la partie"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -8522,7 +8550,7 @@
msgid "No multiplayer sides."
msgstr "Aucun camp multijoueur."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Créer un jeu"
@@ -8574,63 +8602,63 @@
msgid "Receiving game list..."
msgstr "Réception de la liste des jeux..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
msgid "unit^Gold"
msgstr "p. d'or"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "En attente de démarrage du jeu..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "Connection au serveur"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Choisissez un serveur sur lequel vous connecter"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Connexion au serveur distant..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Vous devez vous connecter à ce serveur"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Réception des données du jeu..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Il n'y a aucun camp de disponible."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Choisissez votre camp :"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Le jeu a été annulé"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "Le camp que vous avez choisi n'est plus disponible"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Montrer les actions déjà effectuées jusqu'au point de sauvegarde ?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Meneur : "
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Recrutements : "
@@ -8729,7 +8757,7 @@
msgstr "Couleur"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Or"
@@ -8737,23 +8765,23 @@
msgid "Waiting for network players to join"
msgstr "En attente d'autres joueurs"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Place vacante"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Places vacantes"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Observer la partie"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Quitter"
@@ -8822,62 +8850,58 @@
msgid "It is now your turn"
msgstr "Ã vous de jouer"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Attaquant"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Défenseur"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Calcul des dégâts"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Corps-Ã -corps"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "contre"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Attaquer l'ennemi"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Choisissez une arme"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
"Vous n'avez pas encore commencé votre tour. Voulez-vous vraiment finir votre
"
"tour ?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"Certaines unités peuvent encore se déplacer. Voulez-vous vraiment finir "
"votre tour ?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Sauvegarde automatique"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
"Impossible de sauver le jeu automatiquement. Vous devez le faire "
"manuellement."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Renommer l'unité"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -8886,43 +8910,43 @@
"barres obliques ni de barres obliques inverses. Veuillez choisir un autre "
"nom."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Sauvé"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Le jeu a été sauvegardé"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Chef"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Entretien"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Revenu"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Vous n'avez pas d'unité disponible pour recruter."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Recruter"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Sélectionner l'unité"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Vous n'avez pas assez d'or pour recruter cette unité"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -8930,7 +8954,7 @@
"Mon seigneur, cette unité a de l'expérience, et un niveau avancé !
Voulez-"
"vous vraiment renvoyer $noun ?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -8938,19 +8962,19 @@
"Mon seigneur, cette unité est proche de gagner un niveau ! Voulez-vous "
"vraiment renvoyer $noun ?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "elle"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "lui"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Vous êtes séparés de vos soldats et ne pouvez les rappeler"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8958,100 +8982,100 @@
"Il n'y a pas de troupe disponible à rappeler\n"
"(Vous devez avoir des survivants vétérans d'un précédent scénario)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "Vous devez posséder au moins $cost pièces d'or pour rappeler une
unité"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Renvoyer l'unité"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Rappeler"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Message"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Parler aux alliés uniquement"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Localisation"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Liste des unités"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Recrutements"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Vétérans rappelés"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Avancements"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Pertes"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Ennemis tués"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Dégâts infligés"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Dégâts subis"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Dégâts infligés (attendus)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Dégâts subis (attendus)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statistiques"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Rechercher"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Commande :"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Historique des discussions"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
"Impossible de trouver une étiquette ou une unité contenant : « $searchÂ
»."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Placez l'étiquette"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Ãtiquette"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -9059,23 +9083,23 @@
"Le jeu est désynchronisé et doit se terminer. Voulez-vous sauvegarder les "
"messages d'erreur dans un fichier ?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Remplacer par l'ordinateur"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Remplacer par un joueur local"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Annuler le jeu"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Remplacer par "
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "a quitté le jeu. Que voulez-vous faire ?"
@@ -9247,6 +9271,66 @@
msgid "Deletion of the file failed."
msgstr "La suppression du fichier a échoué."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Aléatoire"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,Loyalistes"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,Rebelles"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,Nordiques"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,Morts-Vivants"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Alliance Knalgane"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Drakes"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Humains"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Elfes"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,Orcs"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Nains"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,Saurien"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Loyalistes"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Rebelles"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Nordiques"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Morts-Vivants"
+
+#~ msgid "&dwarf-lord.png,Knalgan Alliance"
+#~ msgstr "&dwarf-lord.png,Alliance Knalgane"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Alliance de la Lumière"
+
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",Nom,Version,Auteur,Téléchargements,Taille"
+
+#~ msgid "Melee"
+#~ msgstr "Corps-Ã -corps"
+
#~ msgid ""
#~ "Terrible and awe-inspiring, Ancient Woses are majestic treefolk not to be "
#~ "trifled with. Fearsome fighters, they resist many attacks while "
@@ -10012,9 +10096,6 @@
#~ "Dépêchez-vous. Nous devons traverser avant que ces morts-vivants ne nous
"
#~ "massacrent !"
-#~ msgid "An Elven Alliance"
-#~ msgstr "Une alliance elfe"
-
#~ msgid ""
#~ "\n"
#~ "Victory:\n"
@@ -13237,9 +13318,6 @@
#~ "conséquences sur notre sauvetage d'Elensefar. Nous devons continuer à "
#~ "avancer rapidement !"
-#~ msgid "Northern Winter"
-#~ msgstr "Hiver au nord"
-
#~ msgid ""
#~ "\n"
#~ "Victory:\n"
Index: wesnoth/po/wesnoth/hu.po
diff -u wesnoth/po/wesnoth/hu.po:1.20 wesnoth/po/wesnoth/hu.po:1.21
--- wesnoth/po/wesnoth/hu.po:1.20 Sun Dec 5 00:12:16 2004
+++ wesnoth/po/wesnoth/hu.po Sun Dec 12 15:19:49 2004
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.5-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-10-18 22:01+0200\n"
"Last-Translator: Automatically generated <address@hidden>\n"
"Language-Team: none\n"
@@ -50,7 +50,7 @@
msgid "Traits"
msgstr ""
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr ""
@@ -824,94 +824,82 @@
msgid "Default"
msgstr ""
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr ""
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Véletlenszerű pályakialakÃtás"
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
msgstr ""
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+msgid "Rebels"
msgstr ""
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr ""
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+#, fuzzy
+msgid "Northerners"
+msgstr "Tél északon"
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr ""
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "ÃlÅholtak"
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr ""
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "Egy tünde szövetség"
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr ""
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Ãgperzsekény"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr ""
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr ""
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Emberek"
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr ""
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Tündék"
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr ""
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orkok"
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr ""
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Törp pusztaság"
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr ""
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "GyÃk"
-#: data/multiplayer.cfg:196
+#: data/multiplayer.cfg:211
msgid "Age of Heroes"
msgstr ""
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr ""
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr ""
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr ""
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr ""
-
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr ""
-
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr ""
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr ""
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Fény mágusa"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
-msgstr ""
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
+msgstr "Merülés a sötétbe"
#: data/scenario-test.cfg:38
msgid ""
@@ -2044,66 +2032,54 @@
msgid "Canyon"
msgstr ""
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menü"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr ""
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Kör vége"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr ""
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr ""
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "arany"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "falu"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "egység"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "fenntartás"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "bevétel"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr ""
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr ""
@@ -2565,7 +2541,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "hadvezetés"
@@ -2628,7 +2604,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr ""
@@ -2754,22 +2730,6 @@
"Ez a támadás a célpont egységet kÅvé dermeszti. A kÅvé vált
egységek nem "
"mozoghatnak és nem harcolhatnak."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Tündék"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Emberek"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orkok"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "ÃlÅholtak"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "$name hÃdja,$name gázlója"
@@ -2946,7 +2906,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -2961,6 +2921,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3019,7 +2980,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3095,13 +3056,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3119,11 +3081,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3134,7 +3096,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "orvtámadás"
@@ -3219,7 +3181,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3228,9 +3191,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "kard"
@@ -3326,7 +3289,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3344,7 +3308,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3478,7 +3442,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3494,8 +3459,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "roham"
@@ -3517,7 +3482,7 @@
msgid "gaze"
msgstr "bénÃtás"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "kÅvéváltoztatás"
@@ -3743,7 +3708,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr ""
@@ -3876,8 +3841,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr ""
@@ -4372,7 +4338,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "mesterlövész"
@@ -4755,8 +4721,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4805,7 +4773,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4916,21 +4884,24 @@
"állatot, Ãgy a kék egek új világát fedezik fel"
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Alabárdos"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"A közkatonák legjobbjait alabárdosokká teszik meg. Habár a kardnál
lassabb a "
"fegyverük, halálos sebeket lehet ejteni vele."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "alabárd"
@@ -4959,7 +4930,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Reggel"
@@ -5006,6 +4978,23 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Lovag"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"A dárdások jelentÅs részt alkotnak az emberi seregekben.
Alapkiképzésben "
+"részesülnek és egybÅl az arcvonalra kerülnek megtapasztalni a csata
sűrűjét"
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Lovag"
@@ -5327,7 +5316,7 @@
msgid "Mounted Captain"
msgstr "Hegyvidék"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5348,6 +5337,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Perzsekény verekedÅ"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "GyÃk harcos"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr ""
@@ -5791,18 +5798,19 @@
msgid "Pikeman"
msgstr "Pikás gyalogság"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"A tapasztaltabb lándzsások fegyverüket hosszú, hegyes, vékony pikára "
"cserélik, Ãgy rendkÃvül veszélyesek bármilyen lovascsapat ellen"
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "pika"
@@ -5906,7 +5914,7 @@
msgid "Royal Guard"
msgstr "Udvari testÅr"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -5916,10 +5924,6 @@
"legerÅsebb katonái közül. A hűség vezérli Åket minden válságos
helyzetben, "
"és eddig minden feladatukat sikerrel teljesÃtették."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "GyÃk"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6214,8 +6218,8 @@
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"A dárdások jelentÅs részt alkotnak az emberi seregekben.
Alapkiképzésben "
"részesülnek és egybÅl az arcvonalra kerülnek megtapasztalni a csata
sűrűjét"
@@ -6240,7 +6244,7 @@
msgid "Swordsman"
msgstr "Páncélosok"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
#, fuzzy
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
@@ -6704,15 +6708,15 @@
msgid "Close"
msgstr ""
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr ""
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr ""
@@ -6720,7 +6724,17 @@
msgid "none"
msgstr ""
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr ""
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr ""
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr ""
@@ -6732,61 +6746,61 @@
msgid "attacker vulnerability vs"
msgstr ""
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr ""
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr ""
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr ""
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr ""
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr ""
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr ""
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr ""
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr ""
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr ""
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr ""
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr ""
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr ""
@@ -6834,7 +6848,7 @@
msgid "Campaign"
msgstr "Hadjárat"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Többjátékos"
@@ -6846,7 +6860,7 @@
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr ""
@@ -6858,7 +6872,7 @@
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr ""
@@ -6911,25 +6925,15 @@
msgstr ""
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr ""
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr ""
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr ""
-
#: src/display.cpp:883
msgid "healthy"
msgstr ""
@@ -6946,11 +6950,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr ""
@@ -6978,7 +6982,7 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+msgid "Get More Campaigns..."
msgstr ""
#: src/game.cpp:954
@@ -7009,11 +7013,11 @@
msgid "Could not connect to host."
msgstr ""
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr ""
@@ -7025,133 +7029,146 @@
msgid "Error communicating with the server."
msgstr ""
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "tövis"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
+
+#: src/game.cpp:1058
+msgid "Size"
+msgstr ""
+
+#: src/game.cpp:1077
msgid "B"
msgstr ""
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr ""
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr ""
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr ""
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr ""
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr ""
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr ""
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr ""
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr ""
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr ""
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr ""
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr ""
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr ""
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr ""
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr ""
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr ""
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr ""
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr ""
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr ""
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr ""
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr ""
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Nyelv"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr ""
@@ -7171,11 +7188,7 @@
msgid "attacks"
msgstr ""
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr ""
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr ""
@@ -7303,7 +7316,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr ""
@@ -7363,7 +7376,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr ""
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7397,7 +7410,7 @@
msgid "No multiplayer sides."
msgstr ""
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr ""
@@ -7447,63 +7460,63 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
msgid "unit^Gold"
msgstr ""
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr ""
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr ""
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr ""
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr ""
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr ""
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr ""
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr ""
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr ""
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr ""
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr ""
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr ""
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr ""
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr ""
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr ""
@@ -7600,7 +7613,7 @@
msgstr ""
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr ""
@@ -7608,23 +7621,23 @@
msgid "Waiting for network players to join"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr ""
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr ""
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Kilépés"
@@ -7691,242 +7704,238 @@
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr ""
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr ""
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr ""
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr ""
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr ""
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr ""
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr ""
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr ""
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr ""
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr ""
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr ""
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr ""
@@ -8263,10 +8272,6 @@
#~ msgstr "Az útkeresztezÅdés"
#, fuzzy
-#~ msgid "An Elven Alliance"
-#~ msgstr "Egy tünde szövetség"
-
-#, fuzzy
#~ msgid "Lake Vrug"
#~ msgstr "Vrug-tó"
@@ -10798,10 +10803,6 @@
#~ "megmenthessük Elensefart. Minden perc számÃt!"
#, fuzzy
-#~ msgid "Northern Winter"
-#~ msgstr "Tél északon"
-
-#, fuzzy
#~ msgid ""
#~ "\n"
#~ "Victory:\n"
@@ -10912,10 +10913,6 @@
#~ "felé ..."
#, fuzzy
-#~ msgid "Plunging into the Darkness"
-#~ msgstr "Merülés a sötétbe"
-
-#, fuzzy
#~ msgid ""
#~ "\n"
#~ "Victory:\n"
Index: wesnoth/po/wesnoth/it.po
diff -u wesnoth/po/wesnoth/it.po:1.20 wesnoth/po/wesnoth/it.po:1.21
--- wesnoth/po/wesnoth/it.po:1.20 Sun Dec 5 00:12:16 2004
+++ wesnoth/po/wesnoth/it.po Sun Dec 12 15:19:49 2004
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-11-25 14:52+0100\n"
"Last-Translator: Alessio D'Ascanio <address@hidden>\n"
"Language-Team: Italian\n"
@@ -49,7 +49,7 @@
msgid "Traits"
msgstr "Caratteristiche"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Unità "
@@ -844,93 +844,81 @@
msgid "Default"
msgstr "Default"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Casuale"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,Loyalists"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,Ribelli"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,Gente del Nord"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,Non-morti"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Allenza di Knalga"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Draghi"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Mappa casuale"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Richiami"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
+
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "Non-morti"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,Allenza di Knalga"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Drago del Cielo"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Classico"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Umani"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Elfi"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,Orchi"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Nani"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,Saurian"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Umani"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "Età degli Eroi"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elfi"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Leali"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Ribelli"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Gente del Nord"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Non-morti"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orchi"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Allenza di Knalga"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Territori dei nani"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Sauro"
+
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "Età degli Eroi"
+
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Grande Guerra"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Allenaza della Luce"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Mago della Luce"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Alleanza dell'Oscurità "
#: data/scenario-test.cfg:38
@@ -2157,66 +2145,54 @@
msgid "Canyon"
msgstr "Canyon"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menù"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Azioni"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Fine Turno"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "PS"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "PE"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "oro"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "villaggi"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "unità "
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "mantenimento"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr ""
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "statuspanel^livello"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "statuspanel^movimento"
@@ -2678,7 +2654,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "condottiero"
@@ -2744,7 +2720,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr ""
@@ -2868,22 +2844,6 @@
"Questo attacco trasforma il bersaglio in pietra. Le unità trasformate in "
"pietra non possono muoversi o attaccare."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elfi"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Umani"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orchi"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "Non-morti"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "Ponte $name, Attraversamento di $name"
@@ -3061,7 +3021,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3076,6 +3036,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3137,7 +3098,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3212,13 +3173,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3236,11 +3198,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3251,7 +3213,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "Attacco alle spalle"
@@ -3334,7 +3296,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3343,9 +3306,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "Spada"
@@ -3441,7 +3404,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3459,7 +3423,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3594,7 +3558,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3610,8 +3575,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "Carica"
@@ -3634,7 +3599,7 @@
msgid "gaze"
msgstr "Bloccare"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "Pietrifica"
@@ -3866,7 +3831,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "alito di fuoco"
@@ -3999,8 +3964,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "attacco improvviso"
@@ -4511,7 +4477,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "Tiro di precisione"
@@ -4902,8 +4868,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4949,7 +4917,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5064,21 +5032,24 @@
"nuovo mondo dei cieli."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Alabardiere"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"I migliori tra i soldati sono scelti per diventare alabardieri. Anche se "
"sono un pò lenti con la spada, le loro armi possono infliggere colpi
mortali."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "alabarda"
@@ -5106,7 +5077,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
msgid "morning star"
msgstr ""
@@ -5159,6 +5131,24 @@
"numero di elementi nel campo di battaglia, questi potenti soldati potrebbero "
"controllare il contintente."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Cavaliere"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"Il lanciere è la base dell'esercito umano. Questi giovani soldati hanno "
+"avuto un addestramento basilare e messi in prima linea per affrontare la "
+"battaglia."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Cavaliere"
@@ -5482,7 +5472,7 @@
msgid "Mounted Captain"
msgstr "Montagne"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5503,6 +5493,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Nobile Combattente"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Drago Combattente"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
#, fuzzy
msgid "Mudcrawler"
@@ -6010,19 +6018,21 @@
msgid "Pikeman"
msgstr "Picchiere"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"I picchieri sono i maggiori esperti che cambiano le loro lancie con lunghe "
"aste. Grazie alla lunghezza delle loro armi colpiscono sempre per primi in "
"combatimento, anche se stanno difendendo. I picchieri possono essere poco "
"efficaci quando combattono le truppe a cavallo."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr ""
@@ -6122,7 +6132,7 @@
msgid "Royal Guard"
msgstr "Guardia Reale"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -6132,10 +6142,6 @@
"resistenti membri dell'esercito. Sono impiegati solo in situazioni critiche "
"e, fin ora, hanno sempre avuto successo nel lavoro assegnato."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Sauro"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6433,11 +6439,12 @@
msgstr "Lanciere"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"Il lanciere è la base dell'esercito umano. Questi giovani soldati hanno "
"avuto un addestramento basilare e messi in prima linea per affrontare la "
@@ -6463,7 +6470,7 @@
msgid "Swordsman"
msgstr "Spadaccino"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6928,16 +6935,16 @@
msgid "Close"
msgstr "Chiudi"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Non hai un comandante con cui reclutare"
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Devi avere il tuo condottiero nel keep per reclutare o richiamare unità ."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Non ci sono spazi vuoti nel castello per reclutare un'unità ."
@@ -6945,7 +6952,17 @@
msgid "none"
msgstr "nessuno"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "ravvicinato"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "a distanza"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "danno base"
@@ -6957,61 +6974,61 @@
msgid "attacker vulnerability vs"
msgstr "vulnerabilità dell'attaccante vs"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Raddoppiato"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "danno totale"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "resistenze del difensore vs"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "vulnerabilità del difensore vs"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr ""
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "avvelenato"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "rallentato"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Imboscata!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Unità nemica avvistata"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Unità nemica avvistata!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends unità amiche avvistate"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies unità nemiche avvistate!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Unità avvistate! ($friends amiche, $enemies nemiche)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(premi $hotkey per continuare)"
@@ -7059,7 +7076,7 @@
msgid "Campaign"
msgstr "Campagna"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Multiplayer"
@@ -7071,7 +7088,7 @@
msgid "replay"
msgstr "replay"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Turno"
@@ -7083,7 +7100,7 @@
msgid "Difficulty"
msgstr "Difficoltà "
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Versione"
@@ -7144,25 +7161,15 @@
msgstr "Profilo"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "Livello"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Mosse"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "ravvicinato"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "a distanza"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "in salute"
@@ -7179,11 +7186,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Vuoi salvare un replay di questo scenario?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Nome:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "La partita non può essere salvata"
@@ -7213,7 +7220,8 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr " ,Scarica campagne aggiuntive..."
#: src/game.cpp:954
@@ -7244,11 +7252,11 @@
msgid "Could not connect to host."
msgstr "Impossibile connettersi all'host remoto."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Errore"
@@ -7260,137 +7268,150 @@
msgid "Error communicating with the server."
msgstr "Errore di comunicazione con il server."
-#: src/game.cpp:1053
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Nome"
+
+#: src/game.cpp:1056
#, fuzzy
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",Nome,Versione,Autore,Scaricata"
+msgid "Author"
+msgstr "Spine"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "Sirena"
+
+#: src/game.cpp:1077
msgid "B"
msgstr "B"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Pubblica campagna: "
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "Cancella campagna: "
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Nessuna campagna disponibile per il download da questo server."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Scegli la campagna da scaricare."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Scarica Campagna"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Scaricamento campagna..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Campagna Installata"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "La campagna è stata installata."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Errore di comunicazione con la rete."
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Disconnesso dall'host remoto."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
"C'è stato un problema durante la creazione dei file necessari ad installare "
"questa campagna."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Connessione Scaduta"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "Il server ha risposto con un errore: \""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr ""
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr ""
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Unisciti al Server Ufficiale"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Accedi al Server Ufficiale per Wesnoth in multiplayer"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Unisciti al Gioco"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Unisciti al server o alla partita ospitata"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Ospita Partita in Rete"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Ospita una partita senza utilizzare un server"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
#, fuzzy
msgid "Hotseat Game"
msgstr "Crea Partita"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Giocatore vs Computer"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Login"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Lingua"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Scegli la lingua che preferisci"
@@ -7410,11 +7431,7 @@
msgid "attacks"
msgstr "attacchi"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Nome"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Tipo"
@@ -7551,7 +7568,7 @@
msgid "Bump Size"
msgstr "Forza d'Urto"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Villaggi"
@@ -7614,7 +7631,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Permette agli utenti che non giocano di osservare la partita"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7648,7 +7665,7 @@
msgid "No multiplayer sides."
msgstr "Nessun esercito multiplayer."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Crea Partita"
@@ -7698,64 +7715,64 @@
msgid "Receiving game list..."
msgstr "Ricevo la lista delle partite..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Oro"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Attendi che il gioco abbia inizio..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "Connetti al Server"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Scegli l'host a cui connetterti"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Connessione all'host remoto..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Devi effettuare il login al server"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Acquisizione dati della partita..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Non ci sono posti liberi in questa partita"
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Scegli il tuo esercito:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "La partita è stata annullata"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "L'esercito che hai scelto non è più disponibile"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Mostro il replay della partita fino al momento del salvataggio?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Comandante:"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Reclutamenti: "
@@ -7854,7 +7871,7 @@
msgstr "Colore"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Oro"
@@ -7862,23 +7879,23 @@
msgid "Waiting for network players to join"
msgstr "Aspetta che i giocatori remoti si uniscano"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Slot Vuoto"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Slot Vuoti"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Osserva Partita"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Esci"
@@ -7947,62 +7964,58 @@
msgid "It is now your turn"
msgstr "Adesso è il tuo turno"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Attaccante"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Difensore"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Calcolo del Danno"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Rissa"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "vs"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Attacca Nemico"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Scegli Arma"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
"Non hai ancora iniziato il tuo turno. Sei sicuro di voler finire il tuo "
"turno adesso?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"Alcune unità hanno movimenti a disposizione. Vuoi davvero terminare il tuo "
"turno?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Savlataggio Automatico"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
"Impossibile effettuare il salvataggio automatico. Salva manualmente la "
"partita."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Rinomina Unità "
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -8010,43 +8023,43 @@
"I nomi dei salvataggi non possono contenere due punti, slashes o "
"blackslashes. Per favore, scegli un nome differente."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Salvato"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "La partita è stata salvata"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Comandante"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Mantenimento"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Entrate"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Non hai nessuna unità disponibile per il reclutamento."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Recluta"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Seleziona Unità "
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Non hai abbastanza oro per reclutare questa unità "
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -8054,7 +8067,7 @@
"Mio signore, questa è un'unità esperta, è già avanzata di livello! Volete
"
"davvero eliminare $noun?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -8062,19 +8075,19 @@
"Mio signore, questa unità sta per avanzare di livello! Volete davvero "
"eliminare $noun?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "sua"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "suo"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Sei separato dai tuoi soldati e non puoi richiamarli"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8082,99 +8095,99 @@
"Non ci sono truppe da richiamare.\n"
"(Devi avere veterani sopravvissuti dai precedenti scenari)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "Devi avere almeno $cost oro per richiamare un unità "
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Elimina Unità "
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Richiama"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Messaggio"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Invia solo agli alleati"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Luogo"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Lista delle Unità "
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Reclutamenti"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Richiami"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Avanzamenti"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Perdite"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Uccisioni"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Danni inflitti"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Danni subiti"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Danni Inflitti (EV)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Danni Subiti (EV)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statistiche"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Cerca"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Comando:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Chat Log"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Non ho trovato nessuna etichetta contente '$search'."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Imposta Etichetta"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Etichetta"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -8182,23 +8195,23 @@
"La partita non è sincronizzata ed è necessario uscire. Vuoi salvare un file
"
"con gli errori occorsi nella partita?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Rimpiazza con AI"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Rimpiazza con un giocatore locale"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Annulla gioco"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Rimpiazza con "
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "ha abbandonato il gioco. Cosa vuoi fare?"
@@ -8366,6 +8379,64 @@
msgid "Deletion of the file failed."
msgstr "Eliminazione del file non riuscita."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Casuale"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,Loyalists"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,Ribelli"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,Gente del Nord"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,Non-morti"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Allenza di Knalga"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Draghi"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Umani"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Elfi"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,Orchi"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Nani"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,Saurian"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Leali"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Ribelli"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Gente del Nord"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Non-morti"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Allenaza della Luce"
+
+#, fuzzy
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",Nome,Versione,Autore,Scaricata"
+
+#~ msgid "Melee"
+#~ msgstr "Rissa"
+
#~ msgid ""
#~ "This page outlines all you need to know to play Battle for Wesnoth. It "
#~ "covers how to play and the basic mechanics behind the game. For more "
Index: wesnoth/po/wesnoth/nl.po
diff -u wesnoth/po/wesnoth/nl.po:1.20 wesnoth/po/wesnoth/nl.po:1.21
--- wesnoth/po/wesnoth/nl.po:1.20 Sun Dec 5 00:12:16 2004
+++ wesnoth/po/wesnoth/nl.po Sun Dec 12 15:19:49 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-10-19 20:28-0000\n"
"Last-Translator: Pieter Vermeylen <address@hidden>\n"
"Language-Team: none\n"
@@ -49,7 +49,7 @@
msgid "Traits"
msgstr "Trekken"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Troepen"
@@ -840,93 +840,81 @@
msgid "Default"
msgstr "Standaard"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Willekeurig"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,Loyalen"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,Rebellen"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,Noorderstammen"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,Levende Doden"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Knalga Alliantie"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Draken"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Willekeurige kaart"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Oproepingen"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
+
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "Levende Doden"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,Knalga Alliantie"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Hemeldraak"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Klassiek"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Mensen"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Elven"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,Orks"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Dwergen"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,Saurian"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Mensen"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "Heldentijdperk"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elven"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Loyalen"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Rebellen"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Noorderstammen"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Levende Doden"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orks"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Knalga Alliantie"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Woestenij der Dwergen"
+
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Saurian"
+
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "Heldentijdperk"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Grote Oorlog"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Alliantie van het Licht"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Magiër des Licht"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Alliantie van de Duisternis"
#: data/scenario-test.cfg:38
@@ -2097,66 +2085,54 @@
msgid "Canyon"
msgstr "geen"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menu"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Acties"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Volgende"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "HP"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "XP"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "Goud"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "Dorpen"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "Troepen"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "Onderhoudskost"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "Inkomen"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "rang"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "stappen"
@@ -2601,7 +2577,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "leiderschap"
@@ -2667,7 +2643,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "standvastig"
@@ -2788,22 +2764,6 @@
"Deze aanval verandert de vijand in steen. Troepen die in steen zijn "
"veranderd kunnen bewegen noch aanvallen."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elven"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Mensen"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orks"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "Levende Doden"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "$name's Brug,$name's Oversteek"
@@ -2981,7 +2941,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -2996,6 +2956,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3058,7 +3019,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3135,13 +3096,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3159,11 +3121,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3174,7 +3136,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "ruggesteek"
@@ -3258,7 +3220,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3267,9 +3230,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "zwaard"
@@ -3365,7 +3328,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3383,7 +3347,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3515,7 +3479,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3531,8 +3496,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "stormloop"
@@ -3553,7 +3518,7 @@
msgid "gaze"
msgstr "staar"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "steen"
@@ -3781,7 +3746,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "vuuradem"
@@ -3914,8 +3879,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "eerste contact"
@@ -4387,7 +4353,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "precisieschutter"
@@ -4749,8 +4715,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4793,7 +4761,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4900,20 +4868,24 @@
"berijden ontdekken de wereld van de hemel."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Hellebaardier"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"De beste soldaten worden geselecteerd om hellebaardiers te worden. Ook al is "
"de hellebaard trager dan het zwaard, de schade die het aanricht is dodelijk."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "hellebaard"
@@ -4942,7 +4914,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Voormiddag"
@@ -4991,6 +4964,26 @@
"berucht voor hun ongelooflijk brutale hamerslagen en hun robuustheid. Indien "
"ze niet zo traag zouden zijn, heersten ze beslist over het hele continent."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Cavalerie"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"De speerman vormt evenals de zwaardvechter de basis van het mensenleger. "
+"Deze jonge soldaten krijgen een basistraining en doen het meeste van het "
+"vechten aan het front. Omwille van de lengte van hun speer krijgen de "
+"speermannen altijd het eerste woord in een gevecht, zelfs wanneer ze "
+"verdedigen."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Ridder"
@@ -5311,7 +5304,7 @@
msgid "Mounted Captain"
msgstr "Bergen"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5332,6 +5325,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Adelijke Strijder"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Saurian Strijder"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Modderkruiper"
@@ -5822,17 +5833,19 @@
msgid "Pikeman"
msgstr "Piekenier"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Piekeniers zijn meer ervaren soldaten die hun speren voor lange pieken "
"hebben geruild. Piekeniers zijn de nachtmerrie van elke cavalerie."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "piek"
@@ -5932,7 +5945,7 @@
msgid "Royal Guard"
msgstr "Koninklijke Garde"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -5942,10 +5955,6 @@
"krachtigsten uit het Rijk Wesnoth. Ze worden alleen in kritieke situaties "
"gebruikt, en totnogtoe hebben ze hun taak steeds volbracht."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Saurian"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6248,11 +6257,12 @@
msgstr "Speerman"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"De speerman vormt evenals de zwaardvechter de basis van het mensenleger. "
"Deze jonge soldaten krijgen een basistraining en doen het meeste van het "
@@ -6280,7 +6290,7 @@
msgid "Swordsman"
msgstr "Zwaardvechter"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6759,16 +6769,16 @@
msgid "Close"
msgstr "Sluit"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Je hebt geen leider om mee te recruteren."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Je leider moet op een donjon staan om eenheden te recruteren of op te roepen."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Er zijn geen lege velden waarop een eenheid kan worden gerecruteerd."
@@ -6776,7 +6786,17 @@
msgid "none"
msgstr "geen"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "dichtbij"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "veraf"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "basisschade"
@@ -6788,61 +6808,61 @@
msgid "attacker vulnerability vs"
msgstr "kwetsbaarheid van de aanvaller vs"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Verdubbeld"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "totale schade"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "resistentie van de verdediger vs"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "kwetsbaarheid van de verdediger vs"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "Gehalveerd"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "vergiftigd"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "vertraagd"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Hinderlaag!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Bevriende eenheid in zicht!"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Vijandige eenheid in zicht!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends Bevriende troepen gesignaleerd"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies Vijandige troepen gesignaleerd!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Troepen gesignaleerd! (($friends bevriende, $enemies vijandige)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(druk $hotkey om door te gaan)"
@@ -6890,7 +6910,7 @@
msgid "Campaign"
msgstr "Veldtocht"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Multiplayer"
@@ -6902,7 +6922,7 @@
msgid "replay"
msgstr "herspeel"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Beurt"
@@ -6914,7 +6934,7 @@
msgid "Difficulty"
msgstr "Moeilijkheidsgraad"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Versie"
@@ -6973,25 +6993,15 @@
msgstr "Profiel"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "rang"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Stappen"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "dichtbij"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "veraf"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "gezond"
@@ -7008,11 +7018,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Will je een herhaling van dit scenario opnemen?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Naam:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Het spel kon niet worden opgeslagen"
@@ -7042,7 +7052,8 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr ",Haal meer veldtochten..."
#: src/game.cpp:954
@@ -7074,11 +7085,11 @@
msgid "Could not connect to host."
msgstr "Kon geen verbinding maken met 'host'"
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Error"
@@ -7090,136 +7101,150 @@
msgid "Error communicating with the server."
msgstr "Fout bij communiceren met server."
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Naam"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "doornen"
+
+#: src/game.cpp:1057
+msgid "Downloads"
msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "vuur"
+
+#: src/game.cpp:1077
#, fuzzy
msgid "B"
msgstr "KB"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Publiceer veldtocht:"
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "Verwijder veldtocht:"
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Er zijn geen veldtochten beschikbaar om te downloaden van deze server."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Kies een veldtocht om te downloaden."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Haal een Veldtocht"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Veldtocht aan het downloaden..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Veldtocht geïnstalleerd."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "De veldtocht werd geïnstalleerd."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Netwerk communicatie fout."
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "'Remote host' brak verbinding af."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
"Er was een probleem om de bestanden te genereren die nodig zijn voor deze "
"veldtocht."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Connectie timed out"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Afspraken"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Antwoord"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Log in op de Officiële Server"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Log in op de officiële Wesnoth multiplayer server"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Meespelen"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Log in op Server of Host een Spel"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Maak Netwerkspel"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Host een spel zonder een server te gebruiken"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr "Hotseat Spel"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Mens vs AI"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Login"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Taal"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Kies de taal:"
@@ -7239,11 +7264,7 @@
msgid "attacks"
msgstr "aanvallen"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Naam"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Type"
@@ -7381,7 +7402,7 @@
msgid "Bump Size"
msgstr "Landmassa Grootte"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Dorpen"
@@ -7443,7 +7464,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Sta spelers die het spel niet spelen toe om het spel te bekijken."
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7477,7 +7498,7 @@
msgid "No multiplayer sides."
msgstr "Geen multiplayer kanten."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Maak Spel"
@@ -7529,64 +7550,64 @@
msgid "Receiving game list..."
msgstr "Bezig spellijst op te halen..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Goud"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Aan het wachten op de start van het spel..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "Verbind met Server"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Kies host om mee te verbinden"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Bezig met verbinding maken met remote host..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Je moet op deze server inloggen"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Bezig met ophalen data..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Er zijn geen beschikbare kanten in dit spel."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Kies je kant:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Het spel werd geannuleerd"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "De kant die je gekozen hebt is niet langer beschikbaar"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Toon opgenomen spel tot het moment van opslaan?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Leider:"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Rekruten:"
@@ -7685,7 +7706,7 @@
msgstr "Kleur"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Goud"
@@ -7693,23 +7714,23 @@
msgid "Waiting for network players to join"
msgstr "Aan het wachten op netwerkspelers"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Vrije Plaats"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Vrije Plaatsen"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Observeer Spel"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Verlaat"
@@ -7778,57 +7799,53 @@
msgid "It is now your turn"
msgstr "Het is nu jouw beurt"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Aanvaller"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Verdediger"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Schadeberekeningen"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Dichtbij"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "vs"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Val Vijand Aan"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Kies wapen"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr "Je bent je beurt nog niet begonnen. Wil je ze echt al beëindigen."
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr "Sommige eenheden kunnen nog bewegen. Wil je echt je beurt beëindigen"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Auto-Save"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
"Kon het spel niet automatisch opslaan. Gelieve het spel manueel op te slaan."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Hernoem Eenheid"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -7836,43 +7853,43 @@
"Opgeslagen namen mogen geen dubbelpunten of shlashes bevatten. Kies een "
"andere naam."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Opgeslagen"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Het spel werd opgeslagen"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Leider"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Onderhoudskost"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Inkomen"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Je hebt geen eenheden beschikbaar om te recruteren."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Recruteren"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Selecteer eenheid"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Je hebt niet genoeg goud om die eenheid te recruteren"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -7880,26 +7897,26 @@
"Mijnheer, deze eenheid is ervaren en is al gepromoveerd! Wil je $noun echt "
"ontslaan?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
"Mijnheer, deze eenheid is bijna gepromoveerd! Wil je $noun echt ontslaan?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "haar"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "hem"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Je bent van je troepen gescheiden en dus kun je hen niet oproepen."
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -7907,99 +7924,99 @@
"Er zijn geen troepen beschikbaar om op te roepen\n"
"(Je moet veteranen uit vorige scenarios hebben)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "Je moet tenminste $cost goudstukken hebben om een eenheid op te roepen"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Ontsla Eenheid"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Oproepen"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Bericht"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Stuur alleen naar bondgenoten"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Locatie"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Troepenlijst"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Recruteringen"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Oproepingen"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Promoties"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Verliezen"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Gedoodden"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Toegebrachte Schade"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Ontvangen Schade"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Toegebrachte Schade (EV)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Ontvangen Schade (EV)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statistieken"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Zoek"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Commando:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Chat Log"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Kon geen label of eenheid vinden met '$search'."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Plaats Label"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Label"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -8007,23 +8024,23 @@
"De spellen verlopen niet meer synchroon en zullen moeten afsluiten. Wil je "
"een error log opslaan van dit spel?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Vervang door AI"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Vervang door lokale speler"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Stop spel"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Vervang door"
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "heeft het spel verlaten. Wat wil je doen?"
@@ -8189,6 +8206,60 @@
msgid "Deletion of the file failed."
msgstr "Verwijderen van het bestand is mislukt."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Willekeurig"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,Loyalen"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,Rebellen"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,Noorderstammen"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,Levende Doden"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Knalga Alliantie"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Draken"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Mensen"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Elven"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,Orks"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Dwergen"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,Saurian"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Loyalen"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Rebellen"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Noorderstammen"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Levende Doden"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Alliantie van het Licht"
+
+#~ msgid "Melee"
+#~ msgstr "Dichtbij"
+
#~ msgid ""
#~ "This page outlines all you need to know to play Battle for Wesnoth. It "
#~ "covers how to play and the basic mechanics behind the game. For more "
Index: wesnoth/po/wesnoth/no.po
diff -u wesnoth/po/wesnoth/no.po:1.19 wesnoth/po/wesnoth/no.po:1.20
--- wesnoth/po/wesnoth/no.po:1.19 Sun Dec 5 00:12:16 2004
+++ wesnoth/po/wesnoth/no.po Sun Dec 12 15:19:49 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-09-10 15:28+0100\n"
"Last-Translator: Erik <address@hidden>\n"
"Language-Team: none\n"
@@ -47,7 +47,7 @@
msgid "Traits"
msgstr "Trekk"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Enheter"
@@ -827,104 +827,81 @@
msgid "Default"
msgstr "Standard"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Tilfeldig"
-
-#: data/multiplayer.cfg:28
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
#, fuzzy
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-general.png,Lojalister"
+msgid "Random"
+msgstr "Tilfeldig kart"
-#: data/multiplayer.cfg:40
-#, fuzzy
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-lord.png,Opprørere"
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
-#: data/multiplayer.cfg:52
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
#, fuzzy
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warlord.png,Nordboere"
+msgid "Rebels"
+msgstr "Tilbakekallinger"
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-#, fuzzy
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-lich.png,Vandøde"
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
+
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "Vandøde"
-#: data/multiplayer.cfg:76
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
#, fuzzy
-msgid "&dwarf-warrior.png,Knalgan Alliance"
+msgid "Knalgan Alliance"
msgstr "&dwarf-lord.png,Den Knalgaiske Allianse (Knalgiske? Knalgas Allianse?)"
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
#, fuzzy
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-warrior.png,Draker"
+msgid "Drakes"
+msgstr "Slag"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Klassisk"
-#: data/multiplayer.cfg:110
-#, fuzzy
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-general.png,Mennesker"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Mennesker"
-#: data/multiplayer.cfg:122
-#, fuzzy
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-lord.png,Alver"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Alver"
-#: data/multiplayer.cfg:134
-#, fuzzy
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warlord.png,Orker"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orker"
-#: data/multiplayer.cfg:158
+#: data/multiplayer.cfg:171
#, fuzzy
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-lord.png,Dverger"
+msgid "Dwarves"
+msgstr "Dvergisk Ãdeland"
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr ""
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Saurianer"
-#: data/multiplayer.cfg:196
+#: data/multiplayer.cfg:211
msgid "Age of Heroes"
msgstr "Heltenes Alder"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Lojalister"
-
-#: data/multiplayer.cfg:216
-#, fuzzy
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-lord.png,Opprørere"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Nordboere"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Vandøde"
-
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Den Knalgaiske Allianse (Knalgiske? Knalgas Allianse?)"
-
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Den store krigen"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Lysets Allianse"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Lysets Trollmann"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-lich.png,Mørkets Allianse"
#: data/scenario-test.cfg:38
@@ -2090,71 +2067,59 @@
msgid "Canyon"
msgstr "ingenting"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Meny"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Handlinger"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Avslutt runde"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "LP"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "EP"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
#, fuzzy
msgid "gold"
msgstr "frost"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
#, fuzzy
msgid "villages"
msgstr "Landsbyer"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
#, fuzzy
msgid "units"
msgstr "Enheter"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
#, fuzzy
msgid "upkeep"
msgstr "Underhold"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
#, fuzzy
msgid "income"
msgstr "Inntekt"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr ""
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr ""
@@ -2545,7 +2510,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "lederskap"
@@ -2613,7 +2578,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr ""
@@ -2718,22 +2683,6 @@
"may not move or attack."
msgstr ""
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Alver"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Mennesker"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orker"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "Vandøde"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr ""
@@ -2909,7 +2858,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -2924,6 +2873,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -2984,7 +2934,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3061,13 +3011,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3085,11 +3036,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3100,7 +3051,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "ryggdolking"
@@ -3184,7 +3135,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3193,9 +3145,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "sverd"
@@ -3286,7 +3238,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3304,7 +3257,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3435,7 +3388,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3451,8 +3405,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "stormangrep"
@@ -3475,7 +3429,7 @@
msgid "gaze"
msgstr "blikk"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "stein"
@@ -3692,7 +3646,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr ""
@@ -3826,8 +3780,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "førsteslag"
@@ -4313,7 +4268,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "skarpskytter"
@@ -4678,8 +4633,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4724,7 +4681,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4833,21 +4790,25 @@
"kan ri disse flygende beistene oppdager en helt ny verden sett ovenfra."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Hellebardør"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"De beste soldatene blir valgt til å være Hellebarderer. Selv om de er litt "
"langsommere enn sverdkjemperne, gjør deres evner med hellebarden dem til en "
"minst like dødelig motstander."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "hellebard"
@@ -4876,7 +4837,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Formiddag"
@@ -4920,6 +4882,24 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+msgid "Javelineer"
+msgstr ""
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"Spydkasteren utgjr kjernen i de menneskelige hærene. Disse unge soldatene "
+"gis enkel trening og settes på fremste rad for å motta kampens hovedstøt. "
+"Pga. deres lange våpen, får de inn første slag i en kamp, selv når de "
+"forsvarer seg."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Ridder"
@@ -5229,7 +5209,7 @@
msgid "Mounted Captain"
msgstr "Fjell"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5250,6 +5230,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Adelig Stridsmann"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Saurianerkriger"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Sølekryp"
@@ -5738,17 +5736,19 @@
msgid "Pikeman"
msgstr "Pikenerer"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Pikenerere er mer erfarne soldater som har byttet ut spydet med en lang "
"lanse. Pikenerere kan være spesielt dødelige i kamp mot kavaleri."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "piggspyd"
@@ -5847,7 +5847,7 @@
msgid "Royal Guard"
msgstr "Kongelig Gardist"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -5857,10 +5857,6 @@
"robuste i hæren. De blir bare brukt i kritiske situasjoner, og har hittil "
"alltid fullført oppdraget med suksess."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Saurianer"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6161,11 +6157,12 @@
msgstr "Spydkaster"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"Spydkasteren utgjr kjernen i de menneskelige hærene. Disse unge soldatene "
"gis enkel trening og settes på fremste rad for å motta kampens hovedstøt. "
@@ -6188,7 +6185,7 @@
msgid "Swordsman"
msgstr "Sverdkjemper"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6665,16 +6662,16 @@
msgid "Close"
msgstr "Lukk"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Du har ingen leder til å rekruttere med."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Du må ha lederen på en festning for å rekruttere eller tilbakekalle
enheter."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Det finnes ingen ledige plasser i borgen for en ny rekrutt."
@@ -6682,7 +6679,17 @@
msgid "none"
msgstr "ingenting"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "nærkamp"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "avstand"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "Grunnskade"
@@ -6694,61 +6701,61 @@
msgid "attacker vulnerability vs"
msgstr "angripers svakhet mot"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Doblet"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "Totalskade"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "forsvarers motstand mot"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "forsvarers svakhet mot"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "Halvert"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "forgiftet"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "saktnet"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Bakhold!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Vennlig enhet i sikte"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Fiendtlig enhet i sikte!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends vennlige enheter i sikte"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies fiendtlige enheter i sikte!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Enheter i sikte! ($friends vennlige, $enemies fiendtlige)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(tast $hotkey for å fortsette)"
@@ -6796,7 +6803,7 @@
msgid "Campaign"
msgstr "Kampanje"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Flerspiller"
@@ -6808,7 +6815,7 @@
msgid "replay"
msgstr "avspilling"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Runde"
@@ -6820,7 +6827,7 @@
msgid "Difficulty"
msgstr "Vanskelighet"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Versjon"
@@ -6879,25 +6886,15 @@
msgstr "Profil"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "nivå"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Flytt"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "nærkamp"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "avstand"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "frisk"
@@ -6914,11 +6911,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Vil du lagre hendelsene som skjedde i dette scenariet?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Navn:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Spillet kunne ikke lagres"
@@ -6948,8 +6945,9 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
-msgstr ""
+#, fuzzy
+msgid "Get More Campaigns..."
+msgstr "Kampanje"
#: src/game.cpp:954
msgid "Download more campaigns from a server on Internet."
@@ -6981,11 +6979,11 @@
msgid "Could not connect to host."
msgstr "Kunne ikke opprette forbindelse til ekstern vert"
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Feil"
@@ -6997,147 +6995,161 @@
msgid "Error communicating with the server."
msgstr ""
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Navn"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "torner"
+
+#: src/game.cpp:1057
+msgid "Downloads"
msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "ild"
+
+#: src/game.cpp:1077
#, fuzzy
msgid "B"
msgstr "KB"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
#, fuzzy
msgid "Publish campaign: "
msgstr "Alvisk Kaptein"
-#: src/game.cpp:1094
+#: src/game.cpp:1104
#, fuzzy
msgid "Delete campaign: "
msgstr "Kampanje"
-#: src/game.cpp:1098
+#: src/game.cpp:1108
#, fuzzy
msgid "There are no campaigns available for download from this server."
msgstr "Det er ingen kampanjer tilgjengelig"
-#: src/game.cpp:1102
+#: src/game.cpp:1112
#, fuzzy
msgid "Choose the campaign to download."
msgstr "Velg spill for innlasting"
-#: src/game.cpp:1102
+#: src/game.cpp:1112
#, fuzzy
msgid "Get Campaign"
msgstr "Kampanje"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
#, fuzzy
msgid "Campaign Installed"
msgstr "Kampanje"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
#, fuzzy
msgid "The campaign has been installed."
msgstr "Spillet har nå blitt lagret"
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr ""
-#: src/game.cpp:1143
+#: src/game.cpp:1154
#, fuzzy
msgid "Remote host disconnected."
msgstr "Velg vert å koble til"
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Forbindelse utgått på tid"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
#, fuzzy
msgid "Terms"
msgstr "Lag"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
#, fuzzy
msgid "Response"
msgstr "stein"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Koble til offisiell vert"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Koble til den offisielle Wesnoth-flerspillerverten"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Bli med i spill"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Koble opp til en vertsmaskin eller annet spill"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
#, fuzzy
msgid "Host Networked Game"
msgstr "Nettverksspiller"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Vær vert for et spill uten server"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
#, fuzzy
msgid "Hotseat Game"
msgstr "Opprett Spill"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
#, fuzzy
msgid "Human vs AI"
msgstr "Mennesker"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Logg inn"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Språk"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Velg språket du foretrekker"
@@ -7157,11 +7169,7 @@
msgid "attacks"
msgstr "angrep"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Navn"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Type"
@@ -7290,7 +7298,7 @@
msgid "Bump Size"
msgstr "Humpstørrelse"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Landsbyer"
@@ -7352,7 +7360,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Tillat brukere som ikke spiller å følge med på spillet"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7386,7 +7394,7 @@
msgid "No multiplayer sides."
msgstr "Ingen lag i flerspiller."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Opprett Spill"
@@ -7436,66 +7444,66 @@
msgid "Receiving game list..."
msgstr "Mottar spilliste..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Gullstykker"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Venter på at spillet skal starte..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
#, fuzzy
msgid "Connect to Host"
msgstr "Fortsett forflytning"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Velg vert å koble til"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Oppretter forbindelse til ekstern vert..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Du må logge inn på denne tjeneren"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Laster spilldata..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Det er ingen tilgjengelige sider i dette spillet."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Velg side:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Spillet er avlyst"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "Siden du har valgt er ikke lenger tilgjengelig."
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Vis reprise av spill frem til lagringspunkt?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr ""
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
#, fuzzy
msgid "Leader: "
msgstr "Leder"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
#, fuzzy
msgid "Recruits: "
msgstr "Rekrutter"
@@ -7595,7 +7603,7 @@
msgstr "Farge"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Gullstykker"
@@ -7603,23 +7611,23 @@
msgid "Waiting for network players to join"
msgstr "Venter på at nettverksspillere skal koble til"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Tom rubrikk"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Tomme rubrikker"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Se på spill"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Avslutt"
@@ -7688,58 +7696,54 @@
msgid "It is now your turn"
msgstr "Det er nå din tur"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Angriper"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Forsvarer"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Skadeberegninger"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Nærkamp"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "mot"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Angrip fiende"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Velg våpen"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
"Du har ikke begynt turen din ennå. Er du sikker på at du vil avslutte turen
"
"din?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr "Noen enheter kan fremdeles flytte. Vil du likevel avslutte runden din?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Lagre automatisk"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr "Kunne ikke lagre spillet automatisk. Du bør lagre spillet manuelt."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Gi enheten nytt navn"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -7747,43 +7751,43 @@
"Filnavn kan ikke inneholde kolon eller skråstreker. Vennligst velg et annet "
"navn."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Lagret"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Spillet har nå blitt lagret"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Leder"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Underhold"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Inntekt"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Det finnes ingen enheter du kan rekruttere."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Rekrutter"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Velg enhet"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Du har ikke nok gullstykker til å rekruttere denne enheten."
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -7791,7 +7795,7 @@
"Men herre, dette er en erfaren enhet av høy rang! Er du sikker på at du vil
"
"sende bort $noun?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -7799,20 +7803,20 @@
"Men herre, denne enheten er nær ved å gå opp et nivå! Er du sikker på at
du "
"vil sende bort $noun?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "henne"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "ham"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
#, fuzzy
msgid "You are separated from your soldiers and may not recall them"
msgstr "Du er blitt skilt fra soldatene dine og kan ikke kalle dem tilbake"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -7820,100 +7824,100 @@
"Det finnes ingen tropper å tilbakekalle\n"
"(Du må ha veterantropper som har overlevd tidligere scenarier)."
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
#, fuzzy
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "gullstykker for å tilbakekalle en enhet."
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Send bort enhet"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Tilbakekall"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Beskjed"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Send kun til allierte"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Sted"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Liste over enheter"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Rekrutter"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Tilbakekallinger"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Forfremmelser"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Tap"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Drepte fiender"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Skade mottat"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Skade utdelt"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr ""
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr ""
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statistikk"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Søk"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Pratelogg"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Kunne ikke finne merkelapp elelr enhet som inneholdt '$search'."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Sett merkelapp"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Merkelapp"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -7921,23 +7925,23 @@
"Spillene er ikke synkroniserte og må derfor avsluttes. Vil du lagre en "
"feillogg?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Erstatt med datastyrt spiller"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Erstatt med lokal spiller"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Avbryt spill"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Erstatt med "
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "har forlatt spillet. Hva vil du gjøre?"
@@ -8111,6 +8115,69 @@
msgid "Deletion of the file failed."
msgstr "Filsletting slo feil."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Tilfeldig"
+
+#, fuzzy
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-general.png,Lojalister"
+
+#, fuzzy
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-lord.png,Opprørere"
+
+#, fuzzy
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Nordboere"
+
+#, fuzzy
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-lich.png,Vandøde"
+
+#, fuzzy
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr ""
+#~ "&dwarf-lord.png,Den Knalgaiske Allianse (Knalgiske? Knalgas Allianse?)"
+
+#, fuzzy
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-warrior.png,Draker"
+
+#, fuzzy
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-general.png,Mennesker"
+
+#, fuzzy
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-lord.png,Alver"
+
+#, fuzzy
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warlord.png,Orker"
+
+#, fuzzy
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-lord.png,Dverger"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Lojalister"
+
+#, fuzzy
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-lord.png,Opprørere"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Nordboere"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Vandøde"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Lysets Allianse"
+
+#~ msgid "Melee"
+#~ msgstr "Nærkamp"
+
#~ msgid ""
#~ "In Wesnoth, there are three types of damage usually associated with "
#~ "physical attacks: Blade, Pierce and Impact damage. Additionally, there "
Index: wesnoth/po/wesnoth/pl.po
diff -u wesnoth/po/wesnoth/pl.po:1.22 wesnoth/po/wesnoth/pl.po:1.23
--- wesnoth/po/wesnoth/pl.po:1.22 Sun Dec 5 00:12:17 2004
+++ wesnoth/po/wesnoth/pl.po Sun Dec 12 15:19:49 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-11-30 21:59+0100\n"
"Last-Translator: PaweÅ Stradomski <address@hidden>\n"
"Language-Team: none\n"
@@ -47,7 +47,7 @@
msgid "Traits"
msgstr "Cechy"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Jednostki"
@@ -840,93 +840,86 @@
msgid "Default"
msgstr "DomyÅlna"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Losowa"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,LojaliÅci"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain,Buntownicy"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,MieszkaÅcy póÅnocy"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,Nieumarli"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Sojusz KnalgaÅski"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Smoki"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Losowa mapa"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "PrzywoÅaÅ"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
+
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+#, fuzzy
+msgid "Undead"
+msgstr "Nieumarli"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,Sojusz KnalgaÅski"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Ognisty smok"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Klasyczna"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Ludzie"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Elfy"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,Orki"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Krasnoludy"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,Saurianie"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+#, fuzzy
+msgid "Humans"
+msgstr "Ludzie"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "Wiek bohaterów"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+#, fuzzy
+msgid "Elves"
+msgstr "Elfy"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,LojaliÅci"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Buntownicy"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Istoty z póÅnocy"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Nieumarli"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+#, fuzzy
+msgid "Orcs"
+msgstr "Orki"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Sojusz KnalgaÅski"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Krasnoludzki zamek"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+#, fuzzy
+msgid "Saurian"
+msgstr "Sauryjczyk"
+
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "Wiek bohaterów"
+
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Wielka wojna"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Sojusz ÅwiatÅa"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Mag ÅwiatÅa"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Sojusz CiemnoÅci"
#: data/scenario-test.cfg:38
@@ -2210,66 +2203,54 @@
msgid "Canyon"
msgstr "WÄ
wóz"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menu"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "DziaÅania"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "ZakoÅcz turÄ"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "PÅ»"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "PD"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "zÅoto"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "Wioski"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "Jednostki"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "Utrzymanie"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "Dochód"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "poziom"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "ruch"
@@ -2764,7 +2745,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
#, fuzzy
msgid "leadership"
msgstr "dowodzenie"
@@ -2832,7 +2813,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
#, fuzzy
msgid "steadfast"
msgstr "niezÅomny"
@@ -2969,26 +2950,6 @@
"Ten atak obraca przeciwnika w kamieÅ. Takie jednostki nie mogÄ
siÄ ruszaÄ
"
"ani atakowaÄ."
-#: data/translations/english.cfg:124
-#, fuzzy
-msgid "Elves"
-msgstr "Elfy"
-
-#: data/translations/english.cfg:125
-#, fuzzy
-msgid "Humans"
-msgstr "Ludzie"
-
-#: data/translations/english.cfg:126
-#, fuzzy
-msgid "Orcs"
-msgstr "Orki"
-
-#: data/translations/english.cfg:127
-#, fuzzy
-msgid "Undead"
-msgstr "Nieumarli"
-
#: data/translations/english.cfg:130
#, fuzzy
msgid "$name's Bridge,$name's Crossing"
@@ -3182,7 +3143,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3197,6 +3158,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3261,7 +3223,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3341,13 +3303,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3365,11 +3328,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3381,7 +3344,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
#, fuzzy
msgid "backstab"
msgstr "cios w plecy"
@@ -3471,7 +3434,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3480,9 +3444,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
#, fuzzy
msgid "sword"
msgstr "miecz"
@@ -3585,7 +3549,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3603,7 +3568,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3748,7 +3713,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3765,8 +3731,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
#, fuzzy
msgid "charge"
msgstr "szarża"
@@ -3792,7 +3758,7 @@
msgid "gaze"
msgstr "spojrzenie"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
#, fuzzy
msgid "stone"
@@ -4057,7 +4023,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
#, fuzzy
msgid "fire breath"
msgstr "zioniÄcie ogniem"
@@ -4200,8 +4166,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
#, fuzzy
msgid "firststrike"
msgstr "pierwszy cios"
@@ -4758,7 +4725,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "strzelec wyborowy"
@@ -5184,8 +5151,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -5236,7 +5205,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5361,22 +5330,24 @@
#: data/units/Halbardier.cfg:3
#, fuzzy
-msgid "Halbardier"
+msgid "Halberdier"
msgstr "Halabardzista"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"Najlepsi żoÅnierze zostajÄ
wybrani na Halabardzistów. Ich broÅ, choÄ "
"wolniejsza od miecza, z powodu swej dÅugoÅci może uderzyÄ z morderczÄ
siÅÄ
. "
"Zawsze atakujÄ
pierwsi w walce, nawet gdy siÄ broniÄ
."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
#, fuzzy
msgid "halberd"
msgstr "halabarda"
@@ -5408,7 +5379,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Ranek"
@@ -5462,6 +5434,24 @@
"mÅota. Gdyby nie powolnoÅÄ i niezwykle maÅa iloÅÄ, ci żoÅnierze
podbiliby "
"caÅy kontynent."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "UÅan"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"WÅócznicy stanowiÄ
trzon ludzkich armii. Ci mÅodzi ludzie poddawani sÄ
"
+"prostemu przeÄwiczeniu i ustawiani w pierwszej linii, by walczyli z wrogami.
"
+"DziÄki dÅugoÅci swoich wÅóczni zawsze atakujÄ
pierwsi, nawet, gdy siÄ
broniÄ
."
+
#: data/units/Knight.cfg:3
#, fuzzy
msgid "Knight"
@@ -5804,7 +5794,7 @@
msgid "Mounted Captain"
msgstr "Kapitan jazdy"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5825,6 +5815,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Szlachetny wojownik"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Sauryjski wojownik"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
#, fuzzy
msgid "Mudcrawler"
@@ -6378,19 +6386,20 @@
msgid "Pikeman"
msgstr "Pikinier"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Pikinierzy sÄ
doÅwiadczonymi żoÅnierzami, którzy wymienili swe
wÅócznie na "
"dÅugie piki. Z powodu dÅugoÅci swej broni zawsze pierwsi atakujÄ
, nawet,
gdy "
"siÄ broniÄ
. SÄ
szczególnie skuteczni w zwalczaniu kawalerii."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
#, fuzzy
msgid "pike"
msgstr "pika"
@@ -6502,7 +6511,7 @@
msgid "Royal Guard"
msgstr "Królewski Gwardzista"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
#, fuzzy
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
@@ -6513,11 +6522,6 @@
"najsilniejszych i najtwardszych żoÅnierzy. Używa siÄ ich tylko w misjach "
"najwyższej wagi i, jak na razie, nigdy jeszcze nie zawiedli."
-#: data/units/Saurian.cfg:5
-#, fuzzy
-msgid "Saurian"
-msgstr "Sauryjczyk"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6856,8 +6860,8 @@
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"WÅócznicy stanowiÄ
trzon ludzkich armii. Ci mÅodzi ludzie poddawani sÄ
"
"prostemu przeÄwiczeniu i ustawiani w pierwszej linii, by walczyli z wrogami.
"
@@ -6885,7 +6889,7 @@
msgid "Swordsman"
msgstr "Miecznik"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
#, fuzzy
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
@@ -7402,17 +7406,17 @@
msgid "Close"
msgstr "Zamknij"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Nie ma dowódcy, który mógÅby rekrutowaÄ."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Å»eby mmożna byÅo rekrutowaÄ lub przywoÅywaÄ jednostki, dowódca musi
staÄ w "
"twierdzy."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Nie ma pustych pól zamku, na które można by rekrutowaÄ."
@@ -7420,7 +7424,17 @@
msgid "none"
msgstr "brak"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "wrÄcz"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "na odlegÅoÅÄ"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "obrażenia podstawowe"
@@ -7432,61 +7446,61 @@
msgid "attacker vulnerability vs"
msgstr "czuÅoÅÄ atakujÄ
cego na"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Podwojone"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "suma obrażeÅ"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "odpornoÅÄ obroÅcy na"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "czuÅoÅÄ obroÅcy na"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "Zmniejszona o poÅowÄ"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "zatruty"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "spowolniony"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Zasadzka!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Zauważono przyjaznÄ
jednostkÄ"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Zauważono jednostkÄ wroga!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "Zauważono $friends przyjaznych(e) jednostek(i)"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "Zauważono $enemies wrogich(ie) jednostek(i)."
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Zauważono jednostki! ($friends przyjaznych, $enemies wrogich)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(wciÅnij $hotkey aby kontynuowaÄ)"
@@ -7534,7 +7548,7 @@
msgid "Campaign"
msgstr "Kampania"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Gra z innymi"
@@ -7546,7 +7560,7 @@
msgid "replay"
msgstr "powtórka"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Tura"
@@ -7558,7 +7572,7 @@
msgid "Difficulty"
msgstr "Poziom trudnoÅci"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Wersja"
@@ -7617,25 +7631,15 @@
msgstr ""
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "poziom"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "wrÄcz"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "na odlegÅoÅÄ"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "zdrowy"
@@ -7652,11 +7656,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Czy zapisaÄ przebieg tej misji?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "ImiÄ:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Gra nie może zostaÄ zachowana"
@@ -7686,8 +7690,9 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
-msgstr ""
+#, fuzzy
+msgid "Get More Campaigns..."
+msgstr "Pobierz kampaniÄ"
#: src/game.cpp:954
msgid "Download more campaigns from a server on Internet."
@@ -7717,11 +7722,11 @@
msgid "Could not connect to host."
msgstr "Nie mogÄ siÄ podÅÄ
czyÄ do hosta"
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "BÅÄ
d"
@@ -7733,134 +7738,148 @@
msgid "Error communicating with the server."
msgstr ""
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "ImiÄ"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "ciernie"
+
+#: src/game.cpp:1057
+msgid "Downloads"
msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "ogieÅ"
+
+#: src/game.cpp:1077
msgid "B"
msgstr "B"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Opublikuj kampaniÄ:"
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "UsuÅ kampaniÄ"
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Nie ma dostÄpnych kampanii"
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Wybór kampanii do wczytania"
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Pobierz kampaniÄ"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Kampania zainstalowana"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "Kampania zostaÅa zainstalowana."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr ""
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Zdalny komputer rozÅÄ
czyÅ siÄ."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "MinÄ
Å czas oczekiwania poÅÄ
czenia"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Warunki"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Odpowiedź"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "PoÅÄ
cz siÄ z oficjalnym serwerem"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr ""
"Zaloguj siÄ na oficjalny serwer gier wieloosobowych Wesnoth (angielski)"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "DoÅÄ
cz do gry"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "DoÅÄ
cz do już zaÅożonej gry"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Poprowadź grÄ sieciowÄ
"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Nie ÅÄ
cz siÄ z serwerami, tylko zaÅóż wÅasnÄ
grÄ wieloosobowÄ
"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr "Gra na jednym komputerze"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Ludzie kontra komputer"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Login"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "JÄzyk"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Wybierz Twój preferowany jÄzyk"
@@ -7880,11 +7899,7 @@
msgid "attacks"
msgstr "ataki"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "ImiÄ"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Typ"
@@ -8014,7 +8029,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Wioski"
@@ -8076,7 +8091,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Pozwala ludziom, którzy nie grajÄ
obserwowaÄ grÄ"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -8110,7 +8125,7 @@
msgid "No multiplayer sides."
msgstr "Brak ston do gry wieloosobowej."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Stwórz grÄ"
@@ -8162,64 +8177,64 @@
msgid "Receiving game list..."
msgstr "Odbieranie listy gier..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "ZÅoto"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Oczekiwanie na poczÄ
tek gry..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "PodÅÄ
cz do serwera"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Wybierz serwer do poÅÄ
czenia"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "ÅÄ
czenie z serwerem..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Musisz siÄ zalogowaÄ na ten serwer"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Pobieranie danych gry..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Nie ma dostÄpnych stron w tej grze."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Wybierz swojÄ
stronÄ"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Gra zostaÅa odwoÅana"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "Wybrana strona nie jest już dostÄpna"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Czy pokazaÄ przebieg gry do momentu zachowania?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr ""
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Dowódca:"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Rekrutacji:"
@@ -8318,7 +8333,7 @@
msgstr "Kolor"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "ZÅoto"
@@ -8326,23 +8341,23 @@
msgid "Waiting for network players to join"
msgstr "Oczekiwanie na graczy sieciowych"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Wolne miejsce"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Wolne miejsca"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Obserwuj grÄ"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Wyjdź"
@@ -8411,57 +8426,53 @@
msgid "It is now your turn"
msgstr "NadeszÅa Twoja tura"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "AtakujÄ
cy"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "BroniÄ
cy siÄ"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Wyliczenia obrażeÅ"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "WrÄcz"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "kontra"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Atakowanie nieprzyjaciela"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Wybór broni"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr "Jeszcze nie rozpoczÄ
ÅeÅaÅ(aÅ) tury. Czy chcesz jÄ
już
zakoÅczyÄ?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"Niektóre jednostki wciÄ
ż mogÄ
siÄ poruszyÄ. Czy na pewno zakoÅczyÄ
już turÄ?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Autozapis"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr "Nie da siÄ automatycznie zapisaÄ gry. ProszÄ zapisaÄ grÄ
rÄcznie."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Przemianuj jednostkÄ"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -8469,69 +8480,69 @@
"Zapisane gry nie mogÄ
zawieraÄ dwukropków, slashy ani
backslashy(ukoÅników). "
"ProszÄ wybraÄ innÄ
nazwÄ."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Zapisano"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Gra zostaÅa zapisana"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Dowódca"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Utrzymanie"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Dochód"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Nie ma dostÄpnych jednostek do rekrutacji."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Rekrutuj"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Wybierz jednostkÄ"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "NiewystarczajÄ
ce zÅoto, żeby rekrutowaÄ tÄ jednostkÄ"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
"Panie, to doÅwiadczona jednostka, po awansach! Czy naprawdÄ $noun zwolniÄ?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr "Panie, ta jednostka wkrótce awansuje! Czy naprawdÄ $noun zwolniÄ?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "jÄ
"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "go"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr ""
"ZostaÅeÅ oddzielony(a) od swojej armii i nie możesz przywoÅywaÄ
jednostek"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8539,100 +8550,100 @@
"Nie ma jednostek do przywoÅania\n"
"(Musisz mieÄ jakieÅ jednostki pozostaÅe z poprzednich misji)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "Musisz mieÄ $cost sztuk zÅota, żeby przywoÅaÄ jednostkÄ"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Oddal jednostkÄ"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "PrzywoÅaj"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "WiadomoÅÄ"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "WyÅlij tylko do sprzymierzeÅców"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Miejsce"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Lista jednostek"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Rekrutacji"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "PrzywoÅaÅ"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Awansów"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Strat"
# (zabitych przeciwników)
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Zabitych"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Zadane obrażenia"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Otrzymane obrażenia"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Zadane obrażenia (EV)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Otrzymane obrażenia (EV)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statystyki"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Szukaj"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Polecenie:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Zapis rozmów"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Nie znaleziono opisu ani jednostki zawierajÄ
cej '$search'."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "UmieÅÄ opis"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Opis"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -8640,23 +8651,23 @@
"Gry przestaÅy byÄ skoordynowane i konieczne jest wyjÅcie. ZapisaÄ raport "
"bÅÄdów tej gry?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "ZastÄ
p przez AI"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "ZastÄ
p lokalnym graczem"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "OpuÅÄ grÄ"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "ZastÄ
p przez"
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "opuÅciÅ(a) grÄ. Co teraz?"
@@ -8826,6 +8837,60 @@
msgid "Deletion of the file failed."
msgstr "Kasowanie pliku siÄ nie powiodÅo."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Losowa"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,LojaliÅci"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain,Buntownicy"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,MieszkaÅcy póÅnocy"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,Nieumarli"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Sojusz KnalgaÅski"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Smoki"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Ludzie"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Elfy"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,Orki"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Krasnoludy"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,Saurianie"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,LojaliÅci"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Buntownicy"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Istoty z póÅnocy"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Nieumarli"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Sojusz ÅwiatÅa"
+
+#~ msgid "Melee"
+#~ msgstr "WrÄcz"
+
#~ msgid ""
#~ "This page outlines all you need to know to play Battle for Wesnoth. It "
#~ "covers how to play and the basic mechanics behind the game. For more "
Index: wesnoth/po/wesnoth/pt_BR.po
diff -u wesnoth/po/wesnoth/pt_BR.po:1.20 wesnoth/po/wesnoth/pt_BR.po:1.21
--- wesnoth/po/wesnoth/pt_BR.po:1.20 Sun Dec 5 00:12:17 2004
+++ wesnoth/po/wesnoth/pt_BR.po Sun Dec 12 15:19:49 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-09-11 21:11+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,7 +48,7 @@
msgid "Traits"
msgstr "CaracterÃsticas"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Unidades"
@@ -843,99 +843,81 @@
msgid "Default"
msgstr "Padrão"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Aleatório"
-
-#: data/multiplayer.cfg:28
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
#, fuzzy
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-general.png,Conservadores"
+msgid "Random"
+msgstr "Mapa aleatório"
-#: data/multiplayer.cfg:40
-#, fuzzy
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-high-lord.png,Rebeldes"
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
-#: data/multiplayer.cfg:52
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
#, fuzzy
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warlord.png,Nortistas"
+msgid "Rebels"
+msgstr "Convocações"
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-#, fuzzy
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-lich.png,Mortos-Vivos"
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
+
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "Mortos Vivos"
-#: data/multiplayer.cfg:76
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
#, fuzzy
-msgid "&dwarf-warrior.png,Knalgan Alliance"
+msgid "Knalgan Alliance"
msgstr "&dwarf-lord.png,Alianca de Knalga"
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
#, fuzzy
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-warrior.png,Draconianos"
+msgid "Drakes"
+msgstr "Draconiano Celeste"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Clássico"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Humanos"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Elfos"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,Orcs"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Anões"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&seurian-soothsayer.png,Homens-Lagarto"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Humanos"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "Era dos Heróis"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elfos"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Conservadores"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Rebeldes"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Nortistas"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Mortos-Vivos"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orcs"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Alianca de Knalga"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Desolados dos Anões"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Lagarto"
+
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "Era dos Heróis"
+
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "A Grande Guerra"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Aliança da Luz"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Mago da Luz"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Alliance da Escuridão"
#: data/scenario-test.cfg:38
@@ -2389,66 +2371,54 @@
msgid "Canyon"
msgstr "nada"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menu"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Ações"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Termina o turno"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "PV"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "XP"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "ouro"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "vilas"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "unidades"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "gasto"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "receita"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "nÃvel"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "movimento"
@@ -2906,7 +2876,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "liderança"
@@ -2971,7 +2941,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "posição defensiva"
@@ -3096,22 +3066,6 @@
"Este ataque transforma o alvo em pedra. Unidades petreficadas não podem se "
"mover ou atacar."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elfos"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Humanos"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orcs"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "Mortos Vivos"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "Ponte de $name, Encruzilhada de $name"
@@ -3291,7 +3245,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3306,6 +3260,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3367,7 +3322,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3443,13 +3398,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3467,11 +3423,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3482,7 +3438,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "golpe por trás"
@@ -3568,7 +3524,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3577,9 +3534,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "espada"
@@ -3673,7 +3630,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3691,7 +3649,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3826,7 +3784,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3842,8 +3801,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "carga"
@@ -3866,7 +3825,7 @@
msgid "gaze"
msgstr "olhar"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "petrefica"
@@ -4112,7 +4071,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "hálito de fogo"
@@ -4291,8 +4250,9 @@
"alabarda, que eles usam com extrema precisão."
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "iniciativa"
@@ -4799,7 +4759,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "atirador"
@@ -5189,10 +5149,13 @@
msgstr "Impalador Goblin"
#: data/units/Goblin_Impaler.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
"Goblins costumam tentar compensar pela sua estupidez, fragilidade, e falta "
"de armas decentes através da superioridade numérica. Estes são os maiores
e "
@@ -5238,9 +5201,10 @@
msgstr "Lanceiro Goblin"
#: data/units/Goblin_Spearman.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5356,22 +5320,26 @@
"costas de suas bestas aladas."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Alabardeiro"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"Os melhores soldados são escolhidos para se tornar Alabardeiros. Sua arma, "
"apesar de ser um pouco mais lenta que a espada, pode atingir com força "
"mortal. Devido ao comprimento de suas armas, alabardeiros sempre atacam "
"primeiro em combate, mesmo quando defendendo."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "alabarda"
@@ -5400,7 +5368,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Manhã"
@@ -5450,6 +5419,25 @@
"martelo. Não fosse pela sua lentidão e raridade, estes soldados
formidáveis "
"controlariam o continente."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Cavalier"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"Lanceiros são o corpo dos exércitos humanos. A estes jovens soldados é
dado "
+"treinamento basico antes de serem levados à frente de combate para "
+"enfrentarem o grosso da luta. Devido ao comprimento de suas lanças, eles "
+"atacam primeiro em combate, mesmo quando defendendo."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Cavaleiro"
@@ -5769,7 +5757,7 @@
msgid "Mounted Captain"
msgstr "Montanhas"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5790,6 +5778,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Lutador Nobre"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Lagarto Guerreiro"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Monstro de lama"
@@ -6293,19 +6299,21 @@
msgid "Pikeman"
msgstr "Piqueiro"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Piqueiros são soldados mais experientes que trocaram suas lanças por longos
"
"piques. Devido ao comprimento de suas armas, eles sempre atacam primeiro em "
"combate, mesmo quando defendendo. Eles são especialmente mortais quando "
"lutando contra cavalaria."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "pique"
@@ -6405,7 +6413,7 @@
msgid "Royal Guard"
msgstr "Guarda Real"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -6415,10 +6423,6 @@
"resistentes do exército. Eles são enviados apenas em situações crÃticas
e "
"até agora, sempre tiveram sucesso em suas missões."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Lagarto"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6761,11 +6765,12 @@
msgstr "Lanceiro"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"Lanceiros são o corpo dos exércitos humanos. A estes jovens soldados é
dado "
"treinamento basico antes de serem levados à frente de combate para "
@@ -6792,7 +6797,7 @@
msgid "Swordsman"
msgstr "Espadachim"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -7275,16 +7280,16 @@
msgid "Close"
msgstr "Fechar"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Você não tem um lÃder com quem recrutar"
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Você deve ter o seu lÃder em um forte para recrutar ou convocar unidades."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Não há lugar vago no castelo no qual recrutar uma unidade."
@@ -7292,7 +7297,17 @@
msgid "none"
msgstr "nada"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "corpo a corpo"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "longa distância"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "dano básico"
@@ -7304,61 +7319,61 @@
msgid "attacker vulnerability vs"
msgstr "vulnerabilidade do atacante contra"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Dobrado"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "dano total"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "resistência do defensor contra"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "vulnerabilidade do defensor contra"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "Metade"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "envenenado"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "lento"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Emboscada!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Unidade aliada em vista"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Unidade inimiga em vista!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends unidades aliadas vistas"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies unidades inimigas vistas!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Unidades vistas! ($friends aliadas, $enemies inimigas)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(aperte $hotkey para continuar)"
@@ -7406,7 +7421,7 @@
msgid "Campaign"
msgstr "Campanha"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Multijogador"
@@ -7418,7 +7433,7 @@
msgid "replay"
msgstr "replay"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Turno"
@@ -7430,7 +7445,7 @@
msgid "Difficulty"
msgstr "Dificuldade"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Versão"
@@ -7491,25 +7506,15 @@
msgstr "Descrição"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "nÃvel"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Movimento"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "corpo a corpo"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "longa distância"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "saudável"
@@ -7526,11 +7531,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Você quer salvar um replay deste cenário?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Nome:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "O jogo não pôde ser salvo"
@@ -7560,7 +7565,8 @@
msgstr "Erro de E/S ao ler o jogo"
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr " ,Pegar outras campanhas..."
#: src/game.cpp:954
@@ -7591,11 +7597,11 @@
msgid "Could not connect to host."
msgstr "Não foi possÃvel se conectar ao host remoto"
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Erro"
@@ -7607,139 +7613,152 @@
msgid "Error communicating with the server."
msgstr "Erro ao se comunicar com o servidor."
-#: src/game.cpp:1053
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Nome"
+
+#: src/game.cpp:1056
#, fuzzy
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",Nome,Versão,Autor,Vezes Pego"
+msgid "Author"
+msgstr "espinhos"
-#: src/game.cpp:1072
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
+
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "fogo"
+
+#: src/game.cpp:1077
#, fuzzy
msgid "B"
msgstr "KB"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Publicar campanha: "
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "Apagar campanha: "
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Não há campanhas disponÃveis"
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Escolha o jogo a carregar"
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Pegar Campanha"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Fazendo o download da campanha"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Campanha instalada"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "A campanha foi instalada."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Erro de comunicação com a rede."
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "O servidor remoto se disconectou"
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
"Houve um problema criando os arquivos necessários para instalar a campanha."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Time out na conexão"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "O servidor respondeu com um erro: \""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Termos"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Resposta"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Entre no servidor oficial"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Conectar no servidor oficial de multijogadores de Wesnoth"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Entrar no jogo"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Entrar em um servidor ou jogo hospedado"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
#, fuzzy
msgid "Host Networked Game"
msgstr "Jogador Remoto"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Hospedar um jogo sem usar um servidor"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
#, fuzzy
msgid "Hotseat Game"
msgstr "Criar jogo"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
#, fuzzy
msgid "Human vs AI"
msgstr "Humanos"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Entrar"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "LÃngua"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Escolha sua lÃngua preferida"
@@ -7759,11 +7778,7 @@
msgid "attacks"
msgstr "ataca"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Nome"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Tipo"
@@ -7901,7 +7916,7 @@
msgid "Bump Size"
msgstr "Rugosidade"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Vilas"
@@ -7963,7 +7978,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Permite que pessoas que não estão jogando olhem o jogo"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7997,7 +8012,7 @@
msgid "No multiplayer sides."
msgstr "Sem lados multijogadores."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Criar jogo"
@@ -8050,65 +8065,65 @@
msgid "Receiving game list..."
msgstr "Recebendo a lista de jogos"
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Ouro"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Esperando o jogo começar"
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
#, fuzzy
msgid "Connect to Host"
msgstr "Connectar-se ao servidor"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Escolha aonde se conectar"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Conectando-se a um jogo remoto..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Voce deve entrar neste servidor"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Pegando dados do jogo..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Não tem times disponÃveis neste jogo."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Escolha o seu time:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "O jogo foi cancelado"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "O time que você escolheu não está mais disponÃvel"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Mostrar o replay do jogo até o ponto salvo?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "LÃder: "
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Recruta: "
@@ -8207,7 +8222,7 @@
msgstr "Cor"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Ouro"
@@ -8215,23 +8230,23 @@
msgid "Waiting for network players to join"
msgstr "Esperando jogadores remotos entrarem"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Espaço vago"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Espaços vagos"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Observar o jogo"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Sair"
@@ -8300,58 +8315,54 @@
msgid "It is now your turn"
msgstr "Ã o seu turno"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Atacante"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Defensor"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Cálculo de dano"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Corpo a Corpo"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "contra"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Atacar Inimigo"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Escolha a arma"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr "Você ainda não começou o seu turno. Você realmente quer
terminá-lo?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"Algumas unidades ainda podem se mover. Quer realmente terminar o turno?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "auto-salvo"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
"Não pude salvar o jogo automaticamente. Por favor salve o jogo manualmente."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Renomear a unidade"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -8359,43 +8370,43 @@
"Nomes de jogos salvos não podem ter vÃrgulas, barras ou barras invertidas. "
"Por favor escolha outro nome."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Salvo"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "O jogo foi salvo"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "LÃder"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Gasto"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Receita"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Você não tem unidades disponÃveis para recrutar."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Recrutar"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Selecionar unidade"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Você não tem ouro o suficiente para recrutar essa unidade"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -8403,7 +8414,7 @@
"Senhor, esta unidade é experiente, e já passou alguns nÃveis! Você
realmente "
"quer mandar $noun embora?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -8411,19 +8422,19 @@
"Senhor, esta unidade está bem perto de passar de nÃvel! Você realmente
quer "
"mandar $noum embora?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "ela"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "ele"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Você está afastado de seus soldados e não pode convocá-los"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8431,100 +8442,100 @@
"Você não tem tropas para convocar\n"
"(à necessário tropas sobreviventes de um cenário anterior)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "Você deve ter pelo menos $cost peças de ouro para convocar uma
unidade"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Desbandar unidade"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Convocar"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Mensagem"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Enviar apenas para aliados"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Local"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Lista de unidades"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Recrutamentos"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Convocações"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Avanços"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Perdas"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Mortes"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Dano infligido"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Dano tomado"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Dano infligido (EV)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Dano tomado (EV)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "EstatÃsticas"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Procurar"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
#, fuzzy
msgid "prompt^Command:"
msgstr "Comando:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Histórico da conversa"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Não pude encontrar nome ou unidade contendo '$search'."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Colocar nome"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Nome"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -8532,23 +8543,23 @@
"Os jogos estão fora de sincronica e terão de terminar. Você quer salvar um
"
"histórico de erros do seu jogo?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Trocar por uma IA"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Trocar por um jogador local"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Aborat o jogo"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Trocar com "
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "saiu do jogo. O que você quer fazer?"
@@ -8718,6 +8729,70 @@
msgid "Deletion of the file failed."
msgstr "Não foi possÃvel apagar o arquivo."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Aleatório"
+
+#, fuzzy
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-general.png,Conservadores"
+
+#, fuzzy
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-high-lord.png,Rebeldes"
+
+#, fuzzy
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Nortistas"
+
+#, fuzzy
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-lich.png,Mortos-Vivos"
+
+#, fuzzy
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-lord.png,Alianca de Knalga"
+
+#, fuzzy
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-warrior.png,Draconianos"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Humanos"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Elfos"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,Orcs"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Anões"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&seurian-soothsayer.png,Homens-Lagarto"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Conservadores"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Rebeldes"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Nortistas"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Mortos-Vivos"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Aliança da Luz"
+
+#, fuzzy
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",Nome,Versão,Autor,Vezes Pego"
+
+#~ msgid "Melee"
+#~ msgstr "Corpo a Corpo"
+
#~ msgid ""
#~ "Terrible and awe-inspiring, Ancient Woses are majestic treefolk not to be "
#~ "trifled with. Fearsome fighters, they resist many attacks while "
Index: wesnoth/po/wesnoth/ru.po
diff -u wesnoth/po/wesnoth/ru.po:1.25 wesnoth/po/wesnoth/ru.po:1.26
--- wesnoth/po/wesnoth/ru.po:1.25 Sun Dec 5 18:39:04 2004
+++ wesnoth/po/wesnoth/ru.po Sun Dec 12 15:19:49 2004
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.5-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-12-03 16:16+0300\n"
"Last-Translator: Alexandr Menovchicov <address@hidden>\n"
"Language-Team: none\n"
@@ -55,7 +55,7 @@
msgid "Traits"
msgstr "ÐÑобенноÑÑи"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "СоединениÑ"
@@ -844,93 +844,81 @@
msgid "Default"
msgstr "Ðо ÑмолÑаниÑ"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,СлÑÑайнÑе"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,ÐодданнÑе"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,ÐÑÑежники"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,СевеÑÑне"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,ÐеÑÑвеÑÑ"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,ÐлÑÑÐ½Ñ Ðналган"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,ÐÑаконÑ"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "СлÑÑÐ°Ð¹Ð½Ð°Ñ ÐºÐ°ÑÑа"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "ÐÑизваннÑе"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
+
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "ÐеÑÑвеÑÑ"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,ÐлÑÑÐ½Ñ Ðналган"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "ÐебеÑнÑй ÐÑакон"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "ÐлаÑÑиÑеÑкаÑ"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,ÐÑди"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,ÐлÑÑÑ"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,ÐÑки"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,ÐномÑ"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,ЯÑеÑÑ"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "ÐÑди"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "ÐÑемена геÑоев"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "ÐлÑÑÑ"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,ÐеÑноподданнÑе"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,ÐÑÑежники"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,ÐиÑели ÑевеÑа"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,ÐеÑÑвеÑÑ"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "ÐÑки"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,ÐлÑÑÐ½Ñ Ðналган"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Ðамок Ðномов"
+
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "ЯÑеÑ"
+
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "ÐÑемена геÑоев"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "ÐÐµÐ»Ð¸ÐºÐ°Ñ Ð²Ð¾Ð¹Ð½Ð°"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,ÐлÑÑÐ½Ñ Ð¡Ð²ÐµÑа"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "СвеÑлÑй Ðаг"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,ÐлÑÑÐ½Ñ Ð¢ÑмÑ"
#: data/scenario-test.cfg:38
@@ -2396,66 +2384,54 @@
msgid "Canyon"
msgstr "ÐанÑон"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "ÐенÑ"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "ÐейÑÑвиÑ"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "ÐаконÑиÑÑ Ñ
од"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "ÐÐ"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "ÐÐ"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "золоÑо"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "деÑевни"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "ÑоединениÑ"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "ÑодеÑжание"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "доÑ
од"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "ÑÑовенÑ"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "движение"
@@ -2911,7 +2887,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "лидеÑ"
@@ -2982,7 +2958,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "ÑÑойкий"
@@ -3108,22 +3084,6 @@
"ÐаннÑй вид аÑаки пÑевÑаÑÐ°ÐµÑ ÑÐµÐ»Ñ Ð² каменÑ.
СоединениÑ, пÑевÑаÑÑннÑе в "
"каменÑ, не могÑÑ Ð¿ÐµÑемеÑаÑÑÑÑ Ð¸ аÑаковаÑÑ."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "ÐлÑÑÑ"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "ÐÑди"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "ÐÑки"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "ÐеÑÑвеÑÑ"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "ÐоÑÑ $name, ÐеÑеÑ
Ð¾Ð´Ð¸Ñ $name"
@@ -3300,7 +3260,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3315,6 +3275,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3375,7 +3336,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3450,13 +3411,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3474,11 +3436,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3489,7 +3451,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "иÑподÑиÑка"
@@ -3573,7 +3535,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3582,9 +3545,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "меÑ"
@@ -3678,7 +3641,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3696,7 +3660,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3831,7 +3795,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3847,8 +3812,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "бÑоÑок"
@@ -3870,7 +3835,7 @@
msgid "gaze"
msgstr "пÑиÑÑалÑнÑй взглÑд"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "каменÑ"
@@ -4116,7 +4081,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "огненное дÑÑ
ание"
@@ -4264,8 +4229,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "пеÑвÑй ÑдаÑ"
@@ -4712,7 +4678,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "ÑнайпеÑ"
@@ -5056,8 +5022,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -5098,7 +5066,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5204,21 +5172,25 @@
"Ñозданий."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "ÐлебаÑдиÑÑ"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"ÐÑÑÑие из набÑаннÑÑ
ÑÐ¾Ð»Ð´Ð°Ñ ÑÑановÑÑÑÑ
ÐлебаÑдиÑÑами. ÐÑ
оÑÑжие медленее, Ñем "
"меÑ, но Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°Ð½Ð¾ÑиÑÑ ÑдаÑÑ ÑбийÑÑвенной
ÑилÑ. Так как ÐлебаÑдиÑÑÑ Ð²ÑÑокого "
"ÑоÑÑа, они вÑегда наноÑÑÑ ÑÐ´Ð°Ñ Ð¿ÐµÑвÑми,
даже еÑли заÑиÑаÑÑÑÑ."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "алебаÑда"
@@ -5249,7 +5221,8 @@
"моÑгенÑÑеÑн кÑÑÑÐ¸Ñ ÑеÑ
, кÑо покÑепÑе."
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
msgid "morning star"
msgstr "моÑгенÑÑеÑн"
@@ -5287,6 +5260,24 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "ÐÑадник"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"ÐопÑеноÑеÑÑ ÑвлÑÑÑÑÑ Ð¾Ñновой аÑмий лÑдей.
ÐÑи молодÑе ÑолдаÑÑ Ð¸Ð·ÑÑили оÑÐ½Ð¾Ð²Ñ "
+"Ð±Ð¾Ñ Ð¸ бÑли пÑÐ¸Ð·Ð²Ð°Ð½Ñ Ð² ÑÑÐ´Ñ Ð² болÑÑом
колиÑеÑÑве. Ðз-за Ð´Ð»Ð¸Ð½Ñ ÑвоиÑ
копий, в "
+"Ð±Ð¾Ñ Ð¾Ð½Ð¸ наноÑÑÑ ÑÐ´Ð°Ñ Ð¿ÐµÑвÑми, даже еÑли
заÑиÑаÑÑÑÑ."
+
# #"ÐозвÑÑаÑÑиеÑÑ Ð½Ð°Ð´ над полем биÑвÑ
подобно железнÑм гиганÑам, ÐелезнÑе "
# #"ÐÑÑиÑели знамениÑÑ (и за ÑÑо иÑ
боÑÑÑÑ)
Ñвоей невозможной ÑÑойкоÑÑÑÑ Ð¸ "
# #"огÑомнÑм молоÑом. "
@@ -5586,7 +5577,7 @@
msgid "Mounted Captain"
msgstr ""
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5606,6 +5597,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "ÐлагоÑоднÑй ÐоеÑ"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "ÐодÑной Ðоин"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "ÐÑÑзевое ÑÑдиÑе"
@@ -6035,18 +6044,20 @@
msgid "Pikeman"
msgstr "ÐикейÑик"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"ÐикейÑики - более опÑÑнÑе ÑолдаÑÑ,
изменивÑие Ñвои копÑÑ Ð² длиннÑе пики. Ðз-"
"за Ð´Ð»Ð¸Ð½Ñ Ñвоего оÑÑÐ¶Ð¸Ñ Ð¾Ð½Ð¸ вÑегда наноÑÑÑ
ÑÐ´Ð°Ñ Ð¿ÐµÑвÑми в биÑве, даже еÑли "
"заÑиÑаÑÑÑÑ. Ðни наиболее опаÑнÑ, когда
бÑÑÑÑÑ Ð¿ÑоÑив кавалеÑии."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "пика"
@@ -6133,17 +6144,13 @@
msgid "Royal Guard"
msgstr "ÐоÑолевÑкий ÐÑ
Ñанник"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
"always succeeded in their assigned tasks."
msgstr ""
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "ЯÑеÑ"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6427,11 +6434,12 @@
msgstr "ÐопÑеноÑеÑ"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"ÐопÑеноÑеÑÑ ÑвлÑÑÑÑÑ Ð¾Ñновой аÑмий лÑдей.
ÐÑи молодÑе ÑолдаÑÑ Ð¸Ð·ÑÑили оÑÐ½Ð¾Ð²Ñ "
"Ð±Ð¾Ñ Ð¸ бÑли пÑÐ¸Ð·Ð²Ð°Ð½Ñ Ð² ÑÑÐ´Ñ Ð² болÑÑом
колиÑеÑÑве. Ðз-за Ð´Ð»Ð¸Ð½Ñ ÑвоиÑ
копий, в "
@@ -6457,7 +6465,7 @@
msgid "Swordsman"
msgstr "ÐеÑеноÑеÑ"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6893,17 +6901,17 @@
msgid "Close"
msgstr "ÐакÑÑÑÑ"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "У ÐÐ°Ñ Ð½ÐµÑ Ð»Ð¸Ð´ÐµÑа, коÑоÑÑй мог Ð±Ñ ÐºÑпиÑÑ
Ñоединение."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"ÐÑ Ð¼Ð¾Ð¶ÐµÑе покÑпаÑÑ Ð¸Ð»Ð¸ воÑкÑеÑаÑÑ
ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑолÑко еÑли ÐÐ°Ñ Ð»Ð¸Ð´ÐµÑ Ð½Ð°Ñ
одиÑÑÑ
"
"в замке."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr ""
"ÐÐµÑ ÑвободнÑÑ
квадÑаÑов в замке, кÑда
можно бÑло Ð±Ñ Ð¿Ð¾ÑÑавиÑÑ Ð½Ð¾Ð²Ð¾Ðµ "
@@ -6913,7 +6921,17 @@
msgid "none"
msgstr "неÑ"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "ÑÑ
ваÑка"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "колебание"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "базовое повÑеждение"
@@ -6925,61 +6943,61 @@
msgid "attacker vulnerability vs"
msgstr "аÑакÑÑÑий ÑÑзвим пÑоÑив"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Удвоен"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "вÑего повÑеждений"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "заÑиÑник ÑопÑоÑивлÑеÑÑÑ"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "заÑиÑник ÑÑзвим пÑоÑив"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "УменÑÑен вдвое"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "оÑÑавлен"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "замедлен"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Ðопал в заÑадÑ!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "ÐамеÑено дÑÑжеÑÑвенное Ñоединение!"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "ÐамеÑено вÑажеÑкое Ñоединение!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends видим дÑÑжеÑÑвеннÑе ÑоединениÑ"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies видим ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿ÑоÑивника!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "Ðидим ÑоединениÑ! ($friends дÑÑжеÑÑвеннÑе,
$enemies вÑаждебнÑе)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(нажмиÑе $hotkey Ð´Ð»Ñ Ð¿ÑодолжениÑ)"
@@ -7027,7 +7045,7 @@
msgid "Campaign"
msgstr "ÐампаниÑ"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "СеÑÐµÐ²Ð°Ñ Ð¸Ð³Ñа"
@@ -7039,7 +7057,7 @@
msgid "replay"
msgstr "повÑоÑ"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Шаг"
@@ -7051,7 +7069,7 @@
msgid "Difficulty"
msgstr "СложноÑÑÑ"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "ÐеÑÑиÑ"
@@ -7110,25 +7128,15 @@
msgstr "СпÑавка"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "ÑÑовенÑ"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "ХодÑ"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "ÑÑ
ваÑка"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "колебание"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "здоÑовÑй"
@@ -7145,11 +7153,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "ÐÑ Ð´ÐµÐ¹ÑÑвиÑелÑно Ñ
оÑиÑе запиÑаÑÑ
повÑÐ¾Ñ ÑÑенаÑиÑ?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Ðазвание:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "ÐгÑа не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑоÑ
Ñанена"
@@ -7179,7 +7187,8 @@
msgstr "ÐÑибка ввода/вÑвода пÑи ÑÑении Ñайла Ñ
игÑой"
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr ", ÐÑÑгие кампании..."
#: src/game.cpp:954
@@ -7210,11 +7219,11 @@
msgid "Could not connect to host."
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑиÑÑÑÑ Ðº ÑеÑвеÑÑ."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "ÐÑибка"
@@ -7226,135 +7235,149 @@
msgid "Error communicating with the server."
msgstr "ÐÑибка пÑи подклÑÑении к ÑеÑвеÑÑ."
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",ÐмÑ,ÐеÑÑиÑ,ÐвÑоÑ,ÐагÑÑзок,РазмеÑ"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Ðазвание"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "колÑÑка"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "СиÑена"
+
+#: src/game.cpp:1077
msgid "B"
msgstr "ÐайÑ"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "ÐÐайÑ"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr "ÐÐайÑ"
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "ÐпÑбликоваÑÑ ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ñ:"
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "УдалиÑÑ ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ñ:"
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Ðа ÑÑом ÑеÑвеÑе Ð½ÐµÑ Ð´Ð¾ÑÑÑпнÑÑ
длÑ
загÑÑзки кампаний."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "ÐÑбеÑиÑе ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑзки."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "ÐагÑÑзиÑÑ ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ñ"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "ÐагÑÑжаем кампаниÑ..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "УÑÑановленнÑе кампании"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "ÐÐ°Ð¼Ð¿Ð°Ð½Ð¸Ñ ÑÑпеÑно ÑÑÑановлена."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "ÐÑибка пÑи Ñоединение к ÑеÑвеÑÑ."
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑиÑÑÑÑ Ðº ÑеÑвеÑÑ."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
"Ðозникла пÑоблема Ñ Ñозданием Ñайлов,
необÑ
одимÑÑ
Ð´Ð»Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð¹ ÑÑÑановки "
"кампании."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "ÐÑевÑÑен Ð»Ð¸Ð¼Ð¸Ñ Ð²Ñемени подклÑÑениÑ"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "СеÑÐ²ÐµÑ Ð¾ÑвеÑил Ñ Ð¾Ñибкой: \""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "УÑловиÑ"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "ÐÑвеÑ"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "ÐодклÑÑиÑÑÑÑ Ðº оÑиÑиалÑÐ½Ð¾Ð¼Ñ ÑеÑвеÑÑ"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "ÐойÑи на оÑиÑиалÑнÑй игÑовой ÑеÑвеÑ
ÐеÑноÑ"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "ÐодклÑÑиÑÑÑÑ Ðº игÑе"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "ÐодклÑÑиÑÑÑÑ Ðº ÑеÑвеÑÑ Ð¸Ð»Ð¸ игÑе"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "СоздаÑÑ Ð¸Ð³ÑÑ"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "СоздаÑÑ Ð»Ð¾ÐºÐ°Ð»ÑнÑÑ Ð¸Ð³ÑÑ"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr "СеÑÐµÐ²Ð°Ñ Ð¸Ð³Ñа"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr "ÐгÑаÑÑ Ð² ÑеÑевÑÑ Ð¸Ð³ÑÑ Ð½Ð° ÑÑой же
маÑине"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Человек пÑоÑив ÐомпÑÑÑеÑа"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr "ÐгÑа пÑоÑив компÑÑÑеÑа"
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Ðогин"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "ЯзÑк"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "ÐÑбеÑиÑе пÑедпоÑÑиÑелÑнÑй ÑзÑк"
@@ -7374,11 +7397,7 @@
msgid "attacks"
msgstr "ÐÑака"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Ðазвание"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Тип"
@@ -7506,7 +7525,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "ÐеÑевни"
@@ -7568,7 +7587,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "РазÑеÑиÑÑ Ð½Ð°Ð±Ð»ÑдаÑÑ Ð·Ð° игÑой"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7602,7 +7621,7 @@
msgid "No multiplayer sides."
msgstr "ÐÐµÑ ÑеÑевÑÑ
игÑоков."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "СоздаÑÑ Ð¸Ð³ÑÑ"
@@ -7654,63 +7673,63 @@
msgid "Receiving game list..."
msgstr "ÐолÑÑаем ÑпиÑок игÑ..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
msgid "unit^Gold"
msgstr "ÐолоÑо"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "ÐдÑм наÑала игÑÑ..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "ÐодклÑÑиÑÑÑÑ Ðº ÑеÑвеÑÑ"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "ÐÑбеÑиÑе ÑеÑÐ²ÐµÑ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑениÑ"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "ÐодклÑÑение к ÑдалÑÐ½Ð½Ð¾Ð¼Ñ ÑеÑвеÑÑ..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑиÑÑÑÑ Ðº данномÑ
ÑеÑвеÑÑ"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "ÐолÑÑаем даннÑе игÑÑ..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "ÐÐµÑ Ð´Ð¾ÑÑÑпнÑÑ
ÑÑоÑон в ÑÑой игÑе."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "ÐÑбеÑиÑе ÑÑоÑонÑ:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "ÐгÑа бÑла оÑменена"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "СÑоÑона, коÑоÑÑÑ ÐÑ Ð²ÑбÑали, более не
доÑÑÑпна."
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "ÐоказаÑÑ Ð¿Ð¾Ð²ÑÐ¾Ñ Ð¸Ð³ÑÑ Ð´Ð¾ ÑоÑки ÑоÑ
ÑанениÑ?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "ÐидеÑ:"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "ÐовобÑанÑÑ:"
@@ -7809,7 +7828,7 @@
msgstr "ЦвеÑ"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "ÐолоÑо"
@@ -7817,23 +7836,23 @@
msgid "Waiting for network players to join"
msgstr "ÐдÑм подклÑÑÐµÐ½Ð¸Ñ ÑеÑевÑÑ
игÑоков"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "СвободнÑй ÑлоÑ"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "СвободнÑе ÑлоÑÑ"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "ÐаблÑдаÑÑ Ð·Ð° игÑой"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "ÐÑйÑи"
@@ -7901,59 +7920,55 @@
msgid "It is now your turn"
msgstr "СейÑÐ°Ñ ÐÐ°Ñ Ñ
од"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "ÐÑакÑÑÑий"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "ÐаÑиÑник"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "ÐÑÑиÑление ÑÑеÑба"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Ð ÑкопаÑнаÑ"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "пÑоÑив"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "ÐÑаковаÑÑ Ð¿ÑоÑивника"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "ÐÑбеÑиÑе оÑÑжие"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
"ÐÑ ÐµÑÑ Ð½Ðµ наÑинали Ñвой Ñ
од. ÐÑ
дейÑÑвиÑелÑно Ñ
оÑиÑе завеÑÑиÑÑ Ñвой Ñ
од?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"ÐекоÑоÑÑе ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÐµÑÑ Ð½Ðµ Ñделали Ñ
од.
ÐÑ Ð´ÐµÐ¹ÑÑвиÑелÑно Ñ
оÑиÑе завеÑÑиÑÑ "
"Ñвой Ñ
од?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "ÐвÑо-СоÑ
Ñанение"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr "ÐвÑо-ÑоÑ
Ñанение игÑÑ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾. СоÑ
ÑаниÑе игÑÑ Ð²ÑÑÑнÑÑ."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "ÐеÑеименоваÑÑ Ñоединение"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -7961,67 +7976,67 @@
"СоÑ
Ñанение не должно ÑодеÑжаÑÑ Ð´Ð²Ð¾ÐµÑоÑий,
ÑлÑÑей и обÑаÑнÑÑ
ÑлÑÑей. ÐÑбеÑиÑе "
"дÑÑгое имÑ."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "СоÑ
Ñанено"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "ÐгÑа ÑÑпеÑно ÑоÑ
Ñанена"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "ÐидеÑ"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "СодеÑжание"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "ÐоÑ
од"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "ÐÐµÑ Ñоединений Ð´Ð»Ñ Ð²ÐµÑбовки."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "ÐавеÑбоваÑÑ"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "ÐÑбеÑиÑе Ñоединение"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "У ÐÐ°Ñ Ð½ÐµÐ´Ð¾ÑÑаÑоÑно золоÑа Ð´Ð»Ñ Ð¿Ð¾ÐºÑпки
данного ÑоединениÑ"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "еÑ"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "его"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "ÐÑ Ð¸Ð·Ð¾Ð»Ð¸ÑÐ¾Ð²Ð°Ð½Ñ Ð¾Ñ ÐаÑиÑ
ÑÐ¾Ð»Ð´Ð°Ñ Ð¸ не
можеÑе пÑизваÑÑ Ð¸Ñ
"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8029,100 +8044,100 @@
"ÐÐµÑ Ñоединений Ð´Ð»Ñ Ð¿ÑизÑва\n"
"(У ÐÐ°Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ ÑÑелевÑие Ñ Ð¿ÑоÑлого
ÑÑенаÑÐ¸Ñ ÑоединениÑ)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
"У ÐÐ°Ñ Ð´Ð¾Ð»Ð¶Ð½Ð¾ бÑÑÑ Ð¿Ð¾ кÑайней меÑе $cost
ÐµÐ´Ð¸Ð½Ð¸Ñ Ð·Ð¾Ð»Ð¾Ñа Ð´Ð»Ñ Ð²ÐµÑбовки ÑоединениÑ"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "РаÑпÑÑÑиÑÑ Ñоединение"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "ÐÑизваÑÑ"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "СообÑение"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "ÐÑпÑавиÑÑ ÑолÑко ÑоÑзникам"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "ÐозиÑиÑ"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "СпиÑок Ñоединений"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "ÐавеÑбованнÑе"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "ÐÑизваннÑе"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "ÐÑогÑеÑÑ"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "ÐоÑеÑи"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "УбийÑÑва"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "ÐанеÑли ÑÑеÑба"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "ÐолÑÑили ÑÑебÑа"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "ÐанеÑено ÑÑона (Ð ÑÑеднем)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "ÐолÑÑено ÑÑеÑба (Ð ÑÑеднем)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "СÑаÑиÑÑика"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "ÐоиÑк"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Ðоманда:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Ðог ÑаÑа"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð½Ð°Ð¹Ñи меÑÐºÑ Ð¸Ð»Ð¸ Ñоединение,
ÑодеÑжаÑÑÑ ÑекÑÑ '$search'."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "ÐоÑÑавиÑÑ Ð¼ÐµÑкÑ"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "ÐеÑка"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -8130,23 +8145,23 @@
"ÐгÑа не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑинÑ
ÑонизиÑована, вÑÑ
одим. ÐÑ Ñ
оÑиÑе ÑоÑ
ÑаниÑÑ Ð»Ð¾Ð³ оÑибок "
"ÐаÑей игÑÑ?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "ÐамениÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑом"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "ÐамениÑÑ Ð»Ð¾ÐºÐ°Ð»ÑнÑм игÑоком"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "ÐавеÑÑиÑÑ Ð¸Ð³ÑÑ"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "ÐамениÑÑ"
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "вÑÑел из игÑÑ. ЧÑо ÐÑ Ð±ÑдеÑе делаÑÑ?"
@@ -8317,3 +8332,60 @@
#: src/widgets/file_chooser.cpp:126
msgid "Deletion of the file failed."
msgstr "ÐÑибка ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñайла."
+
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,СлÑÑайнÑе"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,ÐодданнÑе"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,ÐÑÑежники"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,СевеÑÑне"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,ÐеÑÑвеÑÑ"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,ÐлÑÑÐ½Ñ Ðналган"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,ÐÑаконÑ"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,ÐÑди"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,ÐлÑÑÑ"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,ÐÑки"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,ÐномÑ"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,ЯÑеÑÑ"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,ÐеÑноподданнÑе"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,ÐÑÑежники"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,ÐиÑели ÑевеÑа"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,ÐеÑÑвеÑÑ"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,ÐлÑÑÐ½Ñ Ð¡Ð²ÐµÑа"
+
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",ÐмÑ,ÐеÑÑиÑ,ÐвÑоÑ,ÐагÑÑзок,РазмеÑ"
+
+#~ msgid "Melee"
+#~ msgstr "Ð ÑкопаÑнаÑ"
Index: wesnoth/po/wesnoth/sk.po
diff -u wesnoth/po/wesnoth/sk.po:1.21 wesnoth/po/wesnoth/sk.po:1.22
--- wesnoth/po/wesnoth/sk.po:1.21 Sun Dec 5 00:12:17 2004
+++ wesnoth/po/wesnoth/sk.po Sun Dec 12 15:19:49 2004
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-11-10 00:25+0100\n"
"Last-Translator: Viliam Búr <address@hidden>\n"
"Language-Team: none\n"
@@ -50,7 +50,7 @@
msgid "Traits"
msgstr "Vlastnosti"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Jednotky"
@@ -840,93 +840,81 @@
msgid "Default"
msgstr "Štandardná"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Náhodný"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,Lojalisti"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,Rebeli"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,Severania"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,NemÅtvi"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Aliancia Knalgy"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Jašteri"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Náhodná mapa"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Privolaných"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "NemÅtvi"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,Aliancia Knalgy"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Lietajúci jašter"
+
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Klasická"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Ľudia"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Elfovia"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,Orkovia"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,TrpaslÃci"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,Saur"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Ľudia"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "Vek hrdinov"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Elfovia"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Lojalisti"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Rebeli"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Severania"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,NemÅtvi"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orkovia"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Aliancia Knalgy"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "TrpasliÄia pustatina"
+
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Saur"
+
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "Vek hrdinov"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Veľká vojna"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&white-mage.png,Aliancia svetla"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Mág svetla"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-necromancer.png,Aliancia temnoty"
#: data/scenario-test.cfg:38
@@ -2320,66 +2308,54 @@
msgid "Canyon"
msgstr "niÄ"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Menu"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Akcie"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Koniec kola"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "Životy"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "Skúsenosti"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "zlato"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "dediny"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "jednotky"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "žold"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "prÃjem"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "úroveÅ"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "pohyb"
@@ -2827,7 +2803,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "velenie"
@@ -2891,7 +2867,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr ""
@@ -3013,22 +2989,6 @@
"Tento útok premenà obeÅ¥ na kameÅ. Jednotky premenené na kameÅ sa
nemôžu "
"hýbaÅ¥ ani útoÄiÅ¥."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Elfovia"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Ľudia"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orkovia"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "NemÅtvi"
-
#: data/translations/english.cfg:130
#, fuzzy
msgid "$name's Bridge,$name's Crossing"
@@ -3219,7 +3179,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3234,6 +3194,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3292,7 +3253,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3368,13 +3329,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3392,11 +3354,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3407,7 +3369,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "zákerný"
@@ -3490,7 +3452,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3499,9 +3462,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "meÄ"
@@ -3594,7 +3557,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3612,7 +3576,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3746,7 +3710,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3762,8 +3727,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "výpad"
@@ -3785,7 +3750,7 @@
msgid "gaze"
msgstr "pohľad"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "kameÅ"
@@ -4026,7 +3991,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "ohnivý dych"
@@ -4179,8 +4144,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "prvý úder"
@@ -4686,7 +4652,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "presný"
@@ -5067,10 +5033,13 @@
msgstr "Goblin napichovaÄ"
#: data/units/Goblin_Impaler.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
"Goblini vyrovnávajú svoju všeobecnú hlúposť, krehkosť a nedostatok "
"zložitejÅ¡Ãch zbranà pokusmi premôcÅ¥ nepriateľov svojÃm poÄtom. Toto
sú tà "
@@ -5114,9 +5083,10 @@
msgstr "Goblin kopijnÃk"
#: data/units/Goblin_Spearman.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5228,21 +5198,25 @@
"dokážu jazdiť na týchto zvieratách, dobývajú oblohu."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "HalapartnÃk"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"NajlepÅ¡Ã spomedzi vojakov sa stávajú halapartnÃkmi. Ich zbraÅ je sÃce "
"pomalÅ¡ia ako meÄ, ale dokáže uÅ¡tedriÅ¥ smrtiaci úder. VÄaka dĺžke
zbrane majú "
"aj pri obrane výhodu prvého útoku."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "halapartÅa"
@@ -5271,7 +5245,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Ráno"
@@ -5320,6 +5295,24 @@
"na bojisku takà pomalà a bolo by ich viac, mohli by tÃto mocnà vojaci "
"ovládnuť celý kontinent."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Jazdec expert"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"OÅ¡tepnÃci sú základom ľudských armád. TÃto mladà vojaci sú po
základnom "
+"výcviku umiestnenà do prvej lÃnie, aby Äelili v boji. VÄaka dĺžke
svojich "
+"oštepov majú aj pri obrane výhodu prvého útoku."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Rytier"
@@ -5636,7 +5629,7 @@
msgid "Mounted Captain"
msgstr "Hory"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -5657,6 +5650,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Šľachtic bojovnÃk"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Saur bojovnÃk"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Blatovec"
@@ -6131,18 +6142,20 @@
msgid "Pikeman"
msgstr "KopijnÃk"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"KopijnÃci sú skúsenà vojaci, ktorà vymenili oÅ¡tepy za dlhé kopije.
VÄaka ich "
"dĺžke majú aj pri obrane výhodu prvého útoku. KopijnÃci sú zvlášť
úspešnà "
"proti kavalérii."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "pika"
@@ -6239,7 +6252,7 @@
msgid "Royal Guard"
msgstr "Kráľovský gardista"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -6249,10 +6262,6 @@
"najhúževnatejÅ¡Ãch vojakov. Sú nasadenà iba v kritických situáciách a
zatiaľ "
"vždy zadanú úlohu zvládli."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Saur"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -6551,11 +6560,12 @@
msgstr "OÅ¡tepnÃk"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"OÅ¡tepnÃci sú základom ľudských armád. TÃto mladà vojaci sú po
základnom "
"výcviku umiestnenà do prvej lÃnie, aby Äelili v boji. VÄaka dĺžke
svojich "
@@ -6580,7 +6590,7 @@
msgid "Swordsman"
msgstr "BojovnÃk"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -7039,17 +7049,17 @@
msgid "Close"
msgstr "Zavri"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Nemáš veliteľa a tak nemôžeš verbovať."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Aby si mohol verbovaÅ¥ alebo privolávaÅ¥ jednotky, musÃÅ¡ maÅ¥ v pevnosti "
"veliteľa."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Nemáš v pevnosti miesto, kam by si naverboval jednotku."
@@ -7057,7 +7067,17 @@
msgid "none"
msgstr "niÄ"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "zblÃzka"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "na diaľku"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "základné zranenie"
@@ -7069,61 +7089,61 @@
msgid "attacker vulnerability vs"
msgstr "zraniteľnosÅ¥ útoÄnÃka voÄi"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "Dvojnásobné"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "celkové zranenie"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "obrancova odolnosÅ¥ voÄi"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "zraniteľnosÅ¥ obrancu voÄi"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "PoloviÄné"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "otrávený"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "spomalený"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Prepad!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "VidÃm priateľskú jednotku"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "VidÃm nepriateľskú jednotku!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "VidÃm $friends priateľských jednotiek"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "VidÃm $enemies nepriateľských jednotiek!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr "VidÃm jednotky! (priatelia: $friends, nepriatelia: $enemies)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(stlaÄ $hotkey a pokraÄujeme)"
@@ -7171,7 +7191,7 @@
msgid "Campaign"
msgstr "Výprava"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Zápas"
@@ -7183,7 +7203,7 @@
msgid "replay"
msgstr "záznam"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Kolo"
@@ -7195,7 +7215,7 @@
msgid "Difficulty"
msgstr "Zložitosť"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Verzia"
@@ -7255,25 +7275,15 @@
msgstr "Profil"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "ÃroveÅ"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Ťahy"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "zblÃzka"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "na diaľku"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "zdravý"
@@ -7290,11 +7300,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Chceš uložiť záznam prejdenia tejto mapy?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Názov:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Nepodarilo sa uložiť hru"
@@ -7322,8 +7332,9 @@
msgstr "Chyba pri ÄÃtanà súboru hry"
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
-msgstr ""
+#, fuzzy
+msgid "Get More Campaigns..."
+msgstr "Stiahni výpravu"
#: src/game.cpp:954
msgid "Download more campaigns from a server on Internet."
@@ -7353,11 +7364,11 @@
msgid "Could not connect to host."
msgstr "Neviem sa pripojiť na server."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Chyba"
@@ -7369,138 +7380,151 @@
msgid "Error communicating with the server."
msgstr "Chyba pri komunikácii so serverom."
-#: src/game.cpp:1053
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Meno"
+
+#: src/game.cpp:1056
#, fuzzy
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",Názov,Verzia,Autor,Stiahnutá"
+msgid "Author"
+msgstr "tÅne"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "oheÅ"
+
+#: src/game.cpp:1077
#, fuzzy
msgid "B"
msgstr "KB"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Publikuj výpravu:"
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "Vymaž výpravu:"
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Na tomto serveri nie sú k dispozÃcii žiadne výpravy."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Vyber si výpravu, ktorú chceš stiahnuť."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Stiahni výpravu"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Sťahujem výpravu..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Výprava nainštalovaná"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "Výprava je nainštalovaná."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Chyba pri komunikácii na sieti."
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Server sa odpojil"
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr "Nastala chyba pri vytváranà inÅ¡talaÄných súborov tejto výpravy."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Äas na pripojenie vyprÅ¡al"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "Server ohlásil chybu: \""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Podmienky"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "OdpoveÄ"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Prihlás sa na Wesnoth"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Prihlás sa na oficiálny server Wesnothu"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Pridaj sa k hre"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Pridaj sa na server alebo do založenej hry"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
#, fuzzy
msgid "Host Networked Game"
msgstr "SieÅ¥ový hráÄ"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Založ novú hru bez pomoci servera"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
#, fuzzy
msgid "Hotseat Game"
msgstr "Vytvor hru"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
#, fuzzy
msgid "Human vs AI"
msgstr "Ľudia"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Prihlásenie"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Jazyk"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Vyber si vhodný jazyk"
@@ -7520,11 +7544,7 @@
msgid "attacks"
msgstr "útoky"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Meno"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Typ"
@@ -7659,7 +7679,7 @@
msgid "Bump Size"
msgstr "Hrúbka"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Dediny"
@@ -7719,7 +7739,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Umožni divákom sledovať hru"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -7753,7 +7773,7 @@
msgid "No multiplayer sides."
msgstr "SieÅ¥ová hra nemá urÄené strany."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Vytvor hru"
@@ -7805,65 +7825,65 @@
msgid "Receiving game list..."
msgstr "Zisťujem zoznam hier..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Zlato"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Äakám, kým zaÄne hra..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
#, fuzzy
msgid "Connect to Host"
msgstr "Pripoj sa na server"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Vyber si herný server, na ktorý sa pripojÃÅ¡"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Pripájam sa na server hry..."
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Na tento server sa musÃÅ¡ prihlásiÅ¥"
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Zisťujem herné údaje..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "V tejto hre už žiadna strana nie je voľná."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Vyber si stranu:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Hra bola zrušená"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "Zvolená strana už nie je voľná"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Zobraziť záznam hry až do okamihu uloženia?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Veliteľ:"
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Naverbovaných:"
@@ -7962,7 +7982,7 @@
msgstr "Farba"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Zlato"
@@ -7970,23 +7990,23 @@
msgid "Waiting for network players to join"
msgstr "Äakám, kým sa pripoja sieÅ¥ovà hráÄi"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Voľné miesto"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Voľné miesta"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Pozoruj hru"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Koniec"
@@ -8053,56 +8073,52 @@
msgid "It is now your turn"
msgstr "Si na ťahu"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "ÃtoÄnÃk"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Obranca"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "VýpoÄet zranenia"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Na blÃzko"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "proti"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "ZaútoÄ na súpera"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Vyber si zbraÅ"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr "EÅ¡te si nezaÄal Å¥ahaÅ¥. ChceÅ¡ naozaj ukonÄiÅ¥ Å¥ah?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr "Niektoré jednotky eÅ¡te môžu Å¥ahaÅ¥. ChceÅ¡ naozaj ukonÄiÅ¥ Å¥ah?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Automatické uloženie"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr "Nepodarilo sa automaticky uložiÅ¥ hru. ProsÃm uložte hru pomocou
menu."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Premenuj jednotku"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -8110,43 +8126,43 @@
"Názvy uložených hier nesmú obsahovaÅ¥ bodkoÄiarky, lomky, ani opaÄné
lomky. "
"ProsÃm zadajte iný názov."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Uložená"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Hra bola uložená"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Veliteľ"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Žold"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "PrÃjem"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Nemôžeš verbovať žiadne jednotky"
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Verbuj"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Vyber si jednotku"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Nemáš dosť zlata, aby si naverboval túto jednotku"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -8154,7 +8170,7 @@
"Môj pane, táto jednotka je skúsená a bola povýšená! Chcete $noun
naozaj "
"rozpustiť?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -8162,19 +8178,19 @@
"Môj pane, táto jednotka má byÅ¥ Äoskoro povýšená! Chcete $noun naozaj "
"rozpustiť?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "ju"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "ho"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Si Äaleko od svojich vojakov a nemôžeÅ¡ ich privolaÅ¥"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8182,121 +8198,121 @@
"Nemáš koho privolať\n"
"(Z predchádzajúcej mapy neprežil žiaden veterán)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "MusÃÅ¡ maÅ¥ aspoÅ $cost zlatých, aby si privolal jednotku"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Prepusti jednotku"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Privolaj"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Správa"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Pošli iba spojencom"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Poloha"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Zoznam jednotiek"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Naverbovaných"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Privolaných"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Povýšených"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Padlých"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Zabitých"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Spôsobené zranenie"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "UtÅžené zranenie"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr ""
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr ""
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Å tatistika"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Hľadaj"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "PrÃkaz:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Záznam rozhovoru"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Neviem nájsÅ¥ znaÄku ani jednotku, ktorá má v názve '$search'."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Umiestni znaÄku"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "ZnaÄka"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr "Hry sa rozladili a treba ich ukonÄiÅ¥. Mám uložiÅ¥ chybovú správu
z hry?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "NahraÄ poÄÃtaÄom"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "NahraÄ iným hráÄom"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Zruš hru"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Nahradiť "
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "opustil hru. Äo chceÅ¡ urobiÅ¥?"
@@ -8464,6 +8480,64 @@
msgid "Deletion of the file failed."
msgstr "Nepodarilo sa vymazať súbor."
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Náhodný"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,Lojalisti"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,Rebeli"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,Severania"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,NemÅtvi"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Aliancia Knalgy"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Jašteri"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Ľudia"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Elfovia"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,Orkovia"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,TrpaslÃci"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,Saur"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Lojalisti"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Rebeli"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Severania"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,NemÅtvi"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&white-mage.png,Aliancia svetla"
+
+#, fuzzy
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",Názov,Verzia,Autor,Stiahnutá"
+
+#~ msgid "Melee"
+#~ msgstr "Na blÃzko"
+
#~ msgid ""
#~ "This page outlines all you need to know to play Battle for Wesnoth. It "
#~ "covers how to play and the basic mechanics behind the game. For more "
Index: wesnoth/po/wesnoth/sl.po
diff -u wesnoth/po/wesnoth/sl.po:1.15 wesnoth/po/wesnoth/sl.po:1.16
--- wesnoth/po/wesnoth/sl.po:1.15 Sun Dec 5 00:12:17 2004
+++ wesnoth/po/wesnoth/sl.po Sun Dec 12 15:19:49 2004
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: smart-sl\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-10-17 20:24+0200\n"
"Last-Translator: \n"
"Language-Team: <address@hidden>\n"
@@ -52,7 +52,7 @@
msgid "Traits"
msgstr "Lastnosti"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Enote"
@@ -820,93 +820,77 @@
msgid "Default"
msgstr "Privzeto"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr ""
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Uveljavi"
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
msgstr ""
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr ""
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Priklicane enote"
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
msgstr ""
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
msgstr ""
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+msgid "Knalgan Alliance"
msgstr ""
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr ""
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Udari"
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "KlasiÄno"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
msgstr ""
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
msgstr ""
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
msgstr ""
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
+#: data/multiplayer.cfg:171
+msgid "Dwarves"
msgstr ""
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
msgstr ""
-#: data/multiplayer.cfg:196
+#: data/multiplayer.cfg:211
msgid "Age of Heroes"
msgstr ""
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr ""
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr ""
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr ""
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr ""
-
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr ""
-
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr ""
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
+#: data/multiplayer.cfg:311
+msgid "Alliance of Light"
msgstr ""
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+msgid "Alliance of Darkness"
msgstr ""
#: data/scenario-test.cfg:38
@@ -2035,66 +2019,54 @@
msgid "Canyon"
msgstr "brez"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Meni"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Dejanja"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "KonÄaj potezo"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "HP"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "XP"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "zlato"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "vasi"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "enote"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "plaÄe"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "prihodek"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr ""
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr ""
@@ -2423,7 +2395,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr ""
@@ -2482,7 +2454,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr ""
@@ -2571,22 +2543,6 @@
"may not move or attack."
msgstr ""
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr ""
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr ""
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr ""
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr ""
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr ""
@@ -2758,7 +2714,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -2773,6 +2729,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -2831,7 +2788,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -2903,13 +2860,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -2927,11 +2885,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -2942,7 +2900,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr ""
@@ -3019,7 +2977,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3028,9 +2987,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "meÄ"
@@ -3115,7 +3074,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3133,7 +3093,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3254,7 +3214,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3270,8 +3231,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr ""
@@ -3290,7 +3251,7 @@
msgid "gaze"
msgstr ""
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "kamen"
@@ -3492,7 +3453,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr ""
@@ -3625,8 +3586,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr ""
@@ -4046,7 +4008,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr ""
@@ -4363,8 +4325,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4403,7 +4367,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4496,18 +4460,20 @@
msgstr ""
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+msgid "Halberdier"
msgstr ""
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr ""
@@ -4533,7 +4499,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
#, fuzzy
msgid "morning star"
msgstr "Jutro"
@@ -4572,6 +4539,19 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+msgid "Javelineer"
+msgstr ""
+
+#: data/units/Javelineer.cfg:16
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr ""
@@ -4842,7 +4822,7 @@
msgid "Mounted Captain"
msgstr "Gore"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -4862,6 +4842,24 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Gore"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Gore"
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr ""
@@ -5266,15 +5264,16 @@
msgid "Pikeman"
msgstr ""
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr ""
@@ -5355,17 +5354,13 @@
msgid "Royal Guard"
msgstr ""
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
"always succeeded in their assigned tasks."
msgstr ""
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr ""
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -5635,8 +5630,8 @@
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
#: data/units/Spectre.cfg:3
@@ -5655,7 +5650,7 @@
msgid "Swordsman"
msgstr ""
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6063,15 +6058,15 @@
msgid "Close"
msgstr "Zapri"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr ""
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr ""
@@ -6079,7 +6074,17 @@
msgid "none"
msgstr "brez"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr ""
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr ""
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr ""
@@ -6091,61 +6096,61 @@
msgid "attacker vulnerability vs"
msgstr ""
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr ""
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr ""
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr ""
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr ""
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr ""
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr ""
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr ""
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr ""
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr ""
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr ""
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr ""
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr ""
@@ -6193,7 +6198,7 @@
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "VeÄigralnost"
@@ -6205,7 +6210,7 @@
msgid "replay"
msgstr "vnoviÄno predvajanje"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Poteza"
@@ -6217,7 +6222,7 @@
msgid "Difficulty"
msgstr "Težavnost"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "RazliÄica"
@@ -6270,25 +6275,15 @@
msgstr "Profil"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "stopnja"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Premiki"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr ""
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr ""
-
#: src/display.cpp:883
msgid "healthy"
msgstr ""
@@ -6305,11 +6300,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Ime:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr ""
@@ -6337,7 +6332,7 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+msgid "Get More Campaigns..."
msgstr ""
#: src/game.cpp:954
@@ -6368,11 +6363,11 @@
msgid "Could not connect to host."
msgstr "Ni se možno povezati z gostiteljem."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Napaka"
@@ -6384,134 +6379,147 @@
msgid "Error communicating with the server."
msgstr ""
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Ime"
+
+#: src/game.cpp:1056
+msgid "Author"
+msgstr ""
+
+#: src/game.cpp:1057
+msgid "Downloads"
msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "ognjen"
+
+#: src/game.cpp:1077
#, fuzzy
msgid "B"
msgstr "KB"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr ""
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr ""
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr ""
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr ""
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr ""
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr ""
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr ""
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr ""
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Povezava je potekla"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Pogoji"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Odziv"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Poveži se z uradnim strežnikom"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Poveži se z uradnim veÄigralskim Wesnoth strežnikom"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Pridruži se igri"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Pridruži se strežniku ali gostovani igri"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Gostuj mrežno igro"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Gostuj igro brez uporabe strežnika"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr "\"VroÄi stol\" igra"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr "VeÄigralska igra na istem raÄunalniku"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Älovek proti UI"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr "Igra proti UI"
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Prijava"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Jezik"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Izberite vam priljubljen jezik"
@@ -6531,11 +6539,7 @@
msgid "attacks"
msgstr "napade"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Ime"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Vrsta"
@@ -6663,7 +6667,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr ""
@@ -6723,7 +6727,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr ""
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -6757,7 +6761,7 @@
msgid "No multiplayer sides."
msgstr ""
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Ustvari igro"
@@ -6807,64 +6811,64 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
#, fuzzy
msgid "unit^Gold"
msgstr "Zlato"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr ""
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr ""
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr ""
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr ""
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr ""
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr ""
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr ""
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr ""
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr ""
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr ""
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr ""
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr ""
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Vodja: "
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr ""
@@ -6961,7 +6965,7 @@
msgstr "Barva"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Zlato"
@@ -6969,23 +6973,23 @@
msgid "Waiting for network players to join"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr ""
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr ""
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Izhod"
@@ -7052,98 +7056,94 @@
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr ""
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "proti"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Samodejno shranjena pozicija"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr ""
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Shranjeno"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Igra je bila shranjena"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Vodja"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "PlaÄe"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Prihodki"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Nikogar ne morete rekrutirati."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr ""
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Izberite enoto"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Za rekrutiranje te enote nimate dovolj zlata"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -7151,7 +7151,7 @@
"Moj gospod, ta enota je izkušena, na višji izkustveni stopnji! Ali res "
"hoÄete odpraviti $noun?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -7159,19 +7159,19 @@
"Moj gospod, ta enota je blizu viÅ¡ji izkustveni stopnji! Ali res hoÄete "
"odpraviti $noun?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "njo"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "njega"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr "Od svojih enot ste loÄeni in jih ne morete priklicati"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -7179,99 +7179,99 @@
"Nobenih enot ne morete priklicati\n"
" (imeti morate preživele veterane iz prejšnjih misij)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr "Za priklic enote potrebujete vsaj $cost zlata"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Odpravi enoto"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr ""
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "SporoÄilo"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Pošlji samo zaveznikom"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Lega"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr ""
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Rekruti"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Priklicane enote"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Napredovanja"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Izgube"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Sovražnikove izgube"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Storjena Å¡koda"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Utrpela Å¡koda"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Storjena Å¡koda (priÄakovana)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Utrpela Å¡koda (priÄakovana)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statistika"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Iskanje"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Ukaz:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Dnevnik pogovorov"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Nisem našel oznake ali enote z '$search' v imenu."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Postavi oznako"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Oznaka"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -7279,23 +7279,23 @@
"Igre niso veÄ sinhronizirane in se bodo morale konÄati. Ali naj shranim "
"dnevnik napak iz igre?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Zamenjaj z UI"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Zamenjaj z lokalnim igralcem"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Prekini igro"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Zamenjaj z "
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "je zapustil igro. Kaj boste storili?"
@@ -7477,9 +7477,6 @@
#~ msgid "Undo"
#~ msgstr "Razveljavi"
-#~ msgid "Redo"
-#~ msgstr "Uveljavi"
-
#~ msgid "Zoom In"
#~ msgstr "PoveÄaj"
Index: wesnoth/po/wesnoth/sv.po
diff -u wesnoth/po/wesnoth/sv.po:1.37 wesnoth/po/wesnoth/sv.po:1.38
--- wesnoth/po/wesnoth/sv.po:1.37 Mon Dec 6 08:31:52 2004
+++ wesnoth/po/wesnoth/sv.po Sun Dec 12 15:19:49 2004
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.9-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: 2004-12-05 19:23+0100\n"
"Last-Translator: tephlon\n"
"Language-Team: Swedish\n"
@@ -44,7 +44,7 @@
msgid "Traits"
msgstr "Karaktärsdrag"
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr "Trupper"
@@ -1135,93 +1135,81 @@
msgid "Default"
msgstr "Standard"
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
-msgstr "&random-enemy.png,Slumpval"
-
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
-msgstr "&human-lieutenant.png,Lojalister"
-
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
-msgstr "&elvish-captain.png,Rebeller"
-
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
-msgstr "&orcish-warrior.png,Nordbor"
-
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
-msgstr "&undead-necromancer.png,Vandöda"
-
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
-msgstr "&dwarf-warrior.png,Knalgas allians"
-
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
-msgstr "&drake-flare.png,Drakfolket"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+#, fuzzy
+msgid "Random"
+msgstr "Slumpkarta"
+
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
+msgstr ""
+
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+#, fuzzy
+msgid "Rebels"
+msgstr "Ã
terkallade"
+
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
+msgstr ""
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
+msgstr "Vandöda"
+
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+#, fuzzy
+msgid "Knalgan Alliance"
+msgstr "&dwarf-lord.png,Knalgas allians"
+
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+#, fuzzy
+msgid "Drakes"
+msgstr "Molndrake"
+
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr "Klassisk"
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
-msgstr "&human-lieutenant.png,Människor"
-
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
-msgstr "&elvish-captain.png,Alver"
-
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
-msgstr "&orcish-warrior.png,Orcher"
-
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
-msgstr "&dwarf-warrior.png,Dvärgar"
-
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
-msgstr "&saurian-soothsayer.png,Ãdleman"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
+msgstr "Människor"
-#: data/multiplayer.cfg:196
-msgid "Age of Heroes"
-msgstr "Hjältarnas tid"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
+msgstr "Alver"
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr "&human-general.png,Lojalister"
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr "&elvish-marshal.png,Rebeller"
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr "&orcish-warlord.png,Nordbor"
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr "&undead-lich.png,Vandöda"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
+msgstr "Orcher"
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr "&dwarf-lord.png,Knalgas allians"
+#: data/multiplayer.cfg:171
+#, fuzzy
+msgid "Dwarves"
+msgstr "Dvärgborg"
+
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
+msgstr "Ãdleman"
+
+#: data/multiplayer.cfg:211
+msgid "Age of Heroes"
+msgstr "Hjältarnas tid"
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr "Det stora kriget"
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
-msgstr "&elvish-lord.png,Ljusets allians"
+#: data/multiplayer.cfg:311
+#, fuzzy
+msgid "Alliance of Light"
+msgstr "Ljusets magiker"
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+#, fuzzy
+msgid "Alliance of Darkness"
msgstr "&undead-lich.png,Mörkrets allians"
#: data/scenario-test.cfg:38
@@ -2682,66 +2670,54 @@
msgid "Canyon"
msgstr "Ravin"
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr "Meny"
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr "Handlingar"
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr "Avsluta draget"
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr "HP"
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr "EP"
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr "guld"
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr "byar"
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr "trupper"
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr "underhåll"
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr "inkomst"
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr "nivå"
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr "förflyttning"
@@ -3191,7 +3167,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr "ledarskap"
@@ -3262,7 +3238,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr "ståndaktig"
@@ -3384,22 +3360,6 @@
"Denna attack förstenar målet. Förstenade trupper kan inte röra sig och
inte "
"attackera."
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr "Alver"
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr "Människor"
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr "Orcher"
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr "Vandöda"
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr "$name|s bro,$name|s överfart"
@@ -3586,7 +3546,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -3601,6 +3561,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3661,7 +3622,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -3736,13 +3697,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -3760,11 +3722,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -3775,7 +3737,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr "rygghugg"
@@ -3859,7 +3821,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3868,9 +3831,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr "svärd"
@@ -3970,7 +3933,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3988,7 +3952,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -4126,7 +4090,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -4142,8 +4107,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr "storma"
@@ -4165,7 +4130,7 @@
msgid "gaze"
msgstr "blick"
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr "sten"
@@ -4411,7 +4376,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr "spruta eld"
@@ -4586,8 +4551,9 @@
"rustningar. Veteranerna bär hillebarder som de använder med stor bravur."
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr "första slaget"
@@ -5100,7 +5066,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr "prickskytt"
@@ -5478,10 +5444,13 @@
msgstr "Spetsarvätte"
#: data/units/Goblin_Impaler.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
"Vättarna försöker kompensera sitt släktes allmänna idioti, bräcklighet
och "
"brist på sofistikerade vapen genom att överväldiga sina fiender med sitt "
@@ -5526,9 +5495,10 @@
msgstr "Spjutvätte"
#: data/units/Goblin_Spearman.cfg:17
+#, fuzzy
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -5646,21 +5616,25 @@
"bestars ryggar."
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+#, fuzzy
+msgid "Halberdier"
msgstr "Hillebardiär"
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
+#, fuzzy
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
"De bästa infanteristerna tilldelas hillebarder. Om än något långsammare
än "
"svärdet så är hillebarden likväl mycket dödlig. På grund av sin stora "
"räckvidd har de alltid första slaget."
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr "hillebard"
@@ -5691,7 +5665,8 @@
"fiender, och de som återstår krossas av deras morgonstjärnor."
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
msgid "morning star"
msgstr "morgonstjärna"
@@ -5741,6 +5716,23 @@
"inte hade varit för deras långsamma rörelser och att de är så ovanliga,
så "
"hade dessa mäktiga soldater härskat över kontinenten."
+#: data/units/Javelineer.cfg:3
+#, fuzzy
+msgid "Javelineer"
+msgstr "Sjöspjutkastare"
+
+#: data/units/Javelineer.cfg:16
+#, fuzzy
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+"Spjutbäraren är kärnan i människoarméerna. Dessa unga soldater får "
+"grundläggande stridsträning och sänds till fronten för att göra
grovgörat."
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr "Riddare"
@@ -6062,7 +6054,7 @@
msgid "Mounted Captain"
msgstr "Ryttarkapten"
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -6088,6 +6080,28 @@
"och morgonstjärna. Med hjälp av sina hästar kan de snabbt förflytta sig
runt "
"slagfältet och kan komma till undsättning på olika fronter."
+#: data/units/Mounted_Fighter.cfg:3
+#, fuzzy
+msgid "Mounted Fighter"
+msgstr "Adlig krigare"
+
+#: data/units/Mounted_Warrior.cfg:3
+#, fuzzy
+msgid "Mounted Warrior"
+msgstr "Sjökrigare"
+
+#: data/units/Mounted_Warrior.cfg:17
+#, fuzzy
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+"Ryttarbefälhavarna är slätternas ledare och är skickliga i bruket av
svärd "
+"och morgonstjärna. Med hjälp av sina hästar kan de snabbt förflytta sig
runt "
+"slagfältet och kan komma till undsättning på olika fronter."
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr "Slamkrypare"
@@ -6599,18 +6613,20 @@
msgid "Pikeman"
msgstr "Pikenerare"
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
+#, fuzzy
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
"Pikenerare är veteraner i den wesnothiska armén och har bytt ut sina spjut "
"mot långa pikar. Med sin stora räckvidd har de alltid första slaget. De
är "
"speciellt dödliga vid försvar mot kavalleri."
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr "pik"
@@ -6712,7 +6728,7 @@
msgid "Royal Guard"
msgstr "Kunglig vakt"
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
@@ -6722,10 +6738,6 @@
"starkaste inom armén. De sänds endast i strid vid extrem fara och har "
"hittills inte misslyckats någon gång."
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr "Ãdleman"
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -7062,11 +7074,12 @@
msgstr "Spjutbärare"
#: data/units/Spearman.cfg:16
+#, fuzzy
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
"Spjutbäraren är kärnan i människoarméerna. Dessa unga soldater får "
"grundläggande stridsträning och sänds till fronten för att göra
grovgörat."
@@ -7091,7 +7104,7 @@
msgid "Swordsman"
msgstr "Svärdssoldat"
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -7568,17 +7581,17 @@
msgid "Close"
msgstr "Stäng"
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr "Du har ingen ledare att rekrytera med."
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
"Du måste ha din ledare i ett kärntorn för att kunna rekrytera eller "
"Ã¥terkalla trupper."
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr "Det finns inga lediga borgrutor för nya trupper."
@@ -7586,7 +7599,17 @@
msgid "none"
msgstr "inget"
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr "närstrid"
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr "distans"
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr "basskada"
@@ -7598,62 +7621,62 @@
msgid "attacker vulnerability vs"
msgstr "anfallarens sårbarhet för"
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr "fördubblad"
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr "Total skada"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr "försvararens motståndskraft mot"
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr "försvararens sårbarhet för"
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr "Halverad"
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr "förgiftad"
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr "långsam"
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr "Bakhåll!"
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr "Allierad trupp inom synhåll"
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr "Fiendetrupp inom synhåll!"
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr "$friends allierade trupper inom synhåll"
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr "$enemies fiendetrupper inom synhåll!"
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr ""
"Trupper inom synhåll! ($friends allierade trupper, $enemies fiendetrupper)"
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr "(Tryck på $hotkey för att fortsätta)"
@@ -7701,7 +7724,7 @@
msgid "Campaign"
msgstr "Kampanj"
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr "Gruppspel"
@@ -7713,7 +7736,7 @@
msgid "replay"
msgstr "repris"
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr "Drag"
@@ -7725,7 +7748,7 @@
msgid "Difficulty"
msgstr "Svårighetsgrad"
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr "Version"
@@ -7786,25 +7809,15 @@
msgstr "Profil"
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr "nivå"
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr "Förflyttning"
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr "närstrid"
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr "distans"
-
#: src/display.cpp:883
msgid "healthy"
msgstr "bra hälsa"
@@ -7821,11 +7834,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr "Vill du spara en repris av detta scenario?"
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr "Namn:"
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr "Spelet kunde inte sparas"
@@ -7855,7 +7868,8 @@
msgstr "I/O-fel vid läsning från fil"
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+#, fuzzy
+msgid "Get More Campaigns..."
msgstr " ,Hämta fler kampanjer..."
#: src/game.cpp:954
@@ -7887,11 +7901,11 @@
msgid "Could not connect to host."
msgstr "Kunde inte ansluta till servern."
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr "Fel"
@@ -7903,135 +7917,149 @@
msgid "Error communicating with the server."
msgstr "Kunde ej kommunicera med servern."
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
-msgstr ",Namn,Version,Författare,Hämtningar, Storlek"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr "Namn"
+
+#: src/game.cpp:1056
+#, fuzzy
+msgid "Author"
+msgstr "törnen"
+
+#: src/game.cpp:1057
+msgid "Downloads"
+msgstr ""
+
+#: src/game.cpp:1058
+#, fuzzy
+msgid "Size"
+msgstr "Siren"
-#: src/game.cpp:1072
+#: src/game.cpp:1077
msgid "B"
msgstr "B"
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr "KB"
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr "MB"
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr "Publicera kampanj: "
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr "Ta bort kampanj: "
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr "Det finns inga kampanjer att hämta på den här servern."
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr "Välj kampanj att hämta hem:"
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr "Hämta kampanj"
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr "Hämtar kampanj..."
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr "Kampanjen har installerats"
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr "Kampanjen har installerats."
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr "Nätverksfel."
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr "Anslutningen avbruten."
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
"Problem uppstod i skapandet av de filer som behövs för att installera denna
"
"kampanj."
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr "Anslutningstiden tog slut"
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr "Felmeddelande från servern: \""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr "Villkor"
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr "Svar"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr "Anslut till den officiella servern"
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr "Logga in på Kampen om Wesnoths officiella spelserver"
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr "Anslut till spel"
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr "Anslut till en server eller ett spel som någon annan är värd för"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr "Var värd för nätverksspel"
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr "Var värd för ett spel utan att använda en server"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr "Heta stolen-spel"
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr "Spela ett gruppspel med en och samma dator"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr "Människa mot dator"
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr "Spela mot datorn"
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr "Logga in"
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr "Språk"
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr "Välj språk"
@@ -8051,11 +8079,7 @@
msgid "attacks"
msgstr "attacker"
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr "Namn"
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr "Typ"
@@ -8189,7 +8213,7 @@
msgid "Bump Size"
msgstr "Kullstorlek"
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr "Byar"
@@ -8250,7 +8274,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr "Tillåt användare som inte spelar att beskåda spelet"
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -8284,7 +8308,7 @@
msgid "No multiplayer sides."
msgstr "Inga sidor angivna."
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr "Skapa nytt spel"
@@ -8337,63 +8361,63 @@
msgid "Receiving game list..."
msgstr "Hämtar spellista..."
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
msgid "unit^Gold"
msgstr "Guld"
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr "Väntar på att spelet skall starta..."
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr "Anslut till server"
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr "Välj server att ansluta dig till"
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr "Ansluter till server"
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr "Du måste logga in på den här servern."
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr "Hämtar spelinformation..."
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr "Det finns inga tillgängliga sidor."
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr "Välj sida:"
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr "Spelet har blivit avbrutet"
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr "Den sida som du har valt är inte längre tillgänglig"
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr "Visa repris av spelet fram till senaste gången du sparade?"
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr "?"
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr "Ledare: "
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr "Rekryterade: "
@@ -8492,7 +8516,7 @@
msgstr "Färg"
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr "Guld"
@@ -8500,23 +8524,23 @@
msgid "Waiting for network players to join"
msgstr "Väntar på att nätverksspelare skall ansluta sig"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr "1"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr "Ledig plats"
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr "Lediga platser"
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr "Iaktta spel"
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr "Avsluta"
@@ -8585,58 +8609,54 @@
msgid "It is now your turn"
msgstr "Nu är det din tur"
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr "Anfallare"
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr "Försvarare"
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr "Skadeberäkning"
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr "Närstrid"
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr "mot"
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr "Anfall fiende"
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr "Välj vapen:"
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
"Du har ännu inte påbörjat ditt drag. Vill du verkligen avsluta ditt drag?"
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
"NÃ¥gra trupper kan fortfarande flytta. Vill du verkligen avsluta ditt drag?"
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr "Automatsparat"
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr "Kunde inte automatspara spelet. Var vänlig och spara spelet manuellt."
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr "Döp om truppen"
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
@@ -8644,43 +8664,43 @@
"Du får inte använda kolon eller någon form av snedstreck när du sparar
ett "
"spel. Var vänlig välj ett annat namn."
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr "Sparat"
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr "Spelet har sparats"
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr "Ledare"
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr "Underhåll"
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr "Inkomst"
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr "Det finns inte några trupper tillgängliga att värva till armén."
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr "Rekrytera"
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr "Välj trupp"
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr "Du har inte tillräckligt med guld för att rekrytera den truppen"
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
@@ -8688,7 +8708,7 @@
"Ers nåd, denna trupp är erfaren och har befordrats. Vill ni verkligen "
"avskeda $noun?"
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
@@ -8696,20 +8716,20 @@
"Ers nåd, denna trupp kommer snart att avancera till en högre nivå. Vill ni
"
"verkligen avskeda $noun?"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr "henne"
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr "honom"
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr ""
"Du är inte tillsammans med dina soldater och kan därför inte återkalla
dem"
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
@@ -8717,100 +8737,100 @@
"Det finns inga trupper att återkalla.\n"
"(Du måste ha överlevande veteraner från ett tidigare scenario)"
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
"Du måste ha åtminstone $cost guldstycken för att kunna återkalla en trupp"
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr "Avskeda trupp"
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr "Ã
terkalla"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr "Meddelande"
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr "Skicka enbart till allierade"
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr "Position"
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr "Trupplista"
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr "Rekryterade"
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr "Ã
terkallade"
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr "Befordringar"
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr "Förluster"
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr "Dödsfall"
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr "Ã
samkad skada"
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr "Mottagen skada"
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr "Ã
samkad skada (VV)"
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr "Mottagen skada (VV)"
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr "Statistik"
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr "Sök"
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr "Kommando:"
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr "Chattlogg"
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr "Kunde inte finna namn eller trupp som innehöll textsträngen
'$search'."
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr "Sätt ut namn"
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr "Namn"
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
@@ -8818,23 +8838,23 @@
"Spelen är osynkroniserade och måste avslutas. Vill du spara en fellogg
över "
"ditt spel?"
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr "Ersätt spelare med datorn"
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr "Ersätt med lokal spelare"
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr "Avbryt spelet"
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr "Ersätt med"
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr "har lämnat spelet. Vad vill du göra?"
@@ -9004,3 +9024,60 @@
#: src/widgets/file_chooser.cpp:126
msgid "Deletion of the file failed."
msgstr "Kunde ej radera fil."
+
+#~ msgid "&random-enemy.png,Random"
+#~ msgstr "&random-enemy.png,Slumpval"
+
+#~ msgid "&human-lieutenant.png,Loyalists"
+#~ msgstr "&human-lieutenant.png,Lojalister"
+
+#~ msgid "&elvish-captain.png,Rebels"
+#~ msgstr "&elvish-captain.png,Rebeller"
+
+#~ msgid "&orcish-warrior.png,Northerners"
+#~ msgstr "&orcish-warrior.png,Nordbor"
+
+#~ msgid "&undead-necromancer.png,Undead"
+#~ msgstr "&undead-necromancer.png,Vandöda"
+
+#~ msgid "&dwarf-warrior.png,Knalgan Alliance"
+#~ msgstr "&dwarf-warrior.png,Knalgas allians"
+
+#~ msgid "&drake-flare.png,Drakes"
+#~ msgstr "&drake-flare.png,Drakfolket"
+
+#~ msgid "&human-lieutenant.png,Humans"
+#~ msgstr "&human-lieutenant.png,Människor"
+
+#~ msgid "&elvish-captain.png,Elves"
+#~ msgstr "&elvish-captain.png,Alver"
+
+#~ msgid "&orcish-warrior.png,Orcs"
+#~ msgstr "&orcish-warrior.png,Orcher"
+
+#~ msgid "&dwarf-warrior.png,Dwarves"
+#~ msgstr "&dwarf-warrior.png,Dvärgar"
+
+#~ msgid "&saurian-soothsayer.png,Saurian"
+#~ msgstr "&saurian-soothsayer.png,Ãdleman"
+
+#~ msgid "&human-general.png,Loyalists"
+#~ msgstr "&human-general.png,Lojalister"
+
+#~ msgid "&elvish-marshal.png,Rebels"
+#~ msgstr "&elvish-marshal.png,Rebeller"
+
+#~ msgid "&orcish-warlord.png,Northerners"
+#~ msgstr "&orcish-warlord.png,Nordbor"
+
+#~ msgid "&undead-lich.png,Undead"
+#~ msgstr "&undead-lich.png,Vandöda"
+
+#~ msgid "&white-mage.png,Alliance of Light"
+#~ msgstr "&elvish-lord.png,Ljusets allians"
+
+#~ msgid ",Name,Version,Author,Downloads,Size"
+#~ msgstr ",Namn,Version,Författare,Hämtningar, Storlek"
+
+#~ msgid "Melee"
+#~ msgstr "Närstrid"
Index: wesnoth/po/wesnoth/wesnoth.pot
diff -u wesnoth/po/wesnoth/wesnoth.pot:1.16 wesnoth/po/wesnoth/wesnoth.pot:1.17
--- wesnoth/po/wesnoth/wesnoth.pot:1.16 Sun Dec 5 00:12:17 2004
+++ wesnoth/po/wesnoth/wesnoth.pot Sun Dec 12 15:19:49 2004
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-12-05 00:48+0100\n"
+"POT-Creation-Date: 2004-12-12 16:16+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -48,7 +48,7 @@
msgid "Traits"
msgstr ""
-#: data/help.cfg:28 src/playturn.cpp:1629
+#: data/help.cfg:28 src/playturn.cpp:1616
msgid "Units"
msgstr ""
@@ -816,93 +816,74 @@
msgid "Default"
msgstr ""
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:105 data/multiplayer.cfg:199
-#: data/multiplayer.cfg:282 src/multiplayer_client.cpp:662
-msgid "&random-enemy.png,Random"
+#: data/multiplayer.cfg:24 data/multiplayer.cfg:113 data/multiplayer.cfg:215
+#: data/multiplayer.cfg:305 src/multiplayer_client.cpp:664
+msgid "Random"
msgstr ""
-#: data/multiplayer.cfg:28
-msgid "&human-lieutenant.png,Loyalists"
+#: data/multiplayer.cfg:30 data/multiplayer.cfg:221
+msgid "Loyalists"
msgstr ""
-#: data/multiplayer.cfg:40
-msgid "&elvish-captain.png,Rebels"
+#: data/multiplayer.cfg:43 data/multiplayer.cfg:234
+msgid "Rebels"
msgstr ""
-#: data/multiplayer.cfg:52
-msgid "&orcish-warrior.png,Northerners"
+#: data/multiplayer.cfg:56 data/multiplayer.cfg:247
+msgid "Northerners"
msgstr ""
-#: data/multiplayer.cfg:64 data/multiplayer.cfg:146
-msgid "&undead-necromancer.png,Undead"
+#: data/multiplayer.cfg:69 data/multiplayer.cfg:158 data/multiplayer.cfg:260
+#: data/translations/english.cfg:127
+msgid "Undead"
msgstr ""
-#: data/multiplayer.cfg:76
-msgid "&dwarf-warrior.png,Knalgan Alliance"
+#: data/multiplayer.cfg:82 data/multiplayer.cfg:273
+msgid "Knalgan Alliance"
msgstr ""
-#: data/multiplayer.cfg:88 data/multiplayer.cfg:170 data/multiplayer.cfg:264
-msgid "&drake-flare.png,Drakes"
+#: data/multiplayer.cfg:95 data/multiplayer.cfg:184 data/multiplayer.cfg:286
+msgid "Drakes"
msgstr ""
-#: data/multiplayer.cfg:102
+#: data/multiplayer.cfg:109
msgid "Classic"
msgstr ""
-#: data/multiplayer.cfg:110
-msgid "&human-lieutenant.png,Humans"
+#: data/multiplayer.cfg:119 data/translations/english.cfg:125
+msgid "Humans"
msgstr ""
-#: data/multiplayer.cfg:122
-msgid "&elvish-captain.png,Elves"
+#: data/multiplayer.cfg:132 data/translations/english.cfg:124
+msgid "Elves"
msgstr ""
-#: data/multiplayer.cfg:134
-msgid "&orcish-warrior.png,Orcs"
+#: data/multiplayer.cfg:145 data/translations/english.cfg:126
+msgid "Orcs"
msgstr ""
-#: data/multiplayer.cfg:158
-msgid "&dwarf-warrior.png,Dwarves"
+#: data/multiplayer.cfg:171
+msgid "Dwarves"
msgstr ""
-#: data/multiplayer.cfg:182
-msgid "&saurian-soothsayer.png,Saurian"
+#: data/multiplayer.cfg:197 data/units/Saurian.cfg:5
+msgid "Saurian"
msgstr ""
-#: data/multiplayer.cfg:196
+#: data/multiplayer.cfg:211
msgid "Age of Heroes"
msgstr ""
-#: data/multiplayer.cfg:204
-msgid "&human-general.png,Loyalists"
-msgstr ""
-
-#: data/multiplayer.cfg:216
-msgid "&elvish-marshal.png,Rebels"
-msgstr ""
-
-#: data/multiplayer.cfg:228
-msgid "&orcish-warlord.png,Northerners"
-msgstr ""
-
-#: data/multiplayer.cfg:240
-msgid "&undead-lich.png,Undead"
-msgstr ""
-
-#: data/multiplayer.cfg:252
-msgid "&dwarf-lord.png,Knalgan Alliance"
-msgstr ""
-
-#: data/multiplayer.cfg:279
+#: data/multiplayer.cfg:301
msgid "Great War"
msgstr ""
-#: data/multiplayer.cfg:287
-msgid "&white-mage.png,Alliance of Light"
+#: data/multiplayer.cfg:311
+msgid "Alliance of Light"
msgstr ""
-#: data/multiplayer.cfg:299
-msgid "&undead-necromancer.png,Alliance of Darkness"
+#: data/multiplayer.cfg:324
+msgid "Alliance of Darkness"
msgstr ""
#: data/scenario-test.cfg:38
@@ -2027,66 +2008,54 @@
msgid "Canyon"
msgstr ""
-#: data/themes/default.cfg:23 data/themes/default.cfg:359
-#: data/themes/default.cfg:697
+#: data/themes/default.cfg:64
msgid "Menu"
msgstr ""
-#: data/themes/default.cfg:32 data/themes/default.cfg:368
-#: data/themes/default.cfg:706
+#: data/themes/default.cfg:75
msgid "Actions"
msgstr ""
-#: data/themes/default.cfg:79 data/themes/default.cfg:415
-#: data/themes/default.cfg:756
+#: data/themes/default.cfg:97
msgid "End Turn"
msgstr ""
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-#: data/themes/default.cfg:809 src/dialogs.cpp:660 src/display.cpp:920
-#: src/help.cpp:1059 src/playturn.cpp:2057 src/unit.cpp:1042
+#: data/themes/default.cfg:152 src/dialogs.cpp:660 src/display.cpp:920
+#: src/help.cpp:1059 src/playturn.cpp:2044 src/unit.cpp:1042
msgid "HP"
msgstr ""
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-#: data/themes/default.cfg:816 src/dialogs.cpp:664 src/dialogs.cpp:672
-#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1897
-#: src/playturn.cpp:2058 src/unit.cpp:1101
+#: data/themes/default.cfg:159 src/dialogs.cpp:664 src/dialogs.cpp:672
+#: src/display.cpp:924 src/display.cpp:932 src/playturn.cpp:1884
+#: src/playturn.cpp:2045 src/unit.cpp:1101
msgid "XP"
msgstr ""
-#: data/themes/default.cfg:142 data/themes/default.cfg:478
-#: data/themes/default.cfg:825
+#: data/themes/default.cfg:168
msgid "gold"
msgstr ""
-#: data/themes/default.cfg:150 data/themes/default.cfg:486
-#: data/themes/default.cfg:833
+#: data/themes/default.cfg:177
msgid "villages"
msgstr ""
-#: data/themes/default.cfg:158 data/themes/default.cfg:494
-#: data/themes/default.cfg:841
+#: data/themes/default.cfg:186
msgid "units"
msgstr ""
-#: data/themes/default.cfg:166 data/themes/default.cfg:502
-#: data/themes/default.cfg:849
+#: data/themes/default.cfg:195
msgid "upkeep"
msgstr ""
-#: data/themes/default.cfg:174 data/themes/default.cfg:510
-#: data/themes/default.cfg:857
+#: data/themes/default.cfg:204
msgid "income"
msgstr ""
-#: data/themes/default.cfg:285 data/themes/default.cfg:623
-#: data/themes/default.cfg:970
+#: data/themes/default.cfg:328
msgid "statuspanel^level"
msgstr ""
-#: data/themes/default.cfg:317 data/themes/default.cfg:655
-#: data/themes/default.cfg:1002
+#: data/themes/default.cfg:360
msgid "statuspanel^movement"
msgstr ""
@@ -2415,7 +2384,7 @@
#: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:357 src/actions.cpp:477
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:356 src/actions.cpp:473
msgid "leadership"
msgstr ""
@@ -2474,7 +2443,7 @@
#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:505
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:501
msgid "steadfast"
msgstr ""
@@ -2563,22 +2532,6 @@
"may not move or attack."
msgstr ""
-#: data/translations/english.cfg:124
-msgid "Elves"
-msgstr ""
-
-#: data/translations/english.cfg:125
-msgid "Humans"
-msgstr ""
-
-#: data/translations/english.cfg:126
-msgid "Orcs"
-msgstr ""
-
-#: data/translations/english.cfg:127
-msgid "Undead"
-msgstr ""
-
#: data/translations/english.cfg:130
msgid "$name's Bridge,$name's Crossing"
msgstr ""
@@ -2750,7 +2703,7 @@
#: data/units/Elvish_Shaman.cfg:44 data/units/Elvish_Shyde.cfg:25
#: data/units/Elvish_Shyde.cfg:51 data/units/Elvish_Sorceress.cfg:26
#: data/units/Elvish_Sorceress.cfg:66 data/units/Elvish_Sylph.cfg:25
-#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:41
+#: data/units/Elvish_Sylph.cfg:52 data/units/Fire_Dragon.cfg:42
#: data/units/Footpad.cfg:20 data/units/Footpad.cfg:38
#: data/units/Galleon.cfg:19 data/units/Gate.cfg:24
#: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
@@ -2765,6 +2718,7 @@
#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
#: data/units/Mounted_Captain.cfg:44 data/units/Mounted_Commander.cfg:44
+#: data/units/Mounted_Fighter.cfg:44 data/units/Mounted_Warrior.cfg:44
#: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
#: data/units/Noble_Youth.cfg:25 data/units/Outlaw.cfg:21
#: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -2823,7 +2777,7 @@
#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
+#: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
#: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
@@ -2895,13 +2849,14 @@
#: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:19
#: data/units/Grand_Knight.cfg:21 data/units/Grand_Marshal.cfg:22
#: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:40
#: data/units/Horse_Lord.cfg:22 data/units/Knight.cfg:21
#: data/units/Lieutenant.cfg:22 data/units/Longbowman.cfg:22
#: data/units/Lord.cfg:23 data/units/Lord.cfg:86 data/units/Mage.cfg:21
#: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
#: data/units/Merman_Triton.cfg:35 data/units/Mounted_Captain.cfg:22
-#: data/units/Mounted_Commander.cfg:22 data/units/Naga-Fighter.cfg:21
+#: data/units/Mounted_Commander.cfg:22 data/units/Mounted_Fighter.cfg:22
+#: data/units/Mounted_Warrior.cfg:22 data/units/Naga-Fighter.cfg:21
#: data/units/Naga-Fighter.cfg:52 data/units/Naga-Myrmidon.cfg:25
#: data/units/Naga-Myrmidon.cfg:60 data/units/Naga-Warrior.cfg:25
#: data/units/Naga-Warrior.cfg:60 data/units/Necrophage.cfg:20
@@ -2919,11 +2874,11 @@
#: data/units/Princess.cfg:62 data/units/Red_Mage.cfg:24
#: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
#: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Sea_Orc.cfg:20
+#: data/units/Royal_Guard.cfg:24 data/units/Sea_Orc.cfg:20
#: data/units/Sergeant.cfg:22 data/units/Shadow.cfg:21
#: data/units/Skeletal_Dragon.cfg:29 data/units/Skeletal_Dragon.cfg:48
#: data/units/Skeleton.cfg:25 data/units/Sleeping_Gryphon.cfg:19
-#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:20
+#: data/units/Spectre.cfg:20 data/units/Swordsman.cfg:24
#: data/units/Thief.cfg:20 data/units/Trapper.cfg:25
#: data/units/Vampire_Bat.cfg:20 data/units/Vampire_Lady.cfg:21
#: data/units/White_Mage.cfg:29 data/units/White_Mage.cfg:88
@@ -2934,7 +2889,7 @@
#: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
#: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:496
+#: src/actions.cpp:492
msgid "backstab"
msgstr ""
@@ -3011,7 +2966,8 @@
#: data/units/Lieutenant.cfg:21 data/units/Longbowman.cfg:21
#: data/units/Lord.cfg:22 data/units/Lord.cfg:85
#: data/units/Master_Bowman.cfg:20 data/units/Mounted_Captain.cfg:21
-#: data/units/Mounted_Commander.cfg:21 data/units/Naga-Fighter.cfg:20
+#: data/units/Mounted_Commander.cfg:21 data/units/Mounted_Fighter.cfg:21
+#: data/units/Mounted_Warrior.cfg:21 data/units/Naga-Fighter.cfg:20
#: data/units/Naga-Fighter.cfg:51 data/units/Naga-Myrmidon.cfg:24
#: data/units/Naga-Myrmidon.cfg:59 data/units/Naga-Warrior.cfg:24
#: data/units/Naga-Warrior.cfg:59 data/units/Noble_Commander.cfg:26
@@ -3020,9 +2976,9 @@
#: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
#: data/units/Paladin.cfg:24 data/units/Princess.cfg:23
-#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:19
+#: data/units/Princess.cfg:61 data/units/Royal_Guard.cfg:23
#: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
-#: data/units/Swordsman.cfg:19
+#: data/units/Swordsman.cfg:23
msgid "sword"
msgstr ""
@@ -3107,7 +3063,8 @@
#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
#: data/units/Grand_Knight.cfg:37 data/units/Grand_Marshal.cfg:45
-#: data/units/Halbardier.cfg:19 data/units/Horseman.cfg:21
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:21
+#: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
#: data/units/Knight.cfg:37 data/units/Lancer.cfg:21
#: data/units/Lieutenant.cfg:39 data/units/Longbowman.cfg:39
#: data/units/Lord.cfg:40 data/units/Master_Bowman.cfg:33
@@ -3125,7 +3082,7 @@
#: data/units/Orcish_Shaman.cfg:112 data/units/Orcish_Sovereign.cfg:43
#: data/units/Orcish_Warlord.cfg:31 data/units/Paladin.cfg:42
#: data/units/Peasant.cfg:21 data/units/Peasant.cfg:34
-#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
+#: data/units/Pikeman.cfg:23 data/units/Pirate_Galleon.cfg:17
#: data/units/Poacher.cfg:42 data/units/Saurian.cfg:24
#: data/units/Saurian.cfg:42 data/units/Saurian_Ambusher.cfg:23
#: data/units/Saurian_Ambusher.cfg:41 data/units/Saurian_Flanker.cfg:24
@@ -3246,7 +3203,8 @@
#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
#: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
#: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
-#: data/units/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Horseman.cfg:20 data/units/Javelineer.cfg:19
+#: data/units/Javelineer.cfg:47 data/units/Merman_Entangler.cfg:18
#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
@@ -3262,8 +3220,8 @@
#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
#: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:367
-#: src/actions.cpp:487
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:366
+#: src/actions.cpp:483
msgid "charge"
msgstr ""
@@ -3282,7 +3240,7 @@
msgid "gaze"
msgstr ""
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:741 src/actions.cpp:888
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:738 src/actions.cpp:885
#: src/reports.cpp:123
msgid "stone"
msgstr ""
@@ -3483,7 +3441,7 @@
#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
-#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:58
msgid "fire breath"
msgstr ""
@@ -3616,8 +3574,9 @@
msgstr ""
#: data/units/Drake_Slasher.cfg:42 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:25
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
+#: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
+#: data/units/Spearman.cfg:25
msgid "firststrike"
msgstr ""
@@ -4037,7 +3996,7 @@
#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
#: data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:61
msgid "marksman"
msgstr ""
@@ -4354,8 +4313,10 @@
#: data/units/Goblin_Impaler.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
-"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
+"numbers. Those who have somehow managed to survive the turmoil of combat "
+"invariably equip themselves with a much larger spear than before, enabling "
+"them to deal the first strike in melee."
msgstr ""
#: data/units/Goblin_Knight.cfg:3
@@ -4394,7 +4355,7 @@
#: data/units/Goblin_Spearman.cfg:17
msgid ""
"Goblins tend to try and make up for their general idiocy, frailty, and lack "
-"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"of sophisticated weaponry by attempting to overwhelm their foes by sheer "
"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
"are well-equipped for a war of attrition. The best Goblin Spearman can look "
"forward to becoming Goblin Impalers."
@@ -4487,18 +4448,20 @@
msgstr ""
#: data/units/Halbardier.cfg:3
-msgid "Halbardier"
+msgid "Halberdier"
msgstr ""
-#: data/units/Halbardier.cfg:15
+#: data/units/Halbardier.cfg:18
msgid ""
-"The best of the soldiers are choosen to become Halberdiers. Their weapon, "
+"The best of the soldiers are chosen to become Halberdiers. Their weapon, "
"though a little slower than the sword, can strike with deadly force, and "
-"because of its great length, Halbardiers always strike first in combat, even "
-"when defending."
+"because of its great length, Halberdiers always strike first in combat, even "
+"when defending. Halberdiers have great facility at dealing with troops they "
+"can keep further than the end of their weapons, but find some difficulty in "
+"very close combat."
msgstr ""
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
msgid "halberd"
msgstr ""
@@ -4524,7 +4487,8 @@
msgstr ""
#: data/units/Horse_Lord.cfg:43 data/units/Mounted_Captain.cfg:43
-#: data/units/Mounted_Commander.cfg:43
+#: data/units/Mounted_Commander.cfg:43 data/units/Mounted_Fighter.cfg:43
+#: data/units/Mounted_Warrior.cfg:43
msgid "morning star"
msgstr ""
@@ -4562,6 +4526,19 @@
"soldiers would control the continent."
msgstr ""
+#: data/units/Javelineer.cfg:3
+msgid "Javelineer"
+msgstr ""
+
+#: data/units/Javelineer.cfg:16
+msgid ""
+"Javelineers have mastered the use of the pointy sticks they were given as "
+"recruits. Dangerous in melee, they have also developed their skill at "
+"throwing their javelins, making them potent in both demesnes of combat. "
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
+msgstr ""
+
#: data/units/Knight.cfg:3
msgid "Knight"
msgstr ""
@@ -4830,7 +4807,7 @@
msgid "Mounted Captain"
msgstr ""
-#: data/units/Mounted_Captain.cfg:17
+#: data/units/Mounted_Captain.cfg:17 data/units/Mounted_Fighter.cfg:17
msgid ""
"The nobles of the men of the plains are trained with the rest of the "
"horsemen to become great warriors. However, they are also trained in "
@@ -4850,6 +4827,22 @@
"different fronts."
msgstr ""
+#: data/units/Mounted_Fighter.cfg:3
+msgid "Mounted Fighter"
+msgstr ""
+
+#: data/units/Mounted_Warrior.cfg:3
+msgid "Mounted Warrior"
+msgstr ""
+
+#: data/units/Mounted_Warrior.cfg:17
+msgid ""
+"Leaders of the plains, Mounted Warriors are skilled with the use of the "
+"sword and the morning star. Riding horses, they are able to move around the "
+"battlefield with great speed, and can provide much needed assistance to "
+"different fronts."
+msgstr ""
+
#: data/units/Mudcrawler.cfg:3
msgid "Mudcrawler"
msgstr ""
@@ -5253,15 +5246,16 @@
msgid "Pikeman"
msgstr ""
-#: data/units/Pikeman.cfg:16
+#: data/units/Pikeman.cfg:19
msgid ""
"Pikemen are more experienced soldiers who have changed their spears for long "
"pikes. Because of the length of their weapons, they always strike first in "
"combat, even when defending. They are especially deadly when fighting "
-"cavalry."
+"cavalry, though they find some difficulty in fighting in extremely close "
+"quarters."
msgstr ""
-#: data/units/Pikeman.cfg:19
+#: data/units/Pikeman.cfg:22
msgid "pike"
msgstr ""
@@ -5342,17 +5336,13 @@
msgid "Royal Guard"
msgstr ""
-#: data/units/Royal_Guard.cfg:16
+#: data/units/Royal_Guard.cfg:20
msgid ""
"Members of the Royal Guard are hand picked from the strongest and sturdiest "
"of the army. They are deployed only in critical situations and, so far, have "
"always succeeded in their assigned tasks."
msgstr ""
-#: data/units/Saurian.cfg:5
-msgid "Saurian"
-msgstr ""
-
#: data/units/Saurian.cfg:18
msgid ""
"Saurians are skilled in the use of the spear. Despite their lethargic cold "
@@ -5622,8 +5612,8 @@
msgid ""
"Spearmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting. "
-"Because of the length of their spears, they strike first in combat, even "
-"when defending."
+"Because of the length of their spears, they strike first in melee, even when "
+"defending."
msgstr ""
#: data/units/Spectre.cfg:3
@@ -5642,7 +5632,7 @@
msgid "Swordsman"
msgstr ""
-#: data/units/Swordsman.cfg:16
+#: data/units/Swordsman.cfg:20
msgid ""
"Swordsmen are the core of the human armies. These young soldiers are given "
"basic training and put in the front lines to do the bulk of the fighting."
@@ -6048,15 +6038,15 @@
msgid "Close"
msgstr ""
-#: src/actions.cpp:98
+#: src/actions.cpp:99
msgid "You don't have a leader to recruit with."
msgstr ""
-#: src/actions.cpp:102
+#: src/actions.cpp:103
msgid "You must have your leader on a keep to recruit or recall units."
msgstr ""
-#: src/actions.cpp:119
+#: src/actions.cpp:120
msgid "There are no vacant castle tiles in which to recruit a unit."
msgstr ""
@@ -6064,7 +6054,17 @@
msgid "none"
msgstr ""
-#: src/actions.cpp:324 src/actions.cpp:443
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:953
+#: src/help.cpp:1129 src/reports.cpp:231
+msgid "melee"
+msgstr ""
+
+#: src/actions.cpp:275 src/dialogs.cpp:692 src/display.cpp:954
+#: src/help.cpp:1129 src/reports.cpp:232
+msgid "ranged"
+msgstr ""
+
+#: src/actions.cpp:325 src/actions.cpp:441
msgid "base damage"
msgstr ""
@@ -6076,61 +6076,61 @@
msgid "attacker vulnerability vs"
msgstr ""
-#: src/actions.cpp:367 src/actions.cpp:487 src/actions.cpp:496
+#: src/actions.cpp:366 src/actions.cpp:483 src/actions.cpp:492
msgid "Doubled"
msgstr ""
-#: src/actions.cpp:395 src/actions.cpp:532
+#: src/actions.cpp:394 src/actions.cpp:528
msgid "total damage"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender resistance vs"
msgstr ""
-#: src/actions.cpp:453
+#: src/actions.cpp:450
msgid "defender vulnerability vs"
msgstr ""
-#: src/actions.cpp:505
+#: src/actions.cpp:501
msgid "Halved"
msgstr ""
-#: src/actions.cpp:727 src/actions.cpp:873 src/display.cpp:896
+#: src/actions.cpp:724 src/actions.cpp:870 src/display.cpp:896
#: src/reports.cpp:116
msgid "poisoned"
msgstr ""
-#: src/actions.cpp:732 src/actions.cpp:878 src/display.cpp:892
+#: src/actions.cpp:729 src/actions.cpp:875 src/display.cpp:892
#: src/reports.cpp:111
msgid "slowed"
msgstr ""
-#: src/actions.cpp:1750
+#: src/actions.cpp:1747
msgid "Ambushed!"
msgstr ""
-#: src/actions.cpp:1778
+#: src/actions.cpp:1775
msgid "Friendly unit sighted"
msgstr ""
-#: src/actions.cpp:1780
+#: src/actions.cpp:1777
msgid "Enemy unit sighted!"
msgstr ""
-#: src/actions.cpp:1785
+#: src/actions.cpp:1782
msgid "$friends Friendly units sighted"
msgstr ""
-#: src/actions.cpp:1787
+#: src/actions.cpp:1784
msgid "$enemies Enemy units sighted!"
msgstr ""
-#: src/actions.cpp:1791
+#: src/actions.cpp:1788
msgid "Units sighted! ($friends friendly, $enemies enemy)"
msgstr ""
-#: src/actions.cpp:1806
+#: src/actions.cpp:1803
msgid "(press $hotkey to continue)"
msgstr ""
@@ -6178,7 +6178,7 @@
msgid "Campaign"
msgstr ""
-#: src/dialogs.cpp:364 src/game.cpp:1243
+#: src/dialogs.cpp:364 src/game.cpp:1254
msgid "Multiplayer"
msgstr ""
@@ -6190,7 +6190,7 @@
msgid "replay"
msgstr ""
-#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1479
+#: src/dialogs.cpp:376 src/multiplayer_lobby.cpp:145 src/playturn.cpp:1466
msgid "Turn"
msgstr ""
@@ -6202,7 +6202,7 @@
msgid "Difficulty"
msgstr ""
-#: src/dialogs.cpp:383 src/titlescreen.cpp:165
+#: src/dialogs.cpp:383 src/game.cpp:1055 src/titlescreen.cpp:165
msgid "Version"
msgstr ""
@@ -6255,25 +6255,15 @@
msgstr ""
#: src/dialogs.cpp:639 src/display.cpp:902 src/help.cpp:1014
-#: src/playturn.cpp:1896
+#: src/playturn.cpp:1883
msgid "level"
msgstr ""
#: src/dialogs.cpp:677 src/display.cpp:936 src/help.cpp:1060
-#: src/playturn.cpp:2059 src/unit.cpp:1078
+#: src/playturn.cpp:2046 src/unit.cpp:1078
msgid "Moves"
msgstr ""
-#: src/dialogs.cpp:692 src/display.cpp:953 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:231
-msgid "melee"
-msgstr ""
-
-#: src/dialogs.cpp:692 src/display.cpp:954 src/help.cpp:1129
-#: src/playturn.cpp:575 src/reports.cpp:232
-msgid "ranged"
-msgstr ""
-
#: src/display.cpp:883
msgid "healthy"
msgstr ""
@@ -6290,11 +6280,11 @@
msgid "Do you want to save a replay of this scenario?"
msgstr ""
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1488
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1475
msgid "Name:"
msgstr ""
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1505
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1492
msgid "The game could not be saved"
msgstr ""
@@ -6322,7 +6312,7 @@
msgstr ""
#: src/game.cpp:953
-msgid " ,Get More Campaigns..."
+msgid "Get More Campaigns..."
msgstr ""
#: src/game.cpp:954
@@ -6353,11 +6343,11 @@
msgid "Could not connect to host."
msgstr ""
-#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1098
-#: src/game.cpp:1127 src/game.cpp:1141 src/game.cpp:1143 src/game.cpp:1145
-#: src/game.cpp:1157 src/game.cpp:1160 src/game.cpp:1195 src/game.cpp:1197
-#: src/game.cpp:1219 src/game.cpp:1221 src/playturn.cpp:1491
-#: src/playturn.cpp:1505
+#: src/game.cpp:1027 src/game.cpp:1042 src/game.cpp:1048 src/game.cpp:1108
+#: src/game.cpp:1137 src/game.cpp:1152 src/game.cpp:1154 src/game.cpp:1156
+#: src/game.cpp:1168 src/game.cpp:1171 src/game.cpp:1206 src/game.cpp:1208
+#: src/game.cpp:1230 src/game.cpp:1232 src/playturn.cpp:1478
+#: src/playturn.cpp:1492
msgid "Error"
msgstr ""
@@ -6369,133 +6359,145 @@
msgid "Error communicating with the server."
msgstr ""
-#: src/game.cpp:1053
-msgid ",Name,Version,Author,Downloads,Size"
+#: src/game.cpp:1054 src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2043
+msgid "Name"
+msgstr ""
+
+#: src/game.cpp:1056
+msgid "Author"
+msgstr ""
+
+#: src/game.cpp:1057
+msgid "Downloads"
msgstr ""
-#: src/game.cpp:1072
+#: src/game.cpp:1058
+msgid "Size"
+msgstr ""
+
+#: src/game.cpp:1077
msgid "B"
msgstr ""
-#: src/game.cpp:1075 src/show_dialog.cpp:949
+#: src/game.cpp:1080 src/show_dialog.cpp:949
msgid "KB"
msgstr ""
-#: src/game.cpp:1078
+#: src/game.cpp:1083
msgid "MB"
msgstr ""
-#: src/game.cpp:1090
+#: src/game.cpp:1100
msgid "Publish campaign: "
msgstr ""
-#: src/game.cpp:1094
+#: src/game.cpp:1104
msgid "Delete campaign: "
msgstr ""
-#: src/game.cpp:1098
+#: src/game.cpp:1108
msgid "There are no campaigns available for download from this server."
msgstr ""
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Choose the campaign to download."
msgstr ""
-#: src/game.cpp:1102
+#: src/game.cpp:1112
msgid "Get Campaign"
msgstr ""
-#: src/game.cpp:1121
+#: src/game.cpp:1131
msgid "Downloading campaign..."
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "Campaign Installed"
msgstr ""
-#: src/game.cpp:1139
+#: src/game.cpp:1150
msgid "The campaign has been installed."
msgstr ""
-#: src/game.cpp:1141
+#: src/game.cpp:1152
msgid "Network communication error."
msgstr ""
-#: src/game.cpp:1143
+#: src/game.cpp:1154
msgid "Remote host disconnected."
msgstr ""
-#: src/game.cpp:1145
+#: src/game.cpp:1156
msgid ""
"There was a problem creating the files necessary to install this campaign."
msgstr ""
-#: src/game.cpp:1157 src/game.cpp:1195 src/game.cpp:1219
-#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:318
+#: src/game.cpp:1168 src/game.cpp:1206 src/game.cpp:1230
+#: src/multiplayer_client.cpp:47 src/multiplayer_client.cpp:319
msgid "Connection timed out"
msgstr ""
-#: src/game.cpp:1160 src/game.cpp:1197 src/game.cpp:1221
+#: src/game.cpp:1171 src/game.cpp:1208 src/game.cpp:1232
msgid "The server responded with an error: \""
msgstr ""
-#: src/game.cpp:1163
+#: src/game.cpp:1174
msgid "Terms"
msgstr ""
-#: src/game.cpp:1199 src/game.cpp:1223
+#: src/game.cpp:1210 src/game.cpp:1234
msgid "Response"
msgstr ""
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Join Official Server"
msgstr ""
-#: src/game.cpp:1236
+#: src/game.cpp:1247
msgid "Log on to the official Wesnoth multiplayer server"
msgstr ""
-#: src/game.cpp:1237 src/multiplayer_lobby.cpp:163
+#: src/game.cpp:1248 src/multiplayer_lobby.cpp:164
msgid "Join Game"
msgstr ""
-#: src/game.cpp:1237
+#: src/game.cpp:1248
msgid "Join a server or hosted game"
msgstr ""
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host Networked Game"
msgstr ""
-#: src/game.cpp:1238
+#: src/game.cpp:1249
msgid "Host a game without using a server"
msgstr ""
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Hotseat Game"
msgstr ""
-#: src/game.cpp:1239
+#: src/game.cpp:1250
msgid "Play a multiplayer game sharing the same machine"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Human vs AI"
msgstr ""
-#: src/game.cpp:1240
+#: src/game.cpp:1251
msgid "Play a game against AI opponents"
msgstr ""
-#: src/game.cpp:1243 src/multiplayer_client.cpp:302
+#: src/game.cpp:1254 src/multiplayer_client.cpp:303
msgid "Login"
msgstr ""
-#: src/game.cpp:1322
+#: src/game.cpp:1333
msgid "Language"
msgstr ""
-#: src/game.cpp:1323
+#: src/game.cpp:1334
msgid "Choose your preferred language"
msgstr ""
@@ -6515,11 +6517,7 @@
msgid "attacks"
msgstr ""
-#: src/help.cpp:1083 src/help.cpp:1084 src/playturn.cpp:2056
-msgid "Name"
-msgstr ""
-
-#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2055
+#: src/help.cpp:1087 src/help.cpp:1088 src/playturn.cpp:2042
msgid "Type"
msgstr ""
@@ -6647,7 +6645,7 @@
msgid "Bump Size"
msgstr ""
-#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1628
+#: src/mapgen_dialog.cpp:87 src/playturn.cpp:1615
msgid "Villages"
msgstr ""
@@ -6707,7 +6705,7 @@
msgid "Allow users who are not playing to watch the game"
msgstr ""
-#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:150
+#: src/multiplayer.cpp:120 src/multiplayer_client.cpp:151
#: src/multiplayer_connect.cpp:52 src/show_dialog.cpp:487
#: src/show_dialog.cpp:493
msgid "Cancel"
@@ -6741,7 +6739,7 @@
msgid "No multiplayer sides."
msgstr ""
-#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:164
+#: src/multiplayer.cpp:170 src/multiplayer_lobby.cpp:165
msgid "Create Game"
msgstr ""
@@ -6791,63 +6789,63 @@
msgid "Receiving game list..."
msgstr ""
-#: src/multiplayer_client.cpp:126 src/playturn.cpp:1724
+#: src/multiplayer_client.cpp:126 src/playturn.cpp:1711
msgid "unit^Gold"
msgstr ""
-#: src/multiplayer_client.cpp:144
+#: src/multiplayer_client.cpp:145
msgid "Waiting for game to start..."
msgstr ""
-#: src/multiplayer_client.cpp:252
+#: src/multiplayer_client.cpp:253
msgid "Connect to Host"
msgstr ""
-#: src/multiplayer_client.cpp:254
+#: src/multiplayer_client.cpp:255
msgid "Choose host to connect to"
msgstr ""
-#: src/multiplayer_client.cpp:272
+#: src/multiplayer_client.cpp:273
msgid "Connecting to remote host..."
msgstr ""
-#: src/multiplayer_client.cpp:301
+#: src/multiplayer_client.cpp:302
msgid "You must log in to this server"
msgstr ""
-#: src/multiplayer_client.cpp:381
+#: src/multiplayer_client.cpp:382
msgid "Getting game data..."
msgstr ""
-#: src/multiplayer_client.cpp:433
+#: src/multiplayer_client.cpp:434
msgid "There are no available sides in this game."
msgstr ""
-#: src/multiplayer_client.cpp:481
+#: src/multiplayer_client.cpp:482
msgid "Choose your side:"
msgstr ""
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:513
msgid "The game has been cancelled"
msgstr ""
-#: src/multiplayer_client.cpp:516
+#: src/multiplayer_client.cpp:517
msgid "The side you have chosen is no longer available"
msgstr ""
-#: src/multiplayer_client.cpp:552
+#: src/multiplayer_client.cpp:553
msgid "Show replay of game up to save point?"
msgstr ""
-#: src/multiplayer_client.cpp:687 src/multiplayer_client.cpp:690
+#: src/multiplayer_client.cpp:689 src/multiplayer_client.cpp:692
msgid "?"
msgstr ""
-#: src/multiplayer_client.cpp:774
+#: src/multiplayer_client.cpp:776
msgid "Leader: "
msgstr ""
-#: src/multiplayer_client.cpp:776
+#: src/multiplayer_client.cpp:778
msgid "Recruits: "
msgstr ""
@@ -6944,7 +6942,7 @@
msgstr ""
#: src/multiplayer_connect.cpp:390 src/multiplayer_connect.cpp:392
-#: src/playlevel.cpp:792 src/playturn.cpp:1627 src/playturn.cpp:1634
+#: src/playlevel.cpp:792 src/playturn.cpp:1614 src/playturn.cpp:1621
msgid "Gold"
msgstr ""
@@ -6952,23 +6950,23 @@
msgid "Waiting for network players to join"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "1"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slot"
msgstr ""
-#: src/multiplayer_lobby.cpp:147
+#: src/multiplayer_lobby.cpp:148
msgid "Vacant Slots"
msgstr ""
-#: src/multiplayer_lobby.cpp:162
+#: src/multiplayer_lobby.cpp:163
msgid "Observe Game"
msgstr ""
-#: src/multiplayer_lobby.cpp:165
+#: src/multiplayer_lobby.cpp:166
msgid "Quit"
msgstr ""
@@ -7035,242 +7033,238 @@
msgid "It is now your turn"
msgstr ""
-#: src/playturn.cpp:499
+#: src/playturn.cpp:504
msgid "Attacker"
msgstr ""
-#: src/playturn.cpp:501
+#: src/playturn.cpp:506
msgid "Defender"
msgstr ""
-#: src/playturn.cpp:525 src/playturn.cpp:611
+#: src/playturn.cpp:526 src/playturn.cpp:599
msgid "Damage Calculations"
msgstr ""
-#: src/playturn.cpp:575
-msgid "Melee"
-msgstr ""
-
-#: src/playturn.cpp:589 src/reports.cpp:209
+#: src/playturn.cpp:578 src/reports.cpp:209
msgid "vs"
msgstr ""
-#: src/playturn.cpp:623
+#: src/playturn.cpp:611
msgid "Attack Enemy"
msgstr ""
-#: src/playturn.cpp:624
+#: src/playturn.cpp:612
msgid "Choose weapon"
msgstr ""
-#: src/playturn.cpp:1213
+#: src/playturn.cpp:1200
msgid ""
"You have not started your turn yet. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1222 src/playturn.cpp:1227
+#: src/playturn.cpp:1209 src/playturn.cpp:1214
msgid "Some units have movement left. Do you really want to end your turn?"
msgstr ""
-#: src/playturn.cpp:1242
+#: src/playturn.cpp:1229
msgid "Auto-Save"
msgstr ""
-#: src/playturn.cpp:1244
+#: src/playturn.cpp:1231
msgid "Could not auto save the game. Please save the game manually."
msgstr ""
-#: src/playturn.cpp:1443
+#: src/playturn.cpp:1430
msgid "Rename Unit"
msgstr ""
-#: src/playturn.cpp:1491
+#: src/playturn.cpp:1478
msgid ""
"Save names may not contain colons, slashes, or backslashes. Please choose a "
"different name."
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "Saved"
msgstr ""
-#: src/playturn.cpp:1502
+#: src/playturn.cpp:1489
msgid "The game has been saved"
msgstr ""
-#: src/playturn.cpp:1626
+#: src/playturn.cpp:1613
msgid "Leader"
msgstr ""
-#: src/playturn.cpp:1630
+#: src/playturn.cpp:1617
msgid "Upkeep"
msgstr ""
-#: src/playturn.cpp:1631
+#: src/playturn.cpp:1618
msgid "Income"
msgstr ""
-#: src/playturn.cpp:1730
+#: src/playturn.cpp:1717
msgid "You have no units available to recruit."
msgstr ""
-#: src/playturn.cpp:1742
+#: src/playturn.cpp:1729
msgid "Recruit"
msgstr ""
-#: src/playturn.cpp:1743 src/playturn.cpp:1922
+#: src/playturn.cpp:1730 src/playturn.cpp:1909
msgid "Select unit"
msgstr ""
-#: src/playturn.cpp:1772
+#: src/playturn.cpp:1759
msgid "You don't have enough gold to recruit that unit"
msgstr ""
-#: src/playturn.cpp:1830
+#: src/playturn.cpp:1817
msgid ""
"My lord, this unit is an experienced one, having advanced levels! Do you "
"really want to dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1832
+#: src/playturn.cpp:1819
msgid ""
"My lord, this unit is close to advancing a level! Do you really want to "
"dismiss $noun?"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "her"
msgstr ""
-#: src/playturn.cpp:1837
+#: src/playturn.cpp:1824
msgid "him"
msgstr ""
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1865
msgid "You are separated from your soldiers and may not recall them"
msgstr ""
-#: src/playturn.cpp:1880
+#: src/playturn.cpp:1867
msgid ""
"There are no troops available to recall\n"
"(You must have veteran survivors from a previous scenario)"
msgstr ""
-#: src/playturn.cpp:1886
+#: src/playturn.cpp:1873
msgid "You must have at least $cost gold pieces to recall a unit"
msgstr ""
-#: src/playturn.cpp:1909
+#: src/playturn.cpp:1896
msgid "Dismiss Unit"
msgstr ""
-#: src/playturn.cpp:1921
+#: src/playturn.cpp:1908
msgid "Recall"
msgstr ""
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Message"
msgstr ""
-#: src/playturn.cpp:1966
+#: src/playturn.cpp:1953
msgid "Send to allies only"
msgstr ""
-#: src/playturn.cpp:2060
+#: src/playturn.cpp:2047
msgid "Location"
msgstr ""
-#: src/playturn.cpp:2107
+#: src/playturn.cpp:2094
msgid "Unit List"
msgstr ""
-#: src/playturn.cpp:2142 src/playturn.cpp:2204
+#: src/playturn.cpp:2129 src/playturn.cpp:2191
msgid "Recruits"
msgstr ""
-#: src/playturn.cpp:2148 src/playturn.cpp:2208
+#: src/playturn.cpp:2135 src/playturn.cpp:2195
msgid "Recalls"
msgstr ""
-#: src/playturn.cpp:2154 src/playturn.cpp:2212
+#: src/playturn.cpp:2141 src/playturn.cpp:2199
msgid "Advancements"
msgstr ""
-#: src/playturn.cpp:2160 src/playturn.cpp:2216
+#: src/playturn.cpp:2147 src/playturn.cpp:2203
msgid "Losses"
msgstr ""
-#: src/playturn.cpp:2166 src/playturn.cpp:2220
+#: src/playturn.cpp:2153 src/playturn.cpp:2207
msgid "Kills"
msgstr ""
-#: src/playturn.cpp:2172
+#: src/playturn.cpp:2159
msgid "Damage Inflicted"
msgstr ""
-#: src/playturn.cpp:2178
+#: src/playturn.cpp:2165
msgid "Damage Taken"
msgstr ""
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2171
msgid "Damage Inflicted (EV)"
msgstr ""
-#: src/playturn.cpp:2191
+#: src/playturn.cpp:2178
msgid "Damage Taken (EV)"
msgstr ""
-#: src/playturn.cpp:2197
+#: src/playturn.cpp:2184
msgid "Statistics"
msgstr ""
-#: src/playturn.cpp:2234
+#: src/playturn.cpp:2221
msgid "Search"
msgstr ""
-#: src/playturn.cpp:2244
+#: src/playturn.cpp:2231
msgid "prompt^Command:"
msgstr ""
-#: src/playturn.cpp:2255
+#: src/playturn.cpp:2242
msgid "Chat Log"
msgstr ""
-#: src/playturn.cpp:2320
+#: src/playturn.cpp:2307
msgid "Couldn't find label or unit containing the string '$search'."
msgstr ""
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2388
msgid "Place Label"
msgstr ""
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2389
msgid "Label"
msgstr ""
-#: src/playturn.cpp:2534
+#: src/playturn.cpp:2521
msgid ""
"The games are out of sync and will have to exit. Do you want to save an "
"error log of your game?"
msgstr ""
-#: src/playturn.cpp:2586
+#: src/playturn.cpp:2573
msgid "Replace with AI"
msgstr ""
-#: src/playturn.cpp:2587
+#: src/playturn.cpp:2574
msgid "Replace with local player"
msgstr ""
-#: src/playturn.cpp:2588
+#: src/playturn.cpp:2575
msgid "Abort game"
msgstr ""
-#: src/playturn.cpp:2591
+#: src/playturn.cpp:2578
msgid "Replace with "
msgstr ""
-#: src/playturn.cpp:2595
+#: src/playturn.cpp:2582
msgid "has left the game. What do you want to do?"
msgstr ""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/po/wesnoth ca.po cs.po da.po de.po el_G...,
Yann Dirson <=