From 2c7df9da6a081055a3b1919d7700a8f983799a89 Mon Sep 17 00:00:00 2001
From: licht-im-Norden87 <dariusleigers@gmx.de>
Date: Thu, 9 Apr 2015 23:02:28 +0200
Subject: [PATCH 1/5] Stringtable: German additions

---
 addons/captives/stringtable.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index f03f30a113..32334811f3 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -52,7 +52,7 @@
     </Key>
     <Key ID="STR_ACE_Captives_NoCaptive">
       <English>You need to take him as prisoner first!</English>
-      <German>Du must ihn zuerst gefangen nehmen.</German>
+      <German>Du musst ihn zuerst gefangen nehmen.</German>
       <Spanish>Necesitas hacerle prisionero primero!</Spanish>
       <Polish>Najpierw musisz wziąć go jako więźnia!</Polish>
       <French>Vous devez d'abord le capturer!</French>
@@ -132,18 +132,23 @@
     </Key>
     <Key ID="STR_ACE_Captives_StartSurrendering">
       <English>Surrender</English>
+      <German>Kapitulieren</German>
     </Key>
     <Key ID="STR_ACE_Captives_StopSurrendering">
       <English>Stop Surrendering</English>
+      <German>Den Kampf erneut aufnehmen</German>
     </Key>
     <Key ID="STR_ACE_Captives_Zeus_OnlyAlive">
       <English>Only use on alive units</English>
+      <German>Nur bei lebenden Einheiten verwendbar</German>
     </Key>
     <Key ID="STR_ACE_Captives_Zeus_OnlyInfentry">
       <English>Only use on dismounted inf</English>
+      <German>Nur bei abgesessener Infanterie verwendbar</German>
     </Key>
     <Key ID="STR_ACE_Captives_Zeus_NothingSelected">
       <English>Nothing under mouse</English>
+      <German>Es wurde nichts ausgewählt</German>
     </Key>
   </Package>
-</Project>
\ No newline at end of file
+</Project>

From 7b4d62c46c027b681ed157b06ea20669adf32242 Mon Sep 17 00:00:00 2001
From: Legolasindar <legolasindar@gmail.com>
Date: Fri, 10 Apr 2015 00:05:47 +0200
Subject: [PATCH 2/5] Update stringtable.xml

Fixed spanish terms
---
 addons/attach/stringtable.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml
index 13c468184b..34e8883537 100644
--- a/addons/attach/stringtable.xml
+++ b/addons/attach/stringtable.xml
@@ -173,7 +173,7 @@
       <French>Échec du Attacher</French>
       <German>Befestigen Fehlgeschlagen</German>
       <Russian>Присоединить Ошибка</Russian>
-      <Spanish>Error en Acoplar</Spanish>
+      <Spanish>Error al acoplar</Spanish>
     </Key>
   </Package>
 </Project>

From 1dcbebc04cf4e45caf9fccb7498178bbc14c2913 Mon Sep 17 00:00:00 2001
From: Legolasindar <legolasindar@gmail.com>
Date: Fri, 10 Apr 2015 00:10:47 +0200
Subject: [PATCH 3/5] Update stringtable.xml

Updated spanish terms
---
 addons/captives/stringtable.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index 32334811f3..0c81a0bf1d 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -133,22 +133,27 @@
     <Key ID="STR_ACE_Captives_StartSurrendering">
       <English>Surrender</English>
       <German>Kapitulieren</German>
+      <Spanish>Rendirse</Spanish>
     </Key>
     <Key ID="STR_ACE_Captives_StopSurrendering">
       <English>Stop Surrendering</English>
       <German>Den Kampf erneut aufnehmen</German>
+      <Spanish>Dejar de rendirse</Spanish>
     </Key>
     <Key ID="STR_ACE_Captives_Zeus_OnlyAlive">
       <English>Only use on alive units</English>
       <German>Nur bei lebenden Einheiten verwendbar</German>
+      <Spanish>Utilizar solo en unidades vivas</Spanish>
     </Key>
     <Key ID="STR_ACE_Captives_Zeus_OnlyInfentry">
       <English>Only use on dismounted inf</English>
       <German>Nur bei abgesessener Infanterie verwendbar</German>
+      <Spanish>Utilizar solo en infanteria desmontada</Spanish>
     </Key>
     <Key ID="STR_ACE_Captives_Zeus_NothingSelected">
       <English>Nothing under mouse</English>
       <German>Es wurde nichts ausgewählt</German>
+      <Spanish>Nada bajo el ratón</Spanish>
     </Key>
   </Package>
 </Project>

From c511431e61d81f2a078612e5b779337c13c73182 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Thu, 9 Apr 2015 17:17:26 -0500
Subject: [PATCH 4/5] Fix encoding problem

Not sure why, but it was decoding the \a's: Warning:
z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM
'\zceddons\mainbout.sqf';-NOGIT
---
 addons/main/config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/main/config.cpp b/addons/main/config.cpp
index a6a85418c3..eb136f84cf 100644
--- a/addons/main/config.cpp
+++ b/addons/main/config.cpp
@@ -1,4 +1,4 @@
-#include "script_component.hpp"
+#include "script_component.hpp"
 
 class CfgPatches {
     class ADDON {
@@ -546,7 +546,7 @@ class CfgPatches {
         author[] = {"ACE Team"};
         authorUrl = "";
         versionDesc = "A.C.E.";
-        versionAct = "['MAIN',_this] execVM '\z\ace\addons\main\about.sqf';";
+        versionAct = QUOTE(['MAIN',_this] execVM '\z\ace\addons\main\about.sqf';);
         VERSION_CONFIG;
     };
 };

From ed87e53c8018330a806443cf6738082e34c7841c Mon Sep 17 00:00:00 2001
From: Legolasindar <legolasindar@gmail.com>
Date: Fri, 10 Apr 2015 00:48:51 +0200
Subject: [PATCH 5/5] Update stringtable.xml

Updated spanish terms.
---
 addons/dragging/stringtable.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml
index 1fca04fee1..9193d2712e 100644
--- a/addons/dragging/stringtable.xml
+++ b/addons/dragging/stringtable.xml
@@ -29,6 +29,7 @@
     <Key ID="STR_ACE_Dragging_UnableToDrag">
       <English>Item to heavy</English>
       <German>Gegenstand zu schwer</German>
+      <Spanish>Articulo demasiado pesado</Spanish>
       <!-- <English>Unable to drag item due to weight</English>
       <Russian>Слишком тяжелый предмет</Russian>
       <Spanish>No se puede arrastrar el objeto debido a su peso</Spanish>