Merge branch 'master' of github.com:KoffeinFlummi/ACE3

This commit is contained in:
esteldunedain 2015-04-09 22:49:25 -03:00
commit def9000520
4 changed files with 16 additions and 5 deletions

View File

@ -173,7 +173,7 @@
<French>Échec du Attacher</French> <French>Échec du Attacher</French>
<German>Befestigen Fehlgeschlagen</German> <German>Befestigen Fehlgeschlagen</German>
<Russian>Присоединить Ошибка</Russian> <Russian>Присоединить Ошибка</Russian>
<Spanish>Error en Acoplar</Spanish> <Spanish>Error al acoplar</Spanish>
</Key> </Key>
</Package> </Package>
</Project> </Project>

View File

@ -52,7 +52,7 @@
</Key> </Key>
<Key ID="STR_ACE_Captives_NoCaptive"> <Key ID="STR_ACE_Captives_NoCaptive">
<English>You need to take him as prisoner first!</English> <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> <Spanish>Necesitas hacerle prisionero primero!</Spanish>
<Polish>Najpierw musisz wziąć go jako więźnia!</Polish> <Polish>Najpierw musisz wziąć go jako więźnia!</Polish>
<French>Vous devez d'abord le capturer!</French> <French>Vous devez d'abord le capturer!</French>
@ -132,18 +132,28 @@
</Key> </Key>
<Key ID="STR_ACE_Captives_StartSurrendering"> <Key ID="STR_ACE_Captives_StartSurrendering">
<English>Surrender</English> <English>Surrender</English>
<German>Kapitulieren</German>
<Spanish>Rendirse</Spanish>
</Key> </Key>
<Key ID="STR_ACE_Captives_StopSurrendering"> <Key ID="STR_ACE_Captives_StopSurrendering">
<English>Stop Surrendering</English> <English>Stop Surrendering</English>
<German>Den Kampf erneut aufnehmen</German>
<Spanish>Dejar de rendirse</Spanish>
</Key> </Key>
<Key ID="STR_ACE_Captives_Zeus_OnlyAlive"> <Key ID="STR_ACE_Captives_Zeus_OnlyAlive">
<English>Only use on alive units</English> <English>Only use on alive units</English>
<German>Nur bei lebenden Einheiten verwendbar</German>
<Spanish>Utilizar solo en unidades vivas</Spanish>
</Key> </Key>
<Key ID="STR_ACE_Captives_Zeus_OnlyInfentry"> <Key ID="STR_ACE_Captives_Zeus_OnlyInfentry">
<English>Only use on dismounted inf</English> <English>Only use on dismounted inf</English>
<German>Nur bei abgesessener Infanterie verwendbar</German>
<Spanish>Utilizar solo en infanteria desmontada</Spanish>
</Key> </Key>
<Key ID="STR_ACE_Captives_Zeus_NothingSelected"> <Key ID="STR_ACE_Captives_Zeus_NothingSelected">
<English>Nothing under mouse</English> <English>Nothing under mouse</English>
<German>Es wurde nichts ausgewählt</German>
<Spanish>Nada bajo el ratón</Spanish>
</Key> </Key>
</Package> </Package>
</Project> </Project>

View File

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

View File

@ -1,4 +1,4 @@
#include "script_component.hpp" #include "script_component.hpp"
class CfgPatches { class CfgPatches {
class ADDON { class ADDON {
@ -546,7 +546,7 @@ class CfgPatches {
author[] = {"ACE Team"}; author[] = {"ACE Team"};
authorUrl = ""; authorUrl = "";
versionDesc = "A.C.E."; 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; VERSION_CONFIG;
}; };
}; };