--- 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 @@
         <source>new</source>
         <translation>nový</translation>
     </message>
+    <message>
+        <source>copy of</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FreqSpinBox</name>
@@ -187,6 +191,10 @@
         <source>Large floating islands</source>
         <translation>Veľké plávajúce ostrovčeky</translation>
     </message>
+    <message>
+        <source>Seed</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HWNetServersModel</name>
@@ -322,6 +330,37 @@
     </message>
 </context>
 <context>
+    <name>PageDrawMap</name>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished">Načítať</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load drawn map</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Drawn Maps (*.hwmap);;All files (*.*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save drawn map</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>PageEditTeam</name>
     <message>
         <source>General</source>
@@ -1050,6 +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>
@@ -1065,6 +1111,13 @@
     <message>
         <source>New</source>
         <translation>Nová</translation>
+<<<<<<< local
+=======
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+>>>>>>> other
     </message>
 </context>
 <context>
@@ -1270,6 +1323,14 @@
         <source>Crazy</source>
         <translation type="obsolete">Šialené</translation>
     </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hand drawn map...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QGroupBox</name>
@@ -1506,6 +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>
@@ -1690,6 +1758,10 @@
         <source>Associate file extensions</source>
         <translation>Asociovať prípony súborov.</translation>
     </message>
+    <message>
+        <source>Set</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QTableWidget</name>
@@ -1743,6 +1815,13 @@
     <message>
         <source>new</source>
         <translation>nový</translation>
+<<<<<<< local
+=======
+    </message>
+    <message>
+        <source>copy of</source>
+        <translation type="unfinished"></translation>
+>>>>>>> other
     </message>
 </context>
 <context>