merge
authorjose1711
Sat, 08 Oct 2011 16:45:52 +0200
changeset 5801 531f64292489
parent 5753 f5dcef0bb8b9 (diff)
parent 5799 55c08df2bdfd (current diff)
child 6101 5a4ea2c7b9df
merge
share/hedgewars/Data/Graphics/Hats/Balrog.png
share/hedgewars/Data/Graphics/Hats/Blanka.png
share/hedgewars/Data/Graphics/Hats/BlankaToothless.png
share/hedgewars/Data/Graphics/Hats/BlueCap.png
share/hedgewars/Data/Graphics/Hats/BlueHair.png
share/hedgewars/Data/Graphics/Hats/Bob.png
share/hedgewars/Data/Graphics/Hats/BrainSlug.png
share/hedgewars/Data/Graphics/Hats/BrainSlugMouth.png
share/hedgewars/Data/Graphics/Hats/Bub.png
share/hedgewars/Data/Graphics/Hats/Bunny.png
share/hedgewars/Data/Graphics/Hats/Chunli.png
share/hedgewars/Data/Graphics/Hats/Cororon.png
share/hedgewars/Data/Graphics/Hats/Deer.png
share/hedgewars/Data/Graphics/Hats/Falcon.png
share/hedgewars/Data/Graphics/Hats/Geordi.png
share/hedgewars/Data/Graphics/Hats/GreenCap.png
share/hedgewars/Data/Graphics/Hats/GreenHair.png
share/hedgewars/Data/Graphics/Hats/GreyHair.png
share/hedgewars/Data/Graphics/Hats/Guile.png
share/hedgewars/Data/Graphics/Hats/Honda.png
share/hedgewars/Data/Graphics/Hats/Ken.png
share/hedgewars/Data/Graphics/Hats/KirbyMask.png
share/hedgewars/Data/Graphics/Hats/Kululun.png
share/hedgewars/Data/Graphics/Hats/Ladle.png
share/hedgewars/Data/Graphics/Hats/Luigi.png
share/hedgewars/Data/Graphics/Hats/Mario.png
share/hedgewars/Data/Graphics/Hats/Moose.png
share/hedgewars/Data/Graphics/Hats/OrangeHair.png
share/hedgewars/Data/Graphics/Hats/Pig.png
share/hedgewars/Data/Graphics/Hats/PinkHair.png
share/hedgewars/Data/Graphics/Hats/PrincessDaisy.png
share/hedgewars/Data/Graphics/Hats/PrincessPeach.png
share/hedgewars/Data/Graphics/Hats/Pumpkin_Hat.png
share/hedgewars/Data/Graphics/Hats/PurpleHair.png
share/hedgewars/Data/Graphics/Hats/RedCap.png
share/hedgewars/Data/Graphics/Hats/RedHair.png
share/hedgewars/Data/Graphics/Hats/Ryu.png
share/hedgewars/Data/Graphics/Hats/Samus.png
share/hedgewars/Data/Graphics/Hats/SauceBoatSilver.png
share/hedgewars/Data/Graphics/Hats/Sonic.png
share/hedgewars/Data/Graphics/Hats/Teacup.png
share/hedgewars/Data/Graphics/Hats/TeamCap.png
share/hedgewars/Data/Graphics/Hats/TeamHair.png
share/hedgewars/Data/Graphics/Hats/Teapot.png
share/hedgewars/Data/Graphics/Hats/Toad.png
share/hedgewars/Data/Graphics/Hats/Vega.png
share/hedgewars/Data/Graphics/Hats/Wario.png
share/hedgewars/Data/Graphics/Hats/YellowCap.png
share/hedgewars/Data/Graphics/Hats/YellowHair.png
share/hedgewars/Data/Graphics/Hats/apple.png
share/hedgewars/Data/Graphics/Hats/ash.png
share/hedgewars/Data/Graphics/Hats/banana.png
share/hedgewars/Data/Graphics/Hats/beaver.png
share/hedgewars/Data/Graphics/Hats/charmander.png
share/hedgewars/Data/Graphics/Hats/chikorita.png
share/hedgewars/Data/Graphics/Hats/cyborg.png
share/hedgewars/Data/Graphics/Hats/darthvader.png
share/hedgewars/Data/Graphics/Hats/diglett.png
share/hedgewars/Data/Graphics/Hats/jigglypuff.png
share/hedgewars/Data/Graphics/Hats/junior.png
share/hedgewars/Data/Graphics/Hats/lemon.png
share/hedgewars/Data/Graphics/Hats/link.png
share/hedgewars/Data/Graphics/Hats/lugia.png
share/hedgewars/Data/Graphics/Hats/mudkip.png
share/hedgewars/Data/Graphics/Hats/orange.png
share/hedgewars/Data/Graphics/Hats/pikachu.png
share/hedgewars/Data/Graphics/Hats/porkey.png
share/hedgewars/Data/Graphics/Hats/sheep.png
share/hedgewars/Data/Graphics/Hats/slowpoke.png
share/hedgewars/Data/Graphics/Hats/spidey.png
share/hedgewars/Data/Graphics/Hats/squirtle.png
share/hedgewars/Data/Graphics/Hats/stormtrooper.png
share/hedgewars/Data/Graphics/Hats/venom.png
share/hedgewars/Data/Graphics/Hats/voltorb.png
--- a/share/hedgewars/Data/Locale/sk.lua	Wed Sep 07 15:06:42 2011 -0400
+++ b/share/hedgewars/Data/Locale/sk.lua	Sat Oct 08 16:45:52 2011 +0200
@@ -1,7 +1,7 @@
 locale = {
         [":("] = ":(",
         ["!!!"] = "!!!",
---      ["..."] = "",
+        ["..."] = "...",
         ["Accuracy Bonus!"] = "Bonus za presnosť!",
         ["a Hedgewars mini-game"] = "minihra Hedgewars", -- Space_Invasion, The_Specialists
 	["Aiming Practice"] = "Tréning presnosti", --Bazooka, Shotgun, SniperRifle
@@ -17,12 +17,12 @@
         ["Bloody Rookies"] = "Mizerní zelenáči", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
         ["BOOM!"] = "BUM!",
         ["Boom!"] = "Bum!",
---      ["Boss defeated!"] = "",
+        ["Boss defeated!"] = "Vodca bol porazený!",
 --      ["Boss Slayer!"] = "",
         ["CAPTURE THE FLAG"] = "ZMOCNITE SA VLAJKY",
         ["Careless"] = "Bezstarostný",
         ["Clumsy"] = "Nešikovný",
-        ["Codename: Teamwork"] = "Kódové meno: Teamová práca",
+        ["Codename: Teamwork"] = "Kódové meno: Tímová práca",
 --      ["Complete the track as fast as you can!"] = "",
         ["Congratulations!"] = "Gratulujem!",
 	["Congratulations! You've eliminated all targets|within the allowed time frame."] = "Gratulujem! Zneškodnili ste všetky ciele|v stanovenom čase.", --Bazooka, Shotgun, SniperRifle
@@ -37,7 +37,7 @@
 --      ["Drone Hunter!"] = "",
 --      ["Drowner"] = "",
 --      ["Each turn you get 1-3 random weapons"] = "",
---      ["Each turn you get one random weapon"] = "",
+        ["Each turn you get one random weapon"] = "Každé koho dostanete jednu náhodnú zbraň",
         ["Eliminate all enemies"] = "Zneškodnite všetkých nepriateľov",
 	["Eliminate all targets before your time runs out.|You have unlimited ammo for this mission."] = "Zneškodnite všetky ciele pred vypršaním času.|Na túto misiu máte neobmedzené množstvo streliva.", --Bazooka, Shotgun, SniperRifle
         ["Eliminate Poison before the time runs out"] = "Zneškodnite Poisona pred tým, ako vyprší čas",
@@ -53,24 +53,24 @@
         ["Flag respawned!"] = "Vlajka obnovená!",
         ["Flag returned!"] = "Vlajka vrátená!",
 --      ["Flags, and their home base will be placed where each team ends their first turn."] = "",
---      ["GAME BEGUN!!!"] = "",
---      ["Game Modifiers: "] = "",
+        ["GAME BEGUN!!!"] = "HRA ZAČALA!!!",
+        ["Game Modifiers: "] = "Modifikátory hry: ",
         ["GAME OVER!"] = "KONIEC HRY!",
         ["Game Started!"] = "Hra začala!",
-        ["Get on over there and take him out!"] = "Okamžite poď sem a dostaň ho!",
---      ["Goal"] = "",
-        ["GO! GO! GO!"] = "POĎ! POĎ! POĎ!",
+        ["Get on over there and take him out!"] = "Okamžite sa tam presuň a zneškodni ho!",
+        ["Goal"] = "Cieľ",
+        ["GO! GO! GO!"] = "POHYB! POHYB! POHYB!",
         ["Good birdy......"] = "Dobrý vtáčik......",
         ["Good luck out there!"] = "Veľa šťastia!",
---      ["GOTCHA!"] = "",
---      ["Hahahaha!"] = "",
---      ["Haha, now THAT would be something!"] = "",
+        ["GOTCHA!"] = "A MÁM ŤA!",
+        ["Hahahaha!"] = "Hehehehe!",
+        ["Haha, now THAT would be something!"] = "Haha, tak TO by bolo niečo!",
 --      ["Hapless Hogs"] = "",
 --      [" Hapless Hogs left!"] = "",
---      ["Heavy"] = "",
+        ["Heavy"] = "Ťažký",
 	["Hedgewars-Basketball"] = "Hedgewars-Basketbal",
 	["Hedgewars-Knockball"] = "Hedgewars-Knockball",
---      ["Heh, it's not that bad."] = "",
+        ["Heh, it's not that bad."] = "Heh, to nie je také zlé.",
 --      ["Hit Combo!"] = "",
         ["Hmmm..."] = "Hmm..",
         ["Hooray!"] = "Hurá!",
@@ -80,8 +80,8 @@
 --      ["It's a good thing SUDDEN DEATH is 99 turns away..."] = "",
 --      ["Jumping is disabled"] = "",
 --      ["Kamikaze Expert!"] = "",
---      ["KILLS"] = "",
---      ["[Left Shift]"] = "",
+        ["KILLS"] = "ZABITÍ:",
+        ["[Left Shift]"] = "[Ľavý Shift]",
         ["Listen up, maggot!!"] = "Počúvaj, ty biedny červ!",
         ["|- Mines Time:"] = "|- Časovač pre míny:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
         ["MISSION FAILED"] = "MISIA NEÚSPEŠNÁ", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -89,8 +89,8 @@
         ["MISSION SUCCESSFUL"] = "MISIA ÚSPEŠNÁ", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
         ["Movement: [Up], [Down], [Left], [Right]"] = "Pohyb: [Hore], [Dole], [Vľavo], [Vpravo]",
 --      ["Multi-shot!"] = "",
---      ["Nameless Heroes"] = "",
---      ["NEW CLAN RECORD: "] = "",
+        ["Nameless Heroes"] = "Hrdinovia bez mena",
+        ["NEW CLAN RECORD: "] = "NOVÝ KLANOVÝ REKORD: ",
 	["NEW fastest lap: "] = "NOVÉ najrýchlejšie kolo: ",
 --      ["NEW RACE RECORD: "] = "",
 --      ["NOT ENOUGH WAYPOINTS"] = "",
@@ -100,34 +100,34 @@
         ["Operation Diver"] = "Operácia Potápač",
         ["Opposing Team: "] = "Nepriateľský tím",
         ["Pathetic Hog #%d"] = "Žalostný ježko #%d",
---      ["Per-Hog Ammo"] = "",
---      ["Place more waypoints using [ENTER]"] = "",
+        ["Per-Hog Ammo"] = "Samostatná munícia pre ježkov",
+        ["Place more waypoints using [ENTER]"] = "Umiesnite viac bodov pomocou [ENTER]u",
         ["points"] = "body", -- Control, CTF_Blizzard, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle
         ["Poison"] = "Poison",
---      ["Power Remaining"] = "",
---      ["Press [Precise] to skip intro"] = "",
+        ["Power Remaining"] = "Zostáva energie",
+        ["Press [Precise] to skip intro"] = "Stlačte [Presnejšie mierenie] pre preskočenie intra",
 --      ["Race complexity limit reached."] = "",
         [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Skórujete prinesením nepriateľskej vlajky do vašej základne | -  Prvý tím, ktorý dosiahne 3 body, vyhráva | - Skórujete len vtedy, keď je máte svoju vlajku v základni | - Spadnuté vlajky môžu byť vrátené na základňu alebo sa ich môže zmocniť súpere | - Ježkovia po smrti ožiujú",
---      ["Round Limit"] = "",
---      ["Rounds Complete"] = "",
+        ["Round Limit"] = "Limit na kolo",
+        ["Rounds Complete"] = "Dokončených kôl",
         ["RULES OF THE GAME [Press ESC to view]"] = "PRAVIDLÁ HRY [Stlačte Esc pre ich zobrazenie]",
 --      ["s|"] = "",
 --      ["Save as many hapless hogs as possible!"] = "",
---      ["SCORE"] = "",
+        ["SCORE"] = "SKÓRE",
         ["sec"] = "sek", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
         ["See ya!"] = "Tak zatiaľ!",
---      ["s"] = "", -- GaudyRacer, Space_Invasion
---      ["Shield boosted! +30 power"] = "",
---      ["Shield Depleted"] = "",
---      ["Shield is fully recharged!"] = "",
+        ["s"] = "s", -- GaudyRacer, Space_Invasion
+        ["Shield boosted! +30 power"] = "Štít posilnený! Energia +30",
+        ["Shield Depleted"] = "Štít vyčerpaný",
+        ["Shield is fully recharged!"] = "Štít je plne nabitý!",
 --      ["Shield Master!"] = "",
 --      ["Shield Miser!"] = "",
---      ["Shield OFF:"] = "",
---      ["Shield ON:"] = "",
---      ["Shield Seeker!"] = "",
+        ["Shield OFF:"] = "Štít VYPNUTÝ:",
+        ["Shield ON:"] = "Štít ZAPNUTÝ:",
+        ["Shield Seeker!"] = "Hľadač štítov!",
 	["Shotgun Team"] = "Shotgun tím",
 	["Shotgun Training"] = "Tréning s brokovnicou",
---      ["Shots Left: "] = "", -- GaudyRacer, Tumbler
+        ["Shots Left: "] = "Zostáva striel: ", -- GaudyRacer, Tumbler
 --      ["Silly"] = "",
 --      ["Sinky"] = "",
 	["%s is out and Team %d|scored a penalty!| |Score:"] = "%s je mimo hru a tím %d|dostal trestný bod!| |Skóre:", -- Basketball, Knockball
@@ -137,7 +137,7 @@
 --      ["Sponge"] = "",
         ["Spooky Tree"] = "Strašidelný strom",
 --      ["STATUS UPDATE"] = "", -- GaudyRacer, Space_Invasion
---      ["Switched to "] = "",
+        ["Switched to "] = "Prepnuté na ",
 	["Team %d: "] = "Tím %d: ",
 --      ["Team Scores"] = "", -- Control, Space_Invasion
 --      ["That Sinking Feeling"] = "",
@@ -145,13 +145,13 @@
         ["The enemy is hiding out on yonder ducky!"] = "Nepriateľ sa schováva na tamtej kačičke!",
         ["The flag will respawn next round."] = "V ďalšom kole sa obnoví vlajka.",
 --      ["The Nameless One"] = "",
---      ["THE SPECIALISTS"] = "",
---      ["This rain is really something..."] = "",
+        ["THE SPECIALISTS"] = "ŠPECIALISTI",
+        ["This rain is really something..."] = "Ten dážď naozaj stojí za to...",
         ["TIME: "] = "ČAS: ",
 --      ["Timed Kamikaze!"] = "",
---      ["Time Extended!"] = "",
---      ["Time Left: "] = "",
---      ["Toggle Shield"] = "",
+        ["Time Extended!"] = "Predĺžený čas!",
+        ["Time Left: "] = "Zostávajúci čas: ",
+        ["Toggle Shield"] = "Prepnúť štít",
         ["Toxic Team"] = "Toxic tím", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
 --      ["TRACK COMPLETED"] = "",
         ["Track Time: "] = "Čas: ",
@@ -166,10 +166,10 @@
         ["Victory for the "] = "Víťazstvo pre", -- CTF_Blizzard, Capture_the_Flag
 --      ["Waypoint placed."] = "",
 --      ["Weapons Reset"] = "",
---      ["WINNING TIME: "] = "",
+        ["WINNING TIME: "] = "ČAS PRE VÍŤAZSTVO: ",
 --      ["You'd almost swear the water was rising!"] = "",
         ["You have SCORED!!"] = "SKÓROVALI ste!!",
---      ["You saved"] = "",
+        ["You saved"] = "Zachránili ste",
         ["You've failed. Try again."] = "Neuspeli ste. Skúste to znova.",
 	["You've reached the goal!| |Time: "] = "Dosiahli ste cieľ!| |Čas: ",
 	["'Zooka Team"] = "Bazuka tím",
--- a/share/hedgewars/Data/Locale/sk.txt	Wed Sep 07 15:06:42 2011 -0400
+++ b/share/hedgewars/Data/Locale/sk.txt	Sat Oct 08 16:45:52 2011 +0200
@@ -258,7 +258,7 @@
 03:43=Zahrať Beathovenovu smrteľnú sonátu
 03:44=Spotrebujte do: 1923
 03:45=Sila vedy
-03:46=Hot Hot Hot!
+03:46=Páli, páli, páli!
 03:47=Prilepte ich niekam šikovne!
 03:48=A je tu Hammer-time!
 03:49=Je dobrý na to, na čo si myslíte
@@ -267,6 +267,7 @@
 03:52=NEPOUŽÍVANÉ
 03:53=Typ 40
 03:54=Postavte niečo
+03:55=Pomôcka
 
 ; Popis zbraní (ako oddeľovač riadkov použite |)
 04:00=Zaútočte na vašich nepriateľov obyčajným granátom.|Vybuchne vtedy, keď vyprší časomiera.|1‐5: Nastavenie časovača granátu|Útok: Držanie tlačidla zvyšuje silu hodu|
@@ -319,6 +320,12 @@
 04:47=Dvojnásobná radosť s dvoma ostnatými,|prikrádajúcimi sa, lepkavými mínami. Pripravte|reťazovú reakciu alebo sa ochráňte (alebo oboje|naraz!)|Útok: Podržte dlhšie pre vyššiu silu výstrelu|(dvakrát)|
 04:48=Prečo si vylievať svoj hnev len na krtkoch?|Búchanie po ježkoch vie byť rovnako zábavné! Dobrá|rana týmto kladivom vezme ježkovi tretinu jeho|zdravia a zarazí ho do zeme.|Útok: Aktivovanie|
 04:49=Oživte vašich priateľov!|Ale pozor, že táto zbraň oživí aj vašich nepriateľov.|Útok: Pre pomalé oživovanie držte útok stlačený|Hore: Urýchlenie oživovania
+04:50=Skrýva sa pred vami nepriateľ pod zemou? Vykopte|ho pomocou raketovej vŕtačky!|Časovač nastavuje počet sekúnd|do detonácie.
+04:51=Nemíňajte muníciu - hod blatom je zdarma.|Trošku štípe a dokáže ježka zhodiť.
+04:52=NEPOUŽITÉ
+04:53=Vyberte sa na cestu časom a priestorom|a nechajte vašich priateľov bojovať bez vás.|Buďte pripravený vrátiť sa kedykoľvek,|buď pri Náhlej smrti alebo keď sú všetci porazení.|Poznámka: Nefunguje počas Náhlej smrti,|ak ste sám alebo ak ste kráľom.
+04:54=NEKOMPLETNÉ
+04:55=Rozprášte prúd lepkavej hliny.|Postavte mosty, pochovajte nepriateľov,|zapečaťte tunely. Buďte|však opatrný a nezašpinte sa|od nej aj vy.
 
 
 ; Reťazce pre ciele hry