diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts
index 44daecba..2b86c0ae 100644
--- a/cockatrice/translations/cockatrice_es.ts
+++ b/cockatrice/translations/cockatrice_es.ts
@@ -6,32 +6,32 @@
     <message>
         <location filename="../src/abstractcounter.cpp" line="56"/>
         <source>&amp;Set counter...</source>
-        <translation type="unfinished">E&amp;stablecer contadores...</translation>
+        <translation>E&amp;stablecer contador...</translation>
     </message>
     <message>
         <location filename="../src/abstractcounter.cpp" line="63"/>
         <source>Ctrl+L</source>
-        <translation type="unfinished">Ctrl+L</translation>
+        <translation>Ctrl+L</translation>
     </message>
     <message>
         <location filename="../src/abstractcounter.cpp" line="64"/>
         <source>F11</source>
-        <translation type="unfinished">F11</translation>
+        <translation>F11</translation>
     </message>
     <message>
         <location filename="../src/abstractcounter.cpp" line="65"/>
         <source>F12</source>
-        <translation type="unfinished">F12</translation>
+        <translation>F12</translation>
     </message>
     <message>
         <location filename="../src/abstractcounter.cpp" line="122"/>
         <source>Set counter</source>
-        <translation type="unfinished">Establecer contador</translation>
+        <translation>Establecer contador</translation>
     </message>
     <message>
         <location filename="../src/abstractcounter.cpp" line="122"/>
         <source>New value for counter &apos;%1&apos;:</source>
-        <translation type="unfinished">Nuevo valor para el contador &apos;%1&apos;:</translation>
+        <translation>Nuevo valor para el contador &apos;%1&apos;:</translation>
     </message>
 </context>
 <context>
@@ -175,12 +175,12 @@
     <message>
         <location filename="../src/carditem.cpp" line="175"/>
         <source>&amp;Play</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Jugar</translation>
     </message>
     <message>
         <location filename="../src/carditem.cpp" line="176"/>
         <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ocultar</translation>
     </message>
     <message>
         <location filename="../src/carditem.cpp" line="178"/>
@@ -1103,7 +1103,7 @@
     <message>
         <location filename="../src/tab_room.cpp" line="114"/>
         <source>Show &amp;full games</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver partidas &amp;sin plazas libres</translation>
     </message>
     <message>
         <source>&amp;Show full games</source>
@@ -1248,42 +1248,42 @@
     <message>
         <location filename="../src/window_main.cpp" line="158"/>
         <source>Version %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Versión %1</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="159"/>
         <source>Authors:</source>
-        <translation type="unfinished"></translation>
+        <translation>Autores:</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="160"/>
         <source>Translators:</source>
-        <translation type="unfinished"></translation>
+        <translation>Traductores:</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="161"/>
         <source>Spanish:</source>
-        <translation type="unfinished"></translation>
+        <translation>Español:</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="162"/>
         <source>Portugese (Portugal):</source>
-        <translation type="unfinished"></translation>
+        <translation>Portugués (Portugal):</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="163"/>
         <source>Portugese (Brazil):</source>
-        <translation type="unfinished"></translation>
+        <translation>Portugués (Brasil):</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="164"/>
         <source>French:</source>
-        <translation type="unfinished"></translation>
+        <translation>Francés:</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="165"/>
         <source>Japanese:</source>
-        <translation type="unfinished"></translation>
+        <translation>Japonés:</translation>
     </message>
     <message>
         <location filename="../src/window_main.cpp" line="171"/>
@@ -1499,7 +1499,7 @@
     <message>
         <location filename="../src/messagelogwidget.cpp" line="202"/>
         <source>%1 gives %2 control over %3.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 entrega a %2 el control sobre %3.</translation>
     </message>
     <message>
         <location filename="../src/messagelogwidget.cpp" line="208"/>
@@ -2165,7 +2165,7 @@
     <message>
         <location filename="../src/player.cpp" line="416"/>
         <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Poner carta superior en la parte &amp;inferior</translation>
     </message>
     <message>
         <location filename="../src/player.cpp" line="419"/>
@@ -2337,32 +2337,32 @@
     <message>
         <location filename="../src/tab_server.cpp" line="51"/>
         <source>Rooms</source>
-        <translation type="unfinished"></translation>
+        <translation>Salas</translation>
     </message>
     <message>
         <location filename="../src/tab_server.cpp" line="52"/>
         <source>Joi&amp;n</source>
-        <translation type="unfinished">E&amp;ntrar</translation>
+        <translation>E&amp;ntrar</translation>
     </message>
     <message>
         <location filename="../src/tab_server.cpp" line="55"/>
         <source>Room</source>
-        <translation type="unfinished"></translation>
+        <translation>Sala</translation>
     </message>
     <message>
         <location filename="../src/tab_server.cpp" line="56"/>
         <source>Description</source>
-        <translation type="unfinished">Descripción</translation>
+        <translation>Descripción</translation>
     </message>
     <message>
         <location filename="../src/tab_server.cpp" line="57"/>
         <source>Players</source>
-        <translation type="unfinished">Jugadores</translation>
+        <translation>Jugadores</translation>
     </message>
     <message>
         <location filename="../src/tab_server.cpp" line="58"/>
         <source>Games</source>
-        <translation type="unfinished">Partidas</translation>
+        <translation>Partidas</translation>
     </message>
 </context>
 <context>
@@ -2390,37 +2390,37 @@
     <message>
         <location filename="../src/tab_admin.cpp" line="40"/>
         <source>Update server &amp;message</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar &amp;mensaje del servidor</translation>
     </message>
     <message>
         <location filename="../src/tab_admin.cpp" line="41"/>
         <source>Server administration functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Funciones de administración del servidor</translation>
     </message>
     <message>
         <location filename="../src/tab_admin.cpp" line="43"/>
         <source>&amp;Unlock functions</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Desbloquear funciones</translation>
     </message>
     <message>
         <location filename="../src/tab_admin.cpp" line="44"/>
         <source>&amp;Lock functions</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bloquear funciones</translation>
     </message>
     <message>
         <location filename="../src/tab_admin.cpp" line="54"/>
         <source>Unlock administration functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Desbloquear funciones de administración</translation>
     </message>
     <message>
         <location filename="../src/tab_admin.cpp" line="54"/>
         <source>Do you really want to unlock the administration functions?</source>
-        <translation type="unfinished"></translation>
+        <translation>¿Realmente quieres desbloquear las funciones de administración?</translation>
     </message>
     <message>
         <location filename="../src/tab_admin.h" line="26"/>
         <source>Administration</source>
-        <translation type="unfinished"></translation>
+        <translation>Administración</translation>
     </message>
 </context>
 <context>
@@ -2626,32 +2626,32 @@ Por favor, introduzca un nombre:</translation>
     <message>
         <location filename="../src/tab_room.cpp" line="219"/>
         <source>&amp;Say:</source>
-        <translation type="unfinished">&amp;Decir:</translation>
+        <translation>&amp;Decir:</translation>
     </message>
     <message>
         <location filename="../src/tab_room.cpp" line="220"/>
         <source>Chat</source>
-        <translation type="unfinished"></translation>
+        <translation>Chat</translation>
     </message>
     <message>
         <location filename="../src/tab_room.cpp" line="221"/>
         <source>&amp;Room</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sala</translation>
     </message>
     <message>
         <location filename="../src/tab_room.cpp" line="222"/>
         <source>&amp;Leave room</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dejar sala</translation>
     </message>
     <message>
         <location filename="../src/tab_room.cpp" line="268"/>
         <source>%1 has joined the room.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 se ha unido a la sala.</translation>
     </message>
     <message>
         <location filename="../src/tab_room.cpp" line="274"/>
         <source>%1 has left the room.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ha dejado la sala.</translation>
     </message>
 </context>
 <context>
@@ -2667,12 +2667,12 @@ Por favor, introduzca un nombre:</translation>
     <message>
         <location filename="../src/userinfobox.cpp" line="38"/>
         <source>User information</source>
-        <translation type="unfinished"></translation>
+        <translation>Información del usuario</translation>
     </message>
     <message>
         <location filename="../src/userinfobox.cpp" line="45"/>
         <source>Real name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nombre real:</translation>
     </message>
     <message>
         <location filename="../src/userinfobox.cpp" line="46"/>
@@ -2687,22 +2687,22 @@ Por favor, introduzca un nombre:</translation>
     <message>
         <location filename="../src/userinfobox.cpp" line="65"/>
         <source>Administrator</source>
-        <translation type="unfinished"></translation>
+        <translation>Administrador</translation>
     </message>
     <message>
         <location filename="../src/userinfobox.cpp" line="67"/>
         <source>Judge</source>
-        <translation type="unfinished"></translation>
+        <translation>Juez</translation>
     </message>
     <message>
         <location filename="../src/userinfobox.cpp" line="69"/>
         <source>Registered user</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuario registrado</translation>
     </message>
     <message>
         <location filename="../src/userinfobox.cpp" line="71"/>
         <source>Unregistered user</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuario no registrado</translation>
     </message>
 </context>
 <context>
@@ -2738,17 +2738,17 @@ Por favor, introduzca un nombre:</translation>
     <message>
         <location filename="../src/userlist.cpp" line="65"/>
         <source>Users in this room: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuarios en esta sala: %1</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="119"/>
         <source>User &amp;details</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Detalles del usuario</translation>
     </message>
     <message>
         <location filename="../src/userlist.cpp" line="120"/>
         <source>Direct &amp;chat</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Chat privado</translation>
     </message>
 </context>
 <context>
@@ -2837,14 +2837,15 @@ Por favor, introduzca un nombre:</translation>
         <location filename="../src/window_deckeditor.cpp" line="312"/>
         <location filename="../src/window_deckeditor.cpp" line="336"/>
         <source>Error</source>
-        <translation type="unfinished">Error</translation>
+        <translation>Error</translation>
     </message>
     <message>
         <location filename="../src/window_deckeditor.cpp" line="312"/>
         <location filename="../src/window_deckeditor.cpp" line="336"/>
         <source>The deck could not be saved.
 Please check that the directory is writable and try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>El mazo no puede guardarse
+Por favor, compruebe que tiene permisos de escritura en el directorio e intentelo de nuevo.</translation>
     </message>
     <message>
         <location filename="../src/window_deckeditor.cpp" line="318"/>
@@ -2935,7 +2936,7 @@ Please check that the directory is writable and try again.</source>
         <location filename="../src/window_deckeditor.cpp" line="254"/>
         <source>The decklist has been modified.
 Do you want to save the changes?</source>
-        <translation type="unfinished">La lista del mazo ha sido modificada
+        <translation>La lista del mazo ha sido modificada
 ¿Deseas guardar los cambios?</translation>
     </message>
 </context>