# HG changeset patch
# User jose1711
# Date 1293132765 -3600
# Node ID ed23eba1a36961172ef6088f8265e7cba839961d
# Parent  20b982afbe6efb6e72bcc44ae7a838ce050773ae# Parent  0167cbb6aee35bbef6a858fa620dfacdb8bf9af8
merge

diff -r 0167cbb6aee3 -r ed23eba1a369 share/hedgewars/Data/Locale/hedgewars_sk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts	Thu Dec 23 22:05:42 2010 +0300
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts	Thu Dec 23 20:32:45 2010 +0100
@@ -1089,10 +1089,13 @@
     <message>
         <source>Wind will affect almost everything.</source>
         <translation>Vietor bude ovplyvňovať takmer všetko.</translation>
+<<<<<<< local
+=======
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
+>>>>>>> other
     </message>
 </context>
 <context>
@@ -1108,10 +1111,13 @@
     <message>
         <source>New</source>
         <translation>Nová</translation>
+<<<<<<< local
+=======
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
+>>>>>>> other
     </message>
 </context>
 <context>
@@ -1561,10 +1567,13 @@
     <message>
         <source>% Rope Length</source>
         <translation>% dĺžka lana</translation>
+<<<<<<< local
+=======
     </message>
     <message>
         <source>Gameplay</source>
         <translation type="unfinished"></translation>
+>>>>>>> other
     </message>
 </context>
 <context>
@@ -1806,10 +1815,13 @@
     <message>
         <source>new</source>
         <translation>nový</translation>
+<<<<<<< local
+=======
     </message>
     <message>
         <source>copy of</source>
         <translation type="unfinished"></translation>
+>>>>>>> other
     </message>
 </context>
 <context>
diff -r 0167cbb6aee3 -r ed23eba1a369 share/hedgewars/Data/Locale/sk.txt
--- a/share/hedgewars/Data/Locale/sk.txt	Thu Dec 23 22:05:42 2010 +0300
+++ b/share/hedgewars/Data/Locale/sk.txt	Thu Dec 23 20:32:45 2010 +0100
@@ -50,6 +50,8 @@
 00:47=Lepkavá mína
 00:48=Kladivo
 00:49=Oživovač
+00:50=Útok raketovými vŕtačkami
+00:51=Blatová guľa
 
 01:00=Do boja!
 01:01=Remíza