merge trunk 2007-01-02T20:37:30Z!david@torangan.de..2007-01-03T22:00:18Z!koraq@xs4all.nl

This commit is contained in:
Mark de Wever 2007-01-03 22:26:57 +00:00
parent 79678dc770
commit 5c0a611315
63 changed files with 797 additions and 1819 deletions

View file

@ -23,59 +23,13 @@ Version 1.3-terrain-branch: also read README.BRANCH
and no longer makes assumptions about the internal format.
Version 1.3-svn:
Concise list of player-visible changes:
* Graphics
* Item graphic improvements including an animatable campfire.
* Added visible peaks to the impassable mountains.
* Added a recruit animation for Skeleton.
* Fixed animation of gryphon units not being displayed in the center of
the hex.
* Fixed incorrect WML in some units causing female variations to use male
images.
* Improved hex grid.
* Sound
* New sound effects: morning star.
* Added an advanced sound tab to preferences, allowing one to specify the
values used for sample rate and buffer size.
* Unit changes and balancing
* New traits: healthy (+3HP, +4 rest healing), fearless (ignore unfavourable
time of day).
* Dark Adepts no longer get the 'strong' trait.
* Added the 'skirmisher' ability to the Shadow line.
* Increased the HP of the Longbowman from 45 to 51.
* Decreased the XP requirement of the Longbowman from 80 to 68.
* Increased the HP of the Master Bowman from 58 to 67.
* Increased the XP requirement of the Guardsman from 42 to 47.
* Increased the HP of the Stalwart from 48 to 54.
* Increased the XP requirement of the Stalwart from 65 to 85.
* Increased the HP of the Sentinel from 56 to 68.
* Decreased cost of the Mudcrawler from 9 to 5.
* Decreased the HP of the Shadow from 26 to 24.
* Increased the HP of the Goblin Rouser from 26 to 31.
* Increased the melee damage of the Goblin Rouser from 5-3 to 6-3.
* Multiplayer
* Maps
* New maps: The Manzivan Traps
* Revised maps: Blitz
* Map editor
* Maps can now be opened directly from a scenario file and saved back to it.
* Language and translations
* Updated translations: German, Italian.
* Fixed spelling mistakes in the default en_US language.
Detailed changelog and internal changes:
* Campaignd
* first argument is number of threads to use, defaults to 5
* campaigns
* Heir to the Throne
* removed Mountain Pass and Valley of Statues from the repository
* added underpinnings of a unlockable, optional, bonus scenario
* Battle_for_Wesnoth: allow Asheviere to recruit non-scout units
* The South Guard
* Proven by the Sword: tell Deoran to go to Westin if the citadel is
secured (fixes #7360)
@ -95,7 +49,7 @@ Detailed changelog and internal changes:
* Fixed incorrect WML in some units causing female variations to use male
* language and i18n:
* new/updated man pages:
* updated translations: German, Italian
* updated translations: French, German, Italian, Swedish
* fixed huge list of spelling mistakes in the en_US version
* multiplayer
* game management
@ -107,8 +61,8 @@ Detailed changelog and internal changes:
* configurable castle size for random map generator (patch #598, FR #3232)
* team names translation now supported
* scenarios
* scenarios can set faction, recruit, leader, and some other initial settings
previously ignored in multiplayer
* scenarios can set faction, recruit, leader, and some other initial
settings previously ignored in multiplayer
* maps:
* new multiplayer maps: The Manzivan Traps
* revised maps: Blitz
@ -138,7 +92,8 @@ Detailed changelog and internal changes:
* added the Armageddon Drake (not used in any mainline eras)
* added a generic macro to have a standard filter for all idle anim
* user interface
* use "Save Replay" instead of "Save Game" when asking to save a replay (bug #7256)
* use "Save Replay" instead of "Save Game" when asking to save a replay
(bug #7256)
* fix enemy Gold show twice in debug mode in status table (bug #6895)
* added an option to hide minimaps in the multiplayer lobby
* added menu items for saving the current map
@ -169,8 +124,10 @@ Detailed changelog and internal changes:
unit modification [effect] tag
* SUF can now filter on anything that is also available throught unit
variables, using a [wml_filter] block
* overhaul of team coloring engine. Now possible to apply multiple TC to an image.
* added fourth color in team_rgb definitions for representative color in minimap
* overhaul of team coloring engine. Now possible to apply multiple TC to an
image.
* added fourth color in team_rgb definitions for representative color in
minimap
* added a 'hide_help' key that prevents a unit type from being listed in the
in-game help (bug #5701)
* added an 'allow_new_game' key (default=yes) to prevent [multiplayer]
@ -193,7 +150,8 @@ Detailed changelog and internal changes:
* units can now have a recruit animations that will be played on unit recruit
* units now have idle animations, played when they've been idle for some time
* units now have leveling up animations
* units can now have victory animations, usable with the WML tag 'victory_anim'
* units can now have victory animations, usable with the WML tag
'victory_anim'
* units can now have healed animations, used when they get healed
* units can now have poison animations, used when they suffer poison
damage
@ -212,7 +170,8 @@ Detailed changelog and internal changes:
* gender-specific forms for trait names are now possible.
* seting a WML variable to a random value now works correctly in MP games
* sound
* add advanced sound tab to pref allowing you to play with sample_rate and buffer_size options
* add advanced sound tab to pref allowing you to play with sample_rate and
buffer_size options
* misc:
* --validcache runtime switch to force assumption that cache is valid
* add two new debug command set_var and show_var to check variables within

View file

@ -317,6 +317,7 @@ Jehan Hysseo (Jey)
Jérémy Rosen (Boucman)
Julien Moncel
Julien Tailleur
Michel Poléni (Thanatloc)
Nicolas Boudin (Blurgk)
Philippe Plantier (Ayin)
Sébastien Raynaud (Galactic turkey)

View file

@ -156,7 +156,6 @@
recruit=Royal Guard,Heavy Infantryman,Dragoon,Longbowman,Duelist,Halberdier
{GOLD 300 400 500}
[ai]
recruitment_pattern=scout
{ATTACK_DEPTH 5 6 6}
[/ai]
team_name=evil

View file

@ -248,7 +248,7 @@
[/message]
[message]
speaker=Sir Gerrick
message= _ "Now Deoran, take you post of command at the Citadel of Westin."
message= _ "Now Deoran, take your post of command at the Citadel of Westin."
[/message]
[objectives]
side=1

View file

@ -64,4 +64,130 @@ Special Notes:"+{SPECIAL_NOTES_AMBUSH}+{SPECIAL_NOTES_REGENERATES}
[/frame]
[/animation]
[/attack]
[death]
damage_type=blade,impact,pierce
[frame]
begin=0
end=100
image="units/woses/wose-die-fall-1.png"
[/frame]
[frame]
begin=100
end=200
image="units/woses/wose-die-fall-2.png"
[/frame]
[frame]
begin=200
end=300
image="units/woses/wose-die-fall-3.png"
[/frame]
[frame]
begin=300
end=400
image="units/woses/wose-die-fall-4.png"
[/frame]
[frame]
begin=400
end=500
image="units/woses/wose-die-fall-5.png"
[/frame]
[frame]
begin=500
end=600
image="units/woses/wose-die-fall-6.png"
[/frame]
[frame]
begin=600
end=700
image="units/woses/wose-die-fall-7.png"
[/frame]
[frame]
begin=700
end=800
image="units/woses/wose-die-fall-8.png"
[/frame]
[frame]
begin=800
end=900
image="units/woses/wose-die-fall-9.png"
[/frame]
[frame]
begin=900
end=1000
image="units/woses/wose-die-fall-10.png"
[/frame]
[frame]
begin=1000
end=1100
image="units/woses/wose-die-fall-11.png"
[/frame]
[frame]
begin=1100
end=1200
image="units/woses/wose-die-fall-12.png"
[/frame]
[frame]
begin=1200
end=1300
image="units/woses/wose-die-fall-13.png"
[/frame]
[frame]
begin=1300
end=1400
image="units/woses/wose-die-fall-14.png"
[/frame]
[frame]
begin=1400
end=1500
image="units/woses/wose-die-fall-15.png"
[/frame]
[/death]
[death]
damage_type=holy,fire,cold
[frame]
begin=0
end=150
image="units/woses/wose-die-decay-1.png"
[/frame]
[frame]
begin=150
end=300
image="units/woses/wose-die-decay-2.png"
[/frame]
[frame]
begin=300
end=450
image="units/woses/wose-die-decay-3.png"
[/frame]
[frame]
begin=450
end=600
image="units/woses/wose-die-decay-4.png"
[/frame]
[frame]
begin=600
end=750
image="units/woses/wose-die-decay-5.png"
[/frame]
[frame]
begin=750
end=900
image="units/woses/wose-die-decay-6.png"
[/frame]
[frame]
begin=900
end=1050
image="units/woses/wose-die-decay-7.png"
[/frame]
[frame]
begin=1050
end=1200
image="units/woses/wose-die-decay-8.png"
[/frame]
[frame]
begin=1200
end=1350
image="units/woses/wose-die-decay-9.png"
[/frame]
[/death]
[/unit]

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

48
players_changelog Normal file
View file

@ -0,0 +1,48 @@
This is meant to be a concise list of player-visible changes. For a complete
list of changes, see the main changelog:
http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
Version 1.3-svn:
* Graphics
* Item graphic improvements including an animatable campfire.
* Added visible peaks to the impassable mountains.
* Added a recruit animation for Skeleton.
* Fixed animation of gryphon units not being displayed in the center of
the hex.
* Fixed incorrect WML in some units causing female variations to use male
images.
* Improved hex grid.
* Sound
* New sound effects: morning star.
* Added an advanced sound tab to preferences, allowing one to specify the
values used for sample rate and buffer size.
* Unit changes and balancing
* New traits: healthy (+3 HP, +4 rest healing), fearless (ignore unfavourable
time of day).
* Dark Adepts no longer get the 'strong' trait.
* Added the 'skirmisher' ability to the Shadow line.
* Increased the HP of the Longbowman from 45 to 51.
* Decreased the XP requirement of the Longbowman from 80 to 68.
* Increased the HP of the Master Bowman from 58 to 67.
* Increased the XP requirement of the Guardsman from 42 to 47.
* Increased the HP of the Stalwart from 48 to 54.
* Increased the XP requirement of the Stalwart from 65 to 85.
* Increased the HP of the Sentinel from 56 to 68.
* Decreased the cost of the Mudcrawler from 9 to 5.
* Decreased the HP of the Shadow from 26 to 24.
* Increased the HP of the Goblin Rouser from 26 to 31.
* Increased the melee damage of the Goblin Rouser from 5-3 to 6-3.
* Multiplayer
* Maps
* New maps: The Manzivan Traps.
* Revised maps: Blitz.
* Map editor
* Maps can now be opened directly from a scenario file and saved back to it.
* Language and translations
* Updated translations: French, German, Italian, Swedish.
* Fixed spelling mistakes in the default en_US language.

View file

@ -10,8 +10,8 @@ msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.7.11-CVS\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:40+0100\n"
"PO-Revision-Date: 2006-12-01 12:40+0100\n"
"Last-Translator: Guillaume MASSART <massart.guillaume@wanadoo.fr>\n"
"PO-Revision-Date: 2007-01-03 16:35+0100\n"
"Last-Translator: Benoît Timbert <benoit.timbert@free.fr>\n"
"Language-Team: Français\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -103,7 +103,6 @@ msgid "Resist until Dacyn's return tomorrow night"
msgstr "Résistez jusqu'au retour de Dacyn demain soir"
#: data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg:120
#, fuzzy
msgid "Resist until Dacyn's return in two days"
msgstr "Résistez jusqu'au retour de Dacyn dans deux jours"
@ -333,7 +332,6 @@ msgstr ""
"trolls. Je pense que tous ceux qu'ils attaquent méritent de l'aide."
#: data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg:174
#, fuzzy
msgid ""
"Thank you. Now, I advise you to join us. Undead have followed us into these "
"caves, and they will kill you if you stay behind."
@ -343,7 +341,6 @@ msgstr ""
"restez derrière."
#: data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg:180
#, fuzzy
msgid ""
"Thank you. Now, I advise you to join us. Undead are in these lands, and they "
"will find these caves."
@ -938,7 +935,6 @@ msgstr ""
"sont actuellement à nos trousses."
#: data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg:129
#, fuzzy
msgid ""
"Indeed, they do. And do not think you will be able to defeat them. They are "
"too powerful. We are heading for the Northlands, where we may be able to "
@ -1979,7 +1975,6 @@ msgstr ""
"je connaisse le point faible des morts-vivants."
#: data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg:340
#, fuzzy
msgid ""
"Very well. If returning to Wesnoth has any chance of success, it is our best "
"option. We will go south."
@ -1988,7 +1983,6 @@ msgstr ""
"meilleure option. Nous allons vers le sud."
#: data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg:344
#, fuzzy
msgid ""
"I do not like this. But it appears we will die no matter our course of "
"action."
@ -2440,7 +2434,7 @@ msgstr ""
"lâche ! Les bardes pourraient chanter comment tu as vaincu mes Capitaines, "
"alors qu'en réalité, tu n'as rien fait d'autre que de te cacher loin "
"derrière tes lignes, en sécurité, tandis que d'autres bien plus braves que "
"toi ont combattu et sont morts en ton nom. »"
"toi ont combattu et sont morts en ton nom. »"
#: data/campaigns/Eastern_Invasion/scenarios/17.Weldyn_Under_Attack.cfg:287
msgid ""

View file

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:40+0100\n"
"PO-Revision-Date: 2006-07-09 22:51+0200\n"
"PO-Revision-Date: 2007-01-02 23:35+0100\n"
"Last-Translator: Stefan Bergström (tephlon) <stefan DOT bergstrom AT gmail "
"DOT com>\n"
"Language-Team: Swedish\n"
@ -12,7 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.2\n"
"X-Generator: KBabel 1.11.4\n"
#: data/campaigns/Eastern_Invasion.cfg:10
msgid "The Eastern Invasion"
@ -98,7 +98,6 @@ msgid "Resist until Dacyn's return tomorrow night"
msgstr "Håll stånd tills Dacyn återvänder imorgon natt"
#: data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg:120
#, fuzzy
msgid "Resist until Dacyn's return in two days"
msgstr "Håll stånd tills Dacyn återvänder om två dagar"
@ -324,7 +323,6 @@ msgstr ""
"förtjänar vår hjälp, tycker jag. "
#: data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg:174
#, fuzzy
msgid ""
"Thank you. Now, I advise you to join us. Undead have followed us into these "
"caves, and they will kill you if you stay behind."
@ -333,7 +331,6 @@ msgstr ""
"med oss in i grottorna, och de kommer att döda er om ni stannar kvar."
#: data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg:180
#, fuzzy
msgid ""
"Thank you. Now, I advise you to join us. Undead are in these lands, and they "
"will find these caves."
@ -912,7 +909,6 @@ msgstr ""
"inkräktare. De förföljer oss fortfarande."
#: data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg:129
#, fuzzy
msgid ""
"Indeed, they do. And do not think you will be able to defeat them. They are "
"too powerful. We are heading for the Northlands, where we may be able to "
@ -1932,7 +1928,6 @@ msgstr ""
"har... råd... till kungen. Jag tror jag har kommit på de vandödas svaghet."
#: data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg:340
#, fuzzy
msgid ""
"Very well. If returning to Wesnoth has any chance of success, it is our best "
"option. We will go south."
@ -1941,7 +1936,6 @@ msgstr ""
"är det det bästa vi kan göra. Vi färdas söderut."
#: data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg:344
#, fuzzy
msgid ""
"I do not like this. But it appears we will die no matter our course of "
"action."

View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Battle for Wesnoth\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:39+0100\n"
"PO-Revision-Date: 2006-12-16 11:01+0100\n"
"PO-Revision-Date: 2007-01-03 19:29+0100\n"
"Last-Translator: Guillaume MASSART <massart.guillaume@wanadoo.fr>\n"
"Language-Team: Language fr\n"
"MIME-Version: 1.0\n"
@ -880,7 +880,7 @@ msgid ""
"are best for doing that!"
msgstr ""
"Parce que nous devons contrôler les mers et le peuple ondin et que les nagas "
"et les chauves-souris sont les meilleurs ça !"
"et les chauves-souris sont les meilleurs pour ça !"
#: data/campaigns/Heir_To_The_Throne/scenarios/04_Bay_of_Pearls.cfg:223
msgid "But orcs are the most powerful race in all of..."
@ -2304,7 +2304,7 @@ msgstr "En effet ! Je pense que nous avons gagné cette bataille."
#: data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg:293
msgid "Whew! That was a difficult battle, but they are retreating at last!"
msgstr ""
"Waouh ! Ce fût un dur combat mais finalement, ils battent en retraite !"
"Waouh ! Ce fut un dur combat mais finalement, ils battent en retraite !"
#: data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg:316
msgid "Yes! We have fought them off!"
@ -2515,20 +2515,21 @@ msgid ""
"slaughter any gryphons. They are magnificent animals (looks back at the "
"mountain). Still..."
msgstr ""
"Quel dommage de n'avoir pu prendre ces œufs de griffons. Je suis heureux que "
"nous n'ayons pas massacré de bête. Ce sont de magnifiques animaux ( il se "
"retourne vers la montagne ). Pourtant..."
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:263
msgid "Woah!!"
msgstr ""
msgstr "Waouh !"
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:317
#, fuzzy
msgid "Graik"
msgstr "Graak"
msgstr "Graik"
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:318
#, fuzzy
msgid "Griak"
msgstr "Graak"
msgstr "Griak"
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:325
msgid ""
@ -2536,19 +2537,23 @@ msgid ""
"glared in Konrad's direction, their eagle eyes fixed on him at an incredible "
"distance."
msgstr ""
"En effet, les bêtes majestueuses décrivaient à présent un cercle autour du "
"sommet de la montagne. Plusieurs d'entre elles regardaient en direction de "
"Konrad, leurs yeux de rapaces le toisant à une incroyable distance."
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:361
msgid "Amazing! I have never before heard of such behavior in gryphons."
msgstr ""
"Hallucinant ! Je n'avais jamais entendu parler auparavant d'un tel "
"comportement chez les griffons."
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:365
#, fuzzy
msgid "What does it mean?"
msgstr "Que voulez-vous dire ?"
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:369
msgid "I do not know. Come now, the show is over."
msgstr ""
msgstr "Je ne sais pas. Venez maintenant, le spectacle est terminé."
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:375
msgid ""
@ -2584,7 +2589,7 @@ msgstr "Le Gué d'Abez"
#: data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg:25
msgid "Move Konrad to the north side of the river"
msgstr "Menez Konrad du coté nord du fleuve"
msgstr "Mener Konrad du coté nord du fleuve"
#: data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg:77
msgid "Gaga-Breuk"
@ -3086,8 +3091,8 @@ msgid ""
"The battle outside was fierce and lasted a full half-year. But, the battles "
"inside the tunnels were worse."
msgstr ""
"La bataille à l'extérieur fut enragée et dura six mois, mais les batailles "
"dans les tunnels furent pires encore."
"La bataille à l'extérieur fut terrible et dura six mois, mais les combats "
"dans les galeries furent pires encore."
#: data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg:266
msgid ""
@ -3095,17 +3100,18 @@ msgid ""
"stand here. May we triumph where he fell."
msgstr ""
"Les colonnes de Thunedain. On dit qu'un seigneur nain légendaire en fît sa "
"dernière tombe. Puissions-nous triompher où il tomba."
"dernière demeure. Puissions-nous triompher là où il tomba."
#: data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg:270
msgid ""
"I would settle for escape, though I know not which I dread more: foul orcs "
"or fetid caves."
msgstr ""
"Je préparerais bien mon échappée, cependant je ne sais pas ce qui me fait le "
"plus peur : les immondes orcs ou les grottes fétides."
"Je me préparerais bien à la fuite, cependant je ne sais pas ce qui me fait "
"le plus peur : les orcs immondes ou les grottes fétides."
#: data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg:281
#, fuzzy
msgid "Back to the abyss, spawn of filth!"
msgstr "Retourne dans les abysses, ignoble déchet !"
@ -3133,7 +3139,7 @@ msgstr ""
#: data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg:418
msgid "Haw! Any friend of $outlaw_name is a friend of mine too."
msgstr "Ah ! Tout ami de $outlaw_name est mon ami."
msgstr "Ah ! Les amis de $outlaw_name sont mes amis."
#: data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg:424
msgid "Who... who's here?"
@ -3151,7 +3157,7 @@ msgid ""
msgstr ""
"Les entrées de la mine avaient été sciemment détruites durant la bataille. "
"Les portes, bien que lourdement défendues, restent accessibles. Les hordes "
"orcs qui les assaillent sont repoussées, mais vous devriez être capables de "
"orcs qui les assaillent ont été repoussées, vous devriez être capables de "
"vous faufiler sans être repérés."
#: data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg:453
@ -3190,8 +3196,8 @@ msgid ""
"It is said that the orcs used old mine tunnels to surprise the dwarves. "
"There appears to be one nearby, to the north-east."
msgstr ""
"Il est dit que les orcs ont utilisé une ancienne galerie pour prendre les "
"nains par surprise. Ce doit être celle-là au nord-est."
"Il paraitrait que les orcs ont utilisé une ancienne galerie pour prendre les "
"nains par surprise. Ce doit être celle-là, au nord-est."
#: data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg:516
msgid "Then we must make it to that tunnel!"
@ -3236,7 +3242,7 @@ msgid ""
"We have defeated the foul orcs guarding this land, but we must continue "
"without rest. More will surely come!"
msgstr ""
"Nous avons vaincu les orcs stupides occupant ces terres, mais nous devons "
"Nous avons vaincu ces orcs stupides occupant ces terres, mais nous devons "
"poursuivre sans relâche. D'autres vont venir !"
#: data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg:647
@ -3335,7 +3341,7 @@ msgid ""
"in peace without the treacherous elves coming to bother us?"
msgstr ""
"Oh, vraiment ? Je vois que vous êtes accompagnés d'elfes. Ne pouvons-nous "
"pas vivre en paix sans que ces elfes déloyaux ne viennent nous harceler ?"
"pasvivre en paix sans que ces elfes déloyaux ne viennent nous harceler ?"
#: data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg:346
msgid "Why such harsh words, Dwarf? Elves have never done you any harm."
@ -3497,7 +3503,7 @@ msgstr "Alors nous emprunterons les galeries de l'est !"
#: data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg:535
#, fuzzy
msgid "Gryphon Tender"
msgstr "La Montagne aux griffons"
msgstr "Éleveur de griffons"
#: data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg:548
msgid ""
@ -3521,7 +3527,7 @@ msgstr "Des bêtes ? Nous prévoyions de les utiliser comme montures."
msgid "Ha ha! Gryphons as mounts! Is there no end to your folly?"
msgstr ""
"Ah ah ! Des griffons comme montures ! N'y a-t-il donc pas de fin à votre "
"folie ?"
"délire ?"
#: data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg:593
#: data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg:601
@ -3628,19 +3634,18 @@ msgstr ""
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:155
msgid "A hidden whirlpool sucks you down into a subterranean current!"
msgstr ""
msgstr "Soudain, un tourbillon vous aspire vers un courant souterrain !"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:159
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:246
msgid "Ulfdain"
msgstr ""
msgstr "Ulfdain"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:175
msgid "What's this, more trolls? Aye, come to papa, little whelps."
msgstr ""
msgstr "Quoi ! ? Encore des trolls ? Allez, viens voir papa, petit morveux !"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:179
#, fuzzy
msgid "Hello? Who is here?"
msgstr "Halte ! Qui va là ?"
@ -3649,6 +3654,8 @@ msgid ""
"What in the world are you? Some sort of monster's appendage set ta lure me "
"down to be yer watery meal, eh?"
msgstr ""
"Quelle curieuse bestiole avons-nous là ? Le genre de trompe à monstre "
"servant de suçoir pour qu'je sois l'bout d'gras dans la soupe, hein ?"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:187
msgid ""
@ -3656,16 +3663,22 @@ msgid ""
"a cave. My lord can be somewhat eccentric. We are fighting at the side of "
"your fellow cave-dwellers to drive back the orcs."
msgstr ""
"Je suis un ondin, habitant des vastes océans ! Ne me demandez pas ce que je "
"fais dans une grotte, mon seigneur peut être parfois excentrique ! Nous "
"combattons aux côtés de vos camarades 'habitants-des-cavernes' pour "
"repousser les orcs."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:191
msgid ""
"(sniffs) A mer-mahn. Never heard of it. I doubt yer as tasty as my friends "
"here."
msgstr ""
"(renifle) Un Ondinde. Jamais entendu parler. Je doute que tu sois aussi "
"goutû que mes copains ici."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:195
msgid "Why are you down here? Are those... troll carcasses?"
msgstr ""
msgstr "Que faîtes-vous ici bas ? Toutes ces... carcasses de trolls ?"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:199
msgid ""
@ -3673,10 +3686,13 @@ msgid ""
"little carried away, fell in the water, and were sucked down inta this "
"grotto."
msgstr ""
"Je rentrais dans l'lard de ces chiffes molles, défendant mon avant-poste. On "
"s'est un peu emportés, on est tombé dans l'eau et pis on a été aspirés dans "
"c'te grotte, quoi."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:203
msgid "How long have you been here?"
msgstr ""
msgstr "Depuis combien de temps êtes-vous là ?"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:207
msgid ""
@ -3684,26 +3700,33 @@ msgid ""
"little ravenous, if ye catch my drift. Canna swim past that current, not for "
"lack of tryin'."
msgstr ""
"Heuuu... plusieurs jours, au moins. La viande des trolls commence à puer et "
"je suis un brin affamé, si tu vois ce que je veux dire. C'est pas faute "
"d'avoir essayé mais je sais pas comment remonter ce courant."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:211
msgid "I will rescue you. Hold onto my shoulders, sir dwarf."
msgstr ""
msgstr "Je vais vous sauver. Attrappez mes épaules, messire nain."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:215
msgid "Thanks. No need teh wait any more around here. Let's go."
msgstr ""
msgstr "Merci. Inutile de traîner ici plus longtemps. Allons-y."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:233
msgid ""
"Better prepared this time to fight the current, you eventually manage to "
"emerge from the whirlpool."
msgstr ""
"Mieux préparé à affronter le courant cette fois, vous parvenez finalement à "
"émerger du tourbillon."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:257
msgid ""
"Well, mer-mahn, we made it. I will fight for yer lord. He sounds like my "
"kind of guy."
msgstr ""
"Bien Ondinde ! Nous avons réussi ! Je me battrai pour ton seigneur. On "
"dirait bien qu'c'est mon genre de gars."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:270
msgid "These passages seem to have been used recently."
@ -3718,12 +3741,12 @@ msgid ""
"which have since been driven into the upper caves of Knalga by the forces of "
"darkness."
msgstr ""
"Vous pénétrez dans une vaste cathédrale naturelle, les murs finissant au "
"delà de la portée de votre vision dans l'obscurité. Un grand gouffre s'étire "
"à travers la galerie autour duquel le sol de la cave semble avoir été "
"complètement aspiré. Cela fut à une époque le centre d'un empire nain actif, "
"dont les restes ont depuis été conduits dans ces caves supérieures de Knalga "
"par les forces des ténèbres."
"Vous pénétrez dans une vaste cathédrale naturelle. Les murs s'étendant à "
"perte de vue dans l'obscurité. Un grand gouffre s'étire en travers de la "
"galerie autour de laquelle le sol semble avoir été littéralement aspiré. "
"Cela fut à une époque le centre d'un empire nain affairé, dont les restes "
"ont depuis été redirigés dans les cavernes supérieures de Knalga par les "
"forces des ténèbres."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:315
msgid "There is a big cave-in south of here."
@ -3755,7 +3778,7 @@ msgstr "Ah, un orc stupide ! Débarrassons les galeries de son espèce !"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:421
msgid "I did not know that the undead were in these pits!"
msgstr "J'ignorais que des morts-vivants peuplaient ces puits !"
msgstr "J'ignorais que ces puits regorgeaint de morts-vivants !"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:432
msgid "Who is this foul enemy that we fight?"
@ -3785,8 +3808,8 @@ msgstr ""
"Ainsi vous vous souvenez de moi ? J'étais le meilleur général du roi, envoyé "
"dans ces puits à la recherche du Sceptre. Mais les orcs m'ont emprisonné, "
"ainsi que mes hommes, dans cette caverne, nous laissant mourir de faim. Les "
"nains ne furent d'aucune aide, me laissant mourir. Maintenant je tiens enfin "
"ma vengeance !"
"nains ne furent d'aucune aide, me laissant mourir. L'heure est venue de me "
"venger de vous tous !"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:467
msgid ""
@ -3794,7 +3817,7 @@ msgid ""
"disgusting orcs."
msgstr ""
"Argh ! Je suis vaincu ! Mais au moins par de dignes ennemis et non par ces "
"orcs fétides."
"orcs répugnants."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:471
msgid "Rest in peace, Lionel. The poor, lost general."
@ -3808,9 +3831,9 @@ msgid ""
"not asking for directions when I became lost. May you have better fortune in "
"your quest than I did!"
msgstr ""
"Je suis vaincu, mais ma mission doit être accomplie. Bien qu'ennemis vous au "
"moins êtes valeureux. Je vais donc vous révéler que le Sceptre se trouve à "
"l'est d'ici, par le chemin d'où vous venez, dans les profondeurs des "
"Je suis vaincu mais ma mission doit être accomplie. Bien qu'ennemis vous "
"êtes au moins valeureux. Je vais donc vous révéler que le Sceptre se trouve "
"à l'est d'ici, par le chemin d'où vous venez, dans les profondeurs des "
"cavernes. J'ai commis l'erreur de ne pas demander mon chemin lorsque je me "
"suis perdu. Que la chance vous sourie dans votre quête plus qu'elle ne l'a "
"fait pour moi."
@ -3824,8 +3847,8 @@ msgid ""
"Tall ones, I thank you. Life has been nothing but a struggle recently. We "
"are the last outpost of civilization in these caves."
msgstr ""
"Grands-hommes, je vous remercie. La vie n'a été qu'un véritable combat "
"dernièrement. Nous sommes le dernier rempart de civilisation de ces cavernes."
"Grands-hommes, je vous remercie. La vie n'a été qu'une lutte acharnée ces "
"jours-ci. Nous sommes le dernier rempart de civilisation dans ces cavernes."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:554
msgid ""
@ -3843,9 +3866,9 @@ msgid ""
"Beyond my citadel the spawn of the darkness hold complete sway. You will not "
"survive without assistance."
msgstr ""
"Le Sceptre ? Ah, vous cherchez le Sceptre. Vous autres, êtres de la surface, "
"êtes ambitieux. Au delà de ma citadelle, les pions des ténèbres tiennent les "
"souterrains d'une main de fer. Nous ne survivrez pas sans aide."
"Le Sceptre ? Ah, vous cherchez le Sceptre. Vous autres, les habitants de la "
"surface, êtes ambitieux. Au-delà de ma citadelle, les pions des ténèbres "
"tiennent les souterrains d'une main de fer. Vous ne survivrez pas sans aide."
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:562
msgid "How will we make it?"
@ -3857,7 +3880,7 @@ msgid ""
"reaches of the underground kingdom. The Scepter can only be there. Please "
"accept the gift of my guardsmen. These elite warriors will protect you."
msgstr ""
"Au nord-est de mon donjon, jeune humain, les galeries convergent vers les "
"Au nord-est de mon fort, jeune humain, les galeries convergent vers les "
"zones les plus profondes du royaume souterrain. Le Sceptre ne peut être que "
"là. S'il vous plaît, acceptez donc l'aide de mes gardes. Ces guerriers "
"d'élite vous protégeront."
@ -3881,8 +3904,8 @@ msgid ""
"will continue to the northeast, to the deepest depths of these caverns."
msgstr ""
"Je ne sais pas, Konrad, mais je sens que notre quête ne peut que nous mener "
"plus bas. Nous continuerons au nord-est, vers les plus insondables "
"profondeurs sous ces cavernes."
"plus bas. Nous continuerons au nord-est, sous les plus insondables "
"profondeurs de ces cavernes."
#: data/campaigns/Heir_To_The_Throne/scenarios/17_Hasty_Alliance.cfg:4
msgid "Hasty Alliance"
@ -3908,7 +3931,7 @@ msgid ""
"occasional goblin, the air in the lower passages was still and tomblike."
msgstr ""
"Le dernier campement nain laissé loin derrière eux, le groupe descendit vers "
"les parties les plus profondes de ces cavernes. Hormis quelques "
"les parties les plus profondes des cavernes aménagées. Hormis quelques "
"perturbations causées par d'occasionnels gobelins, l'air dans les passages "
"inférieurs était stagnant comme dans une tombe."
@ -3919,10 +3942,10 @@ msgid ""
"flickered and went out. Even the staff of the elder mage struggled to "
"produce enough light to see by."
msgstr ""
"Traversant un long couloir, Konrad et Delfador passèrent de labyrinthiques "
"catacombes à une obscurité glaciale. Le noir semblait les broyer. Les "
"lumières vacillèrent et s'éteignirent. Même l'équipe du plus vieux mage se "
"débattit pour produire suffisamment de lumière pour se repérer."
"Parcourant une galerie basse, Konrad et Delfador quittèrent le dédale des "
"catacombes pour émerger dans l'obscurité glaciale. Le noir semblait les "
"broyer. Les lumières vacillèrent et s'éteignirent. Même les aides du plus "
"vieux mage luttèrent pour produire suffisamment de lumière pour se repérer."
#: data/campaigns/Heir_To_The_Throne/scenarios/17_Hasty_Alliance.cfg:52
msgid ""
@ -3956,7 +3979,7 @@ msgstr "En garde !"
#: data/campaigns/Heir_To_The_Throne/scenarios/17_Hasty_Alliance.cfg:196
msgid "What in the world are you doing here?"
msgstr "Que faites-vous donc ici ?"
msgstr "Mais qu'est-ce que vous faîtes ici ?"
#: data/campaigns/Heir_To_The_Throne/scenarios/17_Hasty_Alliance.cfg:200
msgid "Tracking you down, of course! You have escaped me for the last time!"
@ -4064,10 +4087,10 @@ msgid ""
"faint glow provided a small reprieve from the thick blackness. Volcanic "
"fumes drifted up from cracks in the floor."
msgstr ""
"A travers le gouffre, l'air craquait presque d'énergie magique et se "
"réchauffait progressivement. Le sol était lisse et vitreux par endroits et "
"un faible rougeoiement fournissait avec peine le réconfort dans l'obscurité "
"épaisse. Des vapeurs volcaniques s'échappaient des fissures du sol."
"A travers le gouffre, l'air étincelait presque d'énergie magique et se "
"réchauffait progressivement. Le sol était lisse et vitreux. Par endroits, un "
"faible rougeoiement ravivait avec peine le réconfort dans l'épaisse "
"obscurité. Des fumerolles volcaniques émanaient des fissures du sol."
#: data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg:19
msgid ""
@ -4075,9 +4098,9 @@ msgid ""
"The very earth had come alive, heaving, and ready to be relieved of its "
"century-old burden..."
msgstr ""
"Des éboulements et tremblements de terre distants rendaient la marche "
"difficile. La terre même s'était réveillée à la vie, lourde et prête à se "
"libérer du poids des siècles."
"Les éboulements et les tremblements de terre distants rendaient la marche "
"difficile. Même la terre était devenu vivante, lourde et prête à se libérer "
"du poids des siècles..."
#: data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg:58
msgid "Capture the Scepter of Fire with Konrad or Li'sar"
@ -4094,8 +4117,8 @@ msgid ""
"the caves with us."
msgstr ""
"Nous ne pourrons pas explorer seuls une si grande zone, en particuliers si "
"nous sommes dérangés par les habitants de ces cavernes. Nous devons demander "
"à nos alliés nains de l'aide pour fouiller ces grottes."
"nous sommes assaillis par les occupants de ces cavernes. Nous devons "
"demander à nos alliés nains de l'aide pour fouiller ces grottes."
#: data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg:133
msgid "Yes, I feel it is near here! We must search for it carefully."
@ -4112,7 +4135,7 @@ msgid ""
"No, not an earthquake princess. I feel it too. Something is... aware... of "
"us."
msgstr ""
"Non, pas un tremblement de terre princesse. Je l'ai senti aussi. Quelque "
"Non, pas un tremblement de terre, princesse. Je l'ai senti aussi. Quelque "
"chose est... conscient... de notre présence."
#: data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg:147
@ -4169,9 +4192,9 @@ msgid ""
"the dwellers of the deep quickly scattered and remained out of sight."
msgstr ""
"Une première rencontre avec le Sceptre aux mains de ses nouveaux "
"propriétaires laissa plusieurs trolls à l'état de tas de cendres. Ressentant "
"le réveil d'une puissante magie, les habitants des profondeurs s'éloignèrent "
"rapidement pour rester hors de vue."
"propriétaires laissa plusieurs trolls à l'état de tas de cendres. Réalisant "
"qu'une puissante magie se ranimait, les habitants des profondeurs "
"s'éloignèrent promptement pour rester hors de vue."
#: data/campaigns/Heir_To_The_Throne/scenarios/19_A_Choice_Must_Be_Made.cfg:28
msgid ""
@ -4183,7 +4206,7 @@ msgstr ""
"Delfador conduisit ses jeunes pupilles à travers les couloirs désertés et "
"les galeries abandonnées pendant quatre jours. Pour la première fois, Konrad "
"vit des signes de fatigue sur le visage habituellement impénétrable du vieux "
"mage. Enfin, une brise légère accueillit le groupe..."
"mage. Enfin, l'air frais du dehors accueillit le groupe..."
#: data/campaigns/Heir_To_The_Throne/scenarios/19_A_Choice_Must_Be_Made.cfg:41
msgid "Defeat either of the enemy leaders"
@ -4410,7 +4433,6 @@ msgid "Who would discard such a wondrous artifact?"
msgstr "Qui donc voudrait se débarrasser d'un artefact si merveilleux ?"
#: data/campaigns/Heir_To_The_Throne/scenarios/20a_Snow_Plains.cfg:112
#, fuzzy
msgid ""
"I believe it belonged to Ila'alion, a mighty Marshal of the Wood. It was "
"enchanted as a boon to him by your elvish friends in the south. He was "
@ -4418,9 +4440,9 @@ msgid ""
"vanquish some beast or other."
msgstr ""
"Je pense que ça a appartenu à Ila'alion, un puissant Maréchal des forêts. "
"L'arme fut enchantée comme un présent de la part de vos amis, les elfes du "
"sud. Il était envoyé par nous autres, les elfes du nord, afin de vaincre une "
"quelconque bête."
"L'arme fut enchantée comme un présent de la part de vos amis, les Elfes du "
"Sud. Nous, les Elfes du Nord, l'avions envoyé en visite comme émissaire puis "
"il fut améné à vaincre une bête ou quelque chose dans le genre."
#: data/campaigns/Heir_To_The_Throne/scenarios/20a_Snow_Plains.cfg:116
msgid "Some boon! All for a beast?"
@ -4638,7 +4660,6 @@ msgstr ""
"sagement qui en sera le porteur."
#: data/campaigns/Heir_To_The_Throne/scenarios/20b_Swamp_Of_Dread.cfg:246
#, fuzzy
msgid ""
"As the last Death Knight falls, an ear-splitting screech escapes from the "
"Lich. It is clear that controlling such powerful spirits has drained it "
@ -4646,7 +4667,7 @@ msgid ""
msgstr ""
"Alors que le dernier Chevalier de la Mort tombe, un cri strident inhumain "
"s'échappa de la liche. Contrôler des esprits aussi puissants l'a clairement "
"épuisée et elle bout de colère à votre égard."
"épuisée et elle écume de rage à votre égard."
#: data/campaigns/Heir_To_The_Throne/scenarios/20b_Swamp_Of_Dread.cfg:274
msgid ""
@ -4697,12 +4718,11 @@ msgstr ""
#: data/campaigns/Heir_To_The_Throne/scenarios/20c_The_Cliffs_of_Thoria.cfg:4
msgid "The Cliffs of Thoria"
msgstr ""
msgstr "Les Falaises de Thoria"
#: data/campaigns/Heir_To_The_Throne/scenarios/20c_The_Cliffs_of_Thoria.cfg:25
#, fuzzy
msgid "Make it to the end of the river"
msgstr "Menez Konrad du coté nord du fleuve"
msgstr "Mener Konrad du coté nord du fleuve"
#: data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg:4
msgid "Home of the North Elves"
@ -5098,13 +5118,12 @@ msgstr ""
"si rare, particulièrement parmi les humains."
#: data/campaigns/Heir_To_The_Throne/scenarios/22_Elven_Council.cfg:110
#, fuzzy
msgid ""
"How quickly does the race of men mature! Only seventeen winters have passed "
"since I last laid eyes on you, Konrad, yet you are now a grown man. A brave "
"warrior stands before me!"
msgstr ""
"Voyez avec quelle rapidité l'espèce humaine mûrit. Seulement dix-neuf hivers "
"Voyez avec quelle rapidité l'espèce humaine mûrit. Seulement dix-sept hivers "
"ont passé depuis la dernière fois que je vous ai vu, Konrad et vous voilà "
"devenu un homme. Désormais, un fier guerrier se tient devant moi !"
@ -5442,7 +5461,7 @@ msgid ""
"restlessness overtook Konrad. The urgency nagged at him as he donned a new "
"tunic and fastened newly-oiled leather straps."
msgstr ""
"Après de nombreux jours à apprécier l'étrange nourriture et les draps frais "
"Après de nombreux jours à apprécier l'exotique nourriture et les draps frais "
"de ses hôtes, l'agitation reprit Konrad. L'urgence l'assaillit alors qu'il "
"se paraît d'une nouvelle tunique et bouclait une ceinture au cuir "
"nouvellement huilé."
@ -5772,12 +5791,11 @@ msgid "We will serve you, my lord. You will make a worthy king."
msgstr "Nous vous servirons, mon seigneur. Vous ferez un roi valeureux."
#: data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg:380
#, fuzzy
msgid ""
"The mighty riders of the eastern plains, the Knights of the Clans, are now "
"yours to command!"
msgstr ""
"Les glorieux cavaliers des plaines de l'est, les Chevaliers des Clans, sont "
"Les puissants cavaliers des plaines de l'est, les Chevaliers des Clans, sont "
"maintenant à vos ordres !"
#: data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg:389

View file

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:39+0100\n"
"PO-Revision-Date: 2006-07-18 20:52+0200\n"
"PO-Revision-Date: 2007-01-02 23:45+0100\n"
"Last-Translator: Stefan Bergström (tephlon) <stefan DOT bergstrom AT gmail "
"DOT com>\n"
"Language-Team: Swedish\n"
@ -12,7 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.2\n"
"X-Generator: KBabel 1.11.4\n"
#: data/campaigns/Heir_To_The_Throne.cfg:9
msgid "Heir to the Throne"
@ -457,7 +457,6 @@ msgstr ""
"magiker."
#: data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg:179
#, fuzzy
msgid ""
"I will send one of my horsemen to serve under you. I offer you my support, "
"Konrad, and the support of my men - from now on you will be able to recruit "
@ -2432,20 +2431,21 @@ msgid ""
"slaughter any gryphons. They are magnificent animals (looks back at the "
"mountain). Still..."
msgstr ""
"Det är synd att vi inte kunde få tag på de där gripäggen. Jag är glad att vi "
"inte dödade några gripar, dock. De är storartade djur. (Tittar bakåt mot "
"berget) Men ändå..."
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:263
msgid "Woah!!"
msgstr ""
msgstr "Wow!"
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:317
#, fuzzy
msgid "Graik"
msgstr "Graak"
msgstr "Graik"
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:318
#, fuzzy
msgid "Griak"
msgstr "Graak"
msgstr "Griak"
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:325
msgid ""
@ -2459,9 +2459,8 @@ msgid "Amazing! I have never before heard of such behavior in gryphons."
msgstr ""
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:365
#, fuzzy
msgid "What does it mean?"
msgstr "Vad menar du?"
msgstr "Vad betyder det?"
#: data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg:369
msgid "I do not know. Come now, the show is over."
@ -3375,9 +3374,8 @@ msgid "Then to the eastern tunnels we shall go!"
msgstr "Då är det till de östra tunnlarna vi ska gå!"
#: data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg:535
#, fuzzy
msgid "Gryphon Tender"
msgstr "Gripberget"
msgstr "Gripskötare"
#: data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg:548
msgid ""
@ -3405,7 +3403,6 @@ msgid "(looks miffed)"
msgstr "(ser sårad ut)"
#: data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg:597
#, fuzzy
msgid ""
"Well, if you must go on with this mad scheme, I shall supply you with my own "
"troops as riders! A frail human - or worse, an elf - would never be able to "
@ -3511,9 +3508,8 @@ msgid "What's this, more trolls? Aye, come to papa, little whelps."
msgstr ""
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:179
#, fuzzy
msgid "Hello? Who is here?"
msgstr "Halt! Vem där?"
msgstr "Hallå? Vem där?"
#: data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg:183
msgid ""
@ -4252,7 +4248,6 @@ msgid "Who would discard such a wondrous artifact?"
msgstr "Vem skulle kasta bort en sådan underbar artefakt?"
#: data/campaigns/Heir_To_The_Throne/scenarios/20a_Snow_Plains.cfg:112
#, fuzzy
msgid ""
"I believe it belonged to Ila'alion, a mighty Marshal of the Wood. It was "
"enchanted as a boon to him by your elvish friends in the south. He was "
@ -4474,15 +4469,14 @@ msgstr ""
"bära den."
#: data/campaigns/Heir_To_The_Throne/scenarios/20b_Swamp_Of_Dread.cfg:246
#, fuzzy
msgid ""
"As the last Death Knight falls, an ear-splitting screech escapes from the "
"Lich. It is clear that controlling such powerful spirits has drained it "
"significantly, and it is seething in anger towards you."
msgstr ""
"När den sista dödsriddaren faller hörs ett isande tjut från häxmästaren. Det "
"måste ha tagit stora krafter att kontrollera så mäktiga andar. Den sjuder av "
"vrede mot dig."
"står klart att det tagit stora krafter att kontrollera så mäktiga andar, och "
"den sjuder av vrede mot dig."
#: data/campaigns/Heir_To_The_Throne/scenarios/20b_Swamp_Of_Dread.cfg:274
msgid ""
@ -4531,9 +4525,8 @@ msgid "The Cliffs of Thoria"
msgstr ""
#: data/campaigns/Heir_To_The_Throne/scenarios/20c_The_Cliffs_of_Thoria.cfg:25
#, fuzzy
msgid "Make it to the end of the river"
msgstr "För Konrad till norra sidan av floden"
msgstr "Färdas till slutet av floden"
#: data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg:4
msgid "Home of the North Elves"
@ -4912,7 +4905,6 @@ msgstr ""
"i strid. En ovanlig kombination, i synnerhet bland människor."
#: data/campaigns/Heir_To_The_Throne/scenarios/22_Elven_Council.cfg:110
#, fuzzy
msgid ""
"How quickly does the race of men mature! Only seventeen winters have passed "
"since I last laid eyes on you, Konrad, yet you are now a grown man. A brave "
@ -5563,7 +5555,6 @@ msgid "We will serve you, my lord. You will make a worthy king."
msgstr "Vi kommer att tjäna dig, herre. Du kommer att bli en värdig kung."
#: data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg:380
#, fuzzy
msgid ""
"The mighty riders of the eastern plains, the Knights of the Clans, are now "
"yours to command!"
@ -6295,264 +6286,3 @@ msgstr ""
"Delfador flydde med barnet långt in i Västerns skogar, och uppfostrade honom "
"där under alvernas beskydd. Under tiden såg de med sorg i hjärtat hur "
"Ashevieres terrorvälde spred sig över landet.."
#~ msgid "Mountain Pass"
#~ msgstr "Bergspasset"
#~ msgid "Move Konrad to the end of the road in the north-west"
#~ msgstr "För Konrad till slutet av vägen i nordväst"
#~ msgid "Defeat all enemies (Bonus)"
#~ msgstr "Besegra alla fiender (bonus)"
#~ msgid "Ro'Arthian"
#~ msgstr "Ro'Arthian"
#~ msgid "Ro'Sothian"
#~ msgstr "Ro'Sothian"
#~ msgid "Look, Konrad, before us lies the great road built by the dwarves!"
#~ msgstr "Se, Konrad, framför oss ligger dvärgarnas stora väg!"
#~ msgid "But I can hardly see with all this mist around!"
#~ msgstr "Men jag kan knappt se något alls i den här dimman!"
#~ msgid ""
#~ "We must be wary... they say a wizard lives in these mountains, and he "
#~ "does not take kindly to visitors. It is he who causes the mists, so that "
#~ "travelers will lose their way and become prey for his creatures."
#~ msgstr ""
#~ "Vi måste vara försiktiga... Det påstås att en trollkarl bor i de här "
#~ "bergen, och att han inte gillar besökare. Det är han som skapar dimman, "
#~ "så att vandrare ska gå vilse och falla offer för hans varelser."
#~ msgid "His... creatures? We must keep to the road, men!"
#~ msgstr "Hans...varelser? Vi måste hålla oss på vägen, mannar!"
#~ msgid ""
#~ "He would be a mighty foe, Konrad. It is said when the dwarves built this "
#~ "road, they disturbed the resting place of the ancient mage, and ever "
#~ "since, he and his brother have traveled the mountain, wreaking havoc on "
#~ "the dwarven villages."
#~ msgstr ""
#~ "Han är en mäktig fiende, Konrad. Det sägs att när dvärgarna byggde vägen, "
#~ "så störde de vilan hos den uråldrige magikern, och ända sedan dess så har "
#~ "han och hans bror hemsökt bergen och anställt förödelse på dvärgarnas "
#~ "byar."
#~ msgid "Let us then go carefully... but quickly, men!"
#~ msgstr "Låt oss då färdas försiktigt...men snabbt, mannar!"
#~ msgid "Stalrag"
#~ msgstr "Stalrag"
#~ msgid "Gomdrsil"
#~ msgstr "Gomdrsil"
#~ msgid "Duldurus"
#~ msgstr "Duldurus"
#~ msgid "Peldril"
#~ msgstr "Peldril"
#~ msgid ""
#~ "Greetings, Travelers. I am Stalrag, chief of these villages! I warn you, "
#~ "a great wizard and his trolls are in the mountains and will surely "
#~ "attack. I will summon my tribesmen to aid you!"
#~ msgstr ""
#~ "Var hälsade, resenärer. Jag är Stalrag, hövding över dessa byar! Jag "
#~ "varnar er, en stor trollkarl och hans troll håller till i bergen och "
#~ "kommer säkerligen att gå till attack. Jag skall kalla samman mina män för "
#~ "att hjälpa er!"
#~ msgid ""
#~ "If this is true, Konrad, perhaps we should take another route and go "
#~ "around the mountain, rather than trying to defeat these new foes."
#~ msgstr ""
#~ "Om det här är sant, Konrad, så borde vi kanske ta en annan väg och gå "
#~ "runt berget. Hellre det än att försöka besegra dessa nya fiender."
#~ msgid "What do you say, Delfador?"
#~ msgstr "Vad säger du, Delfador?"
#~ msgid ""
#~ "No! We do not have the time to waste. Let us make for the top of the "
#~ "pass, wary of mountain trolls, and taking care lest we come too close to "
#~ "the water!"
#~ msgstr ""
#~ "Nej! Vi har ingen tid att förlora. Vårt mål är toppen av passet. Se upp "
#~ "för bergstroll, och gå inte för nära vattnet!"
#~ msgid ""
#~ "The Shinsplitters will aid you in your quest. Look, they rise from the "
#~ "villages to the west, the mighty Shinsplitters! To battle!"
#~ msgstr ""
#~ "Knäkrossarna skall hjälpa dig på ditt uppdrag. Se, byarna i väster reser "
#~ "sig! De mäktiga Knäkrossarna! Till strid!"
#~ msgid ""
#~ "Well, we have defeated our foes. Let us hope the mountain does not defeat "
#~ "us!"
#~ msgstr ""
#~ "Så, vi har besegrat våra fiender. Låt oss hoppas att berget inte besegrar "
#~ "oss!"
#~ msgid ""
#~ "I wish you all the best on your journey, I must return to my village and "
#~ "take care of my family. Dwarven hospitality will welcome you wherever you "
#~ "go, friends!"
#~ msgstr ""
#~ "Jag önskar er en fortsatt god resa. Jag måste återvända till min by och "
#~ "ta hand om min familj. Dvärgarnas gästfrihet kommer att välkomna er "
#~ "varthän ni färdas, vänner!"
#~ msgid "Let us move onward!"
#~ msgstr "Låt oss fortsätta framåt!"
#~ msgid "Aaargh! I am done for! Fight on without me, Brethren!"
#~ msgstr "Aaargh! Jag är dödligt sårad! Fortsätt kampen utan mig, bröder!"
#~ msgid "The Valley of Statues"
#~ msgstr "Statyernas dal"
#~ msgid "Defeat all enemies"
#~ msgstr "Besegra alla fiender"
#~ msgid "Death of Konrad, or having him turned to stone"
#~ msgstr "Konrad dör eller blir förstenad"
#~ msgid "Death of Delfador, or having him turned to stone"
#~ msgstr "Delfador dör eller blir förstenad"
#~ msgid "A Yeti"
#~ msgstr "En yeti"
#~ msgid "Be warned, a great monster lives in the hills ahead."
#~ msgstr "Tag er i akt, det bor ett stort monster i kullarna där framme."
#~ msgid "Krestrad"
#~ msgstr "Krestrad"
#~ msgid "Traskan"
#~ msgstr "Traskan"
#~ msgid "Urug-Halaki"
#~ msgstr "Urug-Halaki"
#~ msgid "Look ahead of us, orcs and trolls!"
#~ msgstr "Se där framför oss! Orcher och troll!"
#~ msgid "But they look strange -- look, they're just statues!"
#~ msgstr "Men vad de ser konstiga ut... Titta, det är bara statyer!"
#~ msgid ""
#~ "That's very strange, why would someone make statues of such foul "
#~ "creatures?"
#~ msgstr ""
#~ "Det var underligt. Varför skulle någon vilja göra statyer av så hemska "
#~ "varelser?"
#~ msgid "Who are these that approach our valley, my apprentice?"
#~ msgstr "Vilka är det som närmar sig vår dal, min lärling?"
#~ msgid "Halt! You will not pass by this way!"
#~ msgstr "Halt! Här kommer ni inte förbi!"
#~ msgid "We seek only free passage through your valley. We mean no harm."
#~ msgstr "Vi önskar enbart fri passage genom er dal. Vi vill inte något illa."
#~ msgid "No-one passes by us. We rule this valley, and you cannot defeat us!"
#~ msgstr ""
#~ "Ingen kommer förbi oss. Vi styr över denna dal, och ni kan inte besegra "
#~ "oss!"
#~ msgid ""
#~ "If you do not let us through, we will pierce you with sword and bow! "
#~ "Come, let us take up arms against them!"
#~ msgstr ""
#~ "Om ni inte släpper fram oss så kommer vi att genomborra er med svärd och "
#~ "båge! Kom, till vapen mot dem!"
#~ msgid ""
#~ "Do you really think by mere force of arms you can defeat us? Some orcs "
#~ "were once foolish enough to think that as well..."
#~ msgstr ""
#~ "Tror ni verkligen att ni kan besegra oss med vapenmakt? En gång var några "
#~ "orcher lika dåraktiga som ni..."
#~ msgid ""
#~ "Does he mean that these who stand in front of us were once live orcs?"
#~ msgstr "Menar han att statyerna här en gång var levande orcher?"
#~ msgid ""
#~ "Careful, I have heard of such things. We must proceed with caution, and "
#~ "try to discover the nature of the power these wizards wield."
#~ msgstr ""
#~ "Tag er i akt! Jag har hört talas om sådant. Vi måste fortsätta med "
#~ "yttersta försiktighet, och försöka utröna vilken slags kraft dessa "
#~ "trollkarlar använder sig av."
#~ msgid "This place feels eerie. Is there no other way?"
#~ msgstr "Det här stället ger mig kalla kårar. Finns det ingen annan väg?"
#~ msgid ""
#~ "I for one am not afraid of these who would oppose us. I feel certain that "
#~ "once a sword is driven through them, they will threaten us no more."
#~ msgstr ""
#~ "Jag för min del är då inte rädd för de som står i vägen för oss. Jag är "
#~ "säker på att med ett svärd igenom sig, så utgör de inte längre något hot "
#~ "för oss."
#~ msgid "There is no other way, but it is carefully that we shall proceed."
#~ msgstr ""
#~ "Det finns inte någon annan väg, men vi fortsätter framåt med största "
#~ "försiktighet."
#~ msgid "All I can see in here is a large mirror!"
#~ msgstr "Det finns en stor spegel här inne!"
#~ msgid ""
#~ "I have heard of such things. Perhaps the power of the Cockatrices is tied "
#~ "to it!"
#~ msgstr ""
#~ "Jag har hört talas om sådana ting. Kanske är basiliskernas kraft knuten "
#~ "till den!"
#~ msgid "Very well, I'll smash it!"
#~ msgstr "Jag slår sönder den!"
#~ msgid "No! The power of my creations is destroyed!"
#~ msgstr "Nej! Mina skapelsers kraft är förgjord!"
#~ msgid "Free from this prison of stone at last! Now we will gain revenge!"
#~ msgstr "Äntligen fri från stenfängelset! Nu skall vi få vår hämnd!"
#~ msgid "First we have to fight these silly birds, and now bothersome orcs!"
#~ msgstr "Först fick vi slåss mot de där fåniga fåglarna, och nu orcher!"
#~ msgid "Fall on them men!"
#~ msgstr "På dem, mannar!"
#~ msgid "With Konrad turned into a statue, surely all is lost!"
#~ msgstr "Konrad har förvandlats till en staty! Allt är förlorat!"
#~ msgid ""
#~ "No! Delfador has been turned to stone! Without him we have no chance of "
#~ "unmaking the wizard's spell. All is lost!"
#~ msgstr ""
#~ "Nej! Delfador har förvandlats till sten! Utan honom kan vi inte vända "
#~ "trollkarlens makt. Allt är förlorat!"
#~ msgid "What happened there?"
#~ msgstr "Vad hände?"
#~ msgid ""
#~ "These Cockatrices will turn all our troops to stone, as they have the "
#~ "orcs, if we cannot find a way to undo their power!"
#~ msgstr ""
#~ "Basiliskerna kommer att förvandla alla våra trupper till sten, precis som "
#~ "de har gjort med orcherna, om vi inte kan finna något sätt att vända "
#~ "deras kraft!"
#~ msgid "You may now recruit horsemen!"
#~ msgstr "Du kan nu rekrytera ryttare!"

View file

@ -6,8 +6,8 @@ msgstr ""
"Project-Id-Version: Battle for Wesnoth 1.2\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2007-01-01 23:28+0100\n"
"PO-Revision-Date: 2006-12-30 16:43+0100\n"
"Last-Translator: Christoph Berg <Christoph.Berg@kpm-sport.de>\n"
"PO-Revision-Date: 2007-01-03 21:16+0100\n"
"Last-Translator: Nils Kneuper <crazy-ivanovic AT gmx D O T net>\n"
"Language-Team: irc://irc.freenode.net/#wesnoth-de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -276,9 +276,8 @@ msgid "Quit Game"
msgstr "Spiel beenden"
#: src/hotkeys.cpp:83
#, fuzzy
msgid "Set Team Label"
msgstr "Beschriftung erstellen"
msgstr "Teamspezifische Beschriftung erstellen"
#: src/hotkeys.cpp:84
msgid "Set Label"
@ -576,21 +575,20 @@ msgid "Chat Timestamping"
msgstr "Zeitinformationen anzeigen"
#: src/preferences_display.cpp:275
#, fuzzy
msgid "Advanced Mode"
msgstr "Diverses"
msgstr "Erweiterte Einstellungen"
#: src/preferences_display.cpp:276
msgid "Normal Mode"
msgstr ""
msgstr "Standard Einstellungen"
#: src/preferences_display.cpp:279
msgid "User Define"
msgstr ""
msgstr "Benutzerdefiniert"
#: src/preferences_display.cpp:280
msgid "Apply"
msgstr ""
msgstr "Anwenden"
#: src/preferences_display.cpp:282
msgid "Music Volume:"
@ -610,7 +608,7 @@ msgstr "Gamma:"
#: src/preferences_display.cpp:286
msgid "Sample Rate (Hz):"
msgstr ""
msgstr "Abtastrate (Hz):"
#: src/preferences_display.cpp:305
msgid "Sound effects on/off"
@ -633,22 +631,20 @@ msgid "Change the bell volume"
msgstr "Lautstärke der Benachrichtigung zu Rundenbeginn ändern"
#: src/preferences_display.cpp:324
#, fuzzy
msgid "Change the sample rate"
msgstr "Spracheinstellungen ändern"
msgstr "Ändern der Abtastrate (Sample Rate)"
#: src/preferences_display.cpp:333
msgid "User defined sample rate"
msgstr ""
msgstr "Benutzerdefinierte Abtastrate"
#: src/preferences_display.cpp:342 src/preferences_display.cpp:346
#, fuzzy
msgid "Change the buffer size"
msgstr "Lautstärke der Benachrichtigung zu Rundenbeginn ändern"
msgstr "Ändern der Größe des Puffers"
#: src/preferences_display.cpp:344 src/preferences_display.cpp:742
msgid "Buffer Size: "
msgstr ""
msgstr "Größe des Puffers: "
#: src/preferences_display.cpp:351
msgid "Change the speed of scrolling around the map"
@ -677,9 +673,9 @@ msgid "Make units move and fight faster"
msgstr "Die Bewegungs- und Kampfgeschwindigkeit der Einheiten wird erhöht"
#: src/preferences_display.cpp:380
#, fuzzy
msgid "Units move and fight speed"
msgstr "Die Bewegungs- und Kampfgeschwindigkeit der Einheiten wird erhöht"
msgstr ""
"Die Änderung der Bewegungs- und Kampfgeschwindigkeit der Einheiten festlegen"
#: src/preferences_display.cpp:383
msgid "Do not animate AI units moving"

View file

@ -1,20 +1,23 @@
# translation of it.po to Italian
# Italian translations for Battle for Wesnoth package.
# Copyright (C) 2004 Wesnoth development team
# This file is distributed under the same license as the Battle for Wesnoth package.
# Automatically generated, 2004.
#
# Automatically generated, 2004.
# Luciano Montanaro <mikelima@cirulla.net>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.8.11-CVS\n"
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2007-01-01 23:28+0100\n"
"PO-Revision-Date: 2006-06-12 14:49+0100\n"
"Last-Translator: badBob <quagliatie@interfree.it>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2007-01-03 10:59+0100\n"
"Last-Translator: Luciano Montanaro <mikelima@cirulla.net>\n"
"Language-Team: Italian <kde-i18n-it@kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
#: src/construct_dialog.cpp:120 src/construct_dialog.cpp:127
#: src/editor/editor_dialogs.cpp:409
@ -584,21 +587,20 @@ msgid "Chat Timestamping"
msgstr "Visualizzazione del tempo nella chat"
#: src/preferences_display.cpp:275
#, fuzzy
msgid "Advanced Mode"
msgstr "Avanzate"
msgstr "Modalità avanzata"
#: src/preferences_display.cpp:276
msgid "Normal Mode"
msgstr ""
msgstr "Modalità normale"
#: src/preferences_display.cpp:279
msgid "User Define"
msgstr ""
msgstr "Definita dall'utente"
#: src/preferences_display.cpp:280
msgid "Apply"
msgstr ""
msgstr "Applica"
#: src/preferences_display.cpp:282
msgid "Music Volume:"
@ -619,7 +621,7 @@ msgstr "Gamma:"
#: src/preferences_display.cpp:286
msgid "Sample Rate (Hz):"
msgstr ""
msgstr "Frequenza di campionamento (Hz):"
#: src/preferences_display.cpp:305
msgid "Sound effects on/off"
@ -643,22 +645,20 @@ msgid "Change the bell volume"
msgstr "Cambia il volume della musica"
#: src/preferences_display.cpp:324
#, fuzzy
msgid "Change the sample rate"
msgstr "Cambia la lingua"
msgstr "Cambia la frequenza di campionamento"
#: src/preferences_display.cpp:333
msgid "User defined sample rate"
msgstr ""
msgstr "Frequenza di campionamento definita dall'utente"
#: src/preferences_display.cpp:342 src/preferences_display.cpp:346
#, fuzzy
msgid "Change the buffer size"
msgstr "Cambia il volume della musica"
msgstr "Cambia la dimensione del buffer"
#: src/preferences_display.cpp:344 src/preferences_display.cpp:742
msgid "Buffer Size: "
msgstr ""
msgstr "Dimensione del buffer:"
#: src/preferences_display.cpp:351
msgid "Change the speed of scrolling around the map"
@ -859,18 +859,3 @@ msgstr "Errore"
#: src/show_dialog.cpp:425
msgid "KB"
msgstr "KB"
#~ msgid "Receiving data..."
#~ msgstr "Ricezione dati in corso..."
#~ msgid "Ok"
#~ msgstr "Ok"
#~ msgid "Fullscreen"
#~ msgstr "Schermo intero"
#~ msgid "Downloading..."
#~ msgstr "Scaricamento in corso"
#~ msgid "Set Player Start Position"
#~ msgstr "Posizione iniziale giocatore"

View file

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.9.0+cvs\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2007-01-01 23:28+0100\n"
"PO-Revision-Date: 2006-06-13 01:47+0200\n"
"PO-Revision-Date: 2007-01-03 00:20+0100\n"
"Last-Translator: Stefan Bergström (tephlon) <stefan DOT bergstrom AT gmail "
"DOT com>\n"
"Language-Team: Swedish\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.2\n"
"X-Generator: KBabel 1.11.4\n"
#: src/construct_dialog.cpp:120 src/construct_dialog.cpp:127
#: src/editor/editor_dialogs.cpp:409
@ -129,7 +129,7 @@ msgstr "Flippa (detta kan ändra kartans dimensioner):"
#: src/filechooser.cpp:51
msgid "File: "
msgstr ""
msgstr "File: "
#: src/filechooser.cpp:52
msgid "Delete File"
@ -137,7 +137,7 @@ msgstr "Radera fil"
#: src/filechooser.cpp:54 src/filechooser.cpp:166
msgid "New Folder"
msgstr ""
msgstr "Ny mapp"
#: src/filechooser.cpp:154
msgid "Deletion of the file failed."
@ -145,12 +145,11 @@ msgstr "Kunde ej radera fil."
#: src/filechooser.cpp:167
msgid "Name: "
msgstr ""
msgstr "Namn: "
#: src/filechooser.cpp:172
#, fuzzy
msgid "Creation of the directory failed."
msgstr "Kunde ej radera fil."
msgstr "Kunde ej skapa mapp."
#: src/hotkeys.cpp:49
msgid "Next Unit"
@ -213,9 +212,8 @@ msgid "Save Game"
msgstr "Spara spelet"
#: src/hotkeys.cpp:65
#, fuzzy
msgid "Save The Map"
msgstr "Spara"
msgstr "Spara kartan"
#: src/hotkeys.cpp:66
msgid "Load Game"
@ -282,9 +280,8 @@ msgid "Quit Game"
msgstr "Avsluta spelet"
#: src/hotkeys.cpp:83
#, fuzzy
msgid "Set Team Label"
msgstr "Sätt etikett"
msgstr "Sätt lagetikett"
#: src/hotkeys.cpp:84
msgid "Set Label"
@ -467,9 +464,8 @@ msgid "Villages:"
msgstr "Byar:"
#: src/mapgen_dialog.cpp:115
#, fuzzy
msgid "Castle Size:"
msgstr "Max kullstorlek:"
msgstr "Borgstorlek:"
#: src/mapgen_dialog.cpp:116
msgid "Landform:"
@ -518,19 +514,16 @@ msgid "Skip AI Moves"
msgstr "Visa ej datorns steg"
#: src/preferences_display.cpp:256
#, fuzzy
msgid "Show Lobby Minimaps"
msgstr "Visa anslutningar till lobbyn"
msgstr "Visa minikartor i lobbyn"
#: src/preferences_display.cpp:257
#, fuzzy
msgid "Show Lobby Joins Of Friends"
msgstr "Visa anslutningar till lobbyn"
msgstr "Visa när vänner ansluter till lobbyn"
#: src/preferences_display.cpp:258
#, fuzzy
msgid "Sort Lobby List"
msgstr "Visa anslutningar till lobbyn"
msgstr "Sortera lobbylista"
#: src/preferences_display.cpp:259
msgid "Iconize Lobby List"
@ -585,21 +578,20 @@ msgid "Chat Timestamping"
msgstr "Chattidsangivelser"
#: src/preferences_display.cpp:275
#, fuzzy
msgid "Advanced Mode"
msgstr "Avancerat"
msgstr "Avancerat läge"
#: src/preferences_display.cpp:276
msgid "Normal Mode"
msgstr ""
msgstr "Normalt läge"
#: src/preferences_display.cpp:279
msgid "User Define"
msgstr ""
msgstr "Egendefinierad"
#: src/preferences_display.cpp:280
msgid "Apply"
msgstr ""
msgstr "Verkställ"
#: src/preferences_display.cpp:282
msgid "Music Volume:"
@ -610,9 +602,8 @@ msgid "SFX Volume:"
msgstr "Ljudeffektsvolym:"
#: src/preferences_display.cpp:283
#, fuzzy
msgid "Bell Volume:"
msgstr "Ljudeffektsvolym:"
msgstr "Gonggongsvolym:"
#: src/preferences_display.cpp:284
msgid "Gamma:"
@ -620,7 +611,7 @@ msgstr "Ljusstyrka:"
#: src/preferences_display.cpp:286
msgid "Sample Rate (Hz):"
msgstr ""
msgstr "Samplingsfrekvens (Hz):"
#: src/preferences_display.cpp:305
msgid "Sound effects on/off"
@ -639,27 +630,24 @@ msgid "Change the music volume"
msgstr "Ändra musikvolym"
#: src/preferences_display.cpp:322
#, fuzzy
msgid "Change the bell volume"
msgstr "Ändra musikvolym"
msgstr "Ändra gonggongsvolym"
#: src/preferences_display.cpp:324
#, fuzzy
msgid "Change the sample rate"
msgstr "Byt språk"
msgstr "Byt samplingsfrekvens"
#: src/preferences_display.cpp:333
msgid "User defined sample rate"
msgstr ""
msgstr "Egendefinierad samplingsfrekvens"
#: src/preferences_display.cpp:342 src/preferences_display.cpp:346
#, fuzzy
msgid "Change the buffer size"
msgstr "Ändra musikvolym"
msgstr "Ändra buffertstorlek"
#: src/preferences_display.cpp:344 src/preferences_display.cpp:742
msgid "Buffer Size: "
msgstr ""
msgstr "Buffertstorlek"
#: src/preferences_display.cpp:351
msgid "Change the speed of scrolling around the map"
@ -686,9 +674,8 @@ msgid "Make units move and fight faster"
msgstr "Gör att trupper förflyttar sig och slåss snabbare"
#: src/preferences_display.cpp:380
#, fuzzy
msgid "Units move and fight speed"
msgstr "Gör att trupper förflyttar sig och slåss snabbare"
msgstr "Förflyttnings- och stridshastighet"
#: src/preferences_display.cpp:383
msgid "Do not animate AI units moving"
@ -699,9 +686,8 @@ msgid "Overlay a grid onto the map"
msgstr "Lägg ett rutnät över kartan"
#: src/preferences_display.cpp:389
#, fuzzy
msgid "Show minimaps in the multiplayer lobby"
msgstr "Visa meddelanden när spelare ansluter till gruppspelslobbyn"
msgstr "Visa minikartor i gruppspelslobbyn"
#: src/preferences_display.cpp:392
msgid "Sort the player list in the lobby by player groups"
@ -712,9 +698,8 @@ msgid "Show icons in front of the player names in the lobby."
msgstr ""
#: src/preferences_display.cpp:398
#, fuzzy
msgid "Show messages about your friends joining the multiplayer lobby"
msgstr "Visa meddelanden när spelare ansluter till gruppspelslobbyn"
msgstr "Underrätta när vänner ansluter till gruppspelslobbyn"
#: src/preferences_display.cpp:401
msgid "Show text above a unit when it is hit to display damage inflicted"
@ -764,9 +749,8 @@ msgid "View and configure keyboard shortcuts"
msgstr "Se och konfigurera snabbtangenter"
#: src/preferences_display.cpp:637
#, fuzzy
msgid "Speed: "
msgstr "Rullningsfart:"
msgstr "Fart: "
#: src/preferences_display.cpp:768
msgid "Chat Lines: "

View file

@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"POT-Creation-Date: 2006-12-27 19:45+0100\n"
"PO-Revision-Date: 2006-08-30 16:12+0200\n"
"PO-Revision-Date: 2007-01-02 23:59+0100\n"
"Last-Translator: Stefan Bergström (tephlon) <stefan DOT bergstrom AT gmail "
"DOT com>\n"
"Language-Team: Swedish\n"
@ -496,9 +496,9 @@ msgstr "anger antalet drag för det valda scenariot. Standardvärdet är 50."
# type: TP
#: ../../doc/man/wesnoth.6:159
#, fuzzy, no-wrap
#, no-wrap
msgid "Example to test your own AI: "
msgstr "Exempel för att testa en egen AI:"
msgstr "Exempel för att testa en egen AI: "
# type: Plain text
#: ../../doc/man/wesnoth.6:162

View file

@ -3,8 +3,8 @@ msgstr ""
"Project-Id-Version: wescamp-i 18n\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:41+0100\n"
"PO-Revision-Date: 2006-12-09 01:08+0100\n"
"Last-Translator: Damien <guydelatour@gloireetpouvoir.com>\n"
"PO-Revision-Date: 2007-01-03 19:31+0100\n"
"Last-Translator: Guillaume MASSART <massart.guillaume@wanadoo.fr>\n"
"Language-Team: Language fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -297,7 +297,6 @@ msgid "We're chasing after some men who kidnapped my brother!"
msgstr "Nous poursuivons des hommes qui ont enlevé mon frère !"
#: data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg:233
#, fuzzy
msgid ""
"Those men had some great arguments persuading me to not allow you to enter "
"this forest. Any further, and you will die."
@ -419,7 +418,6 @@ msgid "He escaped us..."
msgstr "Il nous a échappé..."
#: data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg:457
#, fuzzy
msgid ""
"You foolish human, you killed me but you won't be able to reach the undead. "
"I fulfilled the pact and will be reanimated soon to be a Lord of their "
@ -430,7 +428,6 @@ msgstr ""
"de leurs armées."
#: data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg:461
#, fuzzy
msgid ""
"Hurry, we have to track them down. Maybe we can still get them. They have to "
"be in the north!"
@ -596,7 +593,6 @@ msgid "Move Arne to the cell with his brother to free him"
msgstr "Amenez Arne à la cellule de son frère pour le libérer"
#: data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg:442
#, fuzzy
msgid "Look what I have found in here! I can count a hundred pieces of gold."
msgstr "Regardez ce que j'ai trouvé ici ! Cent pièces d'or !"
@ -609,12 +605,10 @@ msgid "I found Bjarn. He is in this cell."
msgstr "J'ai trouvé Bjarn. Il est dans cette cellule."
#: data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg:524
#, fuzzy
msgid "Good to see you, Arne. Please help me get out of this dungeon."
msgstr "Content de te voir, Arne. Aide-moi à sortir de ce donjon."
#: data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg:531
#, fuzzy
msgid "You must be one of Arne's men. Please help me get out of this dungeon."
msgstr "Tu dois être un des hommes d'Arne. Aide-moi à sortir de ce donjon."
@ -714,7 +708,6 @@ msgid "So am I. But what is happening to our village?"
msgstr "Et moi donc. Mais que se passe-t-il dans notre village ?"
#: data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg:184
#, fuzzy
msgid ""
"In the time you have been away a looting band of orcs took over this region. "
"There was noone here to stop them."
@ -749,7 +742,6 @@ msgstr ""
"L'orc a enfin été tué. Vous pouvez maintenant retourner à votre village."
#: data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg:224
#, fuzzy
msgid ""
"So much has been destroyed. We will have a hard time fixing the damage the "
"orcs and the undead caused. I hope this does not happen again."
@ -758,7 +750,6 @@ msgstr ""
"les morts-vivants ont causés. J'espère que cela n'arrivera plus."
#: data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg:229
#, fuzzy
msgid ""
"I have to leave you now. My men and I are needed by others, too. But should "
"you ever face another grim foe, send me a messenger. I'll come as fast as I "

View file

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:41+0100\n"
"PO-Revision-Date: 2006-08-29 14:28+0200\n"
"PO-Revision-Date: 2007-01-02 23:59+0100\n"
"Last-Translator: Stefan Bergström (tephlon) <stefan DOT bergstrom AT gmail "
"DOT com>\n"
"Language-Team: Swedish\n"
@ -150,15 +150,13 @@ msgid "'ello there, Bjarn. So, what's the big fuss?"
msgstr "Hej där, Bjarn. Vad är det frågan om?"
#: data/campaigns/Two_Brothers/scenarios/1_Rooting_Out_A_Mage.cfg:240
#, fuzzy
msgid ""
"An evil mage, two days ride north, is posing a threat to our livelihoods. He "
"is terrorizing our countryside. I've already called the village to arms and "
"now it's up to you to lead them."
msgstr ""
"En ond magiker, som driver omkring två dagsritter norrut, är ett hot för oss "
"alla. Han sprider skräck överallt. Jag har redan kallat byn till vapen, men "
"du måste leda dem."
"En ond magiker, två dagsritter norrut, är ett hot mot oss alla. Han sprider "
"skräck överallt. Jag har redan kallat byn till vapen, men du måste leda dem."
#: data/campaigns/Two_Brothers/scenarios/1_Rooting_Out_A_Mage.cfg:245
msgid "Very well. We will go there and slay this source of evil. Charge, men!"
@ -291,7 +289,6 @@ msgid "We're chasing after some men who kidnapped my brother!"
msgstr "Vi är på jakt efter några män som har kidnappat min bror!"
#: data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg:233
#, fuzzy
msgid ""
"Those men had some great arguments persuading me to not allow you to enter "
"this forest. Any further, and you will die."
@ -360,14 +357,13 @@ msgid "Brena"
msgstr "Brena"
#: data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg:376
#, fuzzy
msgid ""
"Greetings, I am Brena. I saw you fighting the foul undead. I like nothing "
"better than smashing those foul skeletons and their ilk. Though I came too "
"late to help in this fight, I would like to aid you in your forthcoming "
"endeavors."
msgstr ""
"Var hälsad. Jag är Brena. Jag såg att ni slogs med de vidriga vandöda. Det "
"Var hälsade. Jag är Brena. Jag såg att ni slogs med de vidriga vandöda. Det "
"finns inget bättre än att göra mos av de vidriga skeletten och deras anhang. "
"Jag kom för sent till den här striden, men jag skulle ändock vilja hjälpa er "
"i era kommande strävanden."
@ -413,18 +409,16 @@ msgid "He escaped us..."
msgstr "Han kom undan..."
#: data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg:457
#, fuzzy
msgid ""
"You foolish human, you killed me but you won't be able to reach the undead. "
"I fulfilled the pact and will be reanimated soon to be a Lord of their "
"armies."
msgstr ""
"Du dåraktiga människa dödade mig, men ni kommer inte att kunna nå de "
"Du dåraktiga människa, ni dödade mig, men ni kommer inte att kunna nå de "
"vandöda. Jag har uppfyllt pakten och kommer snart att återuppväckas för att "
"bli befälhavare i deras arméer."
#: data/campaigns/Two_Brothers/scenarios/2_The_Chase.cfg:461
#, fuzzy
msgid ""
"Hurry, we have to track them down. Maybe we can still get them. They have to "
"be in the north!"
@ -589,7 +583,6 @@ msgid "Move Arne to the cell with his brother to free him"
msgstr "För Arne till cellen där hans bror finns för att befria honom"
#: data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg:442
#, fuzzy
msgid "Look what I have found in here! I can count a hundred pieces of gold."
msgstr "Titta vad jag har hittat! Hundra guldstycken!"
@ -602,13 +595,11 @@ msgid "I found Bjarn. He is in this cell."
msgstr "Jag har hittat Bjarn! Han är i den här cellen."
#: data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg:524
#, fuzzy
msgid "Good to see you, Arne. Please help me get out of this dungeon."
msgstr ""
"Skönt att se dig, Arne. Hjälp mig ur de här fängelsehålorna, så är du snäll."
#: data/campaigns/Two_Brothers/scenarios/3_Guarded_Castle.cfg:531
#, fuzzy
msgid "You must be one of Arne's men. Please help me get out of this dungeon."
msgstr ""
"Du måste vara en av Arnes mannar. Hjälp mig ur de här fängelsehålorna, så är "
@ -710,13 +701,12 @@ msgid "So am I. But what is happening to our village?"
msgstr "Jag här glad att vara tillbaka. Men vad händer i vår by?"
#: data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg:184
#, fuzzy
msgid ""
"In the time you have been away a looting band of orcs took over this region. "
"There was noone here to stop them."
msgstr ""
"Medan ni var borta så kom det hit ett gäng orcher som plundrar överallt.Det "
"fanns ingen kvar att stoppa dem."
"Medan ni var borta så kom det hit ett plundrande gäng orcher och tog över. "
"Det fanns ingen kvar att stoppa dem."
#: data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg:188
msgid ""
@ -743,7 +733,6 @@ msgid "Finally the orc is killed. Now you can go back to your village."
msgstr "Äntligen är orchen död. Nu kan ni återvända till er by."
#: data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg:224
#, fuzzy
msgid ""
"So much has been destroyed. We will have a hard time fixing the damage the "
"orcs and the undead caused. I hope this does not happen again."
@ -753,13 +742,12 @@ msgstr ""
"aldrig mer råkar ut för något sådant här."
#: data/campaigns/Two_Brothers/scenarios/4_Return_to_the_Village.cfg:229
#, fuzzy
msgid ""
"I have to leave you now. My men and I are needed by others, too. But should "
"you ever face another grim foe, send me a messenger. I'll come as fast as I "
"can, little brother."
msgstr ""
"Jag måste ge mig av nu. Jag och mina mannar behövs på annat håll. Men om du "
"Jag måste ge mig av nu. Jag och mina mannar behövs på annat håll. Men om ni "
"någonsin ställs inför en sådan grym fiende igen, så skicka bud efter mig. "
"Jag kommer så fort jag kan, lillebror."

View file

@ -20,8 +20,8 @@ msgstr ""
"Project-Id-Version: Battle for Wesnoth\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:40+0100\n"
"PO-Revision-Date: 2006-12-20 22:11+0100\n"
"Last-Translator: Guillaume MASSART <massart.guillaume@wanadoo.fr>\n"
"PO-Revision-Date: 2007-01-03 16:41+0100\n"
"Last-Translator: Benoît Timbert <benoit.timbert@free.fr>\n"
"Language-Team: Language fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -3786,7 +3786,6 @@ msgid "In the name of Peace between our Peoples:"
msgstr "Au nom de la paix qui existe entre nos peuples."
#: data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_Elf_Lords.cfg:306
#, fuzzy
msgid ""
"I fear my kin are too easy on you. I decree that you should be made to fight "
"the Dragon of the Green Swamp and its Saurian minions. If you can defeat "
@ -5342,7 +5341,6 @@ msgstr ""
"peuple du port d'Aigueclaire !"
#: data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg:430
#, fuzzy
msgid "All life is finite; you will be made to serve along with the rest."
msgstr "Toute vie a une fin, tu viendras me servir, comme tous les autres."

View file

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:40+0100\n"
"PO-Revision-Date: 2006-06-11 21:10+0200\n"
"PO-Revision-Date: 2007-01-03 00:03+0100\n"
"Last-Translator: Stefan Bergström (tephlon) <stefan DOT bergstrom AT gmail "
"DOT com>\n"
"Language-Team: Swedish\n"
@ -12,7 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.2\n"
"X-Generator: KBabel 1.11.4\n"
#: data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg:4
#: data/campaigns/The_Rise_Of_Wesnoth.cfg:8
@ -1974,7 +1974,6 @@ msgstr ""
"orcherna kommer att hjälpa mig att tänka på annat. "
#: data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg:345
#, fuzzy
msgid ""
"To your posts men! We should be able to evacuate everyone in three more "
"boatloads. Until then, let us make those orcs pay dearly for every inch of "
@ -1982,7 +1981,7 @@ msgid ""
msgstr ""
"Till era poster, mannar! Vi borde kunna evakuera alla på tre skepp till. "
"Tills dess ska vi se till att orcherna får betala dyrt för varje tum land. "
"För våra hem, för vår fallna kung!"
"För våra hem, för vårt folk, för vår fallna kung!"
#: data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg:357
msgid "You killed my family! Die!"
@ -2020,7 +2019,6 @@ msgid "Eriol"
msgstr "Eriol"
#: data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg:413
#, fuzzy
msgid "An ode to ye, on yer way, I hope you have a brighter day!"
msgstr "Ett tips till dig, ge dig av, så får du nog en bättre dag!"
@ -2213,7 +2211,6 @@ msgid "Lich-Lord Caror"
msgstr "Häxmästarfurste Caror"
#: data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg:219
#, fuzzy
msgid "Kill the Lich to get his book and"
msgstr "Döda häxmästaren för att ta hans bok, och"
@ -3619,7 +3616,6 @@ msgid "In the name of Peace between our Peoples:"
msgstr "Å fredens vägnar:"
#: data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_Elf_Lords.cfg:306
#, fuzzy
msgid ""
"I fear my kin are too easy on you. I decree that you should be made to fight "
"the Dragon of the Green Swamp and its Saurian minions. If you can defeat "
@ -5126,7 +5122,6 @@ msgstr ""
"Klarvattnet!"
#: data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg:430
#, fuzzy
msgid "All life is finite; you will be made to serve along with the rest."
msgstr "Allt liv är förgängligt. Du kommer att tjäna mig som alla andra."

View file

@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: Battle for Wesnoth 1.2\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-29 14:51+0100\n"
"PO-Revision-Date: 2006-12-27 20:27+0100\n"
"PO-Revision-Date: 2007-01-03 21:17+0100\n"
"Last-Translator: Nils Kneuper <crazy-ivanovic AT gmx D O T net>\n"
"Language-Team: irc://irc.freenode.net/#wesnoth-de\n"
"MIME-Version: 1.0\n"
@ -3283,21 +3283,18 @@ msgid "Add a swing to your attack."
msgstr "Einen weiteren Schlag zum Angriff hinzufügen."
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:137
#, fuzzy
msgid "female^strong"
msgstr "kräftig"
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:155
#, fuzzy
msgid "female^resilient"
msgstr "robust"
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:169
msgid "female^quick"
msgstr ""
msgstr "schnell"
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:186
#, fuzzy
msgid "female^intelligent"
msgstr "intelligent"
@ -3308,7 +3305,7 @@ msgstr "loyal"
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:198
msgid "female^loyal"
msgstr ""
msgstr "loyal"
#~ msgid "intellegent"
#~ msgstr "intelligent"

View file

@ -3,8 +3,8 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-29 14:51+0100\n"
"PO-Revision-Date: 2006-12-05 12:49+0100\n"
"Last-Translator: Gérard Bodin <gerard.bodin@etu.univ-lille3.fr>\n"
"PO-Revision-Date: 2007-01-03 19:33+0100\n"
"Last-Translator: Guillaume MASSART <massart.guillaume@wanadoo.fr>\n"
"Language-Team: Language fr <wesnoth@ml.free.fr>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -612,19 +612,21 @@ msgstr ""
#: data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg:207
msgid "Take the Citadel at Westin before ten turns pass."
msgstr "Prenez la Citadelle de Westin avant que dix tours ne soient passés."
msgstr "Prenez la citadelle de Westin avant que dix tours ne soient passés."
#: data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg:247
msgid "At last the citadel is secured."
msgstr ""
msgstr "Enfin, la citadelle est libérée."
#: data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg:251
msgid "Now Deoran, take you post of command at the Citadel of Westin."
msgstr ""
"Maintenant Deoran, à votre poste de commandement dans la citadelle de "
"Westin !"
#: data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg:256
msgid "Bring Deoran to the Citadel of Westin."
msgstr ""
msgstr "Amenez Deoran à la citadelle de Westin."
# Damien : la traduction initiale et exacte de Minister est bien Ministre. Mais le mot a perdu son sens religieux en français.
#: data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg:289
@ -922,7 +924,6 @@ msgid "strong,"
msgstr "fort,"
#: data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg:204
#, fuzzy
msgid ""
"Commander, I received your request for reinforcements, and I have brought my "
"riders with me!"
@ -1104,7 +1105,6 @@ msgstr ""
"ils doivent être détruits !"
#: data/campaigns/The_South_Guard/scenarios/4.Vale_of_Tears.cfg:182
#, fuzzy
msgid ""
"Perhaps they are allied with the bandits who have been sacking our towns! "
"They have grown bold to attack the elves!"
@ -1384,12 +1384,11 @@ msgstr ""
"chercher avec prudence car je ne connais pas le chemin."
#: data/campaigns/The_South_Guard/scenarios/5.Choice_In_The_Fog.cfg:230
#, fuzzy
msgid ""
"I fear no forests. Let us find this river and whatever enemies lie beyond."
msgstr ""
"Je ne crains aucune forêt. Trouvons cette rivière et tout ennemi vivant au-"
"delà."
"Je ne crains aucune forêt. Trouvons cette rivière et tout ennemi se trouvant "
"au-delà."
#: data/campaigns/The_South_Guard/scenarios/5.Choice_In_The_Fog.cfg:235
msgid "Very well. We will seek the river and probe its secrets."
@ -1640,7 +1639,6 @@ msgstr ""
"hors de cette forêt maudite ?"
#: data/campaigns/The_South_Guard/scenarios/5.Choice_In_The_Fog.cfg:661
#, fuzzy
msgid ""
"What choice do I have? My life is in as much danger as yours. I will lead "
"you and your men back to the lands of Wesnoth if you will grant me pardon."
@ -1876,7 +1874,6 @@ msgid "Oh. Me only want tasty food. Go away."
msgstr "Oh. Moi vouloir de la nourriture appétissante. Allez-vous-en !"
#: data/campaigns/The_South_Guard/scenarios/6a.Tidings_Good_And_Ill.cfg:336
#, fuzzy
msgid "Wait! Me not believe you. Me eat you!"
msgstr "Attendez ! Moi pas vous croire. Moi vous manger !"
@ -2123,10 +2120,9 @@ msgstr ""
"laisser ici à l'entrée et poursuivre à pied."
#: data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg:147
#, fuzzy
msgid "That is wise. Speed is less valuable in caves than toughness."
msgstr ""
"C'est une sage décision. Mieux vaut être discret que rapide dans ces "
"C'est une sage décision. Mieux vaut être résistant que rapide dans ces "
"cavernes."
#: data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg:153
@ -2262,7 +2258,6 @@ msgstr ""
"nain."
#: data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg:383
#, fuzzy
msgid "Go here and light it and it will blast a backdoor into the lich's lair!"
msgstr ""
"Venez ici et allumez-le, ça creusera une voie vers le repaire de la liche !"
@ -2326,7 +2321,6 @@ msgstr ""
"ensuite m'amuser à mettre tes os à mon service."
#: data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg:501
#, fuzzy
msgid ""
"Nooo! This cannot be. The elves I once led have destroyed me. After all I "
"have sacrificed, I still die...."
@ -2809,7 +2803,6 @@ msgid "Infantry Lieutenant"
msgstr "Lieutenant d'infanterie"
#: data/campaigns/The_South_Guard/units/4.Infantry_Commander.cfg:22
#, fuzzy
msgid ""
"Commanders of the infantry of Wesnoth are responsible for the garrison and "
"defense of the border towns and villages. They are drawn from the ranks of "
@ -2959,7 +2952,6 @@ msgid "Summer"
msgstr "Été"
#: data/campaigns/The_South_Guard/utils/sg_story.cfg:11
#, fuzzy
msgid ""
"During the reign of Haldric VII Wesnoth was secure. Konrad I had driven off "
"the orcs in the north. The eastern forts were quiet and almost deserted. "
@ -3146,7 +3138,7 @@ msgstr ""
"de lances. Baignée de lumière, elle s'adressa aux hommes de Wesnoth, en "
"disant : « Arrêtez ! Assez de sang a été versé devant les murs de cette "
"ville ! La blessure que vous, les hommes, avez infligé aux elfes est grande, "
"mais votre aide a été aussi estimable. »"
"mais votre aide a été aussi estimable. »"
#: data/campaigns/The_South_Guard/utils/sg_story.cfg:137
msgid ""

View file

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-29 14:51+0100\n"
"PO-Revision-Date: 2006-07-18 20:47+0200\n"
"PO-Revision-Date: 2007-01-03 00:09+0100\n"
"Last-Translator: Stefan Bergström (tephlon) <stefan DOT bergstrom AT gmail "
"DOT com>\n"
"Language-Team: Swedish\n"
@ -12,7 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.2\n"
"X-Generator: KBabel 1.11.4\n"
#: data/campaigns/The_South_Guard.cfg:9
msgid "The South Guard"
@ -606,15 +606,15 @@ msgstr "Inta citadellet i Westin innan tio drag passerat."
#: data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg:247
msgid "At last the citadel is secured."
msgstr ""
msgstr "Citadellet är säkrat."
#: data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg:251
msgid "Now Deoran, take you post of command at the Citadel of Westin."
msgstr ""
msgstr "Nu, Deoran, ta kommandot över Westins citadell."
#: data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg:256
msgid "Bring Deoran to the Citadel of Westin."
msgstr ""
msgstr "För Deoran till Westins citadell."
#: data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg:289
msgid "Minister Hylas"
@ -902,7 +902,6 @@ msgid "strong,"
msgstr "stark, "
#: data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg:204
#, fuzzy
msgid ""
"Commander, I received your request for reinforcements, and I have brought my "
"riders with me!"
@ -1080,7 +1079,6 @@ msgstr ""
"Vad!? De är inte alvernas vänner! Det är stråtrövare och de måste förgöras!"
#: data/campaigns/The_South_Guard/scenarios/4.Vale_of_Tears.cfg:182
#, fuzzy
msgid ""
"Perhaps they are allied with the bandits who have been sacking our towns! "
"They have grown bold to attack the elves!"
@ -1355,7 +1353,6 @@ msgstr ""
"för jag vet inte vägen."
#: data/campaigns/The_South_Guard/scenarios/5.Choice_In_The_Fog.cfg:230
#, fuzzy
msgid ""
"I fear no forests. Let us find this river and whatever enemies lie beyond."
msgstr ""
@ -1602,13 +1599,12 @@ msgstr ""
"hänger våra liv på Urza Afalas. Kan du leda oss från den här fördömda skogen?"
#: data/campaigns/The_South_Guard/scenarios/5.Choice_In_The_Fog.cfg:661
#, fuzzy
msgid ""
"What choice do I have? My life is in as much danger as yours. I will lead "
"you and your men back to the lands of Wesnoth if you will grant me pardon."
msgstr ""
"Vilket val har jag? Mitt liv är i lika stor fara som era. Jag kommer att "
"leda er och era män tillbaka till Wesnoth om du benådar mig."
"Vad har jag för val? Mitt liv är i lika stor fara som era. Jag kommer att "
"leda dig och dina män tillbaka till Wesnoth om du benådar mig."
#: data/campaigns/The_South_Guard/scenarios/5.Choice_In_The_Fog.cfg:665
msgid ""
@ -1834,7 +1830,6 @@ msgid "Oh. Me only want tasty food. Go away."
msgstr "Åhå. Jag vill bara ha god mat. Ge er iväg."
#: data/campaigns/The_South_Guard/scenarios/6a.Tidings_Good_And_Ill.cfg:336
#, fuzzy
msgid "Wait! Me not believe you. Me eat you!"
msgstr "Vänta! Jag tror er inte. Jag äter er!"
@ -2072,9 +2067,8 @@ msgstr ""
"vid ingången och fortsätter till fots."
#: data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg:147
#, fuzzy
msgid "That is wise. Speed is less valuable in caves than toughness."
msgstr "Det är klokt. Hastighet är mindre värdefullt i grottor än seghet."
msgstr "Det är klokt. Hastighet är mindre värdefullt i grottor än härdighet."
#: data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg:153
msgid ""
@ -2197,11 +2191,10 @@ msgstr ""
"fall döda dvärgarna! Nu har vi dvärgarnas åskkraft."
#: data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg:383
#, fuzzy
msgid "Go here and light it and it will blast a backdoor into the lich's lair!"
msgstr ""
"Gå hit och tänd på den, så kommer den spränga bakdörren till häxmästarens "
"näste!"
"Gå hit och tänd på den, så kommer den att spränga bakdörren till "
"häxmästarens näste!"
#: data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg:397
msgid "We will offer you freedom and a place in our lands."
@ -2261,7 +2254,6 @@ msgstr ""
"roar mig att låta dina ben tjäna mig."
#: data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg:501
#, fuzzy
msgid ""
"Nooo! This cannot be. The elves I once led have destroyed me. After all I "
"have sacrificed, I still die...."
@ -2731,7 +2723,6 @@ msgid "Infantry Lieutenant"
msgstr "Infanterilöjtnant"
#: data/campaigns/The_South_Guard/units/4.Infantry_Commander.cfg:22
#, fuzzy
msgid ""
"Commanders of the infantry of Wesnoth are responsible for the garrison and "
"defense of the border towns and villages. They are drawn from the ranks of "
@ -2873,14 +2864,13 @@ msgid "Summer"
msgstr "Sommar"
#: data/campaigns/The_South_Guard/utils/sg_story.cfg:11
#, fuzzy
msgid ""
"During the reign of Haldric VII Wesnoth was secure. Konrad I had driven off "
"the orcs in the north. The eastern forts were quiet and almost deserted. "
"The elves in the western forest kept to their own affairs. In the "
"prosperous south men built new towns and farms."
msgstr ""
"Under Haldric VII styre var Wesnoth säkert. Konrad I hade drivit bort "
"Under Haldric VII:s styre var Wesnoth säkert. Konrad I hade drivit bort "
"orcherna från norden. De östra befästningarna var lugna och nästan "
"övergivna. Alverna i de västra skogarna höll sig för sig själva. I den "
"blomstrande södern byggde människorna nya städer och gårdar."
@ -3177,21 +3167,18 @@ msgid "Add a swing to your attack."
msgstr "Ger ett extra utfall."
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:137
#, fuzzy
msgid "female^strong"
msgstr "stark"
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:155
#, fuzzy
msgid "female^resilient"
msgstr "tålig"
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:169
msgid "female^quick"
msgstr ""
msgstr "snabb"
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:186
#, fuzzy
msgid "female^intelligent"
msgstr "intelligent"
@ -3202,7 +3189,4 @@ msgstr "lojal"
#: data/campaigns/The_South_Guard/utils/sg_unit_utils.cfg:198
msgid "female^loyal"
msgstr ""
#~ msgid "intellegent"
#~ msgstr "intelligent"
msgstr "lojal"

View file

@ -3,8 +3,8 @@ msgstr ""
"Project-Id-Version: Battle for Wesnoth 1.1-svn\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:39+0100\n"
"PO-Revision-Date: 2006-10-07 11:46+0100\n"
"Last-Translator: Guillaume MASSART <massart.guillaume@wanadoo.fr>\n"
"PO-Revision-Date: 2006-12-29 17:08+0100\n"
"Last-Translator: POLENI <mi.poleni@wanadoo.fr>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -19,9 +19,10 @@ msgid ""
"email rusty@rustcorp.com.au!"
msgstr ":)"
# Alors, la traduction doit être 'didacticiel' et non 'didactiel'
#: data/tutorial/scenarios/1_Tutorial.cfg:39
msgid "Wesnoth Tutorial"
msgstr "Didactiel Wesnoth"
msgstr "Didacticiel Wesnoth"
#: data/tutorial/scenarios/2_Tutorial.cfg:257
#: data/tutorial/scenarios/1_Tutorial.cfg:70
@ -91,7 +92,7 @@ msgid ""
"You are standing in the keep, and your mentor Delfador is on the East side "
"of the river."
msgstr ""
"Vous êtes actuellment dans le donjon et votre mentor Delfador est sur la "
"Vous êtes actuellement dans le donjon et votre mentor Delfador est sur la "
"rive est de la rivière."
#: data/tutorial/scenarios/1_Tutorial.cfg:193
@ -207,6 +208,7 @@ msgstr ""
"Mon enfant, vous avez 32 points de vie et une épée. Je suis certain que vous "
"gagnerez."
# 'Konradt' remplacé par 'Konrad'
#: data/tutorial/scenarios/1_Tutorial.cfg:379
msgid ""
"To attack the quintain, you will first select the attacker (Konrad) and then "
@ -215,7 +217,7 @@ msgid ""
msgstr ""
"Pour attaquer la quintaine, sélectionnez d'abord l'attaquant (Konrad) puis "
"la cible (la quintaine). Vous verrez une description des détails de "
"l'attaque. Quand vous cliquerez OK, Konradt attaquera."
"l'attaque. Quand vous cliquerez OK, Konrad attaquera."
#: data/tutorial/scenarios/1_Tutorial.cfg:384
msgid ""
@ -247,6 +249,9 @@ msgstr "Devrais-je battre en retraite ?"
msgid "Good idea!"
msgstr "Bonne idée !"
# Faute de conjugaison: '... s'il venez à mourrir.' est incorrect.
# Il faut utiliser l'imparfait: '...s'il venait à mourrir.'
# De plus, on est à la 3ème personne du singulier et non pas la 1ère du pluriel.
#: data/tutorial/scenarios/1_Tutorial.cfg:448
msgid ""
"Note: the tiny blue shield near Delfador shows that you will lose the game "
@ -254,9 +259,10 @@ msgid ""
"killed."
msgstr ""
"Remarque : le mini bouclier bleu prêt de Delfador indique que vous perdriez "
"la partie s'il venez à mourir. Vous perdriez aussi la partie si votre chef "
"(Konrad) venez à être tué."
"la partie s'il venait à mourir. Vous perdriez aussi la partie si votre chef "
"(Konrad) venait à être tué."
# Idem que précédement.
#: data/tutorial/scenarios/1_Tutorial.cfg:451
msgid ""
"Note: the tiny blue shield near Delfador shows that you will lose the game "
@ -264,8 +270,8 @@ msgid ""
"killed."
msgstr ""
"Remarque : le mini bouclier bleu prêt de Delfador indique que vous perdriez "
"la partie s'il venez à mourir. Vous perdriez aussi la partie si votre chef "
"(Li'sar) venez à être tué."
"la partie s'il venait à mourir. Vous perdriez aussi la partie si votre chef "
"(Li'sar) venait à être tué."
#: data/tutorial/scenarios/1_Tutorial.cfg:460
msgid ""
@ -306,7 +312,6 @@ msgid "Village"
msgstr "Village"
#: data/tutorial/scenarios/1_Tutorial.cfg:490
#, fuzzy
msgid ""
"There is a village on the other side of the river. Visiting villages is a "
"good idea, and standing in one will heal you at the start of your next turn: "
@ -441,12 +446,14 @@ msgstr ""
msgid "I'll tell them to use the one which does most damage!"
msgstr "Je leur dirai d'utiliser celui qui fait le plus de dégâts !"
# Dans les dialogues précédents, on parle de 'type d'attaque', il faut donc garder cela en tête dans la suite.
# De plus, il faut faire attention au temps. Delfador pose une question en demandant l'avis de Konrad.
#: data/tutorial/scenarios/1_Tutorial.cfg:679
msgid ""
"And which would that be? The sword (5-4) or the bow (3-3)? I guess you'll "
"find out..."
msgstr ""
"Et laquelle sera-ce ? L'épée (5-4, signifiant qu'un coup fait 5 points de "
"Et lequel serait-ce ? L'épée (5-4, signifiant qu'un coup fait 5 points de "
"dégâts et qu'il y a 4 chances de toucher) ou l'arc (3-3) ? J'imagine que "
"vous trouverez tout seul..."
@ -462,6 +469,11 @@ msgstr "Terminez votre tour puis attaquez à nouveau."
msgid "Left click on the Quintain to attack it."
msgstr "Pressez le bouton gauche sur la quintaine pour l'attaquer."
# Je propose plutôt cette traduction:
#
# Votre elfe a utilisé une épée (5-4, soit 5 points de dégâts pour 4 attaques), qui est une arme de mêlée ; aussi la quintaine fut-elle capable de se défendre avec son arme de mêlée (3-5). L'attaque à distance aurait été plus sûre.
#
# En effet, a mon avis, la quintaine a réagi (à l'attaque de Konrad); cette action là est donc la plus 'proche' dans le temps d'où l'utilisation du passé simple pour la description de l'action de la quintaine.
#: data/tutorial/scenarios/1_Tutorial.cfg:718
msgid ""
"Your elf used a sword (5-4, or 5 damage, 4 attacks), which is a melee "
@ -473,6 +485,7 @@ msgstr ""
"se défendre avec son arme de mêlée (3-5). L'attaque à distance aurait été "
"plus sécuritaire."
# Commentaire équivalent au précédent mais appliquer à la présente traduction
#: data/tutorial/scenarios/1_Tutorial.cfg:725
msgid ""
"Your elf used a sword (5-4, or 5 damage, 4 attacks), which is a melee "
@ -486,6 +499,7 @@ msgstr ""
"plus sécuritaire.\n"
"Terminez votre tour puis attaquez à nouveau."
# Commentaire équivalent au précédent mais appliquer à la présente traduction
#: data/tutorial/scenarios/1_Tutorial.cfg:735
msgid ""
"Your elf used a sword (5-4, or 5 damage, 4 attacks), which is a melee "
@ -503,6 +517,7 @@ msgstr ""
msgid "Attack with the other Elf"
msgstr "Attaquez avec l'autre elfe."
# Etant donné l'imossibilité de réaction de la quintaine, le passé composé passe bien mieux ici. On ne changera donc rien ici.
#: data/tutorial/scenarios/1_Tutorial.cfg:767
#: data/tutorial/scenarios/1_Tutorial.cfg:783
msgid ""
@ -515,6 +530,7 @@ msgstr ""
"distance, seulement une attaque de mêlée ; par conséquent elle n'a pas été "
"capable de se défendre."
# Etant donné l'imossibilité de réaction de la quintaine, le passé composé passe bien mieux ici. On ne changera donc rien ici.
#: data/tutorial/scenarios/1_Tutorial.cfg:774
msgid ""
"Your elf used a bow, which is a ranged attack (3-3, or 3 damage, 3 "
@ -538,15 +554,17 @@ msgstr ""
msgid "Maybe you should recruit another elf?"
msgstr "Peut-être devriez-vous recruter un autre elfe ?"
# Majuscule en début de phrase. Retour à la ligne oblige.
#: data/tutorial/scenarios/1_Tutorial.cfg:813
msgid ""
"Note:\n"
"You can right click on a unit to see a detailed Unit Description."
msgstr ""
"Remarque :\n"
"vous pouvez pressez le bouton droit sur une unité pour avoir accès à une "
"Vous pouvez pressez le bouton droit sur une unité pour avoir accès à une "
"'Description de l'unité' détaillée."
# Majuscule en début de phrase.
#: data/tutorial/scenarios/1_Tutorial.cfg:828
msgid ""
"Note:\n"
@ -554,10 +572,11 @@ msgid ""
"need. Take special care of units with the highest experience points (XP)."
msgstr ""
"Remarque :\n"
"n'oubliez pas de faire battre en retraite les unités blessées dans les "
"N'oubliez pas de faire battre en retraite les unités blessées dans les "
"villages et d'en recruter davantage si nécessaire. Protégez en particulier "
"vos unités avec le plus de points d'expérience (XP)."
# Majuscule en début de phrase.
#: data/tutorial/scenarios/1_Tutorial.cfg:845
msgid ""
"Note:\n"
@ -565,9 +584,10 @@ msgid ""
"should be able to kill them one at a time."
msgstr ""
"Remarque :\n"
"ces poupées n'attaquent que si vous êtes à une case adjacente. En faisant "
"Ces poupées n'attaquent que si vous êtes à une case adjacente. En faisant "
"attention vous devriez être capable de les tuer l'une après l'autre."
# Majuscule en début de phrase.
#: data/tutorial/scenarios/1_Tutorial.cfg:856
msgid ""
"Note:\n"
@ -575,12 +595,11 @@ msgid ""
"unit costs you one gold per turn."
msgstr ""
"Remarque :\n"
"chacun de vos villages permet d'entretenir une de vos unités. Si vous avez "
"Chacun de vos villages permet d'entretenir une de vos unités. Si vous avez "
"plus d'unités que de villages, chaque unité en trop vous coûtera une pièce "
"d'or par tour."
#: data/tutorial/scenarios/1_Tutorial.cfg:865
#, fuzzy
msgid ""
"Note:\n"
"When a unit gets enough experience (the experience bar is the smaller bar on "
@ -592,7 +611,8 @@ msgstr ""
"quand une unité a acquis suffisamment d'expérience (la barre d'expérience "
"est la plus petite barre à droite près du personnage), elle montera de "
"niveau. Les guerriers elfes ont deux possibilités et vous devrez choisir "
"celle que vous désirez."
"celle que vous désirez. Notez que le coût d'entretien d'une unité de niveau "
"2 est le double que celui de celles de niveau 1."
#: data/tutorial/scenarios/1_Tutorial.cfg:874
msgid ""
@ -703,7 +723,6 @@ msgid "Can one unit survive against all those enemies?"
msgstr "Une unité peut-elle survivre seule contre tous ces ennemis ?"
#: data/tutorial/scenarios/2_Tutorial.cfg:28
#, fuzzy
msgid ""
"With a little help, yes. If your move your Shaman next to the defending "
"unit, it will heal it by 4 hitpoints per turn. Just be careful not to "
@ -751,10 +770,11 @@ msgstr "Ouille ! Je ne serais pas contre aller me soigner dans un village."
msgid "I have $gold gold: enough to recruit!"
msgstr "J'ai $gold d'or : bien assez pour recruter !"
# Pourquoi passer du 'vous' au 'tu'?
#: data/tutorial/scenarios/2_Tutorial.cfg:232
msgid "Yes, keep recruiting more units: I think you might need them!"
msgstr ""
"Oui, continue à recruter plus d'unités : je pense que tu en auras besoin !"
"Oui, continuez à recruter plus d'unités : je pense que vous en aurez besoin !"
#: data/tutorial/scenarios/2_Tutorial.cfg:243
msgid "Wesnoth Tutorial Part II"
@ -916,13 +936,14 @@ msgid "Right click on the tile south of you and recall $recall_name1"
msgstr ""
"Pressez le bouton droit sur la case au sud de vous et rappelez $recall_name1"
# Dans le complément d'objet, il faut faire l'accord du participe avec 'qui' qui représente les 'guerriers elfes' même avec le verbe avoir présent.
#: data/tutorial/scenarios/2_Tutorial.cfg:499
msgid ""
"If any Elvish Fighters from your last battle had experience, we would recall "
"them: as they don't, it's cheaper to recruit new ones. So recruit an Elvish "
"Fighter."
msgstr ""
"Si certains des guerriers elfes qui ont survécu à votre dernière bataille "
"Si certains des guerriers elfes qui ont survécus à votre dernière bataille "
"avaient de l'expérience, nous les rappellerions : comme ce n'est pas le cas, "
"il est plus économique d'en recruter de nouveaux. Recrutez donc un guerrier "
"elfe."
@ -967,6 +988,9 @@ msgstr ""
msgid "So, should I end my turn now?"
msgstr "Je peux terminer mon tour maintenant ?"
# Là, l'accord est bien respecté dans le complément avec le verbe avoir.
#
# La tournure de phrase 'Vous avez besoin' nécessite l'introduction de 'de' : on a besoin de quelque chose. Ce n'est pas le cas d'une tournure de phrase du type 'Il vous faut davantage de revenu' puisqu'on ne dit pas: il nous faut de quelque chose. Evidemment...
#: data/tutorial/scenarios/2_Tutorial.cfg:549
msgid ""
"It's true, none of your recruited units can move, but you still can. Your "
@ -975,7 +999,7 @@ msgid ""
msgstr ""
"Il est vrai qu'aucune des unités que vous avez recrutées ne peut bouger, "
"mais vous, vous le pouvez encore. Vos 5 unités vous coûtent 5 pièces d'or, "
"vous appauvrissant de 3 pièces d'or à chaque tour. Vous avez besoin "
"vous appauvrissant de 3 pièces d'or à chaque tour. Vous avez besoin de "
"davantage de revenu."
#: data/tutorial/scenarios/2_Tutorial.cfg:550
@ -1046,13 +1070,14 @@ msgstr ""
"Non ! J'ai dit de rappeler $recall_name1|, non pas $recall_name2| ! "
"Maintenant essayez encore..."
# Ne pas oublier le $ devant recruit.type|
#: data/tutorial/scenarios/2_Tutorial.cfg:761
msgid ""
"No! I said RECALL $recall_name1 from the last battle, not recruit a new "
"$recruit.type|! Now try again..."
msgstr ""
"Non ! J'ai dit de RAPPELER $recall_name1 qui a servi lors de la bataille "
"précédente, non de recruter un nouveau recruit.type| ! Maintenant essayez "
"précédente, non de recruter un nouveau $recruit.type| ! Maintenant essayez "
"encore..."
#: data/tutorial/scenarios/2_Tutorial.cfg:778
@ -1328,14 +1353,13 @@ msgstr ""
"en direction de ce dernier village près du canal."
#: data/tutorial/scenarios/2_Tutorial.cfg:1107
#, fuzzy
msgid ""
"We need to take that village on the island, otherwise they will take it next "
"turn! Move your wounded unit to take it so it can heal, then kill that Orc!"
msgstr ""
"Nous devons prendre ce village, autrement ils s'en empareront au tour "
"suivant ! Déplacez votre unité blessée dessus, afin qu'elle puisse se guérir "
"puis tuer cet orc !"
"puis tuez cet orc !"
#: data/tutorial/scenarios/2_Tutorial.cfg:1119
msgid ""

View file

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:39+0100\n"
"PO-Revision-Date: 2006-09-03 14:55+0200\n"
"PO-Revision-Date: 2007-01-03 00:11+0100\n"
"Last-Translator: Stefan Bergström (tephlon) <stefan DOT bergstrom AT gmail "
"DOT com>\n"
"Language-Team: Swedish\n"
@ -303,7 +303,6 @@ msgid "Village"
msgstr "By"
#: data/tutorial/scenarios/1_Tutorial.cfg:490
#, fuzzy
msgid ""
"There is a village on the other side of the river. Visiting villages is a "
"good idea, and standing in one will heal you at the start of your next turn: "
@ -566,7 +565,6 @@ msgstr ""
"kostar varje trupp ett guld per drag."
#: data/tutorial/scenarios/1_Tutorial.cfg:865
#, fuzzy
msgid ""
"Note:\n"
"When a unit gets enough experience (the experience bar is the smaller bar on "
@ -574,9 +572,11 @@ msgid ""
"you will get to choose which one you want. Note that level 2 units cost you "
"twice as much to support as level 1 units."
msgstr ""
"Observera: När en trupp får tillräckligt med erfarenhet (erfarenheten visas "
"med den mindre mätaren till höger), så går den upp en nivå. Alvkrigare har "
"två valmöjligheter vid befordran, och du får välja vilken du vill."
"Observera:\n"
"När en trupp får tillräckligt med erfarenhet (erfarenheten visas med den "
"mindre mätaren till höger), så går den upp en nivå. Alvkrigare har två "
"valmöjligheter vid befordran, och du får välja vilken du vill. Nivå 2-"
"trupper kostar dubbelt så mycket i underhåll som nivå 1-trupper."
#: data/tutorial/scenarios/1_Tutorial.cfg:874
msgid ""
@ -682,7 +682,6 @@ msgid "Can one unit survive against all those enemies?"
msgstr "Kan en trupp överleva mot alla dessa fiender?"
#: data/tutorial/scenarios/2_Tutorial.cfg:28
#, fuzzy
msgid ""
"With a little help, yes. If your move your Shaman next to the defending "
"unit, it will heal it by 4 hitpoints per turn. Just be careful not to "
@ -1268,12 +1267,11 @@ msgstr ""
"byn vid kanalen."
#: data/tutorial/scenarios/2_Tutorial.cfg:1107
#, fuzzy
msgid ""
"We need to take that village on the island, otherwise they will take it next "
"turn! Move your wounded unit to take it so it can heal, then kill that Orc!"
msgstr ""
"Vi måste ta den byn, annars tar fienden den nästa drag! Flytta din sårade "
"Vi måste ta byn på ön, annars tar fienden den nästa drag! Flytta din sårade "
"trupp till byn så att den kan läkas, och döda sedan den där orchen!"
#: data/tutorial/scenarios/2_Tutorial.cfg:1119

View file

@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: wescamp-i 18n\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2006-12-27 19:41+0100\n"
"PO-Revision-Date: 2006-09-03 14:59+0200\n"
"PO-Revision-Date: 2007-01-03 00:37+0100\n"
"Last-Translator: Stefan Bergström (tephlon) <stefan DOT bergstrom AT gmail "
"DOT com>\n"
"Language-Team: Swedish\n"
@ -262,7 +262,6 @@ msgstr ""
"trodde att mörkret och ondskan var för evigt fördrivna."
#: data/campaigns/Under_the_Burning_Suns/scenarios/10_Fish.cfg:345
#, fuzzy
msgid ""
"But with their prosperity and power, over the generations the humans grew "
"arrogant. One day a young descendant of the original king decreed that "
@ -910,7 +909,6 @@ msgid "Yes, anything."
msgstr "Ja, vad som helst."
#: data/campaigns/Under_the_Burning_Suns/scenarios/10_Fish.cfg:882
#, fuzzy
msgid ""
"We go into this darkness knowing that perhaps none of us will return alive. "
"But I cannot ask all my people to go with me against their will. This battle "
@ -1070,7 +1068,6 @@ msgstr ""
"hans kropp till marken."
#: data/campaigns/Under_the_Burning_Suns/scenarios/10_Fish.cfg:941
#, fuzzy
msgid ""
"By this point the entire forest was being engulfed by flame, and friend and "
"foe alike fled from the inferno. With the death of their god the Wesmere "
@ -1205,7 +1202,6 @@ msgstr ""
"framför oss, mörk och hotfull."
#: data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg:318
#, fuzzy
msgid ""
"In the end, almost all of my people decided to join in this final battle. I "
"was surprised. They had gone through so much and yet they still had faith in "
@ -1487,7 +1483,6 @@ msgstr ""
"mitt i den mörka djungeln."
#: data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg:1312
#, fuzzy
msgid ""
"In our exploration we found a group of reinforcements, who were sent to help "
"you, compliments of Melusand. You can recruit them into service at your "
@ -1597,7 +1592,6 @@ msgstr "Besegra fiendeledarna, och finn båda nycklarna"
#: data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg:1534
#: data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg:1565
#, fuzzy
msgid ""
"We've reached what looks like the citadel, but it is surrounded by a huge "
"perfectly smooth obsidian wall. I can't find any entrances or exits."
@ -3896,7 +3890,6 @@ msgstr "Vi har stött på ett skorpionnäste!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/2_Harsh_Sands.cfg:1010
#: data/campaigns/Under_the_Burning_Suns/scenarios/2_Harsh_Sands.cfg:1018
#, fuzzy
msgid ""
"The scorpions were devouring some poor person's body. There doesn't seem to "
"be much of him or her left, but wait...what's this? It looks like a tiny "
@ -3960,12 +3953,10 @@ msgid "Ambush! Ogres!"
msgstr "Bakhåll! Resar!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/2_Harsh_Sands.cfg:1415
#, fuzzy
msgid "Ogre ambush!"
msgstr "Resar i bakhåll!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/2_Harsh_Sands.cfg:1423
#, fuzzy
msgid "Fresh meat!"
msgstr "Färskt kött!"
@ -5632,7 +5623,6 @@ msgstr ""
"Greebo skyddar glittret från fula orcher. Och särskilt från stinkande alver."
#: data/campaigns/Under_the_Burning_Suns/scenarios/4_Orcish_Foothills.cfg:1318
#, fuzzy
msgid ""
"Looks like he's been squirreling away his stolen loot in this cave. Not that "
"he had much. Must be hard times."
@ -6448,7 +6438,6 @@ msgid "Troll Flamecaster"
msgstr "Eldkastartroll"
#: data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg:2251
#, fuzzy
msgid "Burn, burn and die!"
msgstr "Brinn, brinn och dö!"
@ -6475,12 +6464,10 @@ msgid "No!!!"
msgstr "Nej!!!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg:2436
#, fuzzy
msgid "Help me!!!"
msgstr "Hjälp!!!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg:2452
#, fuzzy
msgid "More accursed troll magic. Fall back! "
msgstr "Mer fördömd trollmagi. Tillbaka!"
@ -6509,7 +6496,6 @@ msgstr ""
"Nu spränger vi de här odjuren tillbaka där de kom ifrån! Tänt var det här!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg:2545
#, fuzzy
msgid "More Dwarven trickery! Fall back!"
msgstr "Mer dvärgatrick! Tillbaka!"
@ -6628,13 +6614,11 @@ msgstr ""
"just skickad tillbaka till riktiga striden."
#: data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg:3131
#, fuzzy
msgid "The real fighting? I thought that was what we were waist-deep in?"
msgstr ""
"Den riktiga striden? Jag trodde det var den vi stod upp till halsen i nu?"
#: data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg:3136
#, fuzzy
msgid ""
"While you fighting, another clan of dwarves sneak around and flank us. They "
"tricksy like that. We must leave you and run back to defend women and little "
@ -6719,7 +6703,6 @@ msgstr ""
"tillbakaskickad hit från huvudfronten."
#: data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg:3227
#, fuzzy
msgid "The front? I thought this was the front."
msgstr "Fronten? Jag trodde att det här var fronten."
@ -7782,7 +7765,6 @@ msgstr ""
#: data/campaigns/Under_the_Burning_Suns/scenarios/6_2_Hunting_Dwarves.cfg:1330
#: data/campaigns/Under_the_Burning_Suns/scenarios/6_2_Hunting_Dwarves.cfg:1339
#, fuzzy
msgid ""
"They've crossed the chasm! Blow the backup charges! If we can't stop them "
"then maybe the black lake will."
@ -7820,7 +7802,6 @@ msgid "Grrraaawwwkkk!"
msgstr "Grrraaawwwkkk!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/6_2_Hunting_Dwarves.cfg:1534
#, fuzzy
msgid "Good riddance."
msgstr "Så där ja."
@ -7945,12 +7926,11 @@ msgstr ""
"väntar!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/6_2_Hunting_Dwarves.cfg:2108
#, fuzzy
msgid ""
"They've come for my precious. It's mine, yes it is. They shan't have it, no "
"they shan't. We shall kill them all, yes, yes we will."
msgstr ""
"De har kommit för min käraste. Den är min, ja det är den. De skall inte få "
"De har kommit för min älskade. Den är min, ja det är den. De skall inte få "
"den, nej det skall de inte. Vi skall döda dem, ja, ja det skall vi."
#: data/campaigns/Under_the_Burning_Suns/scenarios/6_2_Hunting_Dwarves.cfg:2122
@ -8176,7 +8156,6 @@ msgid "I am Kaleh, leader of the Quenoth Elves."
msgstr "Jag är Kaleh, Quenoth-alvernas ledare."
#: data/campaigns/Under_the_Burning_Suns/scenarios/7_1_DwarfInterlude.cfg:604
#, fuzzy
msgid ""
"I've heard of your recent exploits against the troll menace. They've been "
"quite a thorn in our side for a while now. They used to be just an "
@ -8272,7 +8251,6 @@ msgstr ""
"kan göra."
#: data/campaigns/Under_the_Burning_Suns/scenarios/7_1_DwarfInterlude.cfg:647
#, fuzzy
msgid ""
"You rescued my brother, and though he died fighting, he died a warrior's "
"death instead of a coward's. For that I thank you. I will take his place and "
@ -8691,7 +8669,6 @@ msgstr ""
"skall skydda små alver och visa dem vägen tillbaka till upplyst land."
#: data/campaigns/Under_the_Burning_Suns/scenarios/7_2_TrollInterlude.cfg:646
#, fuzzy
msgid ""
"You rescued Nog's brother, and he died like a warrior in battle, not like a "
"coward in chains. Nog is very grateful. You proved yourselves to be brave "
@ -8987,7 +8964,6 @@ msgstr ""
"vatten. Gör oss sällskap i döden!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg:1282
#, fuzzy
msgid ""
"Foul elves, you have not escaped yet. Our chieftain shall be avenged! We "
"have dammed the river and soon all shall drown in its dark waters. Come join "
@ -9284,7 +9260,6 @@ msgid "The passage just halts at a dead end."
msgstr "Passagen slutar tvärt."
#: data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg:2110
#, fuzzy
msgid ""
"You didn't expect the other end to be left wide open did you? There should "
"be another secret door hidden right in front of you."
@ -9379,7 +9354,6 @@ msgid "The rune is gone. I guess the magic only had limited uses."
msgstr "Runorna är borta. Jag antar att magin var begränsad."
#: data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg:2489
#, fuzzy
msgid "The user feels much better."
msgstr "Truppen mår mycket bättre."
@ -9493,7 +9467,6 @@ msgstr ""
"lektioner i stridsteknik."
#: data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg:2815
#, fuzzy
msgid ""
"Come on! I ain't going anywhere for the rest of the day, and unless you can "
"fight better than that, neither are you. Now get your sorry behinds up off "
@ -9671,7 +9644,6 @@ msgid "Kromph need command. Command me!"
msgstr "Kromph behöver ledning. Led mig!"
#: data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg:3336
#, fuzzy
msgid "Follow us. Attack our enemies."
msgstr "Följ oss. Anfall våra fiender."
@ -9720,7 +9692,6 @@ msgid "I don't like the smell of this place."
msgstr "Jag gillar inte lukten här."
#: data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg:3404
#, fuzzy
msgid "I feel some sort of presence...ugh...it makes my skin crawl."
msgstr "Jag känner någon slags närvaro... Usch... Det kryper i skinnet på mig."
@ -11343,7 +11314,6 @@ msgid "Alastra"
msgstr "Alastra"
#: data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg:345
#, fuzzy
msgid ""
"Chapter 9: Nym and Esanoo led us north, across the sands and through the "
"dunes, towards the human encampment where the merfolk were being held. I "
@ -11702,7 +11672,6 @@ msgstr ""
"Och er räddning var nära."
#: data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg:1132
#, fuzzy
msgid ""
"But there was one who grew corrupted by his power and rejected my divine "
"plan. He sought to usurp my authority. He had no faith and believed that he "
@ -11998,7 +11967,6 @@ msgstr ""
"till oss. Även den minsta fisk kan ändra vattnets väg."
#: data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg:1492
#, fuzzy
msgid ""
"Curse them! The elves have freed the merfolk. We will be have our vengeance. "
"Keep fighting, and execute plan C!"
@ -12119,7 +12087,6 @@ msgstr ""
#: data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg:1909
#: data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg:2039
#: data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg:2164
#, fuzzy
msgid "How could he recognize your face? We've never seen him before."
msgstr ""
"Hur kunde han känna igen ditt ansikte? Vi har aldrig träffat honom förut."
@ -12529,7 +12496,6 @@ msgid "Angry Crab"
msgstr "Arg krabba"
#: data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg:3359
#, fuzzy
msgid "Aaaargh! Fresh meat!"
msgstr "Aaaargh! Färskt kött!"
@ -13199,7 +13165,6 @@ msgid "Cave Spider"
msgstr "Grottspindel"
#: data/campaigns/Under_the_Burning_Suns/units/Cave_Spider2.cfg:18
#, fuzzy
msgid ""
"Cave Spiders roam deep under the earth, devouring many victims. They can "
"bite at close range, thereby poisoning their enemies, and also can attack "
@ -13365,7 +13330,6 @@ msgid "Crab Man"
msgstr "Krabbman"
#: data/campaigns/Under_the_Burning_Suns/units/Crab_Man.cfg:17
#, fuzzy
msgid ""
"The Crab Men are part crab, part humanoid, and are certainly one of the most "
"twisted monsters ever recorded by the sages of Wesnoth. Probably the "
@ -13373,7 +13337,7 @@ msgid ""
"and prefer live around coastal waters, preying on both humans and animals."
msgstr ""
"En krabbman är en kombination av krabba och humanoid, och är definitivt ett "
"av de mer förvridna monster som någonsin hört talas om av de lärda i "
"av de mest förvridna monster som någonsin hört talas om av de lärda i "
"Wesnoth. De är troligtvis skapade av någon galen magiker, och dessa monster "
"har spritt sig över landet och föredra att bo vid kusten, där de söker sitt "
"byte bland både människor och djur."
@ -13427,7 +13391,6 @@ msgstr "Skuggmördare"
#: data/campaigns/Under_the_Burning_Suns/units/Dark_Assassin1.cfg:19
#: data/campaigns/Under_the_Burning_Suns/units/Dark_Assassin2.cfg:19
#: data/campaigns/Under_the_Burning_Suns/units/Dark_Assassin3.cfg:22
#, fuzzy
msgid ""
"The Dark Assassin appears and disappears at a moment's notice. No one knows "
"where he came from or why he acts the way he does, but the trail of death he "
@ -13557,7 +13520,6 @@ msgid "Desert Avenger"
msgstr "Ökenhämnare"
#: data/campaigns/Under_the_Burning_Suns/units/Desert_Avenger.cfg:38
#, fuzzy
msgid ""
"Desert Avengers are extremely skillful and extremely quick, powerful in all "
"forms of combat. Like their kin, they prefer the sword to the bow and are "
@ -13868,7 +13830,6 @@ msgid "Desert Ranger"
msgstr "Ökenvandrare"
#: data/campaigns/Under_the_Burning_Suns/units/Desert_Ranger.cfg:37
#, fuzzy
msgid ""
"Desert Rangers are quick and powerful. Skilled in both short and long-range "
"combat, Rangers are truly all-round fighters. Like their kin, they prefer "
@ -14149,7 +14110,6 @@ msgid "Dwarvish Pathfinder"
msgstr "Dvärgstigfinnare"
#: data/campaigns/Under_the_Burning_Suns/units/Dwarvish_Pathfinder.cfg:21
#, fuzzy
msgid ""
"Dwarvish Pathfinders are faster, stronger and even deadlier with their axes "
"than normal dwarvish scouts. They often race ahead of the main force, "
@ -14467,7 +14427,6 @@ msgid "fire"
msgstr "eld"
#: data/campaigns/Under_the_Burning_Suns/units/Kaleh_Fighter.cfg:30
#, fuzzy
msgid ""
"Desert Fighters make up the bulk of the Elven military in Quenoth. They are "
"trained in both sword and bow, though like most of their kin, they prefer "
@ -14870,22 +14829,3 @@ msgstr "Det långa mörkret (3)"
#: data/campaigns/Under_the_Burning_Suns/utils/time.cfg:184
msgid "The Long Dark (4)"
msgstr "Det långa mörkret (4)"
#~ msgid ""
#~ "The scorpions were devouring some poor person's body. There doesn't seem "
#~ "to be much of him or her left, but wait...what's this? It looks like a "
#~ "tiny gold ring. And there are elvish runes on the inside, I can barely "
#~ "make them out. This seems to be a ring of travel, those who wear it will "
#~ "not suffer from thirst or hunger, nor cold nor heat. I've heard tales of "
#~ "such magical items, we can certainly use it now."
#~ msgstr ""
#~ "Skorpionerna åt på någon stackares lik. Det verkar inte som att det finns "
#~ "mycket kvar av honom eller henne... Men vänta... Vad är det här? Det ser "
#~ "ut som en liten guldring. Det finns alvrunor på insidan, men jag kan "
#~ "knappt läsa dem. Det verkar vara en färdring... Den som bär den kommer "
#~ "inte att lida av hunger eller törst, eller av hetta eller kyla. Jag har "
#~ "hört talas om sådana magiska föremål. Den kan verkligen komma till nytta "
#~ "nu."
#~ msgid "24"
#~ msgstr "24"

View file

@ -9,8 +9,8 @@ msgstr ""
"Project-Id-Version: Battle for Wesnoth 1.2\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2007-01-01 23:27+0100\n"
"PO-Revision-Date: 2006-12-30 17:05+0100\n"
"Last-Translator: Christoph Berg <Christoph.Berg@kpm-sport.de>\n"
"PO-Revision-Date: 2007-01-03 21:17+0100\n"
"Last-Translator: Nils Kneuper <crazy-ivanovic AT gmx D O T net>\n"
"Language-Team: irc://irc.freenode.net/#wesnoth-de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -2052,41 +2052,39 @@ msgstr "Untote"
#: data/english.cfg:21
msgid "race^Dwarves"
msgstr ""
msgstr "Zwerge"
#: data/english.cfg:22
msgid "race^Goblins"
msgstr ""
msgstr "Kobolde"
#: data/english.cfg:23
#, fuzzy
msgid "race^Lizards"
msgstr "Untote"
msgstr "Saurianer"
#: data/english.cfg:24
msgid "race^Mechanical"
msgstr ""
msgstr "Kriegsgerät"
#: data/english.cfg:25
msgid "race^Mermen"
msgstr ""
msgstr "Meervolk"
#: data/english.cfg:26
msgid "race^Monsters"
msgstr ""
msgstr "Monster"
#: data/english.cfg:27
msgid "race^Nagas"
msgstr ""
msgstr "Nagas"
#: data/english.cfg:28
msgid "race^Ogres"
msgstr ""
msgstr "Oger"
#: data/english.cfg:29
#, fuzzy
msgid "race^Troll"
msgstr "Troll"
msgstr "Trolle"
#: data/english.cfg:32
msgid "$name's Bridge,$name's Crossing"
@ -2153,21 +2151,19 @@ msgstr "Fernkampf"
#: data/english.cfg:51
msgid "Wesnoth unit list"
msgstr ""
msgstr "Liste der Einheiten von Wesnoth"
#: data/english.cfg:52
msgid "Based on version"
msgstr ""
msgstr "Basierend auf Version"
#: data/english.cfg:53
#, fuzzy
msgid "Race"
msgstr "Streitkolben"
msgstr "Rasse"
#: data/english.cfg:54
#, fuzzy
msgid "Advance from"
msgstr "Nächste Stufe: "
msgstr "Vorherige Stufe"
#: data/factions/alliance_of_darkness.cfg:4
msgid "Alliance of Darkness"
@ -6330,7 +6326,7 @@ msgstr "kräftig"
#: data/traits.cfg:28
msgid "female^strong"
msgstr "stark"
msgstr "kräftig"
#: data/traits.cfg:44
msgid "dextrous"

View file

@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2007-01-01 23:27+0100\n"
"PO-Revision-Date: 2006-12-06 23:06+0100\n"
"PO-Revision-Date: 2007-01-03 19:24+0100\n"
"Last-Translator: Guillaume MASSART <massart.guillaume@wanadoo.fr>\n"
"Language-Team: <wesnoth@ml.free.fr>\n"
"MIME-Version: 1.0\n"
@ -1969,36 +1969,40 @@ msgstr "Mort-vivant"
#: data/english.cfg:21
msgid "race^Dwarves"
msgstr ""
msgstr "Nains"
#: data/english.cfg:22
msgid "race^Goblins"
msgstr ""
msgstr "Gobelins"
#: data/english.cfg:23
#, fuzzy
msgid "race^Lizards"
msgstr "Mort-vivant"
msgstr "Lézards"
#: data/english.cfg:24
msgid "race^Mechanical"
msgstr ""
msgstr "Mécaniques"
#: data/english.cfg:25
#, fuzzy
msgid "race^Mermen"
msgstr ""
msgstr "Ondins"
#: data/english.cfg:26
#, fuzzy
msgid "race^Monsters"
msgstr ""
msgstr "Monstres"
#: data/english.cfg:27
#, fuzzy
msgid "race^Nagas"
msgstr ""
msgstr "Nagas"
#: data/english.cfg:28
#, fuzzy
msgid "race^Ogres"
msgstr ""
msgstr "Ogres"
#: data/english.cfg:29
#, fuzzy
@ -2096,22 +2100,24 @@ msgid "ranged"
msgstr "à distance"
#: data/english.cfg:51
#, fuzzy
msgid "Wesnoth unit list"
msgstr ""
msgstr "Liste des unités Wesnoth"
#: data/english.cfg:52
#, fuzzy
msgid "Based on version"
msgstr ""
msgstr "Basé sur la version"
#: data/english.cfg:53
#, fuzzy
msgid "Race"
msgstr "masse"
msgstr "Race"
#: data/english.cfg:54
#, fuzzy
msgid "Advance from"
msgstr "Évolue en : "
msgstr "Évolue à partir de"
#: data/factions/alliance_of_darkness.cfg:4
msgid "Alliance of Darkness"
@ -3152,6 +3158,7 @@ msgid "Wrap Up"
msgstr "Conclusion"
#: data/help.cfg:247
#, fuzzy
msgid ""
"This concludes the fundamentals of Wesnoth. You might want to read up on "
"Basic Strategy, or familiarise yourself with <ref>dst=traits text=Traits</"
@ -3385,6 +3392,7 @@ msgid ""
msgstr "Les unités mortes-vivantes sont immunisées contre le poison."
#: data/help.cfg:323
#, fuzzy
msgid ""
"\n"
"\n"
@ -4495,6 +4503,7 @@ msgstr ""
"(inscrit par Turin)"
#: data/scenarios/multiplayer/2p_Caves_of_the_Basilisk.cfg:130
#, fuzzy
msgid ""
"A brave hero of Wesnoth's Golden Age, this great rider and commander of men "
"came to this evil place while on a raid against the orcs. Caught unaware by "
@ -4548,6 +4557,7 @@ msgstr ""
"(inscrit par Elvish Pillager)"
#: data/scenarios/multiplayer/2p_Caves_of_the_Basilisk.cfg:150
#, fuzzy
msgid ""
"This brave warrior, known as Rilhon amoung the Naga, heard tell of a "
"fabulous treasure that had been lost in these watery caves- a spear whose "
@ -6333,6 +6343,7 @@ msgid "Pirate Galleon"
msgstr "Galion pirate"
#: data/units/Boat_Pirate_Galleon.cfg:17
#, fuzzy
msgid ""
"Pirate galleons are to transport ships what wolves are to sheep. Ships full "
"of goods shouldn't be lonely, far away from any land, better to help them to "
@ -6340,7 +6351,7 @@ msgid ""
msgstr ""
"Les galions pirates sont aux navires de transport ce que les loups sont aux "
"brebis. Les navires chargés de marchandises ne devraient pas être seuls si "
"loin de la terre... Il vaut mieux les aider à ne pas couler par excès de "
"loin des terres... Il vaut mieux les aider à ne pas couler par excès de "
"chargement."
#: data/units/Boat_Pirate_Galleon.cfg:19
@ -12264,8 +12275,9 @@ msgid "The replay could not be saved"
msgstr "Le jeu ne peut pas être sauvegardé"
#: src/playcampaign.cpp:342
#, fuzzy
msgid "Downloading next level..."
msgstr "Téléchargement du prochain niveau..."
msgstr "Téléchargement du prochain scénario..."
#: src/playcampaign.cpp:422
msgid "Do you want to save your game? (Also erases Auto-Save files)"
@ -12669,10 +12681,6 @@ msgstr "Vous pouvez voir le résultat à l'adresse : "
msgid "Help us make Wesnoth better for you!"
msgstr "Aidez-nous à améliorer Wesnoth pour vous !"
#, fuzzy
#~ msgid "Yes"
#~ msgstr "Oui !"
#~ msgid ""
#~ "You can come if you wish, but the leader is only interested in speaking "
#~ "to Baldras."
@ -12680,10 +12688,6 @@ msgstr "Aidez-nous à améliorer Wesnoth pour vous !"
#~ "Vous pouvez venir si vous le voulez, mais le chef ne souhaite parler qu'à "
#~ "Baldras."
#, fuzzy
#~ msgid "Potion of bleach"
#~ msgstr "Potion de dégénérescence"
#~ msgid "Sulla's statue"
#~ msgstr "La statue de Sulla"
@ -12861,6 +12865,9 @@ msgstr "Aidez-nous à améliorer Wesnoth pour vous !"
#~ msgid "Computer vs Computer"
#~ msgstr "Ordinateur contre ordinateur"
#~ msgid "Receiving data..."
#~ msgstr "Réception des données du jeu..."
#~ msgid "+Core Developers"
#~ msgstr "+Noyau dur"

View file

@ -7,13 +7,13 @@
#
# Automatically generated, 2004.
# Alessio D'Ascanio <otaku@fastwebnet.it>, 2004, 2005.
# Luciano Montanaro <mikelima@cirulla.net>, 2006.
# Luciano Montanaro <mikelima@cirulla.net>, 2006, 2007.
msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
"POT-Creation-Date: 2007-01-01 23:27+0100\n"
"PO-Revision-Date: 2006-12-28 01:25+0100\n"
"PO-Revision-Date: 2007-01-03 10:57+0100\n"
"Last-Translator: Luciano Montanaro <mikelima@cirulla.net>\n"
"Language-Team: Italian <kde-i18n-it@kde.org>\n"
"MIME-Version: 1.0\n"
@ -1976,39 +1976,37 @@ msgstr "Non-morto"
#: data/english.cfg:21
msgid "race^Dwarves"
msgstr ""
msgstr "Nani"
#: data/english.cfg:22
msgid "race^Goblins"
msgstr ""
msgstr "Goblin"
#: data/english.cfg:23
#, fuzzy
msgid "race^Lizards"
msgstr "Non-morto"
msgstr "Sauri"
#: data/english.cfg:24
msgid "race^Mechanical"
msgstr ""
msgstr "Meccanici"
#: data/english.cfg:25
msgid "race^Mermen"
msgstr ""
msgstr "Nereidi"
#: data/english.cfg:26
msgid "race^Monsters"
msgstr ""
msgstr "Mostri"
#: data/english.cfg:27
msgid "race^Nagas"
msgstr ""
msgstr "Naga"
#: data/english.cfg:28
msgid "race^Ogres"
msgstr ""
msgstr "Ogri"
#: data/english.cfg:29
#, fuzzy
msgid "race^Troll"
msgstr "Troll"
@ -2078,21 +2076,19 @@ msgstr "a distanza"
#: data/english.cfg:51
msgid "Wesnoth unit list"
msgstr ""
msgstr "Elenco delle unità di Wesnoth"
#: data/english.cfg:52
msgid "Based on version"
msgstr ""
msgstr "Basato sulla versione"
#: data/english.cfg:53
#, fuzzy
msgid "Race"
msgstr "mazza"
msgstr "Razza"
#: data/english.cfg:54
#, fuzzy
msgid "Advance from"
msgstr "Avanza come: "
msgstr "Avanza da"
#: data/factions/alliance_of_darkness.cfg:4
msgid "Alliance of Darkness"
@ -12230,8 +12226,9 @@ msgid "The replay could not be saved"
msgstr "La partita non può essere salvata"
#: src/playcampaign.cpp:342
#, fuzzy
msgid "Downloading next level..."
msgstr "Scarica il livello successivo..."
msgstr "Scaricamento successivo scenario..."
#: src/playcampaign.cpp:422
msgid "Do you want to save your game? (Also erases Auto-Save files)"
@ -12630,10 +12627,6 @@ msgstr "Puoi vedere i risultati a:"
msgid "Help us make Wesnoth better for you!"
msgstr "Aiutaci a migliorare Wesnoth!"
#, fuzzy
#~ msgid "Yes"
#~ msgstr "Sì!"
#~ msgid ""
#~ "You can come if you wish, but the leader is only interested in speaking "
#~ "to Baldras."
@ -12641,10 +12634,6 @@ msgstr "Aiutaci a migliorare Wesnoth!"
#~ "Puoi venire se vuoi, ma il capo è solamente interessato a parlare con "
#~ "Baldras."
#, fuzzy
#~ msgid "Potion of bleach"
#~ msgstr "Pozione del deperimento"
#~ msgid "Sulla's statue"
#~ msgstr "Statua di Sulla"
@ -12815,3 +12804,6 @@ msgstr "Aiutaci a migliorare Wesnoth!"
#~ msgid "Computer vs Computer"
#~ msgstr "Computer contro Computer"
#~ msgid "Receiving data..."
#~ msgstr "Ricezione dati..."

File diff suppressed because it is too large Load diff

View file

@ -411,7 +411,7 @@ private:
surface get_minimap(int w, int h);
CVideo& screen_;
mutable CKey keys_;
CKey keys_;
int xpos_, ypos_, zoom_;
const gamemap& map_;

View file

@ -20,7 +20,7 @@ CKey::CKey() : is_enabled(true)
key_list = SDL_GetKeyState( &num_keys );
}
int CKey::operator[]( int code )
int CKey::operator[]( int code ) const
{
return (code == SDLK_ESCAPE || is_enabled) && int(key_list[code]);
}

View file

@ -25,7 +25,7 @@ class CKey {
public:
CKey();
int operator[](int);
int operator[](int) const;
void SetEnabled(bool enable);
private:
Uint8 *key_list;

View file

@ -111,21 +111,21 @@ const map_labels::label_map& map_labels::labels()
{
if (changed_)
{
label_cashe_.clear();
label_cache_.clear();
team_label_map::iterator i = labels_.find(team_name());
if (i != labels_.end())
{
label_cashe_.insert(i->second.begin(),i->second.end());
label_cache_.insert(i->second.begin(),i->second.end());
}
i = labels_.find(std::string());
i = labels_.find("");
if (i != labels_.end())
{
label_cashe_.insert(i->second.begin(),i->second.end());
label_cache_.insert(i->second.begin(),i->second.end());
}
changed_ = false;
}
return label_cashe_;
return label_cache_;
}
const display& map_labels::disp() const
@ -251,7 +251,7 @@ void map_labels::clear(const std::string& team_name, replay* replay)
clear_map(i->second);
}
i = labels_.find(std::string());
i = labels_.find("");
if (i != labels_.end())
{
clear_map(i->second);

View file

@ -34,7 +34,7 @@ class map_labels
{
public:
typedef std::map<gamemap::location,const terrain_label*> label_map;
typedef std::map<std::string,const label_map> team_label_map;
typedef std::map<std::string,label_map> team_label_map;
map_labels(const display& disp, const gamemap& map, const team*);
map_labels(const display& disp, const config& cfg, const gamemap& map, const team*);
@ -49,7 +49,7 @@ public:
const terrain_label* set_label(const gamemap::location& loc,
const std::string& text,
replay* = 0,
const std::string team = std::string(),
const std::string team = "",
const SDL_Color colour = font::NORMAL_COLOUR);
void add_label(const gamemap::location&,
@ -84,7 +84,7 @@ private:
const gamemap& map_;
team_label_map labels_;
label_map label_cashe_;
label_map label_cache_;
bool changed_;
};

View file

@ -93,7 +93,7 @@ private:
paths::route current_route_;
paths current_paths_;
bool enemy_paths_;
mutable unit_map visible_units_;
unit_map visible_units_;
int path_turns_;
unsigned int team_num_;

View file

@ -79,7 +79,7 @@ private:
std::pair<size_t, size_t> visible_range_;
std::vector<game_item> games_;
std::vector<size_t> redraw_items_;
mutable std::vector<int> widths_;
std::vector<int> widths_;
bool double_clicked_;
bool ignore_next_doubleclick_;
bool last_was_doubleclick_;

View file

@ -337,11 +337,6 @@ void unit::write_checksum(std::string& str) const
str = unit_config.hash();
}
std::string unit::generate_description() const
{
return race_->generate_name(cfg_["gender"] == "female" ? unit_race::FEMALE : unit_race::MALE);
}
void unit::generate_traits()
{
if(!traits_description_.empty())
@ -466,16 +461,7 @@ void unit::advance_to(const unit_type* t)
refreshing_ = false;
hidden_ = false;
}
const std::vector<std::string> unit::advances_to() const
{
return advances_to_;
}
// the current type id
const std::string& unit::id() const
{
return id_;
}
const unit_type* unit::type() const
{
wassert(gamedata_ != NULL);
@ -485,37 +471,7 @@ const unit_type* unit::type() const
}
return NULL;
}
// the actual name of the unit
const std::string& unit::name() const
{
if(description_.empty() == false)
return description_;
else
return language_name();
}
void unit::rename(const std::string& name)
{
if (!unrenamable_) {
custom_unit_description_ = name;
}
}
// the unit type name
const std::string& unit::description() const
{
if(custom_unit_description_ != "") {
return custom_unit_description_;
} else {
return description_;
}
}
const std::string& unit::underlying_description() const
{
return underlying_description_;
}
const t_string& unit::language_name() const
{
return language_name_;
}
// the unit's profile
const std::string& unit::profile() const
{
@ -524,48 +480,7 @@ const std::string& unit::profile() const
}
return absolute_image();
}
//information about the unit -- a detailed description of it
const std::string& unit::unit_description() const
{
return cfg_["unit_description"];
}
const std::string& unit::undead_variation() const
{
return undead_variation_;
}
int unit::hitpoints() const
{
return hit_points_;
}
int unit::max_hitpoints() const
{
return max_hit_points_;
}
int unit::experience() const
{
return experience_;
}
int unit::max_experience() const
{
return maximum<int>(1,(max_experience_*unit_type::experience_accelerator::get_acceleration() + 50) / 100);
}
int unit::level() const
{
return level_;
}
// adds 'xp' points to the units experience; returns true if advancement should occur
bool unit::get_experience(int xp)
{
experience_ += xp;
return advances();
}
bool unit::advances() const
{
return experience_ >= max_experience() && can_advance();
}
SDL_Colour unit::hp_color() const
{
double unit_energy = 0.0;
@ -638,23 +553,7 @@ SDL_Colour unit::xp_color() const
}
return(colour);
}
bool unit::unrenamable() const /** < Set to true for some scenario-specific units which should not be renamed */
{
return unrenamable_;
}
unsigned int unit::side() const
{
return side_;
}
Uint32 unit::team_rgb() const
{
return(team::get_side_rgb(side()));
}
const std::vector<Uint32>& unit::flag_rgb() const
{
return game_config::tc_info(flag_rgb_);
}
std::vector<Uint32> unit::team_rgb_range() const
{
std::vector<Uint32> temp;
@ -663,78 +562,18 @@ std::vector<Uint32> unit::team_rgb_range() const
temp.push_back(team::get_side_rgb_min(side()));
return(temp);
}
const std::string& unit::team_color() const
{
return flag_rgb_;
}
unit_race::GENDER unit::gender() const
{
return gender_;
}
void unit::set_side(unsigned int new_side)
{
side_ = new_side;
}
fixed_t unit::alpha() const
{
return alpha_;
const std::vector<Uint32>& unit::flag_rgb() const {
return game_config::tc_info(flag_rgb_);
}
bool unit::can_recruit() const
{
return utils::string_bool(cfg_["canrecruit"]);
}
bool unit::incapacitated() const
{
return utils::string_bool(get_state("stoned"),false);
}
const std::vector<std::string>& unit::recruits() const
{
return recruits_;
}
int unit::total_movement() const
{
return max_movement_;
}
int unit::movement_left() const
{
return movement_;
}
void unit::set_hold_position(bool value)
{
hold_position_ = value;
}
bool unit::hold_position() const
{
return hold_position_;
}
void unit::set_user_end_turn(bool value)
{
end_turn_ = value;
}
bool unit::user_end_turn() const
{
return end_turn_;
}
int unit::attacks_left() const
{
return attacks_left_;
}
void unit::set_movement(int moves)
{
hold_position_ = false;
end_turn_ = false;
movement_ = maximum<int>(0,minimum<int>(moves,max_movement_));
}
void unit::set_attacks(int left)
{
attacks_left_ = maximum<int>(0,minimum<int>(left,max_attacks_));
}
void unit::unit_hold_position()
{
hold_position_ = true;
end_turn_ = true;
}
void unit::end_unit_turn()
{
// wassert("not done" == "done");
@ -801,11 +640,6 @@ void unit::remove_temporary_modifications()
}
}
bool unit::take_hit(int damage)
{
hit_points_ -= damage;
return hit_points_ <= 0;
}
void unit::heal(int amount)
{
int max_hp = max_hitpoints();
@ -819,18 +653,6 @@ void unit::heal(int amount)
hit_points_ = 1;
}
}
void unit::heal_all()
{
hit_points_ = max_hitpoints();
}
bool unit::resting() const
{
return resting_;
}
void unit::set_resting(bool rest)
{
resting_ = rest;
}
const std::string unit::get_state(const std::string& state) const
{
@ -852,21 +674,6 @@ void unit::set_state(const std::string& state, const std::string& value)
}
}
bool unit::has_moved() const
{
return movement_left() != total_movement();
}
bool unit::has_goto() const
{
return get_goto().valid();
}
int unit::emits_zoc() const
{
if(incapacitated()) {
return false;
}
return emit_zoc_;
}
bool unit::has_ability_by_id(const std::string& ability) const
{
@ -1034,18 +841,8 @@ bool unit::matches_filter(const config& orig_cfg,const gamemap::location& loc,bo
}
return true;
}
void unit::add_overlay(const std::string& overlay)
{
overlays_.push_back(overlay);
}
void unit::remove_overlay(const std::string& overlay)
{
overlays_.erase(std::remove(overlays_.begin(),overlays_.end(),overlay),overlays_.end());
}
const std::vector<std::string>& unit::overlays() const
{
return overlays_;
}
/**
* Initializes this unit from a cfg object.
*
@ -1605,23 +1402,6 @@ void unit::write(config& cfg) const
}
void unit::assign_role(const std::string& role)
{
role_ = role;
}
const std::vector<attack_type>& unit::attacks() const
{
return attacks_;
}
std::vector<attack_type>& unit::attacks()
{
return attacks_;
}
int unit::damage_from(const attack_type& attack,bool attacker,const gamemap::location& loc) const
{
return resistance_against(attack,attacker,loc);
}
const surface unit::still_image() const
{
@ -1885,6 +1665,11 @@ void unit::restart_animation(const display& disp,int start_time) {
frame_begin_time = start_time -1;
}
void unit::set_facing(gamemap::location::DIRECTION dir) {
wassert(dir != gamemap::location::NDIRECTIONS);
facing_ = dir;
}
void unit::redraw_unit(display& disp,gamemap::location hex)
{
const gamemap & map = disp.get_map();
@ -2099,16 +1884,6 @@ void unit::redraw_unit(display& disp,gamemap::location hex)
anim_->update_last_draw_time();
}
gamemap::location::DIRECTION unit::facing() const
{
return facing_;
}
void unit::set_facing(gamemap::location::DIRECTION dir)
{
wassert(dir != gamemap::location::NDIRECTIONS);
facing_ = dir;
}
std::set<gamemap::location> unit::overlaps(const gamemap::location &loc) const
{
std::set<gamemap::location> over;
@ -2158,29 +1933,6 @@ std::set<gamemap::location> unit::overlaps(const gamemap::location &loc) const
return over;
}
const t_string& unit::traits_description() const
{
return traits_description_;
}
int unit::value() const
{
return unit_value_;
}
int unit::cost() const
{
return unit_value_;
}
const gamemap::location& unit::get_goto() const
{
return goto_;
}
void unit::set_goto(const gamemap::location& new_goto)
{
goto_ = new_goto;
}
int unit::upkeep() const
{
if(cfg_["upkeep"] == "full") {
@ -2192,11 +1944,6 @@ int unit::upkeep() const
return lexical_cast_default<int>(cfg_["upkeep"]);
}
bool unit::is_flying() const
{
return flying_;
}
int unit::movement_cost_internal(t_translation::t_letter terrain, int recurse_count) const
{
const int impassable = 10000000;
@ -2410,11 +2157,6 @@ std::map<terrain_type::TERRAIN,int> unit::movement_type() const
}
#endif
bool unit::can_advance() const
{
return advances_to_.empty()==false || get_modification_advances().empty() == false;
}
std::map<std::string,std::string> unit::advancement_icons() const
{
std::map<std::string,std::string> temp;
@ -2501,11 +2243,6 @@ void unit::backup_state()
}
}
const config::child_list& unit::modification_advancements() const
{
return cfg_.get_children("advancement");
}
config::child_list unit::get_modification_advances() const
{
config::child_list res;
@ -2802,37 +2539,7 @@ const t_string& unit::modification_description(const std::string& type) const
}
}
bool unit::move_interrupted() const
{
return movement_left() > 0 && interrupted_move_.x >= 0 && interrupted_move_.y >= 0;
}
const gamemap::location& unit::get_interrupted_move() const
{
return interrupted_move_;
}
void unit::set_interrupted_move(const gamemap::location& interrupted_move)
{
interrupted_move_ = interrupted_move;
}
unit::STATE unit::state() const
{
if(state_ == STATE_IDLING) return STATE_STANDING;
return state_;
}
const std::string& unit::absolute_image() const
{
return cfg_["image"];
}
const std::string& unit::image_ellipse() const
{
return cfg_["ellipse"];
}
const std::string& unit::image_halo() const
{
return cfg_["halo"];
}
const std::string& unit::image_profile() const
{
const std::string& val = cfg_["profile"];
@ -2867,31 +2574,7 @@ const std::string& unit::image_healing() const
return val;
}
}
const std::string& unit::image_halo_healing() const
{
return cfg_["image_halo_healing"];
}
const std::string& unit::get_hit_sound() const
{
return cfg_["get_hit_sound"];
}
const std::string& unit::die_sound() const
{
return cfg_["die_sound"];
}
const std::string& unit::usage() const
{
return cfg_["usage"];
}
unit_type::ALIGNMENT unit::alignment() const
{
return alignment_;
}
const std::string& unit::race() const
{
return race_->name();
}
const defensive_animation& unit::defend_animation(const display& disp, const gamemap::location& loc,
fighting_animation::hit_type hits, const attack_type* attack,const attack_type* secondary_attack, int swing_num,int damage) const

View file

@ -65,79 +65,80 @@ class unit
// Advances this unit to another type
void advance_to(const unit_type* t);
const std::vector<std::string> advances_to() const;
const std::vector<std::string> advances_to() const { return advances_to_; }
// the current type id
const std::string& id() const;
const std::string& id() const { return id_; }
const unit_type* type() const;
// the actual name of the unit
const std::string& name() const;
void rename(const std::string& name);
const std::string& name() const { if (description_.empty()) return language_name(); else return description_; }
void rename(const std::string& name) { if (!unrenamable_) custom_unit_description_ = name; }
// the unit type name
const std::string& description() const;
const std::string& underlying_description() const;
const t_string& language_name() const;
const std::string& undead_variation() const;
const std::string& description() const { return (custom_unit_description_ != "") ? custom_unit_description_ : description_; }
const std::string& underlying_description() const { return underlying_description_; }
const t_string& language_name() const { return language_name_; }
const std::string& undead_variation() const { return undead_variation_; }
// the unit's profile
const std::string& profile() const;
//information about the unit -- a detailed description of it
const std::string& unit_description() const;
const std::string& unit_description() const { return cfg_["unit_description"]; }
int hitpoints() const;
int max_hitpoints() const;
int experience() const;
int max_experience() const;
int level() const;
int hitpoints() const { return hit_points_; }
int max_hitpoints() const { return max_hit_points_; }
int experience() const { return experience_; }
int max_experience() const { return maximum<int>(1,(max_experience_*unit_type::experience_accelerator::get_acceleration() + 50) / 100); }
int level() const { return level_; }
// adds 'xp' points to the units experience; returns true if advancement should occur
bool get_experience(int xp);
bool get_experience(int xp) { experience_ += xp; return advances(); }
SDL_Colour hp_color() const;
SDL_Colour xp_color() const;
bool unrenamable() const; /** < Set to true for some scenario-specific units which should not be renamed */
unsigned int side() const;
Uint32 team_rgb() const;
/** < Set to true for some scenario-specific units which should not be renamed */
bool unrenamable() const { return unrenamable_; }
unsigned int side() const { return side_; }
Uint32 team_rgb() const { return(team::get_side_rgb(side())); }
std::vector<Uint32> team_rgb_range() const;
const std::vector<Uint32>& flag_rgb() const;
const std::string& team_color() const;
unit_race::GENDER gender() const;
void set_side(unsigned int new_side);
fixed_t alpha() const;
const std::string& team_color() const { return flag_rgb_; }
unit_race::GENDER gender() const { return gender_; }
void set_side(unsigned int new_side) { side_ = new_side; }
fixed_t alpha() const { return alpha_; }
bool can_recruit() const;
bool incapacitated() const;
const std::vector<std::string>& recruits() const;
int total_movement() const;
int movement_left() const;
void set_hold_position(bool value);
bool hold_position() const;
void set_user_end_turn(bool value=true);
bool user_end_turn() const;
int attacks_left() const;
bool can_recruit() const { return utils::string_bool(cfg_["canrecruit"]); }
bool incapacitated() const { return utils::string_bool(get_state("stoned"),false); }
const std::vector<std::string>& recruits() const { return recruits_; }
int total_movement() const { return max_movement_; }
int movement_left() const { return movement_; }
void set_hold_position(bool value) { hold_position_ = value; }
bool hold_position() const { return hold_position_; }
void set_user_end_turn(bool value=true) { end_turn_ = value; }
bool user_end_turn() const { return end_turn_; }
int attacks_left() const { return attacks_left_; }
void set_movement(int moves);
void set_attacks(int left);
void unit_hold_position();
void set_attacks(int left) { attacks_left_ = maximum<int>(0,minimum<int>(left,max_attacks_)); }
void unit_hold_position() { hold_position_ = end_turn_ = true; }
void end_unit_turn();
void new_turn();
void end_turn();
void new_level();
void refresh(const display& disp,const gamemap::location& loc); // called on every draw
bool take_hit(int damage);
bool take_hit(int damage) { hit_points_ -= damage; return hit_points_ <= 0; }
void heal(int amount);
void heal_all();
bool resting() const;
void set_resting(bool rest);
void heal_all() { hit_points_ = max_hitpoints(); }
bool resting() const { return resting_; }
void set_resting(bool rest) { resting_ = rest; }
const std::string get_state(const std::string& state) const;
void set_state(const std::string& state, const std::string& value);
bool has_moved() const;
bool has_goto() const;
int emits_zoc() const;
bool has_moved() const { return movement_left() != total_movement(); }
bool has_goto() const { return get_goto().valid(); }
int emits_zoc() const { return (incapacitated()) ? false : emit_zoc_; }
/* cfg: standard unit filter */
bool matches_filter(const config& cfg,const gamemap::location& loc,bool use_flat_tod=false) const;
void add_overlay(const std::string& overlay);
void remove_overlay(const std::string& overlay);
const std::vector<std::string>& overlays() const;
void add_overlay(const std::string& overlay) { overlays_.push_back(overlay); }
void remove_overlay(const std::string& overlay) { overlays_.erase(std::remove(overlays_.begin(),overlays_.end(),overlay),overlays_.end()); }
const std::vector<std::string>& overlays() const { return overlays_; }
/**
* Initializes this unit from a cfg object.
*
@ -147,11 +148,11 @@ class unit
void write(config& cfg) const;
void write(config_writer& out) const;
void assign_role(const std::string& role);
const std::vector<attack_type>& attacks() const;
std::vector<attack_type>& attacks();
void assign_role(const std::string& role) { role_ = role; }
const std::vector<attack_type>& attacks() const { return attacks_; }
std::vector<attack_type>& attacks() { return attacks_; }
int damage_from(const attack_type& attack,bool attacker,const gamemap::location& loc) const;
int damage_from(const attack_type& attack,bool attacker,const gamemap::location& loc) const { return resistance_against(attack,attacker,loc); }
// a sdl surface, ready for display for place where we need a fix image of the unit
const surface still_image() const;
@ -176,23 +177,23 @@ class unit
void restart_animation(const display& disp,int start_time);
const unit_animation* get_animation() const { return anim_;};
void set_offset(double offset){offset_ = offset;}
void set_facing(gamemap::location::DIRECTION);
gamemap::location::DIRECTION facing() const;
void set_facing(gamemap::location::DIRECTION dir);
gamemap::location::DIRECTION facing() const { return facing_; }
std::set<gamemap::location> overlaps(const gamemap::location &loc) const;
const t_string& traits_description() const;
const t_string& traits_description() const { return traits_description_; }
int value() const;
int cost() const;
int value() const { return unit_value_; }
int cost () const { return unit_value_; }
const gamemap::location& get_goto() const;
void set_goto(const gamemap::location& new_goto);
const gamemap::location& get_goto() const { return goto_; }
void set_goto(const gamemap::location& new_goto) { goto_ = new_goto; }
int upkeep() const;
void set_hidden(bool state) {hidden_ = state;};
bool get_hidden() { return hidden_; };
bool is_flying() const;
bool is_flying() const { return flying_; }
bool is_fearless() const { return is_fearless_; }
bool is_healthy() const { return is_healthy_; }
int movement_cost(t_translation::t_letter terrain, int recurse_count=0) const;
@ -200,14 +201,14 @@ class unit
int resistance_against(const attack_type& damage_type,bool attacker,const gamemap::location& loc) const;
// std::map<terrain_type::TERRAIN,int> movement_type() const;
bool can_advance() const;
bool advances() const;
bool can_advance() const { return advances_to_.empty()==false || get_modification_advances().empty() == false; }
bool advances() const { return experience_ >= max_experience() && can_advance(); }
std::map<std::string,std::string> advancement_icons() const;
std::vector<std::pair<std::string,std::string> > amla_icons() const;
config::child_list get_modification_advances() const;
const config::child_list& modification_advancements() const;
const config::child_list& modification_advancements() const { return cfg_.get_children("advancement"); }
size_t modification_count(const std::string& type, const std::string& id) const;
@ -216,30 +217,30 @@ class unit
const t_string& modification_description(const std::string& type) const;
bool move_interrupted() const;
const gamemap::location& get_interrupted_move() const;
void set_interrupted_move(const gamemap::location& interrupted_move);
bool move_interrupted() const { return movement_left() > 0 && interrupted_move_.x >= 0 && interrupted_move_.y >= 0; }
const gamemap::location& get_interrupted_move() const { return interrupted_move_; }
void set_interrupted_move(const gamemap::location& interrupted_move) { interrupted_move_ = interrupted_move; }
enum STATE { STATE_STANDING, STATE_ATTACKING, STATE_DEFENDING,
STATE_LEADING, STATE_HEALING, STATE_WALKING, STATE_LEVELIN,
STATE_LEVELOUT, STATE_DYING, STATE_EXTRA, STATE_TELEPORT,
STATE_RECRUITED, STATE_HEALED, STATE_POISONED, STATE_IDLEIN, STATE_IDLING, STATE_VICTORIOUS};
STATE state() const;
STATE state() const { return (state_ == STATE_IDLING) ? STATE_STANDING : state_; }
//the name of the file to display (used in menus
const std::string& absolute_image() const;
const std::string& image_halo() const;
const std::string& absolute_image() const { return cfg_["image"]; }
const std::string& image_halo() const { return cfg_["halo"]; }
const std::string& image_profile() const;
const std::string& image_fighting(attack_type::RANGE range) const;
const std::string& image_healing() const;
const std::string& image_halo_healing() const;
const std::string& get_hit_sound() const;
const std::string& die_sound() const;
const std::string& image_ellipse() const;
const std::string& image_halo_healing() const { return cfg_["image_halo_healing"]; }
const std::string& get_hit_sound() const { return cfg_["get_hit_sound"]; }
const std::string& die_sound() const { return cfg_["die_sound"]; }
const std::string& image_ellipse() const { return cfg_["ellipse"]; }
const std::string& usage() const;
unit_type::ALIGNMENT alignment() const;
const std::string& race() const;
const std::string& usage() const { return cfg_["usage"]; }
unit_type::ALIGNMENT alignment() const { return alignment_; }
const std::string& race() const { return race_->name(); }
const defensive_animation& defend_animation(const display& disp, const gamemap::location& loc,
fighting_animation::hit_type hits,const attack_type* attack,
@ -272,7 +273,7 @@ class unit
void remove_temporary_modifications();
void generate_traits();
void generate_traits_description();
std::string generate_description() const;
std::string generate_description() const { return race_->generate_name(cfg_["gender"] == "female" ? unit_race::FEMALE : unit_race::MALE); }
bool invisible(const gamemap::location& loc,
const unit_map& units,const std::vector<team>& teams) const;

View file

@ -89,71 +89,6 @@ attack_type::attack_type(const config& cfg,const std::string& id, const std::str
}
}
config& attack_type::get_cfg()
{
return cfg_;
}
const config& attack_type::get_cfg() const
{
return cfg_;
}
const t_string& attack_type::name() const
{
return description_;
}
const std::string& attack_type::id() const
{
return id_;
}
const std::string& attack_type::type() const
{
return type_;
}
const std::string& attack_type::icon() const
{
return icon_;
}
attack_type::RANGE attack_type::range_type() const
{
return range_type_;
}
const std::string& attack_type::range() const
{
return range_;
}
int attack_type::damage() const
{
return damage_;
}
int attack_type::num_attacks() const
{
return num_attacks_;
}
double attack_type::attack_weight() const
{
return attack_weight_;
}
double attack_type::defense_weight() const
{
return defense_weight_;
}
int attack_type::movement_used() const
{
return cfg_["movement_used"] == "" ? 100000 : lexical_cast_default<int>(cfg_["movement_used"]);
}
const attack_animation& attack_type::animation(const display& disp, const gamemap::location& loc,const unit* my_unit,
const fighting_animation::hit_type hit,const attack_type*secondary_attack,int swing_num,int damage) const
{
@ -381,11 +316,6 @@ bool attack_type::has_special_by_id(const std::string& special) const
return false;
}
unit_movement_type::unit_movement_type(const config& cfg, const unit_movement_type* parent)
: cfg_(cfg), parent_(parent)
{}
const t_string& unit_movement_type::name() const
{
const t_string& res = cfg_["name"];
@ -550,11 +480,6 @@ int unit_movement_type::defense_modifier(const gamemap& map,
return res;
}
int unit_movement_type::damage_against(const attack_type& attack) const
{
return resistance_against(attack);
}
int unit_movement_type::resistance_against(const attack_type& attack) const
{
bool result_found = false;
@ -601,20 +526,6 @@ bool unit_movement_type::is_flying() const
return utils::string_bool(flies);
}
const config& unit_movement_type::get_cfg() const
{
return cfg_;
}
const unit_movement_type* unit_movement_type::get_parent() const
{
return parent_;
}
void unit_movement_type::set_parent(const unit_movement_type* parent)
{
parent_ = parent;
}
unit_type::unit_type(const unit_type& o)
: variations_(o.variations_), cfg_(o.cfg_), race_(o.race_),
alpha_(o.alpha_), abilities_(o.abilities_),ability_tooltips_(o.ability_tooltips_),
@ -960,15 +871,6 @@ const unit_type& unit_type::get_variation(const std::string& name) const
}
}
unsigned int unit_type::num_traits() const {
return (cfg_["num_traits"].size() ? atoi(cfg_["num_traits"].c_str()) : race_->num_traits());
}
std::string unit_type::generate_description() const
{
return race_->generate_name(cfg_["gender"] == "female" ? unit_race::FEMALE : unit_race::MALE);
}
const std::string& unit_type::id() const
{
if(id_.empty()) {
@ -985,10 +887,6 @@ const std::string& unit_type::id() const
return id_;
}
const t_string& unit_type::language_name() const
{
return cfg_["name"];
}
#if 0
const std::string& unit_type::name() const
@ -997,10 +895,6 @@ const std::string& unit_type::name() const
}
#endif
const std::string& unit_type::image() const
{
return cfg_["image"];
}
const std::string& unit_type::image_fighting(attack_type::RANGE range) const
{
@ -1038,10 +932,6 @@ const t_string& unit_type::unit_description() const
return desc;
}
int unit_type::hitpoints() const
{
return atoi(cfg_["hitpoints"].c_str());
}
std::vector<attack_type> unit_type::attacks() const
{
@ -1054,15 +944,6 @@ std::vector<attack_type> unit_type::attacks() const
return res;
}
const unit_movement_type& unit_type::movement_type() const
{
return movementType_;
}
int unit_type::cost() const
{
return atoi(cfg_["cost"].c_str());
}
namespace {
int experience_modifier = 100;
@ -1078,7 +959,7 @@ unit_type::experience_accelerator::~experience_accelerator()
experience_modifier = old_value_;
}
int unit_type::experience_accelerator::get_acceleration()
int unit_type::experience_accelerator::get_acceleration()
{
return experience_modifier;
}
@ -1093,42 +974,7 @@ int unit_type::experience_needed(bool with_acceleration) const
return experience_needed_;
}
std::vector<std::string> unit_type::advances_to() const
{
return advances_to_;
}
const config::child_list& unit_type::modification_advancements() const
{
return cfg_.get_children("advancement");
}
const std::string& unit_type::undead_variation() const
{
return cfg_["undead_variation"];
}
const std::string& unit_type::usage() const
{
return cfg_["usage"];
}
int unit_type::level() const
{
return atoi(cfg_["level"].c_str());
}
int unit_type::movement() const
{
return atoi(cfg_["movement"].c_str());
}
unit_type::ALIGNMENT unit_type::alignment() const
{
return alignment_;
}
const char* unit_type::alignment_description(unit_type::ALIGNMENT align)
{
@ -1142,37 +988,6 @@ const char* unit_type::alignment_id(unit_type::ALIGNMENT align)
return (aligns[align]);
}
fixed_t unit_type::alpha() const
{
return alpha_;
}
const std::vector<std::string>& unit_type::abilities() const
{
return abilities_;
}
const std::vector<std::string>& unit_type::ability_tooltips() const
{
return ability_tooltips_;
}
bool unit_type::not_living() const
{
return race_->not_living();
}
bool unit_type::can_advance() const
{
return !advances_to_.empty();
}
bool unit_type::has_zoc() const
{
return zoc_;
}
bool unit_type::has_ability(const std::string& ability) const
{
const config* abil = cfg_.child("abilities");
@ -1196,20 +1011,6 @@ bool unit_type::has_ability_by_id(const std::string& ability) const
return false;
}
const std::vector<config*>& unit_type::possible_traits() const
{
return possibleTraits_;
}
bool unit_type::has_random_traits() const
{
return (num_traits() > 0 && possibleTraits_.size() > 1);
}
const std::vector<unit_race::GENDER>& unit_type::genders() const
{
return genders_;
}
const std::string& unit_type::race() const
{
@ -1221,11 +1022,6 @@ const std::string& unit_type::race() const
return race_->name();
}
bool unit_type::hide_help() const
{
return hide_help_;
}
void unit_type::add_advancement(const unit_type &to_unit,int xp)
{
@ -1259,11 +1055,6 @@ void unit_type::add_advancement(const unit_type &to_unit,int xp)
}
}
const std::string& unit_type::flag_rgb() const
{
return flag_rgb_;
}
game_data::game_data()
{}

View file

@ -38,16 +38,16 @@ public:
enum RANGE { SHORT_RANGE, LONG_RANGE };
attack_type(const config& cfg, const std::string& id, const std::string& image_fighting);
const t_string& name() const;
const std::string& id() const;
const std::string& type() const;
const std::string& icon() const;
RANGE range_type() const;
const std::string& range() const;
int damage() const;
int num_attacks() const;
double attack_weight() const;
double defense_weight() const;
const t_string& name() const { return description_; }
const std::string& id() const { return id_; }
const std::string& type() const { return type_; }
const std::string& icon() const { return icon_; }
RANGE range_type() const { return range_type_; }
const std::string& range() const { return range_; }
int damage() const { return damage_; }
int num_attacks() const { return num_attacks_; }
double attack_weight() const { return attack_weight_; }
double defense_weight() const { return defense_weight_; }
bool get_special_bool(const std::string& special,bool force=false) const;
unit_ability_list get_specials(const std::string& special) const;
@ -66,10 +66,10 @@ public:
bool matches_filter(const config& cfg,bool self=false) const;
bool apply_modification(const config& cfg,std::string* description);
int movement_used() const;
int movement_used() const { return cfg_["movement_used"] == "" ? 100000 : lexical_cast_default<int>(cfg_["movement_used"]); }
config& get_cfg();
const config& get_cfg() const;
config& get_cfg() { return cfg_; }
const config& get_cfg() const { return cfg_; }
mutable gamemap::location aloc_,dloc_;
mutable bool attacker_;
mutable const game_data* gamedata_;
@ -114,24 +114,24 @@ class unit_movement_type
public:
//this class assumes that the passed in reference will remain valid
//for at least as long as the class instance
unit_movement_type(const config& cfg, const unit_movement_type* parent=NULL);
unit_movement_type(const config& cfg, const unit_movement_type* parent=NULL) : cfg_(cfg), parent_(parent) {};
const t_string& name() const;
int movement_cost(const gamemap& map, t_translation::t_letter terrain, int recurse_count=0) const;
int defense_modifier(const gamemap& map, t_translation::t_letter terrain, int recurse_count=0) const;
int damage_against(const attack_type& attack) const;
int damage_against(const attack_type& attack) const { return resistance_against(attack); }
int resistance_against(const attack_type& attack) const;
string_map damage_table() const;
void set_parent(const unit_movement_type* parent);
void set_parent(const unit_movement_type* parent) { parent_ = parent; }
bool is_flying() const;
const std::map<t_translation::t_letter, int>& movement_costs() const { return moveCosts_; }
const std::map<t_translation::t_letter, int>& defense_mods() const { return defenseMods_; }
const config& get_cfg() const;
const unit_movement_type* get_parent() const;
const config& get_cfg() const { return cfg_; }
const unit_movement_type* get_parent() const { return parent_; }
private:
const config cfg_;
@ -158,14 +158,14 @@ public:
const unit_type& get_gender_unit_type(unit_race::GENDER gender) const;
const unit_type& get_variation(const std::string& name) const;
//info on the type of unit that the unit reanimates as
const std::string& undead_variation() const;
const std::string& undead_variation() const { return cfg_["undead_variation"]; }
unsigned int num_traits() const;
unsigned int num_traits() const { return (cfg_["num_traits"].size() ? atoi(cfg_["num_traits"].c_str()) : race_->num_traits()); }
std::string generate_description() const;
std::string generate_description() const { return race_->generate_name(cfg_["gender"] == "female" ? unit_race::FEMALE : unit_race::MALE); }
//the name of the unit in the current language setting
const t_string& language_name() const;
const t_string& language_name() const { return cfg_["name"]; }
const std::string& id() const;
//Disabling this one for consistency with other similar structures,
@ -173,20 +173,20 @@ public:
//language_name should eventually be renamed name()
// const std::string& name() const;
const std::string& image() const;
const std::string& image() const { return cfg_["image"]; }
const std::string& image_profile() const;
const t_string& unit_description() const;
const std::string& flag_rgb() const;
const std::string& flag_rgb() const { return flag_rgb_; }
int hitpoints() const;
int hitpoints() const { return atoi(cfg_["hitpoints"].c_str()); }
std::vector<attack_type> attacks() const;
const unit_movement_type& movement_type() const;
const unit_movement_type& movement_type() const { return movementType_; }
int experience_needed(bool with_acceleration=true) const;
std::vector<std::string> advances_to() const;
const config::child_list& modification_advancements() const;
const std::string& usage() const;
std::vector<std::string> advances_to() const { return advances_to_; }
const config::child_list& modification_advancements() const { return cfg_.get_children("advancement"); }
const std::string& usage() const { return cfg_["usage"]; }
struct experience_accelerator {
experience_accelerator(int modifier);
@ -196,36 +196,36 @@ public:
int old_value_;
};
int level() const;
int movement() const;
int cost() const;
int level() const { return atoi(cfg_["level"].c_str()); }
int movement() const { return atoi(cfg_["movement"].c_str()); }
int cost() const { return atoi(cfg_["cost"].c_str()); }
enum ALIGNMENT { LAWFUL, NEUTRAL, CHAOTIC };
ALIGNMENT alignment() const;
ALIGNMENT alignment() const { return alignment_; }
static const char* alignment_description(ALIGNMENT align);
static const char* alignment_id(ALIGNMENT align);
fixed_t alpha() const;
fixed_t alpha() const { return alpha_; }
const std::vector<std::string>& abilities() const;
const std::vector<std::string>& ability_tooltips() const;
const std::vector<std::string>& abilities() const { return abilities_; }
const std::vector<std::string>& ability_tooltips() const { return ability_tooltips_; }
bool not_living() const;
bool can_advance() const;
bool not_living() const { return race_->not_living(); }
bool can_advance() const { return !advances_to_.empty(); }
bool has_zoc() const;
bool has_zoc() const { return zoc_; }
bool has_ability(const std::string& ability) const;
bool has_ability_by_id(const std::string& ability) const;
const std::vector<config*>& possible_traits() const;
bool has_random_traits() const;
const std::vector<config*>& possible_traits() const { return possibleTraits_; }
bool has_random_traits() const { return (num_traits() > 0 && possibleTraits_.size() > 1); }
const std::vector<unit_race::GENDER>& genders() const;
const std::vector<unit_race::GENDER>& genders() const { return genders_; }
const std::string& race() const;
bool hide_help() const;
bool hide_help() const { return hide_help_; }
private:
void operator=(const unit_type& o);