diff -r 5ef5415c4ee1 -r 20b982afbe6e share/hedgewars/Data/Locale/hedgewars_sk.ts --- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Thu Dec 23 17:47:50 2010 +0100 +++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Thu Dec 23 20:26:31 2010 +0100 @@ -7,6 +7,10 @@ new nový + + copy of + + FreqSpinBox @@ -187,6 +191,10 @@ Large floating islands Veľké plávajúce ostrovčeky + + Seed + + HWNetServersModel @@ -322,6 +330,37 @@ + PageDrawMap + + Undo + + + + Clear + + + + Load + Načítať + + + Save + + + + Load drawn map + + + + Drawn Maps (*.hwmap);;All files (*.*) + + + + Save drawn map + + + + PageEditTeam General @@ -1050,6 +1089,13 @@ Wind will affect almost everything. Vietor bude ovplyvňovať takmer všetko. +<<<<<<< local +======= + + + Copy + +>>>>>>> other @@ -1065,6 +1111,13 @@ New Nová +<<<<<<< local +======= + + + Copy + +>>>>>>> other @@ -1270,6 +1323,14 @@ Crazy Šialené + + Normal + + + + hand drawn map... + + QGroupBox @@ -1506,6 +1567,13 @@ % Rope Length % dĺžka lana +<<<<<<< local +======= + + + Gameplay + +>>>>>>> other @@ -1690,6 +1758,10 @@ Associate file extensions Asociovať prípony súborov. + + Set + + QTableWidget @@ -1743,6 +1815,13 @@ new nový +<<<<<<< local +======= + + + copy of + +>>>>>>> other