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

2024-08-30 18:23:18 +00:00 · 2015-04-29 13:33:07 +02:00 · 2015-04-29 13:33:07 +02:00 · a8f37a4c72
commit a8f37a4c72
parent 416a914253 d149db61e8
95 changed files with 2036 additions and 617 deletions
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@ -30,6 +30,7 @@ ACCtomeek <tomeek99@gmail.com>
 Adanteh
 aeroson
 Aggr094 <bastards4glory@gmail.com>
+Alganthe <alganthe@live.fr>
 Anthariel <Contact@storm-simulation.com>
 BlackQwar
 Brakoviejo
@ -42,13 +43,14 @@ evromalarkey <evromalarkey@gmail.com>
 Falke75
 Ferenczi
 Ferenzi
-Filip Basara <filip.basara93@googlemail.com> (Logo)
+Filip Basara <filip.basara93@googlemail.com>
 FreeZbe <freeseb@gmail.com>
 geraldbolso1899
 Ghost
 GieNkoV <gienkov.grzegorz@gmail.com>
 gpgpgpgp
 Grzegorz
+Gianmarco Varriale (TeamNuke) <admin@forhost.org>
 Hamburger SV
 Harakhti <shadowdragonphd@gmail.com>
 havena <silveredenis@gmail.com>
@ -84,3 +86,5 @@ Asgar Serran <piechottaf@web.de>
 Kavinsky <nmunozfernandez@gmail.com>
 Coren <coren4@gmail.com>
 OnkelDisMaster <onkeldismaster@gmail.com>
+Dimaslg <dimaslg@telecable.e>
+VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
--- a/addons/aircraft/stringtable.xml
+++ b/addons/aircraft/stringtable.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
    <Package name="Aircraft">
        <Key ID="STR_ACE_Aircraft_CMFlareLauncher_Burst_Name">
@ -29,23 +29,25 @@
            <English>Open Cargo Door</English>
            <German>Laderampe öffnen</German>
            <Spanish>Abrir compuerta de carga</Spanish>
-            <French>Ourvir rampe cargo</French>
+            <French>Ourvir la rampe</French>
            <Polish>Otwórz drzwi ładowni</Polish>
            <Czech>Otevřít nákladní prostor</Czech>
            <Hungarian>Rakodórámpa nyitása</Hungarian>
            <Russian>Открыть грузовой отсек</Russian>
            <Italian>Apri la porta del cargo</Italian>
+            <Portuguese>Abrir porta de carga</Portuguese>
        </Key>
        <Key ID="STR_ACE_Aircraft_CloseCargoRamp">
            <English>Close Cargo Door</English>
            <German>Laderampe schließen</German>
            <Spanish>Cerrar compuerta de carga</Spanish>
-            <French>Fermer rampe cargo</French>
+            <French>Fermer la rampe</French>
            <Polish>Zamknij drzwi ładowni</Polish>
            <Czech>Zavřít nákladní prostor</Czech>
            <Hungarian>Rakodórámpa zárása</Hungarian>
            <Russian>Закрыть грузовой отсек</Russian>
            <Italian>Chiudi la porta del cargo</Italian>
+            <Portuguese>Fechar porta de carga</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/atragmx/RscTitles.hpp
+++ b/addons/atragmx/RscTitles.hpp
@ -760,7 +760,7 @@ class ATragMX_Display {
            y=0.265*safezoneH+safezoneY+0.35;
            strings[]={"Height","Width"};
            values[]={1,0};
-            onToolBoxSelChanged="GVAR(rangeAssistUseTargetHeight)=((_this select 1)==0)";
+            onToolBoxSelChanged=QUOTE(GVAR(rangeAssistUseTargetHeight) = ((_this select 1) == 0));
        };
        class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE: TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD {
            idc=7003;
--- a/addons/atragmx/stringtable.xml
+++ b/addons/atragmx/stringtable.xml
@ -27,6 +27,7 @@
            <Russian>Защищенный КПК с ATragMX</Russian>
            <Spanish>PDA rugerizada con ATragMX</Spanish>
            <German>Robuster PDA mit ATragMX</German>
+            <French>PDA robuste avec ATragMX</French>
        </Key>
        <Key ID="STR_ACE_ATragMX_ATragMXDialogKey">
            <English>Open ATragMX</English>
@ -37,4 +38,4 @@
            <German>ATragMX öffnen</German>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/attach/stringtable.xml
+++ b/addons/attach/stringtable.xml
@ -176,6 +176,7 @@
            <Russian>Не удалось присоединить</Russian>
            <Spanish>Error al acoplar</Spanish>
            <Czech>Připnutí selhalo</Czech>
+            <Portuguese>Erro ao anexar</Portuguese>
            <Polish>Przyczepianie nie powiodło się</Polish>
            <Hungarian>Hozzácsatolás sikertelen</Hungarian>
        </Key>
--- a/addons/ballistics/CfgMagazines.hpp
+++ b/addons/ballistics/CfgMagazines.hpp
@ -322,13 +322,14 @@ class CfgMagazines {
    class 10Rnd_762x54_Mag: 10Rnd_762x51_Mag {
        initSpeed = 800;
    };
-    class ACE_10Rnd_762x54_Tracer_mag: 16Rnd_9x21_Mag {
+    class ACE_10Rnd_762x54_Tracer_mag: 10Rnd_762x54_Mag {
        author = "$STR_ACE_Common_ACETeam";
        ammo = "ACE_762x54_Ball_7T2";
        displayName = "$STR_ACE_10Rnd_762x54_Tracer_mag_Name";
        displayNameShort = "$STR_ACE_10Rnd_762x54_Tracer_mag_NameShort";
        descriptionShort = "$STR_ACE_10Rnd_762x54_Tracer_mag_Description";
        initSpeed = 800;
+        tracersEvery = 1;
    };
    
    class 150Rnd_762x54_Box: 150Rnd_762x51_Box {
--- a/addons/ballistics/CfgVehicles.hpp
+++ b/addons/ballistics/CfgVehicles.hpp
@ -42,6 +42,7 @@ class CfgVehicles {
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4);
            MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
            MACRO_ADDMAGAZINE(ACE_10Rnd_338_300gr_HPBT_Mag,4);
            MACRO_ADDMAGAZINE(ACE_10Rnd_338_API526_Mag,4);
@ -59,6 +60,7 @@ class CfgVehicles {
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4);
            MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_SD,3);
            MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_M993_AP_Mag,4);
@ -82,6 +84,7 @@ class CfgVehicles {
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4);
            MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
        };
    };
@ -200,6 +203,7 @@ class CfgVehicles {
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4);
            MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x67_Mk248_Mod_0_Mag,4);
            MACRO_ADDMAGAZINE(ACE_20Rnd_762x67_Mk248_Mod_1_Mag,4);
--- a/addons/ballistics/CfgWeapons.hpp
+++ b/addons/ballistics/CfgWeapons.hpp
@ -509,6 +509,7 @@ class CfgWeapons {
    class srifle_EBR_F: EBR_base_F {
        magazines[] = {
            "20Rnd_762x51_Mag",
+            "ACE_20Rnd_762x51_Mag_Tracer",
            "ACE_20Rnd_762x51_Mag_Tracer_Dim",
            "ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
            "ACE_20Rnd_762x51_M118LR_Mag",
@ -560,6 +561,7 @@ class CfgWeapons {
    class srifle_DMR_03_F: DMR_03_base_F {
        magazines[] = {
            "20Rnd_762x51_Mag",
+            "ACE_20Rnd_762x51_Mag_Tracer",
            "ACE_20Rnd_762x51_Mag_Tracer_Dim",
            "ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
            "ACE_20Rnd_762x51_M118LR_Mag",
@ -584,6 +586,7 @@ class CfgWeapons {
    class srifle_DMR_06_camo_F: DMR_06_base_F {
        magazines[] = {
            "20Rnd_762x51_Mag",
+            "ACE_20Rnd_762x51_Mag_Tracer",
            "ACE_20Rnd_762x51_Mag_Tracer_Dim",
            "ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
            "ACE_20Rnd_762x51_M118LR_Mag",
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
    <Package name="Captives">
        <Key ID="STR_ACE_Captives_SetCaptive">
@ -137,6 +137,7 @@
            <French>Se rendre</French>
            <German>Kapitulieren</German>
            <Spanish>Rendirse</Spanish>
+            <Portuguese>Render-se</Portuguese>
            <Czech>Vzdát se</Czech>
            <Polish>Poddaj się</Polish>
            <Russian>Сдаться</Russian>
@ -148,6 +149,7 @@
            <French>Annuler la capitulation</French>
            <German>Den Kampf erneut aufnehmen</German>
            <Spanish>Dejar de rendirse</Spanish>
+            <Portuguese>Parar de se render</Portuguese>
            <Czech>Přestat se vzdávat</Czech>
            <Polish>Podejmij walkę ponownie</Polish>
            <Russian>Прекратить сдачу в плен</Russian>
@ -181,6 +183,7 @@
            <French>Rien sous le curseur</French>
            <German>Es wurde nichts ausgewählt</German>
            <Spanish>Nada bajo el ratón</Spanish>
+            <Portuguese>Nada debaixo do mouse</Portuguese>
            <Czech>Nic není vybráno</Czech>
            <Polish>Nie ma nic pod kursorem</Polish>
            <Russian>Ничего не выделено</Russian>
--- a/addons/common/CfgUnitInsignia.hpp
+++ b/addons/common/CfgUnitInsignia.hpp
@ -0,0 +1,9 @@
+
+class CfgUnitInsignia {
+    class ACE_insignia {
+        displayName = "ACE 3";
+        author = "kripto202";
+        texture = PATHTOF(data\ace3logo_ca.paa);
+        textureVehicle = "";
+    };
+};
--- a/addons/common/config.cpp
+++ b/addons/common/config.cpp
@ -22,6 +22,7 @@ class CfgPatches {
 #include "CfgActions.hpp"
 #include "CfgMoves.hpp"
 #include "CfgVoice.hpp"
+#include "CfgUnitInsignia.hpp"

 class ACE_Rsc_Display_Base {
    idd = -1;
--- a/addons/common/data/ace3logo_ca.paa
+++ b/addons/common/data/ace3logo_ca.paa
--- a/addons/common/stringtable.xml
+++ b/addons/common/stringtable.xml
@ -276,6 +276,7 @@
            <Russian>Выключить командное меню</Russian>
            <Hungarian>Parancsnoki menü kikapcsolása</Hungarian>
            <Italian>Disabilita Menù di comando</Italian>
+            <Portuguese>Desabilitar menu de comando</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_Unknown">
            <English>Unknown</English>
@ -287,6 +288,7 @@
            <Hungarian>Ismeretlen</Hungarian>
            <Italian>Sconosciuto</Italian>
            <French>Inconnu</French>
+            <Portuguese>Desconhecido</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_NoVoice">
            <English>No Voice</English>
@ -298,6 +300,7 @@
            <Hungarian>Nincs hang</Hungarian>
            <Italian>Senza voce</Italian>
            <French>Pas de voix</French>
+            <Portuguese>Sem voz</Portuguese>
        </Key>
        <Key ID="STR_ACE_ACTION_ACCEPT_REQUEST_KEY_TITLE">
            <English>Accept Requests</English>
@ -309,6 +312,7 @@
            <French>Accepter requête</French>
            <Russian>Принять запросы</Russian>
            <Hungarian>Kérések elfogadása</Hungarian>
+            <Portuguese>Aceitar Pedido</Portuguese>
        </Key>
        <Key ID="STR_ACE_ACTION_DECLINE_REQUEST_KEY_TITLE">
            <English>Decline Requests</English>
@ -320,6 +324,7 @@
            <Russian>Отклонить запросы</Russian>
            <French>Rejeter requête</French>
            <Hungarian>Kérések elutasítása</Hungarian>
+            <Portuguese>Rejeitar pedido</Portuguese>
        </Key>
        <Key ID="STR_ACE_ACTION_ACCEPT_REQUEST_KEY_TOOLTIP">
            <English>Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions.</English>
@ -331,6 +336,7 @@
            <Russian>Принять запросы, отправленные другими игроками. Например, запросы на использование/совместное использование снаряжения, выполнение определенных действий</Russian>
            <French>Accepter les requêtes d'autres joueurs. Comme l'utilisation / l'échange d'équipement, la réalisation d'actions.</French>
            <Hungarian>Más játékosok általi kérések elfogadása. Ezek a kérések vonatkozhatnak a felszerelés használatára/megosztására, valamint különböző cselekményekre.</Hungarian>
+            <Portuguese>Aceitar pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações.</Portuguese>
        </Key>
        <Key ID="STR_ACE_ACTION_DECLINE_REQUEST_KEY_TOOLTIP">
            <English>Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions.</English>
@ -342,6 +348,7 @@
            <Russian>Отклонить запросы, отправленные другими игроками. Например, запросы на использование/совместное использование снаряжения, выполнение определенных действий</Russian>
            <French>Rejeter les requêtes d'autres joueurs. Comme l'utilisation / l'échange d'équipement, la réalisation d'actions.</French>
            <Hungarian>Más játékosok általi kérések elutasítása. Ezek a kérések vonatkozhatnak a felszerelés használatára/megosztására, valamint különböző cselekményekre.</Hungarian>
+            <Portuguese>Rejeita pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_SettingFeedbackIconsName">
            <English>Feedback icons</English>
@ -353,6 +360,7 @@
            <French>Icones d'information</French>
            <Czech>Pomocné ikony</Czech>
            <Hungarian>Visszajelző ikonok</Hungarian>
+            <Portuguese>Ícones de Feedback</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_SettingFeedbackIconsDesc">
            <English>Select the position of or disable the feedback icons on your screen. These icons will show to provide extra feedback on your character status and actions performed.</English>
@ -364,6 +372,7 @@
            <French>Sélection de la position ou la désactivation des icones de feedback. Ces icones vous apportent des informations complémentaires sur votre status et sur les actions en cours.</French>
            <Czech>Nastavuje pozici nebo vypíná pomocné ikony. Tyto ikony ukazují extra informace ke stavu postavy a vykonávaných činností.</Czech>
            <Hungarian>Itt beállítható a visszajelző ikonok képernyőn lévő helyzete és jelenléte. Ezek az ikonok extra visszajelzést biztosítanak a karaktered állapotán és végrehajtott cselekvésein.</Hungarian>
+            <Portuguese>Selecione a posição ou disabilite a posição dos ícones de feedback na sua tela. Esses ícones irão aparecer para mostrar feedback extra do status do seu personagem e ações realizadas.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_SettingProgressbarLocationName">
            <English>Progress bar location</English>
@ -375,28 +384,31 @@
            <French>Position de la barre de progression</French>
            <Czech>Pozice ukazetele průběhu činnosti</Czech>
            <Hungarian>Állapotjelző sáv helyzete</Hungarian>
+            <Portuguese>Local da barra de progresso</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_SettingProgressbarLocationDesc">
            <English>Set the desired location of the progress bar on your screen.</English>
            <German>Setze die gewünschte Position der Fortschrittsanzeige fest.</German>
            <Spanish>Seleccionar la ubicación deseada de la barra de progreso en tu pantalla</Spanish>
-            <Italian>Modifica la posizione su schermo della barra di avanzamento.</Italian>
+            <Italian>Modifica la posizione della barra di avanzamernto sullo schermo</Italian>
            <Russian>Установите желаемое положение строки состояния на экране.</Russian>
            <Polish>Ustaw pożądaną lokalizację paska postępu na ekranie</Polish>
            <French>Appliquer la position de la barre de progression sur l'écran</French>
            <Czech>Nastavuje pozici ukazetele průběhu činnosti na vaší obrazovce.</Czech>
            <Hungarian>Itt beállítható az állapotjelző sáv képernyődön lévő helyzete.</Hungarian>
+            <Portuguese>Define o local desejado da barra de progresso na sua tela.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_SettingDisplayTextColorName">
            <English>Hint Background color</English>
            <German>Hintergrundfarbe der Hinweise</German>
            <Spanish>Color de fondo de las notificaciones</Spanish>
-            <Italian>Sfondo dei Suggerimenti</Italian>
+            <Italian>Colore di sfondo dei Suggerimenti</Italian>
            <Russian>Цвет фона всплывающих подсказок</Russian>
            <Polish>Kolor tła powiadomień</Polish>
            <French>Notification: couleur de l'arrière plan</French>
            <Czech>Barva pozadí nápovědy</Czech>
            <Hungarian>Súgó háttérszíne</Hungarian>
+            <Portuguese>Cor do fundo da hint</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_SettingDisplayTextColorDesc">
            <English>The color of the background from the ACE hints.</English>
@ -408,28 +420,31 @@
            <French>Notification ACE: couleur de l'arrière plan</French>
            <Czech>Barva pozadí ACE nápověd.</Czech>
            <Hungarian>Az ACE-súgók hátterének színe.</Hungarian>
+            <Portuguese>A cor de fundo das hints do ACE.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_SettingDisplayTextFontColorName">
            <English>Hint text font color</English>
            <German>Textfarbe der Hinweise</German>
            <Spanish>Color del texto de las notificaciones</Spanish>
-            <Italian>Testo dei Suggerimenti</Italian>
+            <Italian>Il colore del Testo dei Suggerimenti</Italian>
            <Russian>Цвет шрифта всплывающих подсказок</Russian>
            <Polish>Kolor tekstu powiadomień</Polish>
            <French>Notification: couleur du texte</French>
            <Czech>Barva fontu nápověd.</Czech>
            <Hungarian>Súgószöveg betűinek színe</Hungarian>
+            <Portuguese>Cor do do texto da hint</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_SettingDisplayTextFontColorDesc">
            <English>The color of the text font from the ACE hints. This color is the default color for all text displayed through the ACE Hint system, if the hint text has no other color specified.</English>
            <German>Wähle die Textfarbe für ACE-Hinweise. Die gewählte Farbe wird als Standartfarbe der Hinweise angezeigt, wenn der Hinweis selbst keine spezifische Farbe hat. </German>
            <Spanish>El color del texto de las notificaciones del ACE. Este es el color predeterminado para todo el texto que se muestra a través del sistema de notificaciones del ACE, si el texto de notificación no tiene otro color especificado.</Spanish>
-            <Italian>Il colore del testo dei suggerimenti dell'ACE. Questo è il colore standard per tutti i caratteri mostrati dal sistema di suggerimenti dell'ACE, se questo non è altrimenti specificato.</Italian>
+            <Italian>Il colore del testo dei suggerimenti dell'ACE. Questo è il colore standard per tutti i caratteri mostrati dal sistema di suggerimenti dell'ACE, se il colore del testo non è specificato.</Italian>
            <Russian>Цвет шрифта текста всплывающих подсказок АСЕ. Этот цвет является стандартным для всего текста, транслирующегося через систему подсказок АСЕ, если не установлено другого цвета для текста подсказок.</Russian>
            <Polish>Kolor tekstu dla powiadomień ACE. Ten kolor jest domyślnym dla wszystkich tekstów wyświetlanych poprzez System Powiadomień ACE, jeżeli dla powiadomienia nie określono innego koloru.</Polish>
            <French>Notification ACE: couleur du texte. C'est la couleur par défaut de tout texte affiché dans les notifications ACE, si aucune couleur n'est spécifiée pour les notifications</French>
            <Czech>Barva fontu ACE nápověd. Toto je standardní barva pro všechen text zobrazovaný ACE nápovědami, pokud nemá nápověda žádnou specifikanou barvu.</Czech>
            <Hungarian>Az ACE-súgók betűkészletének színek. Ez a szín alapértelmezett az összes szövegre az ACE-súgórendszerben, ha a súgószöveg maga nem ad meg más színt.</Hungarian>
+            <Portuguese>A cor do texto das hints do ACE. Essa cor é a cor default para todos os texos exibidos pelo sistema de hints do ACE , caso o texto da hint não tem outra cor especificada.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_bananaDisplayName">
            <English>Banana</English>
@ -441,17 +456,19 @@
            <Polish>Banan</Polish>
            <French>Banane</French>
            <Hungarian>Banán</Hungarian>
+            <Portuguese>Banana</Portuguese>
        </Key>
        <Key ID="STR_ACE_Common_bananaDescr">
            <English>A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa.</English>
            <German>Die Bananen (Musa) sind eine Pflanzengattung in der Familie der Bananengewächse (Musaceae) innerhalb der Einkeimblättrigen Pflanzen (Monokotyledonen).</German>
            <Spanish>Una banana es una fruta comestible, botanicamente una baya, producida por varios tipos de grandes plantas herbáceas del género Musa.</Spanish>
            <Czech>Banán je protáhlé ovoce a plod banánovníku (epigeická bobule).</Czech>
-            <Italian>Una banana è un frutto commestibile, nello specifico una bacca cuoiosa, prodotto da un gran numero di grandi pianti erbacee dotate di fiori, della famiglia delle Musaceae.</Italian>
+            <Italian>Una banana è un frutto commestibile, nello specifico una bacca cuoiosa, prodotta da un gran numero di grandi piante erbacee dotate di fiori, della famiglia delle Musaceae.</Italian>
            <Russian>Банан - это съедобный фрукт, ягода с ботанической точки зрения, произрастающий на нескольких видах травянистых растениях рода Банан (Musa).</Russian>
            <Hungarian>A banán egy ehető gyümölcs, technikai szempontból bogyótermés, melyet több fürtvirágzatú növény termel a Musa rendszertani nemzetségben.</Hungarian>
            <Polish>Rodzaj roślin z rodziny bananowatych, obejmujący około 80 gatunków.&lt;br /&gt;Przedstawiciele są typowymi przedstawicielami flory międzyzwrotnikowej Azji, Afryki i Australii.&lt;br /&gt;Część gatunków dostarcza jadalnych owoców. Słowo banan pochodzi prawdopodobnie od arabskiego słowa banan, co oznacza palec, lub afrykańskiego języka wolof, w którym rośliny te określa się mianem banaana.</Polish>
            <French>Une banane est un fruit qui, d'un point de vue botanique, fait partie du groupe des baies. Produite par plusieurs sortes de grandes plantes à fleurs herbacées du type Musa.</French>
+            <Portuguese>A banana é uma fruta comestível, botanicamente uma baga, produzida por vários tipos de plantas herbáceas grandes do genero Musa.</Portuguese>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/disposable/stringtable.xml
+++ b/addons/disposable/stringtable.xml
@ -11,6 +11,7 @@
            <Hungarian>Elhasznált kilövőcső</Hungarian>
            <Russian>Отстрелянная труба</Russian>
            <Italian>Tubo utilizzato</Italian>
+            <Portuguese>Tubo utilizado</Portuguese>
        </Key>
        <Key ID="STR_ACE_Disposable_UsedTubeDescription">
            <English>Used disposable rocket launcher</English>
@ -22,6 +23,7 @@
            <Hungarian>Elhasznált eldobható rakétavető</Hungarian>
            <Russian>Отстрелянная одноразовая пусковая установка</Russian>
            <Italian>Lanciarazzi monouso utilizzato</Italian>
+            <Portuguese>Lança foguetes descartável utilizado</Portuguese>
        </Key>
        <Key ID="STR_ACE_Disposable_PreloadedMissileDummy">
            <English>Preloaded Missile Dummy</English>
@ -33,6 +35,7 @@
            <Hungarian>Előtöltött műrakéta</Hungarian>
            <Russian>Предзаряженная ракетная болванка</Russian>
            <Italian>Missile stupido precaricato</Italian>
+            <Portuguese>Míssel dummy pré-carregado</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/dragging/stringtable.xml
+++ b/addons/dragging/stringtable.xml
@ -7,7 +7,7 @@
            <Spanish>Arrastrar</Spanish>
            <Polish>Ciągnij</Polish>
            <Czech>Táhnout</Czech>
-            <French>Tracter</French>
+            <French>Trainer</French>
            <German>Ziehen</German>
            <Portuguese>Arrastar</Portuguese>
            <Italian>Trascina</Italian>
@ -21,7 +21,7 @@
            <Czech>Položit</Czech>
            <French>Lâcher</French>
            <German>Loslassen</German>
-            <Portuguese>Largar</Portuguese>
+            <Portuguese>Soltar</Portuguese>
            <Italian>Lascia</Italian>
            <Hungarian>Elengedés</Hungarian>
        </Key>
--- a/addons/explosives/functions/fnc_getDetonators.sqf
+++ b/addons/explosives/functions/fnc_getDetonators.sqf
@ -21,7 +21,7 @@ _result = [];

 {
    _config = ConfigFile >> "CfgWeapons" >> _x;
-    if (getNumber (_config >> "ACE_Detonator") == 1) then {
+    if (getNumber (_config >> "ACE_Detonator") == 1 && {!(_x in _result)}) then {
        _result pushBack _x;
    };
 } forEach _items;
--- a/addons/explosives/stringtable.xml
+++ b/addons/explosives/stringtable.xml
@ -42,7 +42,7 @@
            <German>Sprengstoffcode: %1</German>
            <Spanish>Código del explosivo: %1</Spanish>
            <Polish>Kod ładunku: %1</Polish>
-            <French>Code explosif: %1</French>
+            <French>Code de l'explosif: %1</French>
            <Czech>Kód výbušniny: %1</Czech>
            <Hungarian>Robbanóanyag kódja: %1</Hungarian>
            <Portuguese>Código do explosivo: %1</Portuguese>
@ -222,7 +222,7 @@
            <German>Löschen</German>
            <Spanish>Borrar</Spanish>
            <Polish>Usuń</Polish>
-            <French>Désamorçé</French>
+            <French>Effacer</French>
            <Czech>Čistý</Czech>
            <Italian>Libera</Italian>
            <Hungarian>Törlés</Hungarian>
@ -477,7 +477,9 @@
            <Polish>Czuwak</Polish>
            <Spanish>Detonador de hombre muerto</Spanish>
            <Hungarian>Dead Man's Switch</Hungarian>
+            <Portuguese>Detonador do homem morto</Portuguese>
            <Russian>Кнопка мертвеца</Russian>
+            <Italian>Detonatore a rilascio</Italian>
        </Key>
        <Key ID="STR_ACE_Explosives_DeadManSwitch_description">
            <English>Used to remotely trigger explosives when released.</English>
@ -486,9 +488,10 @@
            <Czech>Používaný k vzdálenému odpálení, při uvolnění odpálí výbušniny</Czech>
            <Polish>Używany w celu zdalnej detonacji ładunków, kiedy jego operator zostanie zabity.</Polish>
            <Spanish>Utilizado para detonar explosivos remotamente al soltarlo.</Spanish>
-            <Hungarian>Robbanóanyagok távoli robbantásához való, elengedéskor gyújt.</Hungarian>
+            <Hungarian>Robbanóanyagok távoli robbantásához</Hungarian>
+            <Portuguese>Usado para detonar remotamente o explosivo quando solto.</Portuguese>
            <Russian>Используется для дистанционного подрыва, после смерти оператора.</Russian>
-            <Italian>Usato per attivare esplosivi quando rilasciato</Italian>
+            <Italian>Usato per attivare esplosivi al momento del rilascio</Italian>
        </Key>
        <Key ID="STR_ACE_Explosives_Pickup">
            <English>Pick up</English>
@ -500,6 +503,7 @@
            <Hungarian>Felszedés</Hungarian>
            <Russian>Поднять</Russian>
            <Italian>Raccogli</Italian>
+            <Portuguese>Pegar</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/fcs/stringtable.xml
+++ b/addons/fcs/stringtable.xml
@ -10,6 +10,8 @@
            <Spanish>Iluminar objetivo / Medir distancia</Spanish>
            <Russian>Подсветить цель / Замерить расстояние</Russian>
            <Hungarian>Célpont lézerezése / Távolság Bemérése</Hungarian>
+            <Italian>Misura la distanza</Italian>
+            <Portuguese>Marcar com laser / Medir Distância</Portuguese>
        </Key>
        <Key ID="STR_ACE_FCS_ZeroedTo">
            <English>Zeroed To</English>
--- a/addons/frag/stringtable.xml
+++ b/addons/frag/stringtable.xml
@ -11,6 +11,7 @@
            <French>Désactive la fragmentation</French>
            <Hungarian>Repeszek letiltása</Hungarian>
            <Italian>Disattiva la frammentazione</Italian>
+            <Portuguese>Disabilitar Fragmentação</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/grenades/CfgAmmo.hpp
+++ b/addons/grenades/CfgAmmo.hpp
@ -82,7 +82,7 @@ class CfgAmmo {
        SmokeShellSoundHit3[] = {"A3\Sounds_F\weapons\smokeshell\smoke_3",1.25893,1,100};
        SmokeShellSoundLoop1[] = {"A3\Sounds_F\weapons\smokeshell\smoke_loop1",0.125893,1,70};
        SmokeShellSoundLoop2[] = {"A3\Sounds_F\weapons\smokeshell\smoke_loop2",0.125893,1,70};
-        timeToLive = 60;
+        timeToLive = 6;
        fuseDistance = 2.3;
        model = PATHTOF(models\ACE_m84_thrown.p3d);
    };
--- a/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
+++ b/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
@ -56,7 +56,7 @@ _affected = _grenade nearEntities ["CAManBase", 20];
                };
            } forEach [[0,0,0], [0,0,0.2], [0.1, 0.1, 0.1], [-0.1, -0.1, 0.1]];
            TRACE_1("Line of sight count (out of 4)",_losCount);
-            if (_losCount == 0) then {
+            if (_losCount <= 1) then {
                _strength = _strength / 10;
            };

--- a/addons/grenades/stringtable.xml
+++ b/addons/grenades/stringtable.xml
@ -95,7 +95,7 @@
            <Russian>XM84 (M84) - граната нелетального действия, и предназначена для отвлечения и временного вывода из строя, либо дезориентации противника. Основное использование нашла при освобождении заложников, захвате преступников и террористов, а также проведении диверсионных миссий.</Russian>
            <Hungarian>Villanógránát néven is ismert. Azonnali villanási vakságot, süketséget, fülzúgást, és belső füli zavart okoz.</Hungarian>
            <Italian>Anche conosciuta come flashbang. Causa accecamento immediato, sensazioni di sposatezza, mancanza d'equilibrio e disturbi al timpano.</Italian>
-            <Portuguese>Um tipo de granada não-letal destinado a confundir, desorientar e distrair uma potencial ameaça.</Portuguese>
+            <Portuguese>Também conhecida como flashbang. Causa uma clarão imediato, cegueira, surdez, zumbido e distúrbio no tímpano.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Grenades_M127A1_White_Name">
            <English>M127A1 Hand Held Signal (White)</English>
@ -152,7 +152,7 @@
            <Hungarian>Kézi jelzőrakéta, Fehér színű</Hungarian>
            <Italian>Bengala (Bianco)</Italian>
            <Polish>Flara ręczna (biała)</Polish>
-            <Portuguese>Sinalizador (Branco)</Portuguese>
+            <Portuguese>Sinalizador de Mão (Branco)</Portuguese>
            <Russian>Фальшфейер (Белый)</Russian>
            <Spanish>Bengala (Blanca)</Spanish>
            <French>Feux à main (Blanc)</French>
@ -164,7 +164,7 @@
            <Hungarian>Kézi jelzőrakéta, Piros színű</Hungarian>
            <Italian>Bengala (Rosso)</Italian>
            <Polish>Flara ręczna (czerwona)</Polish>
-            <Portuguese>Sinalizador (Vermelho)</Portuguese>
+            <Portuguese>Sinalizador de Mão (Vermelho)</Portuguese>
            <Russian>Фальшфейер (Красный)</Russian>
            <Spanish>Bengala (Roja)</Spanish>
            <French>Feux à main (Rouge)</French>
@ -176,7 +176,7 @@
            <Hungarian>Kézi jelzőrakéta, Zöld színű</Hungarian>
            <Italian>Bengala (Verde)</Italian>
            <Polish>Flara ręczna (zielona)</Polish>
-            <Portuguese>Sinalizador (Verde)</Portuguese>
+            <Portuguese>Sinalizador de Mão (Verde)</Portuguese>
            <Russian>Фальшфейер (Зелёный)</Russian>
            <Spanish>Bengala (Verde)</Spanish>
            <French>Feux à main (Vert)</French>
@ -188,7 +188,7 @@
            <Hungarian>Kézi jelzőrakéta, Sárga színű</Hungarian>
            <Italian>Bengala (Giallo)</Italian>
            <Polish>Flara ręczna (żółta)</Polish>
-            <Portuguese>Sinalizador (Amarelo)</Portuguese>
+            <Portuguese>Sinalizador de Mão (Amarelo)</Portuguese>
            <Russian>Фальшфейер (Жёлтые)</Russian>
            <Spanish>Bengala (Amarilla)</Spanish>
            <French>Feux à main (Jaune)</French>
@ -242,4 +242,4 @@
            <Spanish>M127A1 (Amarilla)</Spanish>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/interact_menu/XEH_clientInit.sqf
+++ b/addons/interact_menu/XEH_clientInit.sqf
@ -8,7 +8,7 @@ GVAR(ParsedTextCached) = [];
 //Setup text/shadow color matrix
 [] call FUNC(setupTextColors);
 ["SettingChanged", {
-    PARAMS_2(_name,_value);
+    PARAMS_1(_name);
    if ((_name == QGVAR(colorTextMax)) || {_name == QGVAR(colorTextMin)} || {_name == QGVAR(colorShadowMax)} || {_name == QGVAR(colorShadowMin)}) then {
        [] call FUNC(setupTextColors);
    };
--- a/addons/interact_menu/config.cpp
+++ b/addons/interact_menu/config.cpp
@ -24,6 +24,13 @@ class ACE_Settings {
        typeName = "BOOL";
        isClientSettable = 1;
        displayName = "$STR_ACE_Interact_Menu_AlwaysUseCursorSelfInteraction";
+    };    
+    class GVAR(cursorKeepCentered) {
+        value = 0;
+        typeName = "BOOL";
+        isClientSettable = 1;
+        displayName = "$STR_ACE_Interact_cursorKeepCentered";
+        description = "$STR_ACE_Interact_cursorKeepCenteredDescription";
    };
    class GVAR(AlwaysUseCursorInteraction) {
        value = 0;
--- a/addons/interact_menu/functions/fnc_compileMenu.sqf
+++ b/addons/interact_menu/functions/fnc_compileMenu.sqf
@ -26,8 +26,7 @@ if !(isNil {missionNamespace getVariable [_actionsVarName, nil]}) exitWith {};

 private "_recurseFnc";
 _recurseFnc = {
-    private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_selection", "_condition", "_showDisabled",
-            "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction"];
+    private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_selection", "_condition", "_showDisabled", "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction", "_i"];
    EXPLODE_1_PVT(_this,_actionsCfg);
    _actions = [];

--- a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
+++ b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
@ -14,7 +14,7 @@

 EXPLODE_1_PVT(_this,_target);

-private ["_objectType","_actionsVarName"];
+private ["_objectType","_actionsVarName", "_canCollapse", "_children", "_enableInside", "_entry", "_entryCfg", "_i", "_insertChildren", "_modifierFunction", "_runOnHover"];
 _objectType = _target;
 if (typeName _target == "OBJECT") then {
    _objectType = typeOf _target;
@ -26,7 +26,7 @@ if !(isNil {missionNamespace getVariable [_actionsVarName, nil]}) exitWith {};

 private "_recurseFnc";
 _recurseFnc = {
-    private ["_actions", "_displayName", "_distance", "_icon", "_statement", "_selection", "_condition", "_showDisabled",
+    private ["_actions", "_displayName", "_icon", "_statement", "_condition", "_showDisabled",
            "_enableInside", "_canCollapse", "_runOnHover", "_children", "_entry", "_entryCfg", "_insertChildren", "_modifierFunction"];
    EXPLODE_1_PVT(_this,_actionsCfg);
    _actions = [];
--- a/addons/interact_menu/functions/fnc_createAction.sqf
+++ b/addons/interact_menu/functions/fnc_createAction.sqf
@ -28,6 +28,7 @@

 EXPLODE_5_PVT(_this,_actionName,_displayName,_icon,_statement,_condition);

+// IGNORE_PRIVATE_WARNING(_target);
 private ["_insertChildren","_customParams","_position","_distance","_params", "_modifierFunction"];

 _insertChildren = if (count _this > 5) then {
--- a/addons/interact_menu/functions/fnc_findActionNode.sqf
+++ b/addons/interact_menu/functions/fnc_findActionNode.sqf
@ -19,7 +19,7 @@

 EXPLODE_2_PVT(_this,_actionTreeList,_parentPath);

-private ["_parentNode", "_foundParentNode", "_fnc_findFolder"];
+private ["_parentNode", "_foundParentNode", "_fnc_findFolder", "_actionTree"];

 // Hack to make this work on the root node too
 if (count _parentPath == 0) exitWith {
--- a/addons/interact_menu/functions/fnc_keyDown.sqf
+++ b/addons/interact_menu/functions/fnc_keyDown.sqf
@ -43,8 +43,14 @@ if (GVAR(useCursorMenu)) then {
    // uiNamespace getVariable QGVAR(dlgCursorMenu);
    // uiNamespace getVariable QGVAR(cursorMenuOpened);
    ctrlEnable [91921, true];
+    GVAR(cursorPos) = [0.5,0.5,0];
    ((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseMoving", {
-        GVAR(cursorPos) = [_this select 1, _this select 2, 0];
+        if (GVAR(cursorKeepCentered)) then {
+            GVAR(cursorPos) = GVAR(cursorPos) vectorAdd [_this select 1, _this select 2, 0] vectorDiff [0.5, 0.5, 0];
+            setMousePosition [0.5, 0.5];
+        } else {
+            GVAR(cursorPos) = [_this select 1, _this select 2, 0];
+        };
    }];
    setMousePosition [0.5, 0.5];
 };
--- a/addons/interact_menu/functions/fnc_removeActionFromClass.sqf
+++ b/addons/interact_menu/functions/fnc_removeActionFromClass.sqf
@ -19,7 +19,7 @@

 EXPLODE_3_PVT(_this,_objectType,_typeNum,_fullPath);

-private ["_res","_varName","_actionTrees"];
+private ["_res","_varName","_actionTrees", "_actionIndex", "_parentLevel", "_parentNode"];
 _res = _fullPath call FUNC(splitPath);
 EXPLODE_2_PVT(_res,_parentPath,_actionName);

--- a/addons/interact_menu/functions/fnc_render.sqf
+++ b/addons/interact_menu/functions/fnc_render.sqf
@ -14,7 +14,7 @@

 BEGIN_COUNTER(fnc_render);

-private ["_cursorPos1", "_cursorPos2", "_cursorVec", "_p1", "_p2", "_p", "_v", "_cp", "_forEachIndex", "_renderTargets", "_x", "_cursorScreenPos", "_closestDistance", "_closestSelection", "_pos", "_sPos", "_disSq", "_closest", "_cTime", "_delta", "_foundTarget", "_misMatch", "_hoverPath", "_i"];
+private ["_cursorPos1", "_cursorPos2", "_p1", "_p2", "_forEachIndex", "_x", "_cursorScreenPos", "_closestDistance", "_closestSelection", "_sPos", "_disSq", "_closest", "_cTime", "_delta", "_foundTarget", "_misMatch", "_hoverPath", "_i", "_actionData", "_player", "_target"];
 _foundTarget = false;
 _cursorPos1 = positionCameraToWorld [0, 0, 0];
 _cursorPos2 = positionCameraToWorld [0, 0, 2];
--- a/addons/interact_menu/functions/fnc_renderActionPoints.sqf
+++ b/addons/interact_menu/functions/fnc_renderActionPoints.sqf
@ -14,7 +14,7 @@

 GVAR(currentOptions) = [];

-private ["_player","_numInteractObjects","_numInteractions","_actionsVarName","_classActions","_objectActions","_target","_player","_action","_actionData","_active","_cameraPos","_cameraDir"];
+private ["_player","_numInteractObjects","_numInteractions","_actionsVarName","_classActions","_target","_player","_action","_cameraPos","_cameraDir", "_lambda", "_nearestObjects", "_pos"];
 _player = ACE_player;

 _fnc_renderNearbyActions = {
--- a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf
+++ b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf
@ -16,7 +16,7 @@

 BEGIN_COUNTER(fnc_renderBaseMenu)

-private ["_distance","_pos","_weaponDir","_ref","_cameraPos","_sPos","_activeActionTree"];
+private ["_distance","_pos","_weaponDir","_ref","_sPos","_activeActionTree", "_line"];

 EXPLODE_2_PVT(_this,_object,_baseActionNode);
 EXPLODE_1_PVT(_baseActionNode,_actionData);
@ -50,11 +50,12 @@ if (GVAR(openedMenuType) == 0 && vehicle ACE_player == ACE_player &&

        if (_actualDistance > _distance) exitWith {true};

-        if (_distance > 1.0) exitWith {
+        if (_actualDistance > 1.0) exitWith {
            // If distance to action is greater than 1.0 m, check LOS
            _line = [_headPos call EFUNC(common,positionToASL), _pos call EFUNC(common,positionToASL), _object, ACE_player];
            lineIntersects _line
        };
+        false
    }) exitWith {false};

 // Exit if the action is behind you
--- a/addons/interact_menu/functions/fnc_renderIcon.sqf
+++ b/addons/interact_menu/functions/fnc_renderIcon.sqf
@ -17,7 +17,7 @@
 */
 #include "script_component.hpp"
 #define DEFAULT_ICON QUOTE(\z\ace\addons\interaction\ui\dot_ca.paa)
-private ["_ctrl"];
+private ["_ctrl", "_pos", "_displayNum"];
 PARAMS_6(_text,_icon,_sPos,_textColor,_shadowColor,_iconColor);

 //systemChat format ["Icon %1 - %2,%3", _text, _sPos select 0, _sPos select 1];
@ -27,6 +27,7 @@ if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then {
    GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]);
 };
 _ctrl = GVAR(iconCtrls) select GVAR(iconCount);
+GVAR(iconCount) = GVAR(iconCount) + 1;
 if(_icon == "") then {
    _icon = DEFAULT_ICON;
 };
@ -39,11 +40,18 @@ _text = if (GVAR(UseListMenu)) then {

 //_ctrl ctrlSetStructuredText parseText _text;
 [_ctrl, GVAR(iconCount), _text] call FUNC(ctrlSetParsedTextCached);
-GVAR(iconCount) = GVAR(iconCount) + 1;

+_pos = [];
 if (GVAR(UseListMenu)) then {
-    _ctrl ctrlSetPosition [(_sPos select 0)-(0.0095*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.20*SafeZoneW, 0.035*SafeZoneW];
+    _pos = [(_sPos select 0)-(0.0095*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.20*SafeZoneW, 0.035*SafeZoneW];
 } else {
-    _ctrl ctrlSetPosition [(_sPos select 0)-(0.0750*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.15*SafeZoneW, 0.100*SafeZoneW];
+    _pos = [(_sPos select 0)-(0.0750*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.15*SafeZoneW, 0.100*SafeZoneW];
 };
+
+if (GVAR(cursorKeepCentered) && {uiNamespace getVariable [QGVAR(cursorMenuOpened),false]}) then {
+    _pos set [0, ((_pos select 0) - (GVAR(cursorPos) select 0) + 0.5)];
+    _pos set [1, ((_pos select 1) - (GVAR(cursorPos) select 1) + 0.5)];
+};
+
+_ctrl ctrlSetPosition _pos;
 _ctrl ctrlCommit 0;
--- a/addons/interact_menu/functions/fnc_renderMenu.sqf
+++ b/addons/interact_menu/functions/fnc_renderMenu.sqf
@ -15,7 +15,7 @@
 */
 #include "script_component.hpp"

-private ["_menuInSelectedPath", "_path", "_menuDepth", "_currentRenderDepth", "_x", "_offset", "_newPos", "_forEachIndex"];
+private ["_menuInSelectedPath", "_path", "_menuDepth", "_x", "_offset", "_newPos", "_forEachIndex", "_player", "_pos", "_shadowColor", "_target", "_textColor"];

 EXPLODE_4_PVT(_this,_parentPath,_action,_sPos,_angles);
 EXPLODE_3_PVT(_action,_actionData,_activeChildren,_actionObject);
--- a/addons/interact_menu/functions/fnc_renderSelector.sqf
+++ b/addons/interact_menu/functions/fnc_renderSelector.sqf
@ -15,21 +15,29 @@

 EXPLODE_2_PVT(_this,_sPos,_icon);

+private ["_displayNum", "_ctrl", "_pos"];
+
 if(GVAR(iconCount) > (count GVAR(iconCtrls))-1) then {
    _displayNum = [[46, 12] select visibleMap,91919] select (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]);
    GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]);
 };

-private "_ctrl";
 _ctrl = GVAR(iconCtrls) select GVAR(iconCount);
+GVAR(iconCount) = GVAR(iconCount) + 1;

+_pos = [];
 if (GVAR(UseListMenu)) then {
 	[_ctrl, GVAR(iconCount), format ["<img image='%1' color='#FF0000' size='1.6'/>", _icon]] call FUNC(ctrlSetParsedTextCached);
-	_ctrl ctrlSetPosition [(_sPos select 0)-(0.014*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.05*SafeZoneW, 0.035*SafeZoneW];
+	_pos = [(_sPos select 0)-(0.014*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.05*SafeZoneW, 0.035*SafeZoneW];
 } else {
 	[_ctrl, GVAR(iconCount), format ["<img image='%1' color='#FF0000' size='1.6' align='center'/>", _icon]] call FUNC(ctrlSetParsedTextCached);
-	_ctrl ctrlSetPosition [(_sPos select 0)-(0.050*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW];
+	_pos = [(_sPos select 0)-(0.050*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW];
 };
-//_ctrl ctrlSetBackgroundColor [1, 0, 0, 0.1];
-GVAR(iconCount) = GVAR(iconCount) + 1;
+
+if (GVAR(cursorKeepCentered) && {uiNamespace getVariable [QGVAR(cursorMenuOpened),false]}) then {
+    _pos set [0, ((_pos select 0) - (GVAR(cursorPos) select 0) + 0.5)];
+    _pos set [1, ((_pos select 1) - (GVAR(cursorPos) select 1) + 0.5)];
+};
+
+_ctrl ctrlSetPosition _pos;
 _ctrl ctrlCommit 0;
--- a/addons/interact_menu/functions/fnc_setupTextColors.sqf
+++ b/addons/interact_menu/functions/fnc_setupTextColors.sqf
@ -12,7 +12,7 @@
 */
 #include "script_component.hpp"

-private ["_mixColor", "_rowT", "_rowS", "_menuDepth", "_pathCount", "_menuInSelectedPath", "_color", "_path"];
+private ["_mixColor", "_rowT", "_rowS", "_menuDepth", "_pathCount"];

 //Mixes 2 colors (number arrays) and makes a color string "#AARRGGBB" for structured text
 _mixColor = {
--- a/addons/interact_menu/functions/fnc_splitPath.sqf
+++ b/addons/interact_menu/functions/fnc_splitPath.sqf
@ -13,7 +13,7 @@
 */
 #include "script_component.hpp"

-private ["_parentPath","_actionName"];
+private ["_parentPath","_actionName", "_i"];
 _parentPath = [];
 for [{_i = 0},{_i < (count _this) - 1},{_i = _i + 1}] do {
    _parentPath pushBack (_this select _i);
--- a/addons/interact_menu/script_component.hpp
+++ b/addons/interact_menu/script_component.hpp
@ -1,6 +1,8 @@
 #define COMPONENT interact_menu
 #include "\z\ace\addons\main\script_mod.hpp"

+// #define DEBUG_MODE_FULL
+
 #ifdef DEBUG_ENABLED_INTERACT_MENU
    #define DEBUG_MODE_FULL
 #endif
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@ -11,6 +11,7 @@
            <French>Toujours afficher le curseur pour les interactions sur soi-même</French>
            <Hungarian>Mindig legyen a saját cselekvés kurzorja látható</Hungarian>
            <Italian>Mostra sempre il cursore per le auto interazioni</Italian>
+            <Portuguese>Sempre mostrar cursor para interação pessoal</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interact_Menu_AlwaysUseCursorInteraction">
            <English>Always display cursor for interaction</English>
@ -18,6 +19,8 @@
            <French>Toujours afficher le curseur pour les interactions</French>
            <Italian>Mostra sempre il cursore per le interazioni</Italian>
            <Polish>Zawsze wyświetlaj kursor dla interakcji</Polish>
+            <Russian>Показывать курсор (взаимодействие)</Russian>
+            <German>Immer den Cursor für Fremd-Interaktionen anzeigen</German>
        </Key>
        <Key ID="STR_ACE_Interact_Menu_UseListMenu">
            <English>Display interaction menus as lists</English>
@ -38,6 +41,7 @@
            <French>Touche d'interaction</French>
            <Hungarian>Cselekvő gomb</Hungarian>
            <Italian>Tasto interazione</Italian>
+            <Portuguese>Tecla de Interação</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interact_Menu_SelfInteractKey">
            <English>Self Interaction Key</English>
@ -49,6 +53,7 @@
            <French>Touche d'interaction personnelle</French>
            <Hungarian>Saját cselekvő gomb</Hungarian>
            <Italian>Tasto per auto interazioni</Italian>
+            <Portuguese>Tecla de Interação Pessoal</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interact_Menu_SelfActionsRoot">
            <English>Self Actions</English>
@ -60,6 +65,7 @@
            <French>Interaction personnelle</French>
            <Hungarian>Saját cselekvések</Hungarian>
            <Italian>Auto interazioni</Italian>
+            <Portuguese>Ações Pessoais</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interact_Menu_VehicleActionsRoot">
            <English>Vehicle Actions</English>
@ -71,22 +77,41 @@
            <French>Interaction véhicule</French>
            <Hungarian>Járműves cselekvések</Hungarian>
            <Italian>Interazioni con veicoli</Italian>
+            <Portuguese>Ações de Veículos</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interact_Menu_ColorTextMax">
            <English>Interaction - Text Max</English>
            <Polish>Interakcja - Tekst max</Polish>
+            <French>Interaction -Texte Max</French>
+            <German>Interaktionstextfarbe Max</German>
+            <Italian>Interazioni - Testo Massimo</Italian>
        </Key>
        <Key ID="STR_ACE_Interact_Menu_ColorTextMin">
            <English>Interaction - Text Min</English>
            <Polish>Interakcja - Tekst min</Polish>
+            <French>Interaction - Texte Min</French>
+            <German>Interaktionstextfarbe Min</German>
+            <Italian>Interazioni - Testo Minimo</Italian>
        </Key>
        <Key ID="STR_ACE_Interact_Menu_ColorShadowMax">
            <English>Interaction - Shadow Max</English>
            <Polish>Interakcja - Cień max</Polish>
+            <French>Interaction - Ombre Max</French>
+            <German>Interaktionstextschatten Max</German>
+            <Italian>Interazioni - Ombra Massima</Italian>
        </Key>
        <Key ID="STR_ACE_Interact_Menu_ColorShadowMin">
            <English>Interaction - Shadow Min</English>
            <Polish>Interakcja - Cień min</Polish>
+            <French>Interaction - Ombre Min</French>
+            <German>Interaktionstextschatten Min</German>
+            <Italian>Interazioni - Ombra Minima</Italian>
+        </Key>
+        <Key ID="STR_ACE_Interact_cursorKeepCentered">
+            <English>Keep cursor centered</English>
+        </Key>
+        <Key ID="STR_ACE_Interact_cursorKeepCenteredDescription">
+            <English>Keeps cursor centered and pans the option menu around.  Useful if screen size is limited.</English>
        </Key>
    </Package>
 </Project>
--- a/addons/interaction/stringtable.xml
+++ b/addons/interaction/stringtable.xml
@ -11,6 +11,7 @@
            <Russian>Взаимодействия</Russian>
            <Hungarian>Cselekvések</Hungarian>
            <Italian>Interazioni</Italian>
+            <Portuguese>Interaçãoes</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_Torso">
            <English>Torso</English>
@ -22,6 +23,7 @@
            <Russian>Торс</Russian>
            <Hungarian>Testtörzs</Hungarian>
            <Italian>Torso</Italian>
+            <Portuguese>Torso</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_Head">
            <English>Head</English>
@ -33,6 +35,7 @@
            <Russian>Голова</Russian>
            <Hungarian>Fej</Hungarian>
            <Italian>Testa</Italian>
+            <Portuguese>Cabeça</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_ArmLeft">
            <English>Left Arm</English>
@ -44,6 +47,7 @@
            <Russian>Левая рука</Russian>
            <Hungarian>Bal kar</Hungarian>
            <Italian>Braccio sinistro</Italian>
+            <Portuguese>Braço Esquerdo</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_ArmRight">
            <English>Right Arm</English>
@ -55,6 +59,7 @@
            <Russian>Правая рука</Russian>
            <Hungarian>Jobb kar</Hungarian>
            <Italian>Braccio destro</Italian>
+            <Portuguese>Braço Direito</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_LegLeft">
            <English>Left Leg</English>
@ -66,6 +71,7 @@
            <Russian>Левая нога</Russian>
            <Hungarian>Bal láb</Hungarian>
            <Italian>Gamba sinistra</Italian>
+            <Portuguese>Perna Esquerda</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_LegRight">
            <English>Right Leg</English>
@ -77,6 +83,7 @@
            <Russian>Правая нога</Russian>
            <Hungarian>Jobb láb</Hungarian>
            <Italian>Gamba destra</Italian>
+            <Portuguese>Perna Direita</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_Weapon">
            <English>Weapon</English>
@ -88,6 +95,7 @@
            <Russian>Оружие</Russian>
            <Hungarian>Fegyver</Hungarian>
            <Italian>Arma</Italian>
+            <Portuguese>Arma</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_InteractionMenu">
            <English>Interaction Menu</English>
@ -552,7 +560,7 @@
            <French>Jaune</French>
            <Polish>Żółty</Polish>
            <Czech>Žlutý</Czech>
-            <Russian>Желтый</Russian>
+            <Russian>Жёлтый</Russian>
            <Portuguese>Amarela</Portuguese>
            <Italian>Giallo</Italian>
            <Hungarian>Sárga</Hungarian>
@ -564,7 +572,7 @@
            <French>Rejoindre&lt;br/&gt;Rouge</French>
            <Polish>Dołącz do drużyny&lt;br/&gt;czerwonej</Polish>
            <Czech>Připojit do&lt;br/&gt;Červeného týmu</Czech>
-            <Russian>Присоединиться&lt;br/&gt;к красной группе</Russian>
+            <Russian>Присоединиться&lt;br/&gt;к Красной группе</Russian>
            <Portuguese>Unir-se à&lt;br/&gt;Equipe Vermelha</Portuguese>
            <Italian>Entra nella&lt;br/&gt;Squadra Rossa</Italian>
            <Hungarian>Csatlakozás a&lt;br/&gt;piros csapathoz</Hungarian>
@ -576,7 +584,7 @@
            <French>Rejoindre&lt;br/&gt;Vert</French>
            <Polish>Dołącz do&lt;br/&gt;drużyny zielonej</Polish>
            <Czech>Připojit do&lt;br/&gt;Zeleného týmu</Czech>
-            <Russian>Присоединиться&lt;br/&gt;к зеленой группе</Russian>
+            <Russian>Присоединиться&lt;br/&gt;к Зеленой группе</Russian>
            <Portuguese>Unir-se à&lt;br/&gt;Equipe Verde</Portuguese>
            <Italian>Entra nella&lt;br/&gt;Squadra Verde</Italian>
            <Hungarian>Csatlakozás a&lt;br/&gt;zöld csapathoz</Hungarian>
@ -588,7 +596,7 @@
            <French>Rejoindre&lt;br/&gt;Bleu</French>
            <Polish>Dołącz do&lt;br/&gt;drużyny niebieskiej</Polish>
            <Czech>Připojit do&lt;br/&gt;Modrého týmu</Czech>
-            <Russian>Присоединиться&lt;br/&gt;к синей группе</Russian>
+            <Russian>Присоединиться&lt;br/&gt;к Синей группе</Russian>
            <Portuguese>Unir-se à&lt;br/&gt;Equipe Azul</Portuguese>
            <Italian>Entra nella&lt;br/&gt;Squadra Blu</Italian>
            <Hungarian>Csatlakozás a&lt;br/&gt;kék csapathoz</Hungarian>
@ -600,7 +608,7 @@
            <French>Rejoindre&lt;br/&gt;Jaune</French>
            <Polish>Dołącz do&lt;br/&gt;drużyny żółtej</Polish>
            <Czech>Připojit do&lt;br/&gt;Žlutého týmu</Czech>
-            <Russian>Присоединиться&lt;br/&gt;к желтой группе</Russian>
+            <Russian>Присоединиться&lt;br/&gt;к Жёлтой группе</Russian>
            <Portuguese>Unir-se à&lt;br/&gt;Equipe Amarela</Portuguese>
            <Italian>Entra nella&lt;br/&gt;Squadra Gialla</Italian>
            <Hungarian>Csatlakozás a&lt;br/&gt;sárga csapathoz</Hungarian>
@ -699,6 +707,7 @@
            <Hungarian>Felszerelés</Hungarian>
            <Russian>Снаряжение</Russian>
            <Italian>Equipaggiamento</Italian>
+            <Portuguese>Equipamento</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_Push">
            <English>Push</English>
@ -710,6 +719,7 @@
            <Hungarian>Tolás</Hungarian>
            <Russian>Толкать</Russian>
            <Italian>Spingi</Italian>
+            <Portuguese>Empurrar</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_Interact">
            <English>Interact</English>
@ -721,6 +731,7 @@
            <Spanish>Interactuar</Spanish>
            <Hungarian>Cselekvés</Hungarian>
            <Italian>Interagisci</Italian>
+            <Portuguese>Interagir</Portuguese>
        </Key>
        <Key ID="STR_ACE_Interaction_Passengers">
            <English>Passengers</English>
@ -732,6 +743,7 @@
            <French>Passagers</French>
            <Hungarian>Utasok</Hungarian>
            <Italian>Passeggeri</Italian>
+            <Portuguese>Passageiros</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/inventory/stringtable.xml
+++ b/addons/inventory/stringtable.xml
@ -11,6 +11,7 @@
            <French>Agrandir la taille d'affichage de l'inventaire</French>
            <Hungarian>Legyen a felszerelés menüje nagyobb</Hungarian>
            <Italian>Ingrandisci il menù inventario</Italian>
+            <Portuguese>Aumentar o Tamanho da Tela do Inventário</Portuguese>
        </Key>
        <Key ID="STR_ACE_Inventory_SettingDescription">
            <English>Normally inventory display is scaled by UI size. This allows scaling the Inventory UI size up, but doesn't increase font size allowing more rows displayed.</English>
@ -22,6 +23,7 @@
            <French>L'inventaire est normalement affiché en fonction de la taille de l'UI. Cette option permet d'agrandir l'affichage de l'inventaire, mais n'a aucun effet sur la taille des polices permettant d'afficher plus de ligne</French>
            <Hungarian>Alaphelyzetben a kezelőfelület mérete skálázza a felszerelési menüt. Ez az opció engedélyezi a menü felskálázását, de megtartja a betűméreteket, így növelve a láthatóságot.</Hungarian>
            <Italian>Normalmente il menù inventario è scalato in base alle dimensioni interfaccia. Questa opzione di permette di ingrandirlo ulteriormente ma senza aumentare la dimensione del testo.</Italian>
+            <Portuguese>Normalmente o tamanho da tela do inventário é ditada pelo tamanho da UI. Isso permite aumentar o tamanho da tela de inventário, mas não aumenta o tamanho da fonte, permitindo que mais linhas sejam visualizadas.</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/javelin/stringtable.xml
+++ b/addons/javelin/stringtable.xml
@ -11,6 +11,7 @@
            <Hungarian>Célpontra állás (Lenyomva tartott)</Hungarian>
            <Italian>Aggangia il bersagio</Italian>
            <Spanish>Fijar objetivo (Mantener)</Spanish>
+            <Portuguese>Travar Alvo(Segurar)</Portuguese>
        </Key>
        <Key ID="STR_ACE_JAVELIN_CycleFireMode">
            <English>Cycle Fire Mode</English>
@ -22,6 +23,7 @@
            <Hungarian>Tüzelési mód váltása</Hungarian>
            <Italian>Alterna le modalità di fuoco</Italian>
            <Spanish>Cambiar modo de disparo</Spanish>
+            <Portuguese>Alterar Modo de Disparo</Portuguese>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/kestrel4500/stringtable.xml
+++ b/addons/kestrel4500/stringtable.xml
@ -20,6 +20,8 @@
            <French>Station météo portable Kestrel 4500</French>
            <Spanish>Kestrel 4500 Pocket Weather Tracker</Spanish>
            <German>Kestrel 4500 Taschenwettermessgerät</German>
+            <Italian>Kestrel 4500 Indicatore Meteorologico Tascabile</Italian>
+            <Portuguese>Kestrel 4500 Medidor Balístico Ativo</Portuguese>
        </Key>
        <Key ID="STR_ACE_Kestrel4500_OpenKestrel">
            <English>Open Kestrel 4500</English>
@ -30,6 +32,7 @@
            <Italian>Accendi Kestrel 4500</Italian>
            <Spanish>Abrir Kestrel 4500</Spanish>
            <German>Kestrel 4500 öffnen</German>
+            <Portuguese>Abrir Kestrel 4500</Portuguese>
        </Key>
        <Key ID="STR_ACE_Kestrel4500_ShowKestrel">
            <English>Show Kestrel 4500</English>
@ -68,4 +71,4 @@
            <German>Kestrel 4500 anzeigen</German>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/laser_selfdesignate/stringtable.xml
+++ b/addons/laser_selfdesignate/stringtable.xml
@ -11,6 +11,7 @@
            <French>Désignateur laser allumé</French>
            <Hungarian>Lézeres Megjelölő Be</Hungarian>
            <Italian>Designatore laser acceso</Italian>
+            <Portuguese>Desiginador Laser Ligado</Portuguese>
        </Key>
        <Key ID="STR_ACE_Laser_SelfDesignate_DesignatorOff">
            <English>Laser Designator Off</English>
@ -22,6 +23,7 @@
            <French>Désignateur laser éteint</French>
            <Hungarian>Lézeres Megjelölő Ki</Hungarian>
            <Italian>Designatore laser spento</Italian>
+            <Portuguese>Desiginador Laser Desligado</Portuguese>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/laserpointer/stringtable.xml
+++ b/addons/laserpointer/stringtable.xml
@ -11,6 +11,7 @@
            <Hungarian>Lézer-pointer (piros)</Hungarian>
            <Spanish>Puntero láser (rojo)</Spanish>
            <Italian>Puntatore laser (rosso)</Italian>
+            <Portuguese>Laser (vermelho)</Portuguese>
        </Key>
        <Key ID="STR_ACE_Laserpointer_green">
            <English>Laser Pointer (green)</English>
@ -22,6 +23,7 @@
            <Hungarian>Lézer-pointer (zöld)</Hungarian>
            <Spanish>Puntero láser (verde)</Spanish>
            <Italian>Puntatore laser (verde)</Italian>
+            <Portuguese>Laser (verde)</Portuguese>
        </Key>
        <Key ID="STR_ACE_Laserpointer_Description">
            <English>Emits visible light. </English>
@ -33,6 +35,7 @@
            <Hungarian>Látható fényt bocsát ki.</Hungarian>
            <Spanish>Emite luz visible.</Spanish>
            <Italian>Emette luce visibile</Italian>
+            <Portuguese>Emite luz visível. </Portuguese>
        </Key>
        <Key ID="STR_ACE_Laserpointer_useLaser">
            <English>&lt;t color='#9cf953'&gt;Use: &lt;/t&gt;Turn Laser ON/OFF</English>
@ -53,6 +56,7 @@
            <Russian>Лазер</Russian>
            <French>Laser</French>
            <Spanish>Laser</Spanish>
+            <Italian>Laser</Italian>
        </Key>
        <Key ID="STR_ACE_Laserpointer_IRLaser">
            <English>IR Laser</English>
@ -61,6 +65,7 @@
            <Russian>ИК-лазер</Russian>
            <French>Laser IR</French>
            <Spanish>Laser IR</Spanish>
+            <Italian>Laser IR</Italian>
        </Key>
        <Key ID="STR_ACE_Laserpointer_switchLaserLight">
            <English>Switch Laser / IR Laser</English>
@ -72,4 +77,4 @@
            <Spanish>Cambiar Laser / Laser IR</Spanish>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/logistics_uavbattery/stringtable.xml
+++ b/addons/logistics_uavbattery/stringtable.xml
@ -9,7 +9,7 @@
            <Polish>Dron jest naładowany</Polish>
            <Hungarian>A drón fel van töltve</Hungarian>
            <Czech>Dron je nabitý</Czech>
-            <Portuguese>O VANT está cheio</Portuguese>
+            <Portuguese>O UAV está cheio</Portuguese>
            <Italian>Il drone è pieno</Italian>
            <Russian>БПЛА полностью заряжен</Russian>
        </Key>
@ -21,7 +21,7 @@
            <Polish>Potrzebujesz baterii UAV</Polish>
            <Hungarian>Szükséged van egy UAV akkumulátorra</Hungarian>
            <Czech>Potřebuješ UAV baterii</Czech>
-            <Portuguese>Você precisa de uma Bateria para VANT</Portuguese>
+            <Portuguese>Você precisa de uma bateria para UAVs</Portuguese>
            <Italian>Hai bisogno di una Batteria UAV</Italian>
            <Russian>Требуется аккумулятор для БПЛА</Russian>
        </Key>
@ -45,7 +45,7 @@
            <Polish>Bateria UAV</Polish>
            <Hungarian>UAV akkumulátor</Hungarian>
            <Czech>UAV baterie</Czech>
-            <Portuguese>Bateria para VANT</Portuguese>
+            <Portuguese>Bateria para UAV</Portuguese>
            <Italian>Batteria UAV</Italian>
            <Russian>Аккумулятор БПЛА</Russian>
        </Key>
@ -57,7 +57,7 @@
            <Polish>Używana do naładowania baterii przenośnego UAV</Polish>
            <Hungarian>Hordozható UAV-k feltöltéséhez való akkumulátor</Hungarian>
            <Czech>Používané k dobíjení UAV</Czech>
-            <Portuguese>Usada para reabastecer VANT</Portuguese>
+            <Portuguese>Usada para reabastecer o UAV</Portuguese>
            <Italian>Usata per ricaricare la Batteria dell'UAV</Italian>
            <Russian>Используется для зарядки переносных БПЛА</Russian>
        </Key>
--- a/addons/logistics_wirecutter/stringtable.xml
+++ b/addons/logistics_wirecutter/stringtable.xml
@ -10,6 +10,8 @@
            <Czech>Štípací kleště</Czech>
            <Polish>Nożyce do cięcia drutu</Polish>
            <Hungarian>Drótvágó</Hungarian>
+            <Italian>Pinze da Taglio</Italian>
+            <Portuguese>Cortador de Arame</Portuguese>
        </Key>
        <Key ID="STR_ACE_logistics_wirecutter_wirecutterDescription">
            <English>Wirecutter</English>
@ -20,6 +22,8 @@
            <Polish>Służą do cięcia drutu i płotów</Polish>
            <French>Pince coupante</French>
            <Hungarian>Drótok, huzalok, és kábelek vágására alkalmas olló.</Hungarian>
+            <Italian>Pinze da Taglio</Italian>
+            <Portuguese>Cortador de Arame</Portuguese>
        </Key>
        <Key ID="STR_ACE_logistics_wirecutter_CutFence">
            <English>Cut Fence</English>
--- a/addons/magazinerepack/stringtable.xml
+++ b/addons/magazinerepack/stringtable.xml
@ -83,6 +83,7 @@
            <Polish>Przepakowywanie zakończone</Polish>
            <Hungarian>Újratárazás befejezve</Hungarian>
            <Italian>Riempi caricatore</Italian>
+            <Portuguese>Reorganização Terminada</Portuguese>
        </Key>
        <Key ID="STR_ACE_MagazineRepack_RepackInterrupted">
            <English>Repacking Interrupted</English>
@ -94,6 +95,7 @@
            <Polish>Przepakowywanie przerwane</Polish>
            <Hungarian>Újratárazás megszakítva</Hungarian>
            <Italian>Riempimento interrotto</Italian>
+            <Portuguese>Reorganização Interrompida</Portuguese>
        </Key>
        <Key ID="STR_ACE_MagazineRepack_RepackedMagazinesCount">
            <English>%1 Full and %2 Partial</English>
@ -105,6 +107,7 @@
            <Polish>Pełnych: %1.&lt;br/&gt;Częściowo pełnych: %2.</Polish>
            <Hungarian>%1 teljes és %2 részleges</Hungarian>
            <Italian>%1 pieno e %2 parziale</Italian>
+            <Portuguese>%1 Total e %2 Parcial </Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/maptools/stringtable.xml
+++ b/addons/maptools/stringtable.xml
@ -143,6 +143,7 @@
            <Hungarian>Irány: %1</Hungarian>
            <Russian>Направление: %1°</Russian>
            <Italian>Direzione : %1°</Italian>
+            <Portuguese>Direção: %1</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/markers/stringtable.xml
+++ b/addons/markers/stringtable.xml
@ -11,6 +11,7 @@
            <Russian>Направление: %1°</Russian>
            <Hungarian>Irány: %1°</Hungarian>
            <Italian>Direzione: %1°</Italian>
+            <Portuguese>Direção %1</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
--- a/addons/microdagr/stringtable.xml
+++ b/addons/microdagr/stringtable.xml
@ -11,6 +11,7 @@
            <French>MicroDAGR GPS</French>
            <Hungarian>MicroDAGR GPS</Hungarian>
            <Italian>MicroDAGR GPS</Italian>
+            <Portuguese>GPS MicroDAGR</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_itemDescription">
            <English>MicroDAGR advanced GPS receiver</English>
@ -22,6 +23,7 @@
            <Czech>MicroDAGR pokročílá GPS příjímač</Czech>
            <Hungarian>MicroDAGR fejlett GPS vevőegység</Hungarian>
            <Italian>MicroDAGR ricevitore GPS avanzato</Italian>
+            <Portuguese>Recepitor GPS avançado MicroDAGR</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_settingUseMils">
            <English>Angular Unit:</English>
@ -33,6 +35,7 @@
            <Czech>Úhlová jednotka:</Czech>
            <Hungarian>Szögmértékegység:</Hungarian>
            <Italian>Unità angolare:</Italian>
+            <Portuguese>Unidade Angular:</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_settingMils">
            <English>Mils</English>
@ -44,6 +47,7 @@
            <Czech>Mils</Czech>
            <Hungarian>Mil</Hungarian>
            <Italian>Miglia</Italian>
+            <Portuguese>Mils:</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_settingShowWP">
            <English>Show Waypoints On Map:</English>
@ -55,6 +59,7 @@
            <Czech>Ukázat waypointy na mapě:</Czech>
            <Hungarian>Útvonalpontok mutatása a térképen:</Hungarian>
            <Italian>Mostra waypoint sulla mappa:</Italian>
+            <Portuguese>Mostrar Waypoints no mapa:</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_settingDegrees">
            <English>Degrees</English>
@ -66,6 +71,7 @@
            <Czech>Stupně</Czech>
            <Hungarian>Fok</Hungarian>
            <Italian>Gradi</Italian>
+            <Portuguese>Graus</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_settingOn">
            <English>On</English>
@ -101,6 +107,7 @@
            <Czech>Napiš souřadnice:</Czech>
            <Hungarian>Add meg a rácskoordinátákat:</Hungarian>
            <Italian>Introduci griglia coordinate:</Italian>
+            <Portuguese>Digite as Ccords. do Grid</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_wpEnterName">
            <English>Name of [%1]</English>
@ -112,6 +119,7 @@
            <Czech>Název [%1]</Czech>
            <Hungarian>[%1] neve</Hungarian>
            <Italian>Nome di [%1]</Italian>
+            <Portuguese>Nome do [%1]</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_controlMGRS">
            <English>MGRS-New</English>
@ -123,6 +131,7 @@
            <Czech>MGRS-Nový</Czech>
            <Hungarian>MGRS-új</Hungarian>
            <Italian>Nuovo MGRS</Italian>
+            <Portuguese>MGRS-Novo</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_controlWGD">
            <English>WGD</English>
@ -134,6 +143,7 @@
            <Czech>WGD</Czech>
            <Hungarian>WGD</Hungarian>
            <Italian>WGD</Italian>
+            <Portuguese>WGD</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_controlRange">
            <English>Range:</English>
@ -145,6 +155,7 @@
            <Czech>Vzdálenost:</Czech>
            <Hungarian>Távolság:</Hungarian>
            <Italian>Distanza:</Italian>
+            <Portuguese>Distância:</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_compasDirection">
            <English>Compass Direction</English>
@ -156,6 +167,7 @@
            <Czech>Azimut:</Czech>
            <Hungarian>Irányszög</Hungarian>
            <Italian>Azimut</Italian>
+            <Portuguese>Direção na bússula</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_menuMark">
            <English>Mark</English>
@ -167,6 +179,7 @@
            <Czech>Označit</Czech>
            <Hungarian>Jelölés</Hungarian>
            <Italian>Marca</Italian>
+            <Portuguese>Marca</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_menuWaypoints">
            <English>Waypoints</English>
@ -178,6 +191,7 @@
            <French>Point de passage</French>
            <Hungarian>Útvonalpontok</Hungarian>
            <Italian>waypoints</Italian>
+            <Portuguese>Waypoints</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_menuConnectTo">
            <English>Connect To</English>
@ -189,6 +203,7 @@
            <French>Connecter</French>
            <Hungarian>Csatlakozás</Hungarian>
            <Italian>Collega a </Italian>
+            <Portuguese>Conectar à</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_menuSettings">
            <English>Settings</English>
@ -200,6 +215,7 @@
            <Polish>Ustawienia</Polish>
            <Hungarian>Beállítások</Hungarian>
            <Italian>Impostaizoni</Italian>
+            <Portuguese>Opções</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_waypointsSet">
            <English>SetWP</English>
@ -211,6 +227,7 @@
            <French>Définir point de passage</French>
            <Hungarian>UP Beállítása</Hungarian>
            <Italian>Definisci WayPoints</Italian>
+            <Portuguese>Definir WP</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_waypointsAdd">
            <English>Add</English>
@ -222,6 +239,7 @@
            <French>Ajouter</French>
            <Hungarian>Hozzáadás</Hungarian>
            <Italian>Aggiungi</Italian>
+            <Portuguese>Adicionar</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_waypointsDelete">
            <English>Delete</English>
@ -244,6 +262,7 @@
            <Czech>Přepnout zobrazení MircroDAGRu</Czech>
            <Hungarian>MicroDAGR kijelzési mód váltása</Hungarian>
            <Italian>Alterna modalità display MicroDAGR</Italian>
+            <Portuguese>Alternar Modo de Display do MicroDAGR</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_show">
            <English>Show MicoDAGR</English>
@ -255,6 +274,7 @@
            <French>Afficher MicroDAGR</French>
            <Hungarian>MicroDAGR mutatása</Hungarian>
            <Italian>Mostra MicroDAGR</Italian>
+            <Portuguese>Mostrar MicroDAGR</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_configure">
            <English>Configure MicroDAGR</English>
@ -266,6 +286,7 @@
            <French>Configurer MicroDAGR</French>
            <Hungarian>MicroDAGR konfigurálása</Hungarian>
            <Italian>ConfiguraMicroDAGR</Italian>
+            <Portuguese>Configurar MicroDAGR</Portuguese>
        </Key>
        <Key ID="STR_ACE_microdagr_closeUnit">
            <English>Close MicroDAGR</English>
@ -277,6 +298,7 @@
            <French>Fermer MicroDAGR</French>
            <Hungarian>MicroDAGR elrejtése</Hungarian>
            <Italian>Chiudi MicroDAGR</Italian>
+            <Portuguese>Fechar MicroDAGR</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@ -17,6 +17,9 @@
            <English>Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types.</English>
            <Polish>Zaawansowane namierzanie rakiet, lub ZNR, dostarcza wiele poprawek do systemu namierzania rakiet oraz dodaje nowe tryby strzału. Jest to wymagana opcja dla broni rakietowych.</Polish>
            <Spanish>Guía de misiles avanzada, o AMG en sus siglas en inglés, ofrece múltiples mejoras en el fijado y disparo de misiles. Es también un framework requerido para armas de tipo misil.</Spanish>
+            <Russian>Продвинутое наведение ракет, или ПНР, обеспечивает множество усовершествований для наведения и стрельбы ракет. Также, это система, необходимая для всех ракетных типов оружия.</Russian>
+            <German>Das Erweiterte Raketenlenksystem, auch AMG genannt, bietet viele Verbesserungen zum Aufschalten und Feuern mittels gelenkten Raketen. </German>
+            <French>Le guidage avancé de missile, ou AMG en anglais, apporte de multiple améliorations au verouillage et au tir de missiles. C'est aussi un framework requis pour tout arme de type missile.</French>
        </Key>
        <Key ID="STR_ACE_Hydra70_DAGR">
            <English>Hydra-70 DAGR Missile</English>
@ -45,7 +48,7 @@
        <Key ID="STR_ACE_Hydra70_DAGR_Desc">
            <English>Hydra-70 DAGR Laser Guided Missile</English>
            <Spanish></Spanish>
-            <French>Missile à guidage Hydra-70 DAGR</French>
+            <French>Missile à guidage laser Hydra-70 DAGR</French>
            <Polish>Laserowo naprowadzana rakieta Hydra-70 DAGR</Polish>
            <German>Hydra-70 DAGR lasergelenkte Rakete</German>
            <Czech>Hydra-70 DAGR laserem naváděná střela</Czech>
--- a/addons/mk6mortar/stringtable.xml
+++ b/addons/mk6mortar/stringtable.xml
@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
-  <Package name="mk6mortar">
-    <Key ID="STR_ACE_MK6MORTAR_rangetable_name">
-      <English>82mm Rangetable</English>
-    </Key>
-    <Key ID="STR_ACE_MK6MORTAR_rangetable_description">
-      <English>Range Table for the MK6 82mm Mortar</English>
-    </Key>
-    <Key ID="STR_ACE_MK6MORTAR_rangetable_action">
-      <English>Open 82mm Rangetable</English>
-    </Key>
-    <Key ID="STR_ACE_MK6MORTAR_rangetable_charge">
-      <English>Charge</English>
-    </Key>
-  </Package>
-</Project>
+    <Package name="mk6mortar">
+        <Key ID="STR_ACE_MK6MORTAR_rangetable_name">
+            <English>82mm Rangetable</English>
+            <German>82mm Distanztabelle</German>
+            <Polish>Tabela strzelnicza 82mm</Polish>
+            <French>table de tir 82mm</French>
+            <Russian>82 мм Таблица дальностей и прицелов</Russian>
+        </Key>
+        <Key ID="STR_ACE_MK6MORTAR_rangetable_description">
+            <English>Range Table for the MK6 82mm Mortar</English>
+            <German>Distanztabelle für den Mk6 82mm Mortar</German>
+            <Polish>Tabela strzelnicza dla moździerza 82mm MK6</Polish>
+            <French>Table de tir pour le mortier MK6 82mm</French>
+            <Russian>Таблица дальностей и прицелов для MK6 82 мм мортиры</Russian>
+        </Key>
+        <Key ID="STR_ACE_MK6MORTAR_rangetable_action">
+            <English>Open 82mm Rangetable</English>
+            <German>Öffne 82mm Distanztabelle</German>
+            <Polish>Otwórz tabelę strzelniczą 82mm</Polish>
+            <French>ouvrir la table de tir 82mm</French>
+            <Russian>Открыть 82 мм Таблицу дальностей и прицелов</Russian>
+        </Key>
+        <Key ID="STR_ACE_MK6MORTAR_rangetable_charge">
+            <English>Charge</English>
+            <German>Ladung</German>
+            <French>Charge</French>
+            <Polish>Ładunek</Polish>
+            <Russian>Зарядить</Russian>
+        </Key>
+    </Package>
+</Project>
--- a/addons/movement/stringtable.xml
+++ b/addons/movement/stringtable.xml
@ -35,6 +35,7 @@
            <Russian>Взобраться</Russian>
            <Hungarian>Mászás</Hungarian>
            <Italian>Arrampicati</Italian>
+            <Portuguese>Subir</Portuguese>
        </Key>
        <Key ID="STR_ACE_Movement_CanNotClimb">
            <English>Can't climb here</English>
@ -46,6 +47,7 @@
            <Russian>Здесь невозможно взобраться</Russian>
            <Hungarian>Itt nem tudsz mászni</Hungarian>
            <Italian>Non puoi arrampicarti qui</Italian>
+            <Portuguese>Não se pode subir aqui</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/nametags/stringtable.xml
+++ b/addons/nametags/stringtable.xml
@ -11,6 +11,7 @@
            <Hungarian>Nevek mutatása</Hungarian>
            <Russian>Показать имена</Russian>
            <Italian>Mostra i nomi</Italian>
+            <Portuguese>Mostrar nomes</Portuguese>
        </Key>
        <Key ID="STR_ACE_NameTags_ShowPlayerNames">
            <English>Show player names</English>
@ -46,6 +47,7 @@
            <Hungarian>Játékosnevek mutatása csak gombnyomásra (a nevek mutatása szükséges)</Hungarian>
            <Russian>Показать имена игроков только по нажатию клавиши (при включенных именах)</Russian>
            <Italian>Mostra i nomi solo se si preme il tasto (richiede mostra nomi abilitato)</Italian>
+            <Portuguese>Mostrar nomes somente ao pressionar teclar (requer nome de jogadores)</Portuguese>
        </Key>
        <Key ID="STR_ACE_NameTags_ShowPlayerRanks">
            <English>Show player ranks (requires player names)</English>
@ -69,6 +71,7 @@
            <Russian>Показывать информацию об экипаже</Russian>
            <Hungarian>Jármű-legénység adatainak mutatása</Hungarian>
            <Italian>Mostra le informazioni sull'equipaggio del veicolo</Italian>
+            <Portuguese>Mostrar tripulantes</Portuguese>
        </Key>
        <Key ID="STR_ACE_NameTags_ShowNamesForAI">
            <English>Show name tags for AI units</English>
@ -80,6 +83,7 @@
            <French>Afficher les noms des IA</French>
            <Hungarian>Névcímkék mutatása MI-egységeknél</Hungarian>
            <Italian>Mostra le tag nomi per le unità AI</Italian>
+            <Portuguese>Mostrar nomes para unidades de IA</Portuguese>
        </Key>
        <Key ID="STR_ACE_NameTags_ShowSoundWaves">
            <English>Show SoundWaves (requires player names)</English>
@ -91,6 +95,7 @@
            <French>Afficher "qui parle" (si noms affichés)</French>
            <Hungarian>"Hanghullámok" mutatása (a nevek mutatása szükséges)</Hungarian>
            <Italian>Mostra barra movimento audio (richiede mostra nomi abilitato)</Italian>
+            <Portuguese>Mostrar onda sonora (requer nome de jogadores)</Portuguese>
        </Key>
        <Key ID="STR_ACE_NameTags_DefaultNametagColor">
            <English>Default Nametag Color (Non Group Members)</English>
@ -102,6 +107,7 @@
            <Czech>Standardní barva jmenovek (pro nečleny jednotky)</Czech>
            <Hungarian>Alap névcímke-szín (csoporton kívüli személyek)</Hungarian>
            <Italian>Colore nametag di default (membri non del gruppo)</Italian>
+            <Portuguese>Cor padrão do nome (unidades fora do grupo)</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/nightvision/stringtable.xml
+++ b/addons/nightvision/stringtable.xml
@ -94,6 +94,7 @@
            <Russian>ПНВ (Широкоугольный)</Russian>
            <French>JVN (Large)</French>
            <Hungarian>Éjjellátó szemüveg (széles látószögű)</Hungarian>
+            <Portuguese>Óculos de visão noturna (Panorâmico)</Portuguese>
        </Key>
        <Key ID="STR_ACE_NightVision_NVGBrightness">
            <English>Brightness: %1</English>
@ -132,4 +133,4 @@
            <Italian>Riduci la luminosità dell'NVG</Italian>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/optics/stringtable.xml
+++ b/addons/optics/stringtable.xml
@ -57,7 +57,7 @@
            <Italian>MRCO (2D)</Italian>
            <Polish>MRCO (2D)</Polish>
            <Portuguese>MRCO (2D)</Portuguese>
-            <Russian>Прицел MRCO (2D)</Russian>
+            <Russian>MRCO (2D)</Russian>
            <Spanish>MRCO (2D)</Spanish>
            <Hungarian>MRCO (2D)</Hungarian>
        </Key>
@ -69,7 +69,7 @@
            <Italian>MRCO (PIP)</Italian>
            <Polish>MRCO (PIP)</Polish>
            <Portuguese>MRCO (PIP)</Portuguese>
-            <Russian>Прицел MRCO (PIP)</Russian>
+            <Russian>MRCO (PIP)</Russian>
            <Spanish>MRCO (PIP)</Spanish>
            <Hungarian>MRCO (PIP)</Hungarian>
        </Key>
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@ -23,6 +23,7 @@
            <French>Corriger animation</French>
            <Hungarian>Animációk kijavítása</Hungarian>
            <Italian>Fixa l'animazione</Italian>
+            <Portuguese>Arrumar  Animação</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_ResetAll">
            <English>Reset All</English>
@ -34,6 +35,7 @@
            <French>Défaut</French>
            <Hungarian>Minden visszaállítása</Hungarian>
            <Italian>Resetta tutto</Italian>
+            <Portuguese>Resetar Tudo</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_TabColors">
            <English>Colors</English>
@ -45,6 +47,7 @@
            <Polish>Kolory</Polish>
            <Hungarian>Színek</Hungarian>
            <Italian>Colori</Italian>
+            <Portuguese>Cores</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_TabOptions">
            <English>Options</English>
@ -68,6 +71,7 @@
            <German>Werte</German>
            <Hungarian>Értékek</Hungarian>
            <Italian>Valori</Italian>
+            <Portuguese>Valores</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_Enabled">
            <English>Yes</English>
@ -103,6 +107,7 @@
            <French>Paramètres</French>
            <Hungarian>Opció:</Hungarian>
            <Italian>Parametri:</Italian>
+            <Portuguese>Opção:</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_Export">
            <English>Export</English>
@ -114,6 +119,7 @@
            <French>Exporter</French>
            <Hungarian>Exportálás</Hungarian>
            <Italian>Esporta</Italian>
+            <Portuguese>Exportar</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_OpenExport">
            <English>Open Export Menu</English>
@ -125,6 +131,7 @@
            <French>Ouvrir le menu d'exportation</French>
            <Hungarian>Exportálási menü megnyitása</Hungarian>
            <Italian>Apri menù esportazione</Italian>
+            <Portuguese>Abrir menu de exportação</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_stringType">
            <English>String input.</English>
@ -135,6 +142,7 @@
            <French>Entrée</French>
            <Hungarian>String bevitel.</Hungarian>
            <Italian>Stringa di unput.</Italian>
+            <Portuguese>Input de String</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_arrayType">
            <English>Array. Seperate elements by using ,.</English>
@ -146,6 +154,7 @@
            <Czech>Tabulka. Odděl elementy použitím ,.</Czech>
            <Hungarian>Array. Válasszad el az elemeket vesszővel.</Hungarian>
            <Italian>Array. Separa gli elementi usando ,.</Italian>
+            <Portuguese>Vetor. Separe elementos usando *,*.</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_scalarType">
            <English>Number</English>
@ -157,6 +166,7 @@
            <French>Nombre</French>
            <Hungarian>Szám</Hungarian>
            <Italian>Numero</Italian>
+            <Portuguese>Número</Portuguese>
        </Key>
        <Key ID="STR_ACE_optionsMenu_unknownType">
            <English>Uknown input type</English>
@ -168,6 +178,7 @@
            <French>Type d'entrée inconnue</French>
            <Hungarian>Ismeretlen beviteli típus</Hungarian>
            <Italian>Input inserito sconosciuto</Italian>
+            <Portuguese>Tipo desonhecido de input</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_SaveInput">
            <English>Save input</English>
@ -179,6 +190,7 @@
            <French>Sauvegarder</French>
            <Hungarian>Bevitel elmentése</Hungarian>
            <Italian>Salva input</Italian>
+            <Portuguese>Salvar input</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_inClientSettings">
            <English>Include Client Settings</English>
@ -190,6 +202,7 @@
            <French>Inclure paramètres client</French>
            <Hungarian>Kliens-beállítások melléklése</Hungarian>
            <Italian>Includi i parametri del client</Italian>
+            <Portuguese>Incluir opções do cliente</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_exClientSettings">
            <English>Exclude Client Settings</English>
@ -201,6 +214,7 @@
            <French>Exclure paramètres client</French>
            <Hungarian>Kliens-beállítások elhagyása</Hungarian>
            <Italian>Escludi i parametri del client</Italian>
+            <Portuguese>Excluir opções do cliente</Portuguese>
        </Key>
        <Key ID="STR_ACE_OptionsMenu_settingsExported">
            <English>Settings exported to clipboard</English>
@ -212,12 +226,15 @@
            <French>Paramètres exportés dans le presse papier</French>
            <Hungarian>Beállítások exportálva a vágólapba</Hungarian>
            <Italian>Parametri esportati alla clipboard</Italian>
+            <Portuguese>Opções exportadas para o clipboard.</Portuguese>
        </Key>
        <Key ID="STR_ACE_optionsMenu_uiScaing">
            <English>Option Menu UI Scaling</English>
            <French>Menu option: taille de l'UI</French>
            <Polish>Skalowanie UI menu ustawień</Polish>
            <Spanish>Opción de escalado del menú UI</Spanish>
+            <Russian>Размер интерфейса меню настройки</Russian>
+            <German>UI Skalierung</German>
        </Key>
    </Package>
 </Project>
--- a/addons/overheating/stringtable.xml
+++ b/addons/overheating/stringtable.xml
@ -10,6 +10,7 @@
            <Polish>Wyświetl tekst przy zacięciu broni</Polish>
            <French>Affiche texte si enrayé</French>
            <Hungarian>Szöveges értesítés kijelzése a fegyver elakadásakor</Hungarian>
+            <Portuguese>Mostrar texto quando trava acontecer</Portuguese>
        </Key>
        <Key ID="STR_ACE_overheating_SettingDisplayTextDesc">
            <English>Display a notification whenever your weapon gets jammed</English>
@ -20,6 +21,7 @@
            <Polish>Wyświetl powiadomienie za każdym razem, kiedy Twoja broń ulegnie zacięciu</Polish>
            <French>Affiche une notification lors d'un enrayement</French>
            <Hungarian>Egy szöveges értesítés jelenik meg, amikor a fegyver megakad</Hungarian>
+            <Portuguese>Mostra uma notificação quando sua arma sofre um travamento.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Overheating_SpareBarrelName">
            <English>Spare barrel</English>
@ -94,15 +96,15 @@
            <Italian>Sostiuisci la canna</Italian>
        </Key>
        <Key ID="STR_ACE_Overheating_SwappingBarrel">
-            <English>Swapping barrel...</English>
-            <German>Lauf wird gewechselt...</German>
-            <Spanish>Cambiando el cañón...</Spanish>
-            <Polish>Wymienianie lufy...</Polish>
+            <English>Swapping barrel ...</English>
+            <German>Lauf wird gewechselt ...</German>
+            <Spanish>Cambiando el cañón ...</Spanish>
+            <Polish>Wymienianie lufy ...</Polish>
            <Czech>Vyměňuji hlaveň ...</Czech>
-            <French>Changement du canon...</French>
+            <French>Changement du canon ...</French>
            <Russian>Смена ствола ...</Russian>
-            <Hungarian>Cső kicserélése folyamatban...</Hungarian>
-            <Portuguese>Substituindo cano...</Portuguese>
+            <Hungarian>Cső kicserélése folyamatban ...</Hungarian>
+            <Portuguese>Substituindo cano ...</Portuguese>
            <Italian>Sto sostituendo la canna ...</Italian>
        </Key>
        <Key ID="STR_ACE_Overheating_SwappedBarrel">
@ -112,13 +114,13 @@
            <Polish>Lufa wymieniona</Polish>
            <Czech>Hlaveň vyměněna</Czech>
            <French>Canon changé</French>
-            <Russian>Ствол сменен</Russian>
+            <Russian>Ствол сменён</Russian>
            <Hungarian>Cső kicserélve</Hungarian>
            <Portuguese>Cano substituído</Portuguese>
            <Italian>Canna sostituita</Italian>
        </Key>
        <Key ID="STR_ACE_Overheating_CheckTemperature">
-            <English>Check weapons temperature</English>
+            <English>Check weapon temperature</English>
            <German>Temperatur der Waffe prüfen</German>
            <Spanish>Verificar temperatura del arma</Spanish>
            <Polish>Sprawdź temperaturę broni</Polish>
@ -130,15 +132,15 @@
            <Russian>Проверить температуру оружия</Russian>
        </Key>
        <Key ID="STR_ACE_Overheating_CheckTemperatureShort">
-            <German>Waffentemperatur&lt;br/&gt;prüfen</German>
            <English>Check weapon temperature</English>
+            <German>Waffentemperatur prüfen</German>
            <Spanish>Verificar temperatura del arma</Spanish>
            <Polish>Sprawdź temperaturę broni</Polish>
            <Czech>Zkontrolovat teplotu zbraně</Czech>
            <French>Vérifier la température</French>
            <Hungarian>Fegyverhő ellenőrzése</Hungarian>
            <Russian>Проверить температуру оружия</Russian>
-            <German>Waffentemperatur prüfen</German>
+            <Portuguese>Conferir temperatura</Portuguese>
        </Key>
        <Key ID="STR_ACE_Overheating_CheckingTemperature">
            <English>Checking temperature ...</English>
--- a/addons/parachute/stringtable.xml
+++ b/addons/parachute/stringtable.xml
@ -11,6 +11,7 @@
            <Hungarian>Magasságmérő</Hungarian>
            <Russian>Высотомер</Russian>
            <Italian>Altimetro</Italian>
+            <Portuguese>Altímetro</Portuguese>
        </Key>
        <Key ID="STR_ACE_Parachute_AltimeterDisplayName">
            <English>Altimeter Watch</English>
@ -22,6 +23,7 @@
            <Hungarian>Magasságmérős karóra</Hungarian>
            <Russian>Часы с высотомером</Russian>
            <Italian>Controlla l'altimetro</Italian>
+            <Portuguese>Relógio Altímetro</Portuguese>
        </Key>
        <Key ID="STR_ACE_Parachute_AltimeterDescription">
            <English>Used to show height, descent rate and the time.</English>
@ -33,6 +35,7 @@
            <Hungarian>Mutatja a magasságot, a zuhanási sebességet, és az időt.</Hungarian>
            <Russian>Используется для определения высоты, скорости снижения и времени.</Russian>
            <Italian>Usato per mostrare l'altitudine, la velocità di discesa e l'ora.</Italian>
+            <Portuguese>Usado para mostrar altura, taxa de descida e o tempo.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Parachute_NonSteerableParachute">
            <English>Non-Steerable Parachute</English>
@ -44,6 +47,7 @@
            <Hungarian>Irányíthatatlan ejtőernyő</Hungarian>
            <Russian>Неуправляемый парашют</Russian>
            <Italian>Paracadute non manovrabile</Italian>
+            <Portuguese>Para-querdas não controlável</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@ -138,7 +138,7 @@
            <Polish>M-ATV (CKM)</Polish>
            <Czech>M-ATV (TK)</Czech>
            <French>M-ATV (HMG)</French>
-            <Russian>M-ATV (Пулемет)</Russian>
+            <Russian>M-ATV (Пулемёт)</Russian>
            <Portuguese>M-ATV (HMG)</Portuguese>
            <Hungarian>M-ATV (nehézgéppuska)</Hungarian>
            <Italian>M-ATV (HMG)</Italian>
@ -150,7 +150,7 @@
            <Polish>M-ATV (GMG)</Polish>
            <Czech>M-ATV (Granátomet)</Czech>
            <French>M-ATV (GMG)</French>
-            <Russian>M-ATV (Гранатомет)</Russian>
+            <Russian>M-ATV (Гранатомёт)</Russian>
            <Portuguese>M-ATV (GMG)</Portuguese>
            <Hungarian>M-ATV (gránátgéppuska)</Hungarian>
            <Italian>M-ATV (GMG)</Italian>
@ -305,7 +305,7 @@
            <Spanish>HEMTT médico</Spanish>
            <Polish>HEMTT Medyczny</Polish>
            <Czech>HEMTT Zdravotnický</Czech>
-            <French>HEMTT Sanitaire</French>
+            <French>HEMTT Médical</French>
            <Russian>HEMTT Медицинский</Russian>
            <Portuguese>HEMTT Médico</Portuguese>
            <Hungarian>HEMTT (egészségügyi)</Hungarian>
@ -366,7 +366,7 @@
            <Polish>Fennek (CKM)</Polish>
            <Czech>Fennek (TK)</Czech>
            <French>Fennek (HMG)</French>
-            <Russian>Феннек (Пулемет)</Russian>
+            <Russian>Феннек (Пулемёт)</Russian>
            <Portuguese>Fennek (HMG)</Portuguese>
            <Hungarian>Fennek (nehézgéppuska)</Hungarian>
            <Italian>Fennek (HMG)</Italian>
@ -378,7 +378,7 @@
            <Polish>Fennek (GMG)</Polish>
            <Czech>Fennek (granátomet)</Czech>
            <French>Fennek (GMG)</French>
-            <Russian>Феннек (Гранатомет)</Russian>
+            <Russian>Феннек (Гранатомёт)</Russian>
            <Portuguese>Fennek (GMG)</Portuguese>
            <Hungarian>Fennek (gránátgéppuska)</Hungarian>
            <Italian>Fennek (GMG)</Italian>
@ -438,7 +438,7 @@
            <Polish>KamAZ Transportowy (zakryty)</Polish>
            <Czech>KAMAZ Valník (krytý)</Czech>
            <French>KamAZ Transport (bâché)</French>
-            <Russian>КамАЗ Траспортный (Крытый)</Russian>
+            <Russian>КамАЗ Траспортный (крытый)</Russian>
            <Portuguese>KamAZ Transporte (coberto)</Portuguese>
            <Hungarian>KamAZ szállítójármű (ponyvás)</Hungarian>
            <Italian>KamAZ da trasporto (coperto)</Italian>
@ -485,7 +485,7 @@
            <Spanish>KamAZ médico</Spanish>
            <Polish>KamAZ Medyczny</Polish>
            <Czech>KAMAZ Zdravotnický</Czech>
-            <French>KamAZ Sanitaire</French>
+            <French>KamAZ Médical</French>
            <Russian>КамАЗ Медицинский</Russian>
            <Portuguese>KamAZ Médico</Portuguese>
            <Hungarian>KamAZ (egészségügyi)</Hungarian>
@ -510,7 +510,7 @@
            <Polish>Punisher (CKM)</Polish>
            <Czech>Punisher (TK)</Czech>
            <French>Punisher (HMG)</French>
-            <Russian>Kаратель (Пулемет)</Russian>
+            <Russian>Kаратель (Пулемёт)</Russian>
            <Portuguese>Punisher (HMG)</Portuguese>
            <Hungarian>Punisher (nehézgéppuska)</Hungarian>
            <Italian>Punisher (HMG)</Italian>
@ -522,7 +522,7 @@
            <Polish>Punisher (GMG)</Polish>
            <Czech>Punisher (granátomet)</Czech>
            <French>Punisher (GMG)</French>
-            <Russian>Kаратель (Гранатомет)</Russian>
+            <Russian>Kаратель (Гранатомёт)</Russian>
            <Portuguese>Punisher (GMG)</Portuguese>
            <Hungarian>Punisher (gránátgéppuska)</Hungarian>
            <Italian>Punisher (GMG)</Italian>
@ -534,7 +534,7 @@
            <Polish>T100 Black Eagle</Polish>
            <Czech>T100 Black Eagle</Czech>
            <French>T100 Black Eagle</French>
-            <Russian>T100 Черный Орел</Russian>
+            <Russian>T100 Чёрный Орел</Russian>
            <Portuguese>T100 Black Eagle</Portuguese>
            <Hungarian>T100 Fekete Sas</Hungarian>
            <Italian>T100 Black Eagle</Italian>
@ -606,7 +606,7 @@
            <Polish>Typhoon Transportowy (przykryty)</Polish>
            <Czech>Typhoon valník (krytý)</Czech>
            <French>Typhoon Transport (bâché)</French>
-            <Russian>Тайфун Транспортный (kрытый)</Russian>
+            <Russian>Тайфун Транспортный (крытый)</Russian>
            <Portuguese>Typhoon Transporte (coberto)</Portuguese>
            <Hungarian>Typhoon szállítójármű (ponyvás)</Hungarian>
            <Italian>Typhoon da trasporto (coperto)</Italian>
@ -665,7 +665,7 @@
            <Spanish>Typhoon médico</Spanish>
            <Polish>Typhoon Medyczny</Polish>
            <Czech>Typhoon zdravotnický</Czech>
-            <French>Typhoon Sanitaire</French>
+            <French>Typhoon Médical</French>
            <Russian>Тайфун Медицинский</Russian>
            <Portuguese>Typhoon Médico</Portuguese>
            <Hungarian>Typhoon (egészségügyi)</Hungarian>
@ -726,7 +726,7 @@
            <Polish>CH-47I Chinook (nieuzbrojony)</Polish>
            <Russian>CH-47I Chinook (невооруженный)</Russian>
            <Czech>CH-47I Chinook (neozbrojený)</Czech>
-            <French>CH-47I Chinook (Neozbrojený)</French>
+            <French>CH-47I Chinook (non-armé)</French>
            <Hungarian>CH-47I Chinook (fegyvertelen)</Hungarian>
        </Key>
        <Key ID="STR_ACE_RealisticNames_Plane_CAS_01_Name">
@ -867,7 +867,7 @@
            <Spanish>M18A1 Claymore</Spanish>
            <Polish>Mina kierunkowa M18A1 Claymore</Polish>
            <Czech>Mina Claymore M18A1</Czech>
-            <French>M18A1 Claymore Mine antipersonnel à effet dirigé</French>
+            <French>M18A1 Claymore</French>
            <Russian>M18A1 Клеймор</Russian>
            <Portuguese>M18A1 Claymore</Portuguese>
            <Hungarian>M18A1 Claymore akna</Hungarian>
@ -891,7 +891,7 @@
            <Spanish>Bloque de demolición M112</Spanish>
            <Polish>Ładunek burzący M112</Polish>
            <Czech>Výbušná nálož M112 </Czech>
-            <French>Pétard M112</French>
+            <French>M112 Block de Démolition</French>
            <Russian>M112 подрывной заряд</Russian>
            <Portuguese>M112 Carga de Demolição</Portuguese>
            <Hungarian>M112 romboló tömb</Hungarian>
@ -988,7 +988,7 @@
            <Polish>Granat dymny M18 (Żółty)</Polish>
            <Czech>M18 Kouřový Granát (žlutý)</Czech>
            <French>M18 Grenade fumigène (Jaune)</French>
-            <Russian>M183 дымовая граната (Жёлтые)</Russian>
+            <Russian>M183 дымовая граната (Жёлтый)</Russian>
            <Portuguese>M18 Granada de fumaça (Amarela)</Portuguese>
            <Hungarian>M18 füstgránát (Sárga)</Hungarian>
            <Italian>M18 Granata fumogena (Giallo)</Italian>
@ -1011,7 +1011,7 @@
            <Spanish>Mina antipersona VS-50</Spanish>
            <Polish>Mina przeciwpiechotna VS-50</Polish>
            <Czech>Protipěchotní mina VS-50 </Czech>
-            <French>VS-50 Mine antipersonnel à pression</French>
+            <French>VS-50 Mine AP</French>
            <Russian>VS-50 Противопехотная мина</Russian>
            <Portuguese>VS-50 Mina antipessoal</Portuguese>
            <Hungarian>VS-50 gyalogsági taposóakna</Hungarian>
@ -1023,7 +1023,7 @@
            <Spanish>Mina antipersona M26</Spanish>
            <Polish>Mina przeciwpiechotna M26</Polish>
            <Czech>Šrapnelová mina M26</Czech>
-            <French>M26  Mine antipersonnel bondissante</French>
+            <French>M26  Mine AP bondissante</French>
            <Russian>M26 Противопехотная мина</Russian>
            <Portuguese>M26 Mina saltadora antipessoal</Portuguese>
            <Hungarian>M26 gyalogsági ugróakna</Hungarian>
@ -1035,7 +1035,7 @@
            <Spanish>Mina antipersona de alambre PMR-3</Spanish>
            <Polish>Mina przeciwpiechotna PMR-3</Polish>
            <Czech>Nástražná mina PMR-3</Czech>
-            <French>PMR-3 Mine antipersonnel à traction</French>
+            <French>PMR-3 Mine AP à traction</French>
            <Russian>PMR-3 Противопехотная мина</Russian>
            <Portuguese>PMR-3 Mina antipessoal (armadilha)</Portuguese>
            <Hungarian>PMR-3 botlódrótos gyalogsági akna</Hungarian>
@ -1050,6 +1050,7 @@
            <Hungarian>P99</Hungarian>
            <Spanish>P99</Spanish>
            <Russian>P99</Russian>
+            <Portuguese>P99</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_hgun_Rook40_Name">
            <English>MP-443 Grach</English>
@ -1060,16 +1061,18 @@
            <Hungarian>MP-443 Grach</Hungarian>
            <Spanish>MP-443 Grach</Spanish>
            <Russian>МР-443 "Грач"</Russian>
+            <Portuguese>MP-443 Grach</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_hgun_ACPC2_Name">
-            <English>ACP-C2</English>
-            <German>ACP-C2</German>
-            <Czech>ACP-C2</Czech>
-            <Polish>ACP-C2</Polish>
-            <French>ACP-C2</French>
-            <Hungarian>ACP-C2</Hungarian>
-            <Spanish>ACP-C2</Spanish>
-            <Russian>ACP-C2</Russian>
+            <English>Custom Covert II</English>
+            <German>Custom Covert II</German>
+            <Czech>Custom Covert II</Czech>
+            <Polish>Custom Covert II</Polish>
+            <French>Custom Covert II</French>
+            <Hungarian>Custom Covert II</Hungarian>
+            <Spanish>Custom Covert II</Spanish>
+            <Russian>Custom Covert II</Russian>
+            <Portuguese>Custom Covert II</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_hgun_Pistol_heavy_01_Name">
            <English>FNX-45 Tactical</English>
@ -1080,6 +1083,7 @@
            <Hungarian>FNX-45 Tactical</Hungarian>
            <Spanish>FNX-45 Tactical</Spanish>
            <Russian>FNX-45 Tactical</Russian>
+            <Portuguese>FNX-45 Tactical</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_hgun_Pistol_heavy_02_Name">
            <English>Chiappa Rhino 60DS</English>
@ -1090,6 +1094,7 @@
            <Hungarian>Chiappa Rhino 6DS</Hungarian>
            <Spanish>Chiappa Rhino 60DS</Spanish>
            <Russian>Chiappa Rhino 60DS</Russian>
+            <Portuguese>Chiappa Rhino 60DS</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_hgun_Pistol_Signal_Name">
            <English>Taurus Judge</English>
@ -1100,6 +1105,7 @@
            <Hungarian>Taurus Judge</Hungarian>
            <Spanish>Taurus Judge</Spanish>
            <Russian>Taurus Judge</Russian>
+            <Portuguese>Taurus Judge</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_launch_NLAW_Name">
            <English>NLAW</English>
@ -1110,6 +1116,7 @@
            <Hungarian>NLAW</Hungarian>
            <Spanish>NLAW</Spanish>
            <Russian>NLAW</Russian>
+            <Portuguese>NLAW</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_launch_RPG32_Name">
            <English>RPG-32</English>
@ -1120,6 +1127,7 @@
            <Hungarian>RPG-32</Hungarian>
            <Spanish>RPG-32</Spanish>
            <Russian>РПГ-32</Russian>
+            <Portuguese>RPG-32</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_launch_Titan_Name">
            <English>Mini-Spike (AA)</English>
@ -1130,16 +1138,18 @@
            <Hungarian>Mini-Spike (Repülő-elhárító)</Hungarian>
            <Spanish>Mini-Spike (AA)</Spanish>
            <Russian>Mini-Spike (AA)</Russian>
+            <Portuguese>Mini-Spike (AA)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_launch_Titan_short_Name">
            <English>Mini-Spike (AT)</English>
            <German>Mini-Spike (PALR)</German>
            <Czech>Mini-Spike (PT)</Czech>
            <Polish>Mini-Spike (AT)</Polish>
-            <French>Mini-Spike (AT)</French>
+            <French>Mini-Spike (AC)</French>
            <Hungarian>Mini-Spike (Tankelhárító)</Hungarian>
            <Spanish>Mini-Spike (AT)</Spanish>
            <Russian>Mini-Spike (AT)</Russian>
+            <Portuguese>Mini-Spike (AT)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MX_Name">
            <English>MX</English>
@ -1150,16 +1160,18 @@
            <Hungarian>MX</Hungarian>
            <Spanish>MX</Spanish>
            <Russian>MX</Russian>
+            <Portuguese>MX</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MX_Black_Name">
            <English>MX (Black)</English>
            <German>MX (Schwarz)</German>
            <Polish>MX (Czarny)</Polish>
            <Czech>MX (černý)</Czech>
-            <French>MX ( Noir)</French>
+            <French>MX (Noir)</French>
            <Hungarian>MX (Fekete)</Hungarian>
            <Spanish>MX (Negro)</Spanish>
-            <Russian>MX (черный)</Russian>
+            <Russian>MX (Чёрный)</Russian>
+            <Portuguese>MX (Preto)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MXC_Name">
            <English>MXC</English>
@ -1170,6 +1182,7 @@
            <Hungarian>MXC</Hungarian>
            <Spanish>MXC</Spanish>
            <Russian>MXC</Russian>
+            <Portuguese>MXC</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MXC_Black_Name">
            <English>MXC (Black)</English>
@ -1179,7 +1192,8 @@
            <French>MXC (Noir)</French>
            <Hungarian>MXC (Fekete)</Hungarian>
            <Spanish>MXC (Negro)</Spanish>
-            <Russian>MXC (черный)</Russian>
+            <Russian>MXC (Чёрный)</Russian>
+            <Portuguese>MXC (Preto)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MX_GL_Name">
            <English>MX 3GL</English>
@ -1190,16 +1204,18 @@
            <Hungarian>MX 3GL</Hungarian>
            <Spanish>MX 3GL</Spanish>
            <Russian>MX 3GL</Russian>
+            <Portuguese>MX 3GL</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MX_GL_Black_Name">
            <English>MX 3GL (Black)</English>
            <German>MX 3GL (Schwarz)</German>
            <Polish>MX 3GL (Czarny)</Polish>
            <Czech>MX 3GL (černý)</Czech>
-            <French>MX 3 GL (Noir)</French>
+            <French>MX 3GL (Noir)</French>
            <Hungarian>MX 3GL (Fekete)</Hungarian>
            <Spanish>MX 3GL (Negro)</Spanish>
-            <Russian>MX 3GL (черный)</Russian>
+            <Russian>MX 3GL (Чёрный)</Russian>
+            <Portuguese>MX 3GL (Preto)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MX_SW_Name">
            <English>MX LSW</English>
@ -1210,6 +1226,7 @@
            <Hungarian>MX LSW</Hungarian>
            <Spanish>MX LSW</Spanish>
            <Russian>MX LSW</Russian>
+            <Portuguese>MX LSW</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MX_SW_Black_Name">
            <English>MX LSW (Black)</English>
@ -1219,7 +1236,8 @@
            <French>MX LSW (Noir)</French>
            <Hungarian>MX LSW (Fekete)</Hungarian>
            <Spanish>MX LSW (Negro)</Spanish>
-            <Russian>MX LSW (черный)</Russian>
+            <Russian>MX LSW (Чёрный)</Russian>
+            <Portuguese>MX LSW (Preto)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MXM_Name">
            <English>MXM</English>
@ -1230,6 +1248,7 @@
            <Hungarian>MXM</Hungarian>
            <Spanish>MXM</Spanish>
            <Russian>MXM</Russian>
+            <Portuguese>MXM</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_MXM_Black_Name">
            <English>MXM (Black)</English>
@ -1239,37 +1258,41 @@
            <French>MXM (Noir)</French>
            <Hungarian>MXM (Fekete)</Hungarian>
            <Spanish>MXM (Negro)</Spanish>
-            <Russian>MXM (черный)</Russian>
+            <Russian>MXM (Чёрный)</Russian>
+            <Portuguese>MXM (Preto)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_Katiba_Name">
-            <English>KT2002 Katiba</English>
-            <German>KT2002 Katiba</German>
-            <Czech>KT2002 Katiba</Czech>
-            <Polish>KT2002 Katiba</Polish>
-            <French>KT2002 Katiba</French>
-            <Hungarian>KT2002 Katiba</Hungarian>
-            <Spanish>KT2002 Katiba</Spanish>
-            <Russian>KT2002 Катиба</Russian>
+            <English>KH2002 Sama</English>
+            <German>KH2002 Sama</German>
+            <Czech>KH2002 Sama</Czech>
+            <Polish>KH2002 Sama</Polish>
+            <French>KH2002 Sama</French>
+            <Hungarian>KH2002 Sama</Hungarian>
+            <Spanish>KH2002 Sama</Spanish>
+            <Russian>KH2002 Сама</Russian>
+            <Portuguese>KT2002 Sama</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_Katiba_C_Name">
-            <English>KT2002C Katiba</English>
-            <German>KT2002C Katiba</German>
-            <Czech>KT2002C Katiba</Czech>
-            <Polish>KT2002C Katiba</Polish>
-            <French>KT2002C Katiba</French>
-            <Hungarian>KT2002C Katiba</Hungarian>
-            <Spanish>KT2002C Katiba</Spanish>
-            <Russian>KT2002C Катиба</Russian>
+            <English>KH2002C Sama</English>
+            <German>KH2002C Sama</German>
+            <Czech>KH2002C Sama</Czech>
+            <Polish>KH2002C Sama</Polish>
+            <French>KH2002C Sama</French>
+            <Hungarian>KH2002C Sama</Hungarian>
+            <Spanish>KH2002C Sama</Spanish>
+            <Russian>KH2002C Сама</Russian>
+            <Portuguese>KT2002C Sama</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_Katiba_GL_Name">
-            <English>KT2002 Katiba KGL</English>
-            <German>KT2002 Katiba KGL</German>
-            <Czech>KT2002 Katiba KGL</Czech>
-            <Polish>KT2002 Katiba KGL</Polish>
-            <French>KT2002 Katiba KGL</French>
-            <Hungarian>KT2002 Katiba KGL</Hungarian>
-            <Spanish>KT2002 Katiba KGL</Spanish>
-            <Russian>KT2002 Катиба KGL</Russian>
+            <English>KH2002 Sama KGL</English>
+            <German>KH2002 Sama KGL</German>
+            <Czech>KH2002 Sama KGL</Czech>
+            <Polish>KH2002 Sama KGL</Polish>
+            <French>KH2002 Sama KGL</French>
+            <Hungarian>KH2002 Sama KGL</Hungarian>
+            <Spanish>KH2002 Sama KGL</Spanish>
+            <Russian>KH2002 Сама KGL</Russian>
+            <Portuguese>KT2002 Sama KGL</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_Mk20_Name">
            <English>F2000 (Camo)</English>
@ -1279,7 +1302,8 @@
            <French>F2000 (Camo)</French>
            <Hungarian>F2000 (Terepmintás)</Hungarian>
            <Spanish>F2000 (Camuflaje)</Spanish>
-            <Russian>F2000 (камо)</Russian>
+            <Russian>F2000 (Камо)</Russian>
+            <Portuguese>F2000 (Camo)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_Mk20_plain_Name">
            <English>F2000</English>
@ -1290,6 +1314,7 @@
            <Hungarian>F2000</Hungarian>
            <Spanish>F2000</Spanish>
            <Russian>F2000</Russian>
+            <Portuguese>F2000</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_Mk20C_Name">
            <English>F2000 Tactical (Camo)</English>
@ -1299,7 +1324,8 @@
            <French>F2000 Tactical (Camo)</French>
            <Hungarian>F2000 Tactical (Terepmintás)</Hungarian>
            <Spanish>F2000 Tactical (Camuflaje)</Spanish>
-            <Russian>F2000 Tactical (камо)</Russian>
+            <Russian>F2000 Tactical (Камо)</Russian>
+            <Portuguese>F2000 Tactical (Camo)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_Mk20C_plain_Name">
            <English>F2000 Tactical</English>
@ -1310,6 +1336,7 @@
            <Hungarian>F2000 Tactical</Hungarian>
            <Spanish>F2000 Tactical</Spanish>
            <Russian>F2000 Tactical</Russian>
+            <Portuguese>F2000 Tactical</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_Mk20_GL_Name">
            <English>F2000 EGLM (Camo)</English>
@ -1319,7 +1346,8 @@
            <French>F2000 EGLM (Camo)</French>
            <Hungarian>F2000 EGLM (Terepmintás)</Hungarian>
            <Spanish>F2000 EGLM (Camuflaje)</Spanish>
-            <Russian>F2000 EGLM (камо)</Russian>
+            <Russian>F2000 EGLM (Камо)</Russian>
+            <Portuguese>F2000 EGLM (Camo)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_Mk20_GL_plain_Name">
            <English>F2000 EGLM</English>
@ -1330,6 +1358,7 @@
            <Hungarian>F2000 EGLM</Hungarian>
            <Spanish>F2000 EGLM</Spanish>
            <Russian>F2000 EGLM</Russian>
+            <Portuguese>F2000 EGLM</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_TRG21_Name">
            <English>TAR-21</English>
@ -1340,6 +1369,7 @@
            <Hungarian>TAR-21</Hungarian>
            <Spanish>TAR-21</Spanish>
            <Russian>TAR-21</Russian>
+            <Portuguese>TAR-21</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_TRG20_Name">
            <English>CTAR-21</English>
@ -1350,6 +1380,7 @@
            <Hungarian>CTAR-21</Hungarian>
            <Spanish>CTAR-21</Spanish>
            <Russian>CTAR-21</Russian>
+            <Portuguese>CTAR-21</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_TRG21_GL_Name">
            <English>TAR-21 EGLM</English>
@ -1360,6 +1391,7 @@
            <Hungarian>TAR-21 EGLM</Hungarian>
            <Spanish>TAR-21 EGLM</Spanish>
            <Russian>TAR-21 EGLM</Russian>
+            <Portuguese>TAR-21 EGLM</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_SMG_01_Name">
            <English>Vector SMG</English>
@ -1370,6 +1402,7 @@
            <Hungarian>Vector SMG</Hungarian>
            <Spanish>Vector SMG</Spanish>
            <Russian>Vector SMG</Russian>
+            <Portuguese>Vector SMG</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_SMG_02_Name">
            <English>Scorpion Evo 3 A1</English>
@ -1380,6 +1413,7 @@
            <Hungarian>Scorpion Evo 3 A1</Hungarian>
            <Spanish>Scorpion Evo 3 A1</Spanish>
            <Russian>Scorpion Evo 3 A1</Russian>
+            <Portuguese>Scorpion Evo 3 A1</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_hgun_PDW2000_Name">
            <English>CPW</English>
@ -1390,6 +1424,7 @@
            <Hungarian>CPW</Hungarian>
            <Spanish>CPW</Spanish>
            <Russian>CPW</Russian>
+            <Portuguese>CPW</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_arifle_SDAR_Name">
            <English>RFB SDAR</English>
@ -1400,6 +1435,7 @@
            <Hungarian>RFB SDAR</Hungarian>
            <Spanish>RFB SDAR</Spanish>
            <Russian>RFB SDAR</Russian>
+            <Portuguese>RFB SDAR</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_LMG_Mk200_Name">
            <English>Stoner 99 LMG</English>
@ -1410,6 +1446,7 @@
            <Hungarian>Stoner 99 Könnyűgéppuska</Hungarian>
            <Spanish>Stoner 99 LMG</Spanish>
            <Russian>Stoner 99 LMG</Russian>
+            <Portuguese>Stoner 99 LMG</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_LMG_Zafir_Name">
            <English>Negev NG7</English>
@ -1420,6 +1457,7 @@
            <Hungarian>Negev NG7</Hungarian>
            <Spanish>Negev NG7</Spanish>
            <Russian>Negev NG7</Russian>
+            <Portuguese>Negev NG7</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_EBR_Name">
            <English>Mk14 Mod 1 EBR</English>
@ -1430,6 +1468,7 @@
            <Hungarian>Mk14 Mod 1 EBR</Hungarian>
            <Spanish>Mk14 Mod 1 EBR</Spanish>
            <Russian>Mk14 Mod 1 EBR</Russian>
+            <Portuguese>Mk14 Mod 1 EBR</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_GM6_Name">
            <English>GM6 Lynx</English>
@ -1440,6 +1479,7 @@
            <Hungarian>GM6 Gepárd</Hungarian>
            <Spanish>GM6 Lynx</Spanish>
            <Russian>GM6 Lynx</Russian>
+            <Portuguese>GM6 Lynx</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_GM6_camo_Name">
            <English>GM6 Lynx (Camo)</English>
@ -1450,6 +1490,7 @@
            <Hungarian>GM6 Gepárd (Terepmintás)</Hungarian>
            <Spanish>GM6 Lynx (Camuflaje)</Spanish>
            <Russian>GM6 Lynx (камо)</Russian>
+            <Portuguese>GM6 Lynx (Camo)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_LRR_Name">
            <English>M200 Intervention</English>
@ -1460,6 +1501,7 @@
            <Hungarian>M200 Intervention</Hungarian>
            <Spanish>M200 Intervention</Spanish>
            <Russian>M200 Intervention</Russian>
+            <Portuguese>M200 Intervention</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_LRR_camo_Name">
            <English>M200 Intervention (Camo)</English>
@ -1470,6 +1512,7 @@
            <Hungarian>M200 Intervention (Terepmintás)</Hungarian>
            <Spanish>M200 Intervention (Camuflaje)</Spanish>
            <Russian>M200 Intervention (камо)</Russian>
+            <Portuguese>M200 Intervention (Camo)</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_01_Name">
            <English>VS-121</English>
@ -1480,90 +1523,106 @@
            <Hungarian>VS-121</Hungarian>
            <Spanish>VS-121</Spanish>
            <Russian>VS-121</Russian>
+            <Portuguese>VS-121</Portuguese>
        </Key>
        <Key ID="STR_ACE_RealisticNames_DMR_02">
-            <English>MAR-10</English>
-            <Czech>MAR-10</Czech>
-            <French>MAR-10</French>
-            <Spanish>MAR-10</Spanish>
-            <Russian>MAR-10</Russian>
+            <English>Noreen "Bad News" ULR</English>
+            <Czech>Noreen "Bad News" ULR</Czech>
+            <French>Noreen "Bad News" ULR</French>
+            <Spanish>Noreen "Bad News" ULR</Spanish>
+            <Russian>Noreen "Bad News" ULR</Russian>
+            <German>Noreen "Bad News" ULR</German>
+            <Polish>Noreen "Bad News" ULR</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_02">
-            <English>MAR-10 (Black)</English>
-            <Czech>MAR-10 (Black)</Czech>
-            <French>MAR-10 (Noir)</French>
-            <Spanish>MAR-10 (Negro)</Spanish>
-            <Russian>MAR-10 (черный)</Russian>
+            <English>Noreen "Bad News" ULR (Black)</English>
+            <Czech>Noreen "Bad News" ULR (Black)</Czech>
+            <French>Noreen "Bad News" ULR (Noir)</French>
+            <Spanish>Noreen "Bad News" ULR (Negro)</Spanish>
+            <Russian>Noreen "Bad News" ULR (Чёрный)</Russian>
+            <German>Noreen "Bad News" ULR (Schwarz)</German>
+            <Polish>Noreen "Bad News" ULR (czarny)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_02_camo">
-            <English>MAR-10 (Camo)</English>
-            <Czech>MAR-10 (Camo)</Czech>
-            <French>MAR-10 (Camo)</French>
-            <Spanish>MAR-10 (Camuflaje)</Spanish>
-            <Russian>MAR-10 (камо)</Russian>
+            <English>Noreen "Bad News" ULR (Camo)</English>
+            <Czech>Noreen "Bad News" ULR (Camo)</Czech>
+            <French>Noreen "Bad News" ULR (Camo)</French>
+            <Spanish>Noreen "Bad News" ULR (Camuflaje)</Spanish>
+            <Russian>Noreen "Bad News" ULR (Камо)</Russian>
+            <German>Noreen "Bad News" ULR (Camo)</German>
+            <Polish>Noreen "Bad News" ULR (kamuflaż)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_02_sniper">
-            <English>MAR-10 (Sand)</English>
-            <Czech>MAR-10 (Sand)</Czech>
-            <French>MAR-10 (Beige)</French>
-            <Spanish>MAR-10 (Arena)</Spanish>
-            <Russian>MAR-10 (песочный)</Russian>
+            <English>Noreen "Bad News" ULR (Sand)</English>
+            <Czech>Noreen "Bad News" ULR (Sand)</Czech>
+            <French>Noreen "Bad News" ULR (Beige)</French>
+            <Spanish>Noreen "Bad News" ULR (Arena)</Spanish>
+            <Russian>Noreen "Bad News" ULR (Песочный)</Russian>
+            <German>Noreen "Bad News" ULR (Sand)</German>
+            <Polish>Noreen "Bad News" ULR (piaskowy)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_DMR_03">
-            <English>SG 556</English>
-            <Czech>SG 556</Czech>
-            <French>SG 556</French>
-            <Spanish>SG 556</Spanish>
-            <Russian>SG 556</Russian>
-            <Polish>SG 556</Polish>
+            <English>SIG 556</English>
+            <Czech>SIG 556</Czech>
+            <French>SIG 556</French>
+            <Spanish>SIG 556</Spanish>
+            <Russian>SIG 556</Russian>
+            <Polish>SIG 556</Polish>
+            <German>SIG 556</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_03">
-            <English>SG 556 (Black)</English>
-            <Czech>SG 556 (Black)</Czech>
-            <French>SG 556 (Noir)</French>
-            <Spanish>SG 556 (Negro)</Spanish>
-            <Russian>SG 556 (черный)</Russian>
-            <Polish>SG 556 (czarny)</Polish>
+            <English>SIG 556 (Black)</English>
+            <Czech>SIG 556 (Black)</Czech>
+            <French>SIG 556 (Noir)</French>
+            <Spanish>SIG 556 (Negro)</Spanish>
+            <Russian>SIG 556 (Чёрный)</Russian>
+            <Polish>SIG 556 (czarny)</Polish>
+            <German>SIG 556 (Schwarz)</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_03_khaki">
-            <English>SG 556 (Khaki)</English>
-            <Czech>SG 556 (Khaki)</Czech>
-            <French>SG 556 (Kaki)</French>
-            <Spanish>SG 556 (Caqui)</Spanish>
-            <Russian>SG 556 (хаки)</Russian>
-            <Polish>SG 556 (khaki)</Polish>
+            <English>SIG 556 (Khaki)</English>
+            <Czech>SIG 556 (Khaki)</Czech>
+            <French>SIG 556 (Kaki)</French>
+            <Spanish>SIG 556 (Caqui)</Spanish>
+            <Russian>SIG 556 (Хаки)</Russian>
+            <Polish>SIG 556 (khaki)</Polish>
+            <German>SIG 556 (Khaki)</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_03_tan">
-            <English>SG 556 (Sand)</English>
-            <Czech>SG 556 (Sand)</Czech>
-            <French>SG 556 (Beige)</French>
-            <Spanish>SG 556 (Arena)</Spanish>
-            <Russian>SG 556 (песочный)</Russian>
-            <Polish>SG 556 (piaskowy)</Polish>
+            <English>SIG 556 (Sand)</English>
+            <Czech>SIG 556 (Sand)</Czech>
+            <French>SIG 556 (Beige)</French>
+            <Spanish>SIG 556 (Arena)</Spanish>
+            <Russian>SIG 556 (Песочный)</Russian>
+            <Polish>SIG 556 (piaskowy)</Polish>
+            <German>SIG 556 (Sand)</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_03_multicam">
-            <English>SG 556 (Camo)</English>
-            <Czech>SG 556 (Camo)</Czech>
-            <French>SG 556 (Camo)</French>
-            <Spanish>SG 556 (Camuflaje)</Spanish>
-            <Russian>SG 556 (камо)</Russian>
-            <Polish>SG 556 (kamuflaż)</Polish>
+            <English>SIG 556 (Camo)</English>
+            <Czech>SIG 556 (Camo)</Czech>
+            <French>SIG 556 (Camo)</French>
+            <Spanish>SIG 556 (Camuflaje)</Spanish>
+            <Russian>SIG 556 (Камо)</Russian>
+            <Polish>SIG 556 (kamuflaż)</Polish>
+            <German>SIG 556 (Camo)</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_03_woodland">
-            <English>SG 556 (Woodland)</English>
-            <Czech>SG 556 (Woodland)</Czech>
-            <French>SG 556 (Woodland)</French>
-            <Spanish>SG 556 (Bosque)</Spanish>
-            <Russian>SG 556 (лесной)</Russian>
-            <Polish>SG 556 (leśny)</Polish>
+            <English>SIG 556 (Woodland)</English>
+            <Czech>SIG 556 (Woodland)</Czech>
+            <French>SIG 556 (Woodland)</French>
+            <Spanish>SIG 556 (Bosque)</Spanish>
+            <Russian>SIG 556 (Лесной)</Russian>
+            <Polish>SIG 556 (leśny)</Polish>
+            <German>SIG 556 (Woodland)</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_03_spotter">
-            <English>SG 556 (provisional) spotter</English>
-            <Czech>SG 556 (provisional) spotter</Czech>
-            <French>SG 556 (provisoire) Observateur</French>
-            <Spanish>SG 556 (provisional) observador</Spanish>
-            <Russian>SG 556 (provisional) корректировщик</Russian>
-            <Polish>SG 556 (prowizoryczny) obserwator</Polish>
+            <English>SIG 556 (provisional) spotter</English>
+            <Czech>SIG 556 (provisional) spotter</Czech>
+            <French>SIG 556 (provisoire) Observateur</French>
+            <Spanish>SIG 556 (provisional) observador</Spanish>
+            <Russian>SIG 556 (provisional) корректировщик</Russian>
+            <Polish>SIG 556 (prowizoryczny) obserwator</Polish>
+            <German>SIG 556 (provisorisch) Beobachter</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_DMR_04">
            <English>ASP-1 Kir</English>
@ -1571,20 +1630,26 @@
            <French>ASP-1 Kir</French>
            <Spanish>ASP-1 Kir</Spanish>
            <Russian>ASP-1 Kir</Russian>
+            <German>ASP-1 Kir</German>
+            <Polish>ASP-1 Kir</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_04">
            <English>ASP-1 Kir (Black)</English>
            <Czech>ASP-1 Kir (Black)</Czech>
            <French>ASP-1 Kir (Noir)</French>
            <Spanish>ASP-1 Kir (Negro)</Spanish>
-            <Russian>ASP-1 Kir (черный)</Russian>
+            <Russian>ASP-1 Kir (Чёрный)</Russian>
+            <German>ASP-1 Kir (Schwarz)</German>
+            <Polish>ASP-1 Kir (czarny)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_04_Tan">
            <English>ASP-1 Kir (Tan)</English>
            <Czech>ASP-1 Kir (Tan)</Czech>
            <French>ASP-1 Kir (Tan)</French>
            <Spanish>ASP-1 Kir (Tan)</Spanish>
-            <Russian>ASP-1 Kir (бронзовый)</Russian>
+            <Russian>ASP-1 Kir (Бронзовый)</Russian>
+            <German>ASP-1 Kir (Hellbraun)</German>
+            <Polish>ASP-1 Kir (Tan)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_DMR_05">
            <English>Cyrus</English>
@ -1592,27 +1657,35 @@
            <French>Cyrus</French>
            <Spanish>Cyrus</Spanish>
            <Russian>Cyrus</Russian>
+            <German>Cyrus</German>
+            <Polish>Cyrus</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_05_blk">
            <English>Cyrus (Black)</English>
            <Czech>Cyrus (Black)</Czech>
            <French>Cyrus (Noir)</French>
            <Spanish>Cyrus (Negro)</Spanish>
-            <Russian>Cyrus (черный)</Russian>
+            <Russian>Cyrus (Чёрный)</Russian>
+            <German>Cyrus (Schwarz)</German>
+            <Polish>Cyrus (czarny)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_05_hex">
            <English>Cyrus (Hex)</English>
            <Czech>Cyrus (Hex)</Czech>
            <French>Cyrus (Hex)</French>
            <Spanish>Cyrus (Hex)</Spanish>
-            <Russian>Cyrus (гекс)</Russian>
+            <Russian>Cyrus (Гекс)</Russian>
+            <German>Cyrus (Hex)</German>
+            <Polish>Cyrus (hex)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_05_tan">
            <English>Cyrus (Tan)</English>
            <Czech>Cyrus (Tan)</Czech>
            <French>Cyrus (Tan)</French>
            <Spanish>Cyrus (Tan)</Spanish>
-            <Russian>Cyrus (бронза)</Russian>
+            <Russian>Cyrus (Бронза)</Russian>
+            <German>Cyrus (Hellbraun)</German>
+            <Polish>Cyrus (podpalany)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_DMR_06">
            <English>M14</English>
@ -1621,6 +1694,7 @@
            <Spanish>M14</Spanish>
            <Russian>M14</Russian>
            <Polish>M14</Polish>
+            <German>M14</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_06_camo">
            <English>M14 (Camo)</English>
@ -1629,6 +1703,7 @@
            <Spanish>M14 (Camuflaje)</Spanish>
            <Russian>M14 (Камо)</Russian>
            <Polish>M14 (kamuflaż)</Polish>
+            <German>M14 (Camo)</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_srifle_DMR_06_olive">
            <English>M14 (Olive)</English>
@ -1637,27 +1712,34 @@
            <Spanish>M14 (Oliva)</Spanish>
            <Russian>M14 (Олива)</Russian>
            <Polish>M14 (oliwkowy)</Polish>
+            <German>M14 (Olive)</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_MMG_01">
-            <English>Navid</English>
-            <Czech>Navid</Czech>
-            <French>Navid</French>
-            <Spanish>Navid</Spanish>
-            <Russian>Navid</Russian>
+            <English>HK121</English>
+            <Czech>HK121</Czech>
+            <French>HK121</French>
+            <Spanish>HK121</Spanish>
+            <Russian>HK121</Russian>
+            <German>HK121</German>
+            <Polish>HK121</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_MMG_01_hex">
-            <English>Navid (Hex)</English>
-            <Czech>Navid (Hex)</Czech>
-            <French>Navid (Hex)</French>
-            <Spanish>Navid (Hex)</Spanish>
-            <Russian>Navid (гекс)</Russian>
+            <English>HK121 (Hex)</English>
+            <Czech>HK121 (Hex)</Czech>
+            <French>HK121 (Hex)</French>
+            <Spanish>HK121 (Hex)</Spanish>
+            <Russian>HK121 (Гекс)</Russian>
+            <German>HK121 (Hex)</German>
+            <Polish>HK121 (hex)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_MMG_01_tan">
-            <English>Navid (Tan)</English>
-            <Czech>Navid (Tan)</Czech>
-            <French>Navid (Tan)</French>
-            <Spanish>Navid (Tan)</Spanish>
-            <Russian>Navid (бронза)</Russian>
+            <English>HK121 (Tan)</English>
+            <Czech>HK121 (Tan)</Czech>
+            <French>HK121 (Tan)</French>
+            <Spanish>HK121 (Tan)</Spanish>
+            <Russian>HK121 (Бронза)</Russian>
+            <German>HK121 (Hellbraun)</German>
+            <Polish>HK121 (podpalany)</Polish>
        </Key>
        <Key ID="STR_ACE_RealisticNames_MMG_02">
            <English>LWMMG</English>
@ -1666,6 +1748,7 @@
            <Spanish>LWMMG</Spanish>
            <Russian>LWMMG</Russian>
            <Polish>LWMMG</Polish>
+            <German>LWMMG</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_MMG_02_camo">
            <English>LWMMG (MTP)</English>
@ -1674,14 +1757,16 @@
            <Spanish>LWMMG (MTP)</Spanish>
            <Russian>LWMMG (MTP)</Russian>
            <Polish>LWMMG (MTP)</Polish>
+            <German>LWMMG (MTP)</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_MMG_02_black">
            <English>LWMMG (Black)</English>
            <Czech>LWMMG (Black)</Czech>
            <French>LWMMG (Noir)</French>
            <Spanish>LWMMG (Negro)</Spanish>
-            <Russian>LWMMG (Черный)</Russian>
+            <Russian>LWMMG (Чёрный)</Russian>
            <Polish>LWMMG (czarny)</Polish>
+            <German>LWMMG (Schwarz)</German>
        </Key>
        <Key ID="STR_ACE_RealisticNames_MMG_02_sand">
            <English>LWMMG (Sand)</English>
@ -1690,6 +1775,7 @@
            <Spanish>LWMMG (Arena)</Spanish>
            <Russian>LWMMG (Песочный)</Russian>
            <Polish>LWMMG (piaskowy)</Polish>
+            <German>LWMMG (Sand)</German>
        </Key>
    </Package>
 </Project>
--- a/addons/recoil/functions/fnc_camshake.sqf
+++ b/addons/recoil/functions/fnc_camshake.sqf
@ -33,8 +33,12 @@ _recoil = if (_muzzle == _weapon) then {
    getText (_config >> _muzzle >> "recoil")
 };

-_recoil = getArray (configFile >> "CfgRecoils" >> _recoil >> "kickBack");
-if (count _recoil < 2) then {
+if (isClass (configFile >> "CfgRecoils" >> _recoil)) then {
+    _recoil = getArray (configFile >> "CfgRecoils" >> _recoil >> "kickBack");
+    if (count _recoil < 2) then {
+        _recoil = [0, 0];
+    };
+} else {
    _recoil = [0, 0];
 };

--- a/addons/reload/stringtable.xml
+++ b/addons/reload/stringtable.xml
@ -11,6 +11,7 @@
            <French>Vérification des munitions au rechargement</French>
            <Hungarian>Lőszer ellenőrzése a fegyver újratöltésekor</Hungarian>
            <Italian>Controlla le munizioni ricaricando</Italian>
+            <Portuguese>Conferir munição ao recarregar a arma</Portuguese>
        </Key>
        <Key ID="STR_ACE_reload_SettingDisplayTextDesc">
            <English>Check the ammo in your new magazine on magazine reload.</English>
@ -22,6 +23,7 @@
            <French>Vérification du nombre de munition au rechargement</French>
            <Hungarian>A lőszer ellenőrzése az új tárad behelyezésekor újratöltés közben.</Hungarian>
            <Italian>Controlla le munizioni rimanenti nel caricatore in fase di cambio caricatore.</Italian>
+            <Portuguese>Confere a munição no seu novo carregador ao recarregar a arma</Portuguese>
        </Key>
        <Key ID="STR_ACE_Reload_checkAmmo">
            <English>Check Ammo</English>
@ -57,6 +59,7 @@
            <German>Gurt anhängen</German>
            <Hungarian>Töltényheveder összekötése</Hungarian>
            <Italian>Attacca la tracolla</Italian>
+            <Portuguese>Ligar cintos de munição</Portuguese>
        </Key>
        <Key ID="STR_ACE_Reload_LinkingBelt">
            <English>Linking belt...</English>
@ -68,6 +71,7 @@
            <German>Gurt anhängen ...</German>
            <Hungarian>Töltényheveder összekötése folyamatban...</Hungarian>
            <Italian>Attacco la tracolla...</Italian>
+            <Portuguese>Ligando cintos...</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/reloadlaunchers/stringtable.xml
+++ b/addons/reloadlaunchers/stringtable.xml
@ -11,6 +11,7 @@
            <French>Charger lanceur</French>
            <Hungarian>Kilövö betöltése</Hungarian>
            <Italian>Carica lanciamissili</Italian>
+            <Portuguese>Recarregar lançador</Portuguese>
        </Key>
        <Key ID="STR_ACE_ReloadLaunchers_LoadingLauncher">
            <English>Loading launcher ...</English>
@ -22,17 +23,19 @@
            <Polish>Ładowanie wyrzutni ...</Polish>
            <Hungarian>Kilövő betöltés alatt ...</Hungarian>
            <Italian>Carico il lanciamissili ...</Italian>
+            <Portuguese>Recarregando lançador...</Portuguese>
        </Key>
        <Key ID="STR_ACE_ReloadLaunchers_LauncherLoaded">
            <English>Launcher loaded</English>
            <French>Lanceur chargé</French>
            <German>Panzerabwehr geladen</German>
            <Spanish>Lanzador cargado</Spanish>
-            <Russian>ПУ заряжено</Russian>
+            <Russian>ПУ заряжена</Russian>
            <Czech>Odpalovač nabit</Czech>
            <Polish>Wyrzutnia załadowana</Polish>
            <Hungarian>Kilövő betöltve</Hungarian>
            <Italian>Lanciamissili caricato</Italian>
+            <Portuguese>Lançador Carregado</Portuguese>
        </Key>
        <Key ID="STR_ACE_ReloadLaunchers_LoadMagazine">
            <English>Load %1</English>
@ -44,6 +47,7 @@
            <Polish>Załadowano %1</Polish>
            <Hungarian>%1 betöltése</Hungarian>
            <Italian>Caricato %1</Italian>
+            <Portuguese>Recarregar %1</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/respawn/stringtable.xml
+++ b/addons/respawn/stringtable.xml
@ -11,6 +11,7 @@
            <Czech>Respawn za 5 sekund...</Czech>
            <Hungarian>Kihelyezés 5 másodperc múlva ...</Hungarian>
            <Italian>Dispiegamento in 5 secondi ...</Italian>
+            <Portuguese>Será posicionado em 5 segundos ...</Portuguese>
        </Key>
        <Key ID="STR_ACE_Respawn_Deployed">
            <English>Rallypoint deployed</English>
@ -22,6 +23,7 @@
            <Czech>Rallypoint umístěn</Czech>
            <Hungarian>Gyülekezőpont elhelyezve</Hungarian>
            <Italian>Rallypoint dispiegato</Italian>
+            <Portuguese>Rallypoints posicionado</Portuguese>
        </Key>
        <Key ID="STR_ACE_Respawn_TeleportedToBase">
            <English>Teleported to Base</English>
@ -33,6 +35,7 @@
            <Czech>Odteleportován na základnu</Czech>
            <Hungarian>Bázisra teleportálva</Hungarian>
            <Italian>Teleportato alla base</Italian>
+            <Portuguese>Teletransportado para a Base</Portuguese>
        </Key>
        <Key ID="STR_ACE_Respawn_TeleportedToRallypoint">
            <English>Teleported to Rallypoint</English>
@ -44,6 +47,7 @@
            <Czech>Odteleportován na rallypoint</Czech>
            <Hungarian>Gyülekezőpontra teleportálva</Hungarian>
            <Italian>Teleportato al rallypoint</Italian>
+            <Portuguese>Teletransportado para o Rallypoints</Portuguese>
        </Key>
        <Key ID="STR_ACE_Respawn_RallypointWestBase">
            <English>Rallypoint West (Base)</English>
--- a/addons/safemode/stringtable.xml
+++ b/addons/safemode/stringtable.xml
@ -11,6 +11,7 @@
            <Russian>Предохранитель</Russian>
            <French>Sécurité</French>
            <Italian>Sicura inserita</Italian>
+            <Portuguese>Modo de segurança</Portuguese>
        </Key>
        <Key ID="STR_ACE_SafeMode_TakeOffSafety">
            <English>Take off Safety</English>
@ -22,6 +23,7 @@
            <Russian>Снять с предохранителя</Russian>
            <French>Enlever sécurité</French>
            <Italian>Togli la sicura</Italian>
+            <Portuguese>Tirar segurança</Portuguese>
        </Key>
        <Key ID="STR_ACE_SafeMode_PutOnSafety">
            <English>Put on Safety</English>
@ -33,6 +35,7 @@
            <Russian>Поставить на предохранитель</Russian>
            <French>Sécurité mise</French>
            <Italian>Inserisci la sicura</Italian>
+            <Portuguese>Colocar Segurança</Portuguese>
        </Key>
        <Key ID="STR_ACE_SafeMode_TookOffSafety">
            <English>Took off Safety</English>
@ -44,6 +47,7 @@
            <Russian>Снят с предохранителя</Russian>
            <French>Sécurité enlevée</French>
            <Italian>Togli la sicura</Italian>
+            <Portuguese>Tirou Segurança</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/scopes/functions/fnc_adjustScope.sqf
+++ b/addons/scopes/functions/fnc_adjustScope.sqf
@ -17,6 +17,7 @@
 PARAMS_3(_unit,_turretAndDirection,_majorStep);

 if (!(_unit isKindOf "Man")) exitWith {false};
+if (currentMuzzle _unit != currentWeapon _unit) exitWith {false};

 private ["_weaponIndex", "_zeroing", "_optic", "_increment", "_maxVertical", "_maxHorizontal", "_elevation", "_windage", "_zero", "_adjustment"];

@ -37,7 +38,7 @@ _increment = getNumber (configFile >> "CfgWeapons" >> _optic >> "ACE_ScopeAdjust
 _maxVertical = getArray (configFile >> "CfgWeapons" >> _optic >> "ACE_ScopeAdjust_Vertical");
 _maxHorizontal = getArray (configFile >> "CfgWeapons" >> _optic >> "ACE_ScopeAdjust_Horizontal");

-if ((count _maxHorizontal < 2) or (count _maxVertical < 2)) exitWith {false};
+if ((_increment == 0) or (count _maxHorizontal < 2) or (count _maxVertical < 2)) exitWith {false};

 _zeroing   = _adjustment select _weaponIndex;
 _elevation = _zeroing select 0;
--- a/addons/switchunits/stringtable.xml
+++ b/addons/switchunits/stringtable.xml
@ -11,6 +11,7 @@
            <French>Unité changée</French>
            <Hungarian>Egység átváltva</Hungarian>
            <Italian>Cambia unità</Italian>
+            <Portuguese>Trocado de unidade</Portuguese>
        </Key>
        <Key ID="STR_ACE_SwitchUnits_TooCloseToEnemy">
            <English>This unit is too close to the enemy.</English>
@ -22,6 +23,7 @@
            <French>Cette unité est trop proche des ennemis</French>
            <Hungarian>Ez az egység túl közel van az ellenséghez.</Hungarian>
            <Italian>Questa unità è troppo vicina al nemico.</Italian>
+            <Portuguese>Essa unidade  está muito perta do inimigo.</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/vehiclelock/stringtable.xml
+++ b/addons/vehiclelock/stringtable.xml
@ -11,6 +11,7 @@
            <Hungarian>Jármű nyitása</Hungarian>
            <Russian>Открыть машину</Russian>
            <Italian>Apri il veicolo</Italian>
+            <Portuguese>Destravar veículo</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Action_Lock">
            <English>Lock Vehicle</English>
@ -22,6 +23,7 @@
            <Hungarian>Jármű zárása</Hungarian>
            <Russian>Закрыть машину</Russian>
            <Italian>Chiudi il veicolo</Italian>
+            <Portuguese>Travar Veículo</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Action_Lockpick">
            <English>Lockpick Vehicle</English>
@ -33,6 +35,7 @@
            <Hungarian>Jármű feltörése</Hungarian>
            <Russian>Взломать замок</Russian>
            <Italian>Scassina veicolo</Italian>
+            <Portuguese>Usar mixa no Veículo</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Action_LockpickInUse">
            <English>Picking Lock....</English>
@ -44,6 +47,7 @@
            <Hungarian>Zár feltörése...</Hungarian>
            <Russian>Взламываем замок...</Russian>
            <Italian>Scassino il veicolo....</Italian>
+            <Portuguese>Usando Mixa...</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Item_Custom_Description">
            <English>A custom key that will open a specific vehicle.</English>
@ -55,6 +59,7 @@
            <Hungarian>Egy egyedi kulcs, ami egy meghatározott járművet nyit ki.</Hungarian>
            <Russian>Ключ от конкретной машины.</Russian>
            <Italian>Una chiave personalizzata che apre determinati veicoli.</Italian>
+            <Portuguese>Uma chave específica que abre um veículo específico.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Item_Master_Description">
            <English>A Master Key will open any lock, no matter what!</English>
@ -66,6 +71,7 @@
            <Hungarian>Egy főkulcs, ami minden zárat kinyit, helyzettől függetlenül!</Hungarian>
            <Russian>Универсальный ключ, открывающий любой замок.</Russian>
            <Italian>Una chiave principale che apre qualsiasi serratura!</Italian>
+            <Portuguese>Uma chave mestre irá abrir qualquer fechadura, não importa qual!</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Item_Lockpick_Description">
            <English>A lockpick set that can pick the locks of most vehicles.</English>
@ -77,6 +83,7 @@
            <Hungarian>Egy tolvajkulcs-készlet, mely a legtöbb jármű zárjait fel tudja törni.</Hungarian>
            <Russian>Набор отмычек, которым можно взломать почти любую машину.</Russian>
            <Italian>Un grimardello per forzare la maggior parte dei veicoli</Italian>
+            <Portuguese>Um set de chave mixas que pode abrir a maioria dos veículos.</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Item_West_Description">
            <English>A key that should open most WEST vehicles.</English>
@ -88,6 +95,7 @@
            <Hungarian>Egy kulcs, ami a NYUGAT egységeinek legtöbb járművét ki tudja nyitni.</Hungarian>
            <Russian>Ключ для открытия большинства машин Красных.</Russian>
            <Italian>Una chiave che apre la maggior parte dei veicoli WEST</Italian>
+            <Portuguese>Uma chave que abre a maioria dos veículos ocidentais</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Item_East_Description">
            <English>A key that should open most EAST vehicle.</English>
@ -99,6 +107,7 @@
            <Czech>Klíč který by měl otevřít vetšinu Východních vozidel.</Czech>
            <Russian>Ключ для открытия большинства машин Синих.</Russian>
            <Italian>Una chaive che apr ela maggior parte dei veicoli EAST</Italian>
+            <Portuguese>Uma chave que abre a maioria dos veículos orientais</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Item_Indp_Description">
            <English>A key that should open most INDEP vehicle.</English>
@ -110,6 +119,7 @@
            <Czech>Klíč který by měl otevřít většinu Nezávislých vozidel.</Czech>
            <Russian>Ключ для открытия большинства машин Независимых.</Russian>
            <Italian>Una chaive che apr ela maggior parte dei veicoli INDEP</Italian>
+            <Portuguese>Uma chave que abre a maioria dos veículos independentes</Portuguese>
        </Key>
        <Key ID="STR_ACE_Vehicle_Item_Civ_Description">
            <English>A key that should open most CIV vehicle.</English>
@ -121,6 +131,7 @@
            <Hungarian>Egy kulcs, ami a CIVIL járművek többségét ki tudja nyitni.</Hungarian>
            <Russian>Ключ для открытия большинства машин Гражданских.</Russian>
            <Italian>Una chaive che apr ela maggior parte dei veicoli CIV</Italian>
+            <Portuguese>Uma chave que abre a maioria dos veículos civis.</Portuguese>
        </Key>
    </Package>
 </Project>
--- a/addons/weaponselect/stringtable.xml
+++ b/addons/weaponselect/stringtable.xml
@ -11,6 +11,7 @@
            <French>Afficher texte lors d'un lancé de grenade</French>
            <Hungarian>Szöveg mutatása gránát eldobásakor</Hungarian>
            <Italian>Mostra indicazioni nel lancio granate</Italian>
+            <Portuguese>Mostrat texto ao lançar granada</Portuguese>
        </Key>
        <Key ID="STR_ACE_Weaponselect_SettingDisplayTextDesc">
            <English>Display a hint or text on grenade throw.</English>
@ -22,6 +23,7 @@
            <French>Afficher texte/info au lancé de grenade</French>
            <Hungarian>Jelez egy súgót vagy szöveget a gránát eldobásakor.</Hungarian>
            <Italian>Mostra un suggerimento quando si lanciano granate</Italian>
+            <Portuguese>Mostra um hint ou texto ao lançar uma granada</Portuguese>
        </Key>
        <Key ID="STR_ACE_WeaponSelect_SelectPistol">
            <English>Select Pistol</English>
@ -53,7 +55,7 @@
            <Spanish>Seleccionar lanzador</Spanish>
            <Polish>Wybierz wyrzutnię</Polish>
            <Czech>Zvolit Raketomet</Czech>
-            <Russian>Выбрать гранатомет</Russian>
+            <Russian>Выбрать гранатомёт</Russian>
            <French>Sélectionner Lanceur</French>
            <Hungarian>Rakétavető Kiválasztása</Hungarian>
            <Portuguese>Selecionar Lançador</Portuguese>
@ -65,7 +67,7 @@
            <Spanish>Seleccionar lanzador de granadas</Spanish>
            <Polish>Wybierz granatnik</Polish>
            <Czech>Zvolit Granátomet</Czech>
-            <Russian>Выбрать подствольный гранатомет</Russian>
+            <Russian>Выбрать подствольный гранатомёт</Russian>
            <French>Sélectionner Lance-grenades</French>
            <Hungarian>Gránátvető Kiválasztása</Hungarian>
            <Portuguese>Selecionar Lança-Granadas</Portuguese>
--- a/addons/weather/ACE_Settings.hpp
+++ b/addons/weather/ACE_Settings.hpp
@ -0,0 +1,38 @@
+class ACE_Settings {
+    class GVAR(enableServerController) {
+        displayName = "Weather propagation";
+        description = "Enables sever side weather propagation";
+        typeName = "BOOL";
+        value = 1;
+    };
+    class GVAR(useACEWeather) {
+        displayName = "ACE Weather";
+        description = "Overrides the default weather (editor, mission settings) with ACE weather (map based)";
+        typeName = "BOOL";
+        value = 1;
+    };
+    class GVAR(syncRain) {
+        displayName = "Sync Rain";
+        description = "Synchronizes rain";
+        typeName = "BOOL";
+        value = 1;
+    };
+    class GVAR(syncWind) {
+        displayName = "Sync Wind";
+        description = "Synchronizes wind";
+        typeName = "BOOL";
+        value = 1;
+    };
+    class GVAR(syncMisc) {
+        displayName = "Sync Misc";
+        description = "Synchronizes lightnings, rainbow, fog, ...";
+        typeName = "BOOL";
+        value = 1;
+    };
+    class GVAR(serverUpdateInterval) {
+        displayName = "Update Interval";
+        description = "Defines the interval (seconds) between weather updates";
+        typeName = "SCALAR";
+        value = 60;
+    };
+};
--- a/addons/weather/CfgVehicles.hpp
+++ b/addons/weather/CfgVehicles.hpp
@ -0,0 +1,52 @@
+class CfgVehicles {
+    class ACE_Module;
+    class GVAR(ModuleSettings): ACE_Module {
+        scope = 2;
+        displayName = "Weather";
+        icon = QUOTE(PATHTOF(UI\Icon_Module_Wind_ca.paa));
+        category = "ACE";
+        function = QUOTE(DFUNC(initModuleSettings));
+        functionPriority = 1;
+        isGlobal = 1;
+        isTriggerActivated = 0;
+        author = "$STR_ACE_Common_ACETeam";
+        class Arguments {
+            class enableServerController {
+                displayName = "Weather propagation";
+                description = "Enables sever side weather propagation";
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+            class useACEWeather {
+                displayName = "ACE Weather";
+                description = "Overrides the default weather (editor, mission settings) with ACE weather (map based)";
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+            class syncRain {
+                displayName = "Sync Rain";
+                description = "Synchronizes rain";
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+            class syncWind {
+                displayName = "Sync Wind";
+                description = "Synchronizes wind";
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+            class syncMisc {
+                displayName = "Sync Misc";
+                description = "Synchronizes lightnings, rainbow, fog, ...";
+                typeName = "BOOL";
+                defaultValue = 1;
+            };
+            class serverUpdateInterval {
+                displayName = "Update Interval";
+                description = "Defines the interval (seconds) between weather updates";
+                typeName = "NUMBER";
+                defaultValue = 60;
+            };
+        };
+    };
+};
--- a/addons/weather/UI/Icon_Module_Wind_ca.paa
+++ b/addons/weather/UI/Icon_Module_Wind_ca.paa
--- a/addons/weather/XEH_postServerInit.sqf
+++ b/addons/weather/XEH_postServerInit.sqf
@ -9,7 +9,4 @@ GVAR(rain_current_range) = -1+(random 2);
 // Wind
 call FUNC(initWind);

-GVAR(overcast_multiplier) = 1;
-GVAR(serverUpdateInterval) = 60;
-
 [FUNC(serverController), GVAR(serverUpdateInterval)] call cba_fnc_addPerFrameHandler;
--- a/addons/weather/XEH_preInit.sqf
+++ b/addons/weather/XEH_preInit.sqf
@ -8,21 +8,15 @@ PREP(calculateBarometricPressure);
 PREP(displayWindInfo);
 PREP(getMapData);
 PREP(getWind);
+PREP(initModuleSettings);
 PREP(initWind);
 PREP(serverController);
+PREP(updateAceWeather);
 PREP(updateHumidity);
 PREP(updateRain);
 PREP(updateTemperature);
 PREP(updateWind);

-// Control server side weather propagation
-GVAR(enableServerController) = true;
-
-// Control client side weather effects
-GVAR(syncRain) = true; 
-GVAR(syncWind) = true; // Wind, Gusts, Waves
-GVAR(syncMisc) = true; // Lightnings, Rainbow, Fog
-
 // Make sure this data is read before client/server postInit
 call FUNC(getMapData);

--- a/addons/weather/config.cpp
+++ b/addons/weather/config.cpp
@ -3,7 +3,7 @@
 class CfgPatches {
    class ADDON {
        units[] = {};
-        weapons[] = {};// "ACE_Kestrel4500" };
+        weapons[] = {};
        requiredVersion = REQUIRED_VERSION;
        requiredAddons[] = {"ace_common"};
        author[] = {"q1184", "Rocko", "esteldunedain","Ruthberg"};
@ -14,3 +14,5 @@ class CfgPatches {
 #include "CfgEventhandlers.hpp"
 #include "CfgWorlds.hpp"
 #include "RscTitles.hpp"
+#include "CfgVehicles.hpp"
+#include "ACE_Settings.hpp"
--- a/addons/weather/functions/fnc_initModuleSettings.sqf
+++ b/addons/weather/functions/fnc_initModuleSettings.sqf
@ -0,0 +1,39 @@
+/*
+ * Author: Glowbal, Ruthberg
+ * Module for adjusting the wind deflection settings
+ *
+ * Arguments:
+ * 0: The module logic <LOGIC>
+ * 1: units <ARRAY>
+ * 2: activated <BOOL>
+ *
+ * Return Value:
+ * None <NIL>
+ *
+ * Public: No
+ */
+
+#include "script_component.hpp"
+
+private ["_logic", "_units", "_activated"];
+_logic = _this select 0;
+_units = _this select 1;
+_activated = _this select 2;
+
+if !(_activated) exitWith {};
+
+// Control server side weather propagation
+[_logic, QGVAR(enableServerController), "enableServerController"] call EFUNC(common,readSettingFromModule);
+
+// Overrides the default weather (editor, mission settings) with ACE weather (map based)
+[_logic, QGVAR(useACEWeather), "useACEWeather"] call EFUNC(common,readSettingFromModule);
+
+// Control client side weather effects
+[_logic, QGVAR(syncRain), "syncRain"] call EFUNC(common,readSettingFromModule);
+[_logic, QGVAR(syncWind), "syncWind"] call EFUNC(common,readSettingFromModule); // Wind, Gusts, Waves
+[_logic, QGVAR(syncMisc), "syncMisc"] call EFUNC(common,readSettingFromModule); // Lightnings, Rainbow, Fog
+
+// Server weather update interval
+[_logic, QGVAR(serverUpdateInterval), "serverUpdateInterval"] call EFUNC(common,readSettingFromModule);
+
+GVAR(serverUpdateInterval) = 1 max GVAR(serverUpdateInterval) min 600;
--- a/addons/weather/functions/fnc_serverController.sqf
+++ b/addons/weather/functions/fnc_serverController.sqf
@ -1,7 +1,7 @@
 /*
- * Author: ACE2 Team, esteldunedain, ruthberg
+ * Author: Ruthberg
 *
- * Calculate the wind and rain evolution on the server. Broadcasts the current and next values to the clients
+ * Gather weather parameters and broadcast them to the clients
 *
 * Argument:
 * None
@ -13,95 +13,21 @@

 if (!GVAR(enableServerController)) exitWith {};

-private ["_lastRain", "_rainOverCast", "_transitionTime", "_windDirectionVariance", "_windSpeed", "_windSpeedChange", "_windMaxDiff", "_windMinDiff", "_windDirection", "_windDirectionChange", "_ratioMin", "_ratioMax"];
-
-// Rain simulation
-if (GVAR(syncRain) && GVAR(rain_period_count) > GVAR(rain_next_period)) then {
-
-    GVAR(rain_next_period) = ceil((1 + (random 10)) / GVAR(overcast_multiplier));
-    GVAR(rain_period_count) = 0;
-    
-    _lastRain = GVAR(current_rain);
-    
-    if (overcast >= 0.7) then {
-        _rainOverCast = (overcast - 0.7) / 0.3;
-        if (GVAR(current_rain) == 0) then {
-            // Initialize rain with a random strength depending on the current overcast value
-            GVAR(current_rain) = 0.25 + (random 0.25) + (random 0.5) * _rainOverCast;
-        };
-        
-        GVAR(current_rain) = GVAR(current_rain) + GVAR(current_rain) * ((_rainOverCast * GVAR(overcast_multiplier)) / 8) * GVAR(rain_current_range);
-        GVAR(current_rain) = 0.01 max GVAR(current_rain) min 1;
-        
-        GVAR(rain_current_range) = -1 + (random 2);
-    } else {
-        _rainOverCast = 1;
-        
-        GVAR(current_rain) = 0;
+if (GVAR(useACEWeather)) then {
+    // Use location based real world weather data
+    [] call FUNC(updateAceWeather);
+} else {
+    // Simply replicate the server weather on the clients
+    if (GVAR(syncRain)) then {
+        ACE_RAIN_PARAMS = [rain, rain, GVAR(serverUpdateInterval)];
+        publicVariable "ACE_RAIN_PARAMS";
+    };
+    if (GVAR(syncWind)) then {
+        ACE_WIND_PARAMS = [wind call CBA_fnc_vectDir, 0, vectorMagnitude wind, 0, GVAR(serverUpdateInterval)];
+        publicVariable "ACE_WIND_PARAMS";
+    };
+    if (GVAR(syncMisc)) then {
+        ACE_MISC_PARAMS = [lightnings, rainbow, fogParams, GVAR(temperatureShift), GVAR(badWeatherShift), GVAR(humidityShift)];
+        publicVariable "ACE_MISC_PARAMS";
    };
-    
-    _transitionTime = 1 + (_rainOverCast * 5) + (random (_rainOverCast * 20));
-    
-    ACE_RAIN_PARAMS = [_lastRain, GVAR(current_rain), _transitionTime];
-    TRACE_4("",_lastRain,_rainOverCast,_transitionTime,overcast);
-
-    GVAR(rain_period_start_time) = time;
-    publicVariable "ACE_RAIN_PARAMS";
 };
-
-// Wind simulation
-if (GVAR(syncWind) && GVAR(wind_period_count) > GVAR(wind_next_period)) then {
-    
-    GVAR(wind_next_period) = ceil((2 + (random 5)) / GVAR(overcast_multiplier));
-    GVAR(wind_period_count) = 0;
-    
-    _windDirectionVariance = (90 - (random 180)) * (overcast ^ 2);
-    _windDirection = (360 + GVAR(wind_direction_reference) + _windDirectionVariance) % 360;
-    _windDirectionChange = _windDirection - GVAR(current_wind_direction);
-    if (_windDirectionChange > 180) then {
-        _windDirectionChange = _windDirectionChange - 360;
-    };
-    if (_windDirectionChange < -180) then {
-        _windDirectionChange = 360 + _windDirectionChange;
-    };
-    
-    _windMaxDiff = GVAR(mean_wind_speed) - GVAR(max_wind_speed);
-    _windMinDiff = GVAR(min_wind_speed) - GVAR(mean_wind_speed);
-    
-    _ratioMax = (random 1) ^ 2;
-    _ratioMin = (random 1) ^ 2;
-    
-    _windSpeed = GVAR(current_wind_speed);
-    _windSpeedChange = 0;
-    if ((random 1) < (0.3 max overcast)) then {
-        _windSpeed = GVAR(mean_wind_speed) + _windMaxDiff * _ratioMax + _windMinDiff * _ratioMin;
-        _windSpeedChange = _windSpeed - GVAR(current_wind_speed);
-    };
-    
-    _transitionTime = GVAR(wind_next_period) * GVAR(serverUpdateInterval);
-    
-    TRACE_5("dirCur/dirNew/spdCur/spdNew/period",GVAR(current_wind_direction),_windDirection,GVAR(current_wind_speed),_windSpeed,_transitionTime);
-    
-    ACE_WIND_PARAMS = [GVAR(current_wind_direction),
-                        _windDirectionChange,
-                       GVAR(current_wind_speed),
-                       _windSpeedChange,
-                       _transitionTime];
-    
-    GVAR(current_wind_direction) = _windDirection;
-    GVAR(current_wind_speed) = _windSpeed;
-    
-    GVAR(wind_period_start_time) = time;
-    publicVariable "ACE_WIND_PARAMS";
-};
-
-
-if (GVAR(syncMisc)) then {
-    ACE_MISC_PARAMS = [lightnings, rainbow, fogParams, GVAR(temperatureShift), GVAR(badWeatherShift), GVAR(humidityShift)];
-    publicVariable "ACE_MISC_PARAMS";
-};
-
-GVAR(rain_period_count) = GVAR(rain_period_count) + 1;
-GVAR(wind_period_count) = GVAR(wind_period_count) + 1;
-
-GVAR(overcast_multiplier) = 1 max (2* overcast) min 2; // 0 (@ overcast 0), 2 (@ overcast 1)
--- a/addons/weather/functions/fnc_updateAceWeather.sqf
+++ b/addons/weather/functions/fnc_updateAceWeather.sqf
@ -0,0 +1,105 @@
+/*
+ * Author: ACE2 Team, esteldunedain, ruthberg
+ *
+ * Updates the wind and rain evolution on the server. Broadcasts the current and next values to the clients
+ *
+ * Argument:
+ * None
+ *
+ * Return value:
+ * None
+ */
+#include "script_component.hpp"
+
+private ["_overcastMultiplier", "_lastRain", "_rainOverCast", "_transitionTime", "_windDirectionVariance", "_windSpeed", "_windSpeedChange", "_windMaxDiff", "_windMinDiff", "_windDirection", "_windDirectionChange", "_ratioMin", "_ratioMax"];
+
+_overcastMultiplier = 1 max (2* overcast) min 2; // 0 (@ overcast 0), 2 (@ overcast 1)
+
+// Rain simulation
+if (GVAR(syncRain) && GVAR(rain_period_count) > GVAR(rain_next_period)) then {
+
+    GVAR(rain_next_period) = ceil((1 + (random 10)) / _overcastMultiplier);
+    GVAR(rain_period_count) = 0;
+    
+    _lastRain = GVAR(current_rain);
+    
+    if (overcast >= 0.7) then {
+        _rainOverCast = (overcast - 0.7) / 0.3;
+        if (GVAR(current_rain) == 0) then {
+            // Initialize rain with a random strength depending on the current overcast value
+            GVAR(current_rain) = 0.25 + (random 0.25) + (random 0.5) * _rainOverCast;
+        };
+        
+        GVAR(current_rain) = GVAR(current_rain) + GVAR(current_rain) * ((_rainOverCast * _overcastMultiplier) / 8) * GVAR(rain_current_range);
+        GVAR(current_rain) = 0.01 max GVAR(current_rain) min 1;
+        
+        GVAR(rain_current_range) = -1 + (random 2);
+    } else {
+        _rainOverCast = 1;
+        
+        GVAR(current_rain) = 0;
+    };
+    
+    _transitionTime = 1 + (_rainOverCast * 5) + (random (_rainOverCast * 20));
+    
+    ACE_RAIN_PARAMS = [_lastRain, GVAR(current_rain), _transitionTime];
+    TRACE_4("",_lastRain,_rainOverCast,_transitionTime,overcast);
+
+    GVAR(rain_period_start_time) = time;
+    publicVariable "ACE_RAIN_PARAMS";
+};
+
+// Wind simulation
+if (GVAR(syncWind) && GVAR(wind_period_count) > GVAR(wind_next_period)) then {
+    
+    GVAR(wind_next_period) = ceil((2 + (random 5)) / _overcastMultiplier);
+    GVAR(wind_period_count) = 0;
+    
+    _windDirectionVariance = (90 - (random 180)) * (overcast ^ 2);
+    _windDirection = (360 + GVAR(wind_direction_reference) + _windDirectionVariance) % 360;
+    _windDirectionChange = _windDirection - GVAR(current_wind_direction);
+    if (_windDirectionChange > 180) then {
+        _windDirectionChange = _windDirectionChange - 360;
+    };
+    if (_windDirectionChange < -180) then {
+        _windDirectionChange = 360 + _windDirectionChange;
+    };
+    
+    _windMaxDiff = GVAR(mean_wind_speed) - GVAR(max_wind_speed);
+    _windMinDiff = GVAR(min_wind_speed) - GVAR(mean_wind_speed);
+    
+    _ratioMax = (random 1) ^ 2;
+    _ratioMin = (random 1) ^ 2;
+    
+    _windSpeed = GVAR(current_wind_speed);
+    _windSpeedChange = 0;
+    if ((random 1) < (0.3 max overcast)) then {
+        _windSpeed = GVAR(mean_wind_speed) + _windMaxDiff * _ratioMax + _windMinDiff * _ratioMin;
+        _windSpeedChange = _windSpeed - GVAR(current_wind_speed);
+    };
+    
+    _transitionTime = GVAR(wind_next_period) * GVAR(serverUpdateInterval);
+    
+    TRACE_5("dirCur/dirNew/spdCur/spdNew/period",GVAR(current_wind_direction),_windDirection,GVAR(current_wind_speed),_windSpeed,_transitionTime);
+    
+    ACE_WIND_PARAMS = [GVAR(current_wind_direction),
+                        _windDirectionChange,
+                       GVAR(current_wind_speed),
+                       _windSpeedChange,
+                       _transitionTime];
+    
+    GVAR(current_wind_direction) = _windDirection;
+    GVAR(current_wind_speed) = _windSpeed;
+    
+    GVAR(wind_period_start_time) = time;
+    publicVariable "ACE_WIND_PARAMS";
+};
+
+
+if (GVAR(syncMisc)) then {
+    ACE_MISC_PARAMS = [lightnings, rainbow, fogParams, GVAR(temperatureShift), GVAR(badWeatherShift), GVAR(humidityShift)];
+    publicVariable "ACE_MISC_PARAMS";
+};
+
+GVAR(rain_period_count) = GVAR(rain_period_count) + 1;
+GVAR(wind_period_count) = GVAR(wind_period_count) + 1;
--- a/addons/winddeflection/stringtable.xml
+++ b/addons/winddeflection/stringtable.xml
@ -12,6 +12,7 @@
                <German>Windinformationen</German>
                <Hungarian>Szélinformáció</Hungarian>
                <Italian>Informazioni sul vento</Italian>
+                <Portuguese>Informação do vento</Portuguese>
            </Key>
            <Key ID="STR_ACE_WEATHER_METER_WIND_DIRECTION">
                <English>Direction: %1</English>
@ -23,6 +24,7 @@
                <German>Windrichtung: %1</German>
                <Hungarian>Irány: %1</Hungarian>
                <Italian>Direzione: %1</Italian>
+                <Portuguese>Direção: %1</Portuguese>
            </Key>
            <Key ID="STR_ACE_WEATHER_METER_WIND_SPEED">
                <English>Speed: %1 m/s</English>
@ -34,6 +36,7 @@
                <German>Geschwindigkeit: %1 m/s</German>
                <Hungarian>Sebesség: %1 m/s</Hungarian>
                <Italian>Velocità: %1 m/s</Italian>
+                <Portuguese>Velocidade: %1 m/s</Portuguese>
            </Key>
            <Key ID="STR_ACE_WEATHER_METER_WEATHER_CATEGORY">
                <English>Weather Information</English>
@ -45,6 +48,7 @@
                <German>Wetterinformationen</German>
                <Hungarian>Időjárás-Információ</Hungarian>
                <Italian>Meteo</Italian>
+                <Portuguese>Informação Meteorológica</Portuguese>
            </Key>
            <Key ID="STR_ACE_WEATHER_METER_WEATHER_HUMIDITY">
                <English>Humidity: %1%</English>
@ -56,6 +60,7 @@
                <German>Luftfeuchtigkeit: %1</German>
                <Hungarian>Páratartalom: %1%</Hungarian>
                <Italian>Umidità: %1%</Italian>
+                <Portuguese>Humidade: %1%</Portuguese>
            </Key>
        </Container>
    </Package>
--- a/documentation/README_PL.md
+++ b/documentation/README_PL.md
@ -0,0 +1,84 @@
+<p align="center">
+    <img src="https://github.com/acemod/ACE3/blob/master/extras/assets/logo/black/ACE3-Logo.jpg"
+         height="112">
+</p>
+<p align="center">
+    <a href="https://github.com/acemod/ACE3/releases">
+        <img src="http://img.shields.io/badge/Version-3.0.0-blue.svg?style=flat"
+             alt="ACE version">
+    </a>
+    <a href="https://github.com/acemod/ACE3/archive/master.zip">
+        <img src="http://img.shields.io/badge/Download-48.3_MB-green.svg?style=flat"
+             alt="ACE download">
+    </a>
+    <a href="https://github.com/acemod/ACE3/issues">
+        <img src="http://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat&label=Issues"
+             alt="ACE issues">
+    </a>
+    <a href="http://forums.bistudio.com/showthread.php?190433-ACE3-A-collaborative-merger-between-AGM-CSE-and-ACE&p=2910796&viewfull=1#post2910796">
+        <img src="https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat"
+             alt="BIF thread">
+    </a>
+    <a href="https://github.com/acemod/ACE3/blob/master/LICENSE">
+        <img src="http://img.shields.io/badge/License-GPLv2-red.svg?style=flat"
+             alt="ACE license">
+    </a>
+</p>
+<p align="center"><sup><strong>Wymaga najnowszej wersji <a href="http://www.armaholic.com/page.php?id=18767">CBA A3</a>. Odwiedź nas na <a href="https://www.facebook.com/ACE3Mod">Facebook</a> | <a href="https://www.youtube.com/c/ACE3Mod">YouTube</a> | <a href="https://twitter.com/ACE3Mod">Twitter</a> | <a href="http://www.reddit.com/r/arma/search?q=ACE&restrict_sr=on&sort=new&t=all">Reddit</a></strong></sup></p>
+
+
+**ACE3** to efekt wspólnego wysiłku grup moderów odpowiedzialnych za **ACE2**, **AGM** oraz **CSE** w celu zwiększenia realizmu i autentyczności Arma 3.
+
+Projekt ten jest całkowicie **otwarty źródłowo** i wszelki wkład w rozwój jest mile widziany. Możesz bez przeszkód prowadzić swoją własną dostosowaną wersję, o ile zmiany jakie wprowadzisz będą otwarte dla publiki zgodnie z GNU General Public License ([GPLv2](https://github.com/acemod/ACE3/blob/master/LICENSE)).
+
+Modyfikacja ta jest **budowana modułowo**, dzięki temu prawie każdy dostarczony plik PBO może zostać łatwo usunięty z konfiguracji. Dzięki temu, grupa może prowadzić własną, dostosowaną do siebie, wersję ACE wyłączając elementy, których nie potrzebują, lub które po prostu nie działają z innymi addonami. Moduły same w sobie np. system medyczny, posiadają wiele możliwości konfiguracji, pozwalając mission designerom dostosować ogólne doświadczenie z gry.
+
+### Główne cechy
+* Całkowicie nowy system akcji/interakcji 3D
+* Wydajna i niezawodna struktura
+* Skupienie na modułowości i customizacji
+* Elastyczny system ustawień i konfiguracji opcji u klienta i serwera
+* Ulepszony system medyczny z różnymi stopniami zaawansowania (podstawowy/rozszerzony) skupiony na grywalności i realizmowi
+* Prawidłowa i spójna synchronizowana pogoda
+* Balistyka oparta na warunkach pogodowych i wietrze
+* Możliwość brania jeńców
+* Rozszerzony system ładunków wybuchowych, włączając w to użycie różnego rodzaju zapalników
+* Ulepszenia mapy - stawianie markerów i przybory mapy
+* Zaawansowane naprowadzanie rakiet i wskazywanie laserem
+
+#### Dodatkowe cechy
+* Przeciąganie i przenoszenie
+* Realistyczne nazwy pojazdów i broni
+* System kontroli ognia (SKO) dla pojazdów opancerzonych oraz śmigłowców
+* Realistyczna balistyka/SKO obliczana w rozszerzeniach C/C++
+* Symulacja strefy backblastu i podciśnienia
+* Jednorazowe wyrzutnie
+* Realistyczne siły G
+* Zamykanie pojazdów na kluczyk
+* Realistyczne tryby termowizji oraz noktowizji
+* Przepakowywanie magazynków
+* Realistyczna mechanika przegrzewania broni
+* Symulacja głuchoty bitewnej (tymczasowej utraty słuchu)
+* Ulepszona fizyka ragdoll
+* Ulepszona interakcja dla asystentów i amunicyjnych
+* Regulowane celowniki snajperskie
+* Usunięte animacje bezczynności z opuszczoną bronią
+* Usunięte głosy awatara gracza
+* Skakanie przez przeszkody, wspinanie się na ściany i przecinanie płotów
+* Urządzenia Vector, MicroDAGR, Kestrel<br>
+***i wiele wiele więcej...***
+
+### Poradniki i instrukcje
+Jeżeli zainstalowałeś ACE3 lecz masz problem ze zrozumieniem jak to wszystko działa, lub gdzie zacząć, zacznij od przeczytania tego:
+* [Wprowadzenie](http://ace3mod.com/wiki/user/getting-started.html)
+
+#### Współpraca
+Możesz pomóc w rozwoju addonu szukając potencjalnych bugów w naszym kodzie, lub zgłaszając nowe funkcje. Aby wnieść swój wkład do ACE, po prostu zforkuj to repozytorium na swoje konto GitHub i zgłoś swoje pull requesty do przeglądu przez innych współpracowników. Pamiętaj, aby dodać siebie do listy autorów każdego PBO jakie edytujesz oraz do pliku ['AUTHORS.txt'](https://github.com/acemod/ACE3/blob/master/AUTHORS.txt) dodając także swój adres e-mail.
+
+Używaj naszego [Issue Tracker-a](https://github.com/acemod/ACE3/issues) aby zgłaszać bugi, proponować nowe funkcje lub sugerować zmiany do aktualnie istniejących. Zobacz także:
+* [Jak zgłosić bug-a](http://ace3mod.com/wiki/user/how-to-report-an-issue.html)
+* [Jak zgłosić feature request-a](http://ace3mod.com/wiki/user/how-to-make-a-feature-request.html)
+
+#### Testowanie i budowanie
+Aby pomóc nam w testowaniu najnowszych zmian rozwojowych, pobierz nasz master branch ([bezpośrednio](https://github.com/acemod/ACE3/archive/master.zip), lub [korzystając z git](https://help.github.com/articles/fetching-a-remote/)), a następnie złóż testowego build-a:
+* [Konfiguracja środowiska do testów](http://ace3mod.com/wiki/development/setting-up-the-development-environment.html) – intrukcja krok-po-kroku jak poprawnie ustawić i zbudować wersję ACE do celów testowych.
--- a/documentation/missionmaker/modules.md
+++ b/documentation/missionmaker/modules.md
@ -236,7 +236,33 @@ The safe zone around players from a different team (in meters)<br>
 ### 1.13 LSD Vehicles
 *Part of: ace_core*

-### 1.14 Wind Deflection
+### 1.14 Weather
+*Part of: ace_weather*
+
+This module allows you to customize the weather settings.
+
+**Settings:**
+
+1. **Weather propagation (Boolean)<br>**
+Enables sever side weather propagation.<br>
+`Default value: Yes`
+2. **ACE Weather (Boolean)<br>**
+Overrides the default weather (editor, mission settings) with ACE weather (map based).<br>
+`Default value: Yes`
+3. **Sync Rain (Boolean)<br>**
+Synchronizes rain.<br>
+`Default value: Yes`
+3. **Sync Wind (Boolean)<br>**
+Synchronizes wind.<br>
+`Default value: Yes`
+3. **Sync Misc (Boolean)<br>**
+Synchronizes lightnings, rainbow, fog, ...<br>
+`Default value: Yes`
+4. **Update Interval (Number)<br>**
+Defines the interval (seconds) between weather updates.<br>
+`Default value: 60`
+    
+### 1.15 Wind Deflection
 *Part of: ace_winddeflection*

 This module allows you to define when wind deflection is active.
--- a/extensions/advanced_ballistics/AdvancedBallistics.cpp
+++ b/extensions/advanced_ballistics/AdvancedBallistics.cpp
@ -461,7 +461,7 @@ void __stdcall RVExtension(char *output, int outputSize, const char *function)

                if (gridHeight > position[2]) {
                    double angle = atan((gridHeight - position[2]) / 100);
-                    windAttenuation *= pow(cos(angle), 2);
+                    windAttenuation *= pow(abs(cos(angle)), 2);
                }
            }
        }
@ -476,7 +476,7 @@ void __stdcall RVExtension(char *output, int outputSize, const char *function)

            if (heightAGL > 0 && heightAGL < 20) {
                double roughnessLength = calculateRoughnessLength(windSourceObstacles[0], windSourceObstacles[1]);
-                windAttenuation *= (log(heightAGL / roughnessLength) / log(20 / roughnessLength));
+                windAttenuation *= abs(log(heightAGL / roughnessLength) / log(20 / roughnessLength));
            }
        }

--- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp
+++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp
@ -0,0 +1,125 @@
+
+class CfgAmmo
+{
+    class BulletBase;
+    class B_556x45_Ball;
+    class rhs_B_545x39_Ball: B_556x45_Ball
+    {
+        ACE_caliber=0.220;
+        ACE_bulletLength=0.85;
+        ACE_bulletMass=52.9;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.168};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ASM";
+        ACE_dragModel=7;
+        ACE_muzzleVelocities[]={780, 880, 920};
+        ACE_barrelLengths[]={10, 16.3, 20};
+    };
+    class rhs_B_545x39_Ball_Tracer_Green: rhs_B_545x39_Ball
+    {
+        ACE_caliber=0.220;
+        ACE_bulletLength=0.85;
+        ACE_bulletMass=49.8;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.168};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ASM";
+        ACE_dragModel=7;
+        ACE_muzzleVelocities[]={785, 883, 925};
+        ACE_barrelLengths[]={10, 16.3, 20};
+    };
+    class B_762x51_Ball;
+    class rhs_B_762x54_Ball: B_762x51_Ball
+    {
+        ACE_caliber=0.312;
+        ACE_bulletLength=1.14;
+        ACE_bulletMass=152;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.4};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={700, 800, 820, 833};
+        ACE_barrelLengths[]={16, 20, 24, 26};
+    };
+    class rhs_B_762x54_Ball_Tracer_Green: B_762x51_Ball
+    {
+        ACE_caliber=0.312;
+        ACE_bulletLength=1.14;
+        ACE_bulletMass=149;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.395};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={680, 750, 798, 800};
+        ACE_barrelLengths[]={16, 20, 24, 26};
+    };
+    class rhs_B_762x54_7N1_Ball: rhs_B_762x54_Ball
+    {
+        ACE_caliber=0.312;
+        ACE_bulletLength=1.14;
+        ACE_bulletMass=152;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.4};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={700, 800, 820, 833};
+        ACE_barrelLengths[]={16, 20, 24, 26};
+    };
+    class rhs_B_762x39_Ball: B_762x51_Ball
+    {
+        ACE_caliber=0.308;
+        ACE_bulletLength=1.14;
+        ACE_bulletMass=123;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.275};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={650, 716, 750};
+        ACE_barrelLengths[]={10, 16.3, 20};
+    };
+    class rhs_B_762x39_Tracer: rhs_B_762x39_Ball
+    {
+        ACE_caliber=0.308;
+        ACE_bulletLength=1.14;
+        ACE_bulletMass=117;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.275};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={650, 716, 750};
+        ACE_barrelLengths[]={10, 16.3, 20};
+    };
+    class B_9x21_Ball;
+    class rhs_B_9x19_7N21: B_9x21_Ball
+    {
+        ACE_caliber=0.355;
+        ACE_bulletLength=0.610;
+        ACE_bulletMass=80.2;
+        ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
+        ACE_ballisticCoefficients[]={0.14};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ASM";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={445, 460, 480};
+        ACE_barrelLengths[]={4, 5, 9};
+    };
+    class rhs_B_9x18_57N181S: B_9x21_Ball
+    {
+        ACE_caliber=0.365;
+        ACE_bulletLength=0.610;
+        ACE_bulletMass=92.6;
+        ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
+        ACE_ballisticCoefficients[]={0.125};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={298, 330, 350};
+        ACE_barrelLengths[]={3.8, 5, 9};
+    };
+};
--- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp
@ -0,0 +1,67 @@
+
+class CfgWeapons
+{
+    class hgun_Rook40_F;
+    class rhs_weap_pya: hgun_Rook40_F
+    {
+        ACE_barrelTwist=10;
+        ACE_barrelLength=4.4;
+    };
+    class Pistol_Base_F;
+    class rhs_weap_makarov_pmm: rhs_weap_pya
+    {
+        ACE_barrelTwist=9.45;
+        ACE_barrelLength=3.68;
+    };
+    class rhs_weap_ak74m_Base_F;
+    class rhs_weap_ak74m: rhs_weap_ak74m_Base_F
+    {
+        ACE_barrelTwist=7.87;
+        ACE_barrelLength=16.3;
+    };
+    class rhs_weap_akm: rhs_weap_ak74m
+    {
+        ACE_barrelTwist=7.87;
+        ACE_barrelLength=16.3;
+    };
+    class rhs_weap_aks74;
+    class rhs_weap_aks74u: rhs_weap_aks74
+    {
+        ACE_barrelTwist=6.3;
+        ACE_barrelLength=8.3;
+    };
+    class rhs_weap_svd: rhs_weap_ak74m
+    {
+        ACE_barrelTwist=9.4;
+        ACE_barrelLength=24.4;
+    };
+    class rhs_weap_svdp;
+    class rhs_weap_svds: rhs_weap_svdp
+    {
+        ACE_barrelTwist=9.4;
+        ACE_barrelLength=22.2;
+    };
+    class rhs_pkp_base;
+    class rhs_weap_pkp: rhs_pkp_base
+    {
+        ACE_barrelTwist=9.45;
+        ACE_barrelLength=25.9;
+    };
+    class rhs_weap_pkm: rhs_weap_pkp
+    {
+        ACE_barrelTwist=9.45;
+        ACE_barrelLength=25.4;
+    };
+    class rhs_weap_rpk74m: rhs_weap_pkp
+    {
+        ACE_barrelTwist=7.68;
+        ACE_barrelLength=23.2;
+    };
+    
+    class rhs_acc_sniper_base;
+    class rhs_acc_pso1m2: rhs_acc_sniper_base {
+        ACE_ScopeAdjust_Vertical[] = { 0, 0 };
+        ACE_ScopeAdjust_Horizontal[] = { -10, 10 };
+        ACE_ScopeAdjust_Increment = 0.5;
+    };
+};
--- a/optionals/compat_rhs_afrf3/config.cpp
+++ b/optionals/compat_rhs_afrf3/config.cpp
@ -0,0 +1,15 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"rhs_c_weapons"};
+        author[]={"Ruthberg"};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgAmmo.hpp"
+#include "CfgWeapons.hpp"
--- a/optionals/compat_rhs_afrf3/script_component.hpp
+++ b/optionals/compat_rhs_afrf3/script_component.hpp
@ -0,0 +1,5 @@
+#define COMPONENT rhs_c_weapons_comp
+
+#include "\z\ace\addons\main\script_mod.hpp"
+
+#include "\z\ace\addons\main\script_macros.hpp"
--- a/optionals/compat_rhs_usf3/CfgAmmo.hpp
+++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp
@ -0,0 +1,97 @@
+
+class CfgAmmo
+{
+    class BulletBase;
+    class rhsusf_B_300winmag: BulletBase
+    {
+        ACE_caliber=0.308;
+        ACE_bulletLength=1.489;
+        ACE_bulletMass=220;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.310};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=7;
+        ACE_muzzleVelocities[]={847, 867, 877};
+        ACE_barrelLengths[]={20, 24, 26};
+    };
+    class B_556x45_Ball;
+    class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball
+    {
+        ACE_caliber=0.224;
+        ACE_bulletLength=0.906;
+        ACE_bulletMass=62;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.307};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ASM";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={780, 886, 950};
+        ACE_barrelLengths[]={10, 15.5, 20};
+    };
+    class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball
+    {
+        ACE_caliber=0.224;
+        ACE_bulletLength=0.906;
+        ACE_bulletMass=77;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.361};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ASM";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={624, 816, 832, 838};
+        ACE_barrelLengths[]={7.5, 14.5, 18, 20};
+    };
+    class rhs_ammo_762x51_M80_Ball: BulletBase
+    {
+        ACE_caliber=0.308;
+        ACE_bulletLength=1.14;
+        ACE_bulletMass=146;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.2};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=7;
+        ACE_muzzleVelocities[]={700, 800, 820, 833, 845};
+        ACE_barrelLengths[]={10, 16, 20, 24, 26};
+    };
+    class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball
+    {
+        ACE_caliber=0.308;
+        ACE_bulletLength=1.24;
+        ACE_bulletMass=175;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.243};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=7;
+        ACE_muzzleVelocities[]={750, 780, 790, 794};
+        ACE_barrelLengths[]={16, 20, 24, 26};
+    };
+    class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball
+    {
+        ACE_caliber=0.308;
+        ACE_bulletLength=1.24;
+        ACE_bulletMass=127;
+        ACE_ammoTempMuzzleVelocityShifts[]={-26.55, -25.47, -22.85, -20.12, -16.98, -12.80, -7.64, -1.53, 5.96, 15.17, 26.19};
+        ACE_ballisticCoefficients[]={0.377};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ICAO";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={875, 910, 930};
+        ACE_barrelLengths[]={13, 16, 20};
+    };
+    class rhs_ammo_45ACP_MHP: BulletBase
+    {
+        ACE_caliber=0.452;
+        ACE_bulletLength=0.68;
+        ACE_bulletMass=230;
+        ACE_ammoTempMuzzleVelocityShifts[]={-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619};
+        ACE_ballisticCoefficients[]={0.195};
+        ACE_velocityBoundaries[]={};
+        ACE_standardAtmosphere="ASM";
+        ACE_dragModel=1;
+        ACE_muzzleVelocities[]={230, 250, 285};
+        ACE_barrelLengths[]={4, 5, 9};
+    };
+};
--- a/optionals/compat_rhs_usf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp
@ -0,0 +1,86 @@
+
+class CfgWeapons
+{
+    class Pistol_Base_F;
+    class Rifle_Base_F;
+    class srifle_EBR_F;
+    class rhs_weap_XM2010_Base_F: Rifle_Base_F
+    {
+        ACE_barrelTwist=10;
+        ACE_barrelLength=24;
+    };
+    class arifle_MX_Base_F;
+    class rhs_weap_m4_Base: arifle_MX_Base_F
+    {
+        ACE_barrelTwist=7;
+        ACE_barrelLength=14.5;
+    };
+    class rhs_weap_m4a1;
+    class rhs_weap_mk18: rhs_weap_m4a1
+    {
+        ACE_barrelTwist=7;
+        ACE_barrelLength=10.3;
+    };
+    class rhs_weap_m16a4: rhs_weap_m4_Base
+    {
+        ACE_barrelTwist=7;
+        ACE_barrelLength=20;
+    };
+    class rhs_M249_base;
+    class rhs_weap_m249_pip: rhs_M249_base
+    {
+        ACE_barrelTwist=7;
+        ACE_barrelLength=16.3;
+    };
+    class weap_m240_base;
+    class rhs_weap_m240B: weap_m240_base
+    {
+        ACE_barrelTwist=12;
+        ACE_barrelLength=24.8;
+    };
+    class rhs_weap_m14ebrri: srifle_EBR_F
+    {
+        ACE_barrelTwist=12;
+        ACE_barrelLength=22;
+    };
+    class rhs_weap_sr25: rhs_weap_m14ebrri
+    {
+        ACE_barrelTwist=11.25;
+        ACE_barrelLength=24;
+    };
+    class rhs_weap_sr25_ec: rhs_weap_sr25
+    {
+        ACE_barrelTwist=11.25;
+        ACE_barrelLength=20;
+    };
+    class rhs_weap_M590_5RD: Rifle_Base_F
+    {
+        ACE_barrelTwist=0;
+        ACE_twistDirection=0;
+        ACE_barrelLength=18.5;
+    };
+    class rhs_weap_M590_8RD: rhs_weap_M590_5RD
+    {
+        ACE_barrelTwist=0;
+        ACE_twistDirection=0;
+        ACE_barrelLength=20;
+    };
+    class hgun_ACPC2_F;
+    class rhsusf_weap_m1911a1: hgun_ACPC2_F
+    {
+        ACE_barrelTwist=16;
+        ACE_barrelLength=5;
+    };
+    
+    class rhsusf_acc_sniper_base;
+    class rhsusf_acc_LEUPOLDMK4: rhsusf_acc_sniper_base {
+        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
+        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
+        ACE_ScopeAdjust_Increment = 0.1;
+    };
+    class rhsusf_acc_LEUPOLDMK4_2: rhsusf_acc_sniper_base {
+        ACE_ScopeAdjust_Vertical[] = { -4, 30 };
+        ACE_ScopeAdjust_Horizontal[] = { -6, 6 };
+        ACE_ScopeAdjust_Increment = 0.1;
+    };
+};
--- a/optionals/compat_rhs_usf3/config.cpp
+++ b/optionals/compat_rhs_usf3/config.cpp
@ -0,0 +1,15 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"rhsusf_c_weapons"};
+        author[]={"Ruthberg"};
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgAmmo.hpp"
+#include "CfgWeapons.hpp"
--- a/optionals/compat_rhs_usf3/script_component.hpp
+++ b/optionals/compat_rhs_usf3/script_component.hpp
@ -0,0 +1,5 @@
+#define COMPONENT rhsusf_c_weapons_comp
+
+#include "\z\ace\addons\main\script_mod.hpp"
+
+#include "\z\ace\addons\main\script_macros.hpp"
--- a/tools/stringtableduplicates.py
+++ b/tools/stringtableduplicates.py
@ -34,7 +34,7 @@ def check_module(projectpath, module):
        diff = len(entries) - len(list(set(entries)))
        duplicates += diff
        if diff > 0:
-            print key.getAttribute("ID")
+            print(key.getAttribute("ID"))

    return duplicates