From ce70c72cd6878e49f86d1b41081a6b048d892f61 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Tue, 7 Apr 2015 22:44:41 -0500
Subject: [PATCH 001/478] wip1
---
addons/interact_menu/config.cpp | 6 ++++++
addons/interact_menu/functions/fnc_keyDown.sqf | 9 ++++++++-
addons/interact_menu/functions/fnc_renderIcon.sqf | 9 ++++++++-
addons/interact_menu/functions/fnc_renderSelector.sqf | 9 ++++++++-
4 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp
index 17900c2f6b..998098470e 100644
--- a/addons/interact_menu/config.cpp
+++ b/addons/interact_menu/config.cpp
@@ -22,5 +22,11 @@ class ACE_Settings {
typeName = "BOOL";
isClientSetable = 1;
displayName = "$STR_ACE_Interact_Menu_AlwaysUseCursorSelfInteraction";
+ };
+ class GVAR(cursorKeepCentered) {
+ value = 0;
+ typeName = "BOOL";
+ isClientSetable = 1;
+ displayName = "Keep cursor centered";
};
};
diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf
index faa5b0f453..291c675260 100644
--- a/addons/interact_menu/functions/fnc_keyDown.sqf
+++ b/addons/interact_menu/functions/fnc_keyDown.sqf
@@ -39,8 +39,15 @@ 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];
};
diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf
index 1cfc13923e..e48847cbb9 100644
--- a/addons/interact_menu/functions/fnc_renderIcon.sqf
+++ b/addons/interact_menu/functions/fnc_renderIcon.sqf
@@ -37,6 +37,13 @@ if(_icon == "") then {
};
_text = format ["%4 ", _icon, _color, _color, _text];
_ctrl ctrlSetStructuredText (parseText _text);
-_ctrl ctrlSetPosition [(_sPos select 0)-(0.125*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.25*SafeZoneW, 0.1*SafeZoneW];
+_pos = [(_sPos select 0)-(0.125*SafeZoneW), (_sPos select 1)-(0.0095*SafeZoneW), 0.25*SafeZoneW, 0.1*SafeZoneW];
+
+if (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 ctrlSetBackgroundColor [1, 0, 0, 0.1];
_ctrl ctrlCommit 0;
diff --git a/addons/interact_menu/functions/fnc_renderSelector.sqf b/addons/interact_menu/functions/fnc_renderSelector.sqf
index 44ed15e9c4..e397b40994 100644
--- a/addons/interact_menu/functions/fnc_renderSelector.sqf
+++ b/addons/interact_menu/functions/fnc_renderSelector.sqf
@@ -25,6 +25,13 @@ _ctrl = GVAR(iconCtrls) select GVAR(iconCount);
GVAR(iconCount) = GVAR(iconCount) + 1;
_ctrl ctrlSetStructuredText (parseText format [" ", _icon]);
-_ctrl ctrlSetPosition [(_sPos select 0)-(0.05*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW];
+_pos = [(_sPos select 0)-(0.05*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW];
+
+if (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 ctrlSetBackgroundColor [1, 0, 0, 0.1];
_ctrl ctrlCommit 0;
From 03dbe8e6c5c8630e5cb6f64a5736c1cf596795e0 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Tue, 7 Apr 2015 22:57:58 -0500
Subject: [PATCH 002/478] Make it optional
---
addons/interact_menu/functions/fnc_keyDown.sqf | 1 -
addons/interact_menu/functions/fnc_renderIcon.sqf | 4 ++--
addons/interact_menu/functions/fnc_renderSelector.sqf | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf
index 291c675260..c488724a21 100644
--- a/addons/interact_menu/functions/fnc_keyDown.sqf
+++ b/addons/interact_menu/functions/fnc_keyDown.sqf
@@ -41,7 +41,6 @@ if (GVAR(useCursorMenu)) then {
ctrlEnable [91921, true];
GVAR(cursorPos) = [0.5,0.5,0];
((finddisplay 91919) displayctrl 91921) ctrlAddEventHandler ["MouseMoving", {
-
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];
diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf
index e48847cbb9..6ed2a74a0a 100644
--- a/addons/interact_menu/functions/fnc_renderIcon.sqf
+++ b/addons/interact_menu/functions/fnc_renderIcon.sqf
@@ -18,7 +18,7 @@
*/
#include "script_component.hpp"
#define DEFAULT_ICON QUOTE(\z\ace\addons\interaction\ui\dot_ca.paa)
-private ["_color", "_sPos", "_ctrl", "_icon"];
+private ["_color", "_sPos", "_ctrl", "_icon", "_pos"];
_text = _this select 0;
_color = _this select 1;
_sPos = _this select 2;
@@ -39,7 +39,7 @@ _text = format [" (count GVAR(iconCtrls))-1) then {
GVAR(iconCtrls) pushBack ((findDisplay _displayNum) ctrlCreate ["RscStructuredText", 54021+GVAR(iconCount)]);
};
-private "_ctrl";
+private ["_ctrl", "_pos"];
_ctrl = GVAR(iconCtrls) select GVAR(iconCount);
GVAR(iconCount) = GVAR(iconCount) + 1;
_ctrl ctrlSetStructuredText (parseText format [" ", _icon]);
_pos = [(_sPos select 0)-(0.05*SafeZoneW), (_sPos select 1)-(0.014*SafeZoneW), 0.1*SafeZoneW, 0.035*SafeZoneW];
-if (uiNamespace getVariable [QGVAR(cursorMenuOpened),false]) then {
+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)];
};
From f0a97bd8553bcdfa56d45cd8e0a1cbbdae1550c0 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 20:20:08 -0300
Subject: [PATCH 003/478] Added - Portuguese translation to Attach Failed
---
addons/attach/stringtable.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml
index 34e8883537..4241ddd644 100644
--- a/addons/attach/stringtable.xml
+++ b/addons/attach/stringtable.xml
@@ -174,6 +174,7 @@
Befestigen Fehlgeschlagen
Присоединить Ошибка
Error al acoplar
+ Erro ao anexar
From ac5589c1c17ad708afb1de7ddcd090973e6d3c34 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 20:30:09 -0300
Subject: [PATCH 004/478] Added - Portuguese translation to Captive surendering
Need more context to translate STR_ACE_Captives_Zeus_OnlyAlive and STR_ACE_Captives_Zeus_OnlyInfentry.
---
addons/captives/stringtable.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index 32334811f3..ff8ff84a47 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -133,10 +133,12 @@
Surrender
Kapitulieren
+ Render-se
Stop Surrendering
Den Kampf erneut aufnehmen
+ Parar de se render
Only use on alive units
@@ -149,6 +151,7 @@
Nothing under mouse
Es wurde nichts ausgewählt
+ Nada debaixo do mouse
From ae7af34a111ebf00f596c403c97a09e176d7013f Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 20:53:44 -0300
Subject: [PATCH 005/478] Added - Portuguese translation to common/Stringtable
Everything translated. Even the banana.
---
addons/common/stringtable.xml | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml
index bcd2b149aa..e1ee265312 100644
--- a/addons/common/stringtable.xml
+++ b/addons/common/stringtable.xml
@@ -276,6 +276,7 @@
Désactiver Menu Commande
Выключить командное меню
Parancsnoki menü kikapcsolása
+ Desabilitar menu de comando
Unknown
@@ -285,6 +286,7 @@
Neznámý
Неизвестно
Ismeretlen
+ Desconhecido
No Voice
@@ -294,56 +296,71 @@
Žádný hlas
Без голоса
Nincs hang
+ Sem voz
Akceptuj prośby
Aceptar Peticiones
Accept Requests
+ Aceitar Pedido
Ignoruj prośby
Rechazar Peticiones
Decline Requests
+ Rejeitar pedido
Akceptuj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności.
Acepta Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones.
Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions.
+ Aceitar pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações.
Ignoruj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności.
Rechazar Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones.
Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions.
+ Rejeita pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações.
Feedback icons
+ Ícones de Feedback
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.
+ 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.
Progress bar location
+ Local da barra de progresso
Set the desired location of the progress bar on your screen.
+ Define o local desejado da barra de progresso na sua tela.
Hint Background color
+ Cor do fundo da hint
The color of the background from the ACE hints.
+ A cor de fundo das hints do ACE.
Hint text font color
+ Cor do do texto da hint
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.
+ 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.
Banana
+ Banana
A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa.
+ A banana é uma fruta comestível, botanicamente uma baga, produzida por vários tipos de plantas herbáceas grandes do genero Musa.
-
\ No newline at end of file
+
From c1941f271938c9e89d5e1413b2f9c0df6bc03e89 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 22:12:54 -0300
Subject: [PATCH 006/478] Added - Portuguese translation to common/Stringtable
I see that the english description for the banana is from the Wikipedia. If wanted I can use the portuguese version from Wikipedia.
---
addons/common/stringtable.xml | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml
index bcd2b149aa..f8a25c6269 100644
--- a/addons/common/stringtable.xml
+++ b/addons/common/stringtable.xml
@@ -1,4 +1,4 @@
-
+
@@ -276,6 +276,7 @@
Désactiver Menu Commande
Выключить командное меню
Parancsnoki menü kikapcsolása
+ Desabilitar menu de comando
Unknown
@@ -285,6 +286,7 @@
Neznámý
Неизвестно
Ismeretlen
+ Desconhecido
No Voice
@@ -294,56 +296,71 @@
Žádný hlas
Без голоса
Nincs hang
+ Sem voz
Akceptuj prośby
Aceptar Peticiones
Accept Requests
+ Aceitar Pedido
Ignoruj prośby
Rechazar Peticiones
Decline Requests
+ Rejeitar pedido
Akceptuj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności.
Acepta Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones.
Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions.
+ Aceitar pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações.
Ignoruj prośby wysłane przez innych graczy. Akceptacji wymagają między innymi akcje używania / współdzielenia wyposażenia, wykonywania określonych czynności.
Rechazar Peticiones de otros jugadores. Pueden ser solicitudes para usar / compartir equipamiento, realizar ciertas acciones.
Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions.
+ Rejeita pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações.
Feedback icons
+ Ícones de Feedback
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.
+ 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.
Progress bar location
+ Local da barra de progresso
Set the desired location of the progress bar on your screen.
+ Define o local desejado da barra de progresso na sua tela.
Hint Background color
+ Cor do fundo da hint
The color of the background from the ACE hints.
+ A cor de fundo das hints do ACE.
Hint text font color
+ Cor do do texto da hint
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.
+ 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.
Banana
+ Banana
A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa.
+ A banana é uma fruta comestível, botanicamente uma baga, produzida por vários tipos de plantas herbáceas grandes do genero Musa.
-
\ No newline at end of file
+
From f98b9c27c6a5ae4bf4821d9a46ec9a5e0ef122fc Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 22:16:14 -0300
Subject: [PATCH 007/478] Added - Portuguese translation to Captive
surrendering
I need more context on "STR_ACE_Captives_Zeus_OnlyInfentry" and "STR_ACE_Captives_Zeus_OnlyAlive" to translate.
Are those texts talking to the player or is just a description for an action?
---
addons/captives/stringtable.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index 32334811f3..32e22a199d 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -1,4 +1,4 @@
-
+
@@ -133,10 +133,12 @@
Surrender
Kapitulieren
+ Render-se
Stop Surrendering
Den Kampf erneut aufnehmen
+ Parar de se render
Only use on alive units
@@ -149,6 +151,7 @@
Nothing under mouse
Es wurde nichts ausgewählt
+ Nada debaixo do mouse
From b8f2bd963627b715f4c62ebaff0efedc5d31202e Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 22:18:46 -0300
Subject: [PATCH 008/478] Added - Portuguese translation to cargo door
Confused if it is a ramp or a door. Translated to as if it is a door. Should work.
---
addons/aircraft/stringtable.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml
index 4d1c49fff6..e89be5db84 100644
--- a/addons/aircraft/stringtable.xml
+++ b/addons/aircraft/stringtable.xml
@@ -1,4 +1,4 @@
-
+
@@ -35,6 +35,7 @@
Otevřít nákladní prostor
Rámpát kinyitni
Открыть грузовой отсек
+ Abrir porta de carga
Close Cargo Door
@@ -45,6 +46,7 @@
Zavřít nákladní prostor
Rámpát zárni
Закрыть грузовой отсек
+ Fechar porta de carga
From 0dbb4579c4857be862f48a8d070fe739bf289473 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 22:25:37 -0300
Subject: [PATCH 009/478] Added - Portuguese translation Disposable
---
addons/disposable/stringtable.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml
index 8b6c032961..6a3f561b22 100644
--- a/addons/disposable/stringtable.xml
+++ b/addons/disposable/stringtable.xml
@@ -11,6 +11,7 @@
Lanzador utilizado
Használt cső
Отстрелянная труба
+ Tubo utilizado
Used disposable rocket launcher
@@ -21,6 +22,7 @@
Lanzador desechable utilizado
Használt rakétavető
Отстрелянная одноразовая пусковая установка
+ Lança foguetes descartável utilizado
Preloaded Missile Dummy
@@ -31,6 +33,7 @@
Preloaded Missile Dummy
Preloaded Missile Dummy
Заряженная ракетная пустышка
+ Preloaded Missile Dummy
-
\ No newline at end of file
+
From c8c183863c741a11c508134be201ee52471c87a4 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 22:28:45 -0300
Subject: [PATCH 010/478] Changed - Dragging drop Portuguese Translation
Changed from "Largar" to "Soltar". "Largar" seems a little to harsh when dealing with humans.
"STR_ACE_Dragging_UnableToDrag" Commented code unchanged
---
addons/dragging/stringtable.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml
index 1fca04fee1..eafa5e597f 100644
--- a/addons/dragging/stringtable.xml
+++ b/addons/dragging/stringtable.xml
@@ -22,7 +22,7 @@
Položit
Lâcher
Loslassen
- Largar
+ Soltar
Lascia
Elengedés
From 4198a942b3673f60cd03015155bddd395e80d2f1 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 22:42:21 -0300
Subject: [PATCH 011/478] Added/Changed - explosives Portuguese Translation
Added "Dead Man's Switch" and "Explosives_Pickup" PT translation and corrected some stuff.
---
addons/explosives/stringtable.xml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml
index 57ef190460..d502053203 100644
--- a/addons/explosives/stringtable.xml
+++ b/addons/explosives/stringtable.xml
@@ -143,7 +143,7 @@
M57 Odpalovací Zařízení
Detonatore M57
M57 Detonátor
- M57 Dispositivo de Detonação
+ Dispositivo de Detonação M57
Взрыватель M57
@@ -251,7 +251,7 @@
Nahoru
Sopra
Fel
- Cima
+ Para cima
Поднять
@@ -263,7 +263,7 @@
Dolu
Sotto
Le
- Baixo
+ Para Baixo
Опустить
@@ -407,7 +407,7 @@
Nástražný drát
Filo a Inciampo
Botlódrót
- Linha de tração
+ Fio de ativação
Натяжной
@@ -478,6 +478,7 @@
Czuwak
Detonador de hombre muerto
Dead Man's Switch
+ Detonador do homem morto
Кнопка мертвеца
@@ -488,10 +489,12 @@
Używany w celu zdalnej detonacji ładunków kiedy jego operator zostanie zabity.
Utilizado para detonar explosivos remotamente al soltarlo.
Robbanóanyagok távoli robbantásához
+ Usado para detonar remotamente o explosivo quando solto.
Используется для дистанционного подрыва, после смерти оператора.
Pick up
+ Pegar
From be7a579f7d975888a762c509bcdd06c19f236c7d Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 22:50:35 -0300
Subject: [PATCH 012/478] Added - Portuguese translation to LaseTarget
There is no way to translate Lase Target in a faithful way to portuguese. If "Marcar com laser" is too big, "Marcar Alvo" is a solid alternative for all intents and purposes...
---
addons/fcs/stringtable.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/fcs/stringtable.xml b/addons/fcs/stringtable.xml
index 154d874f73..b816dc21ad 100644
--- a/addons/fcs/stringtable.xml
+++ b/addons/fcs/stringtable.xml
@@ -15,6 +15,7 @@
Marcar Alvo
Designatore Laser
-->
+ Marcar com laser / Medir Distância
Подсветить цель / Измерить расстояние
From c260ff89baccb33b5236330563d71f954f5d3044 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 23:00:13 -0300
Subject: [PATCH 013/478] Added - Portuguese Translation to Interact_menu
---
addons/interact_menu/stringtable.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index 6e5ce8fdb2..1027daa358 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -4,18 +4,23 @@
-
\ No newline at end of file
+
From ec8e2707f81097f7fb8ef107dad00306d412d8a4 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Thu, 9 Apr 2015 23:05:47 -0300
Subject: [PATCH 014/478] Added - Portuguese translation to inventory
---
addons/inventory/stringtable.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/addons/inventory/stringtable.xml b/addons/inventory/stringtable.xml
index 9ca01373d1..e716041c15 100644
--- a/addons/inventory/stringtable.xml
+++ b/addons/inventory/stringtable.xml
@@ -4,9 +4,12 @@
Make Inventory Display Bigger
+ Aumentar o Tamanho da Tela do Inventário
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.
+ 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.
+
-
\ No newline at end of file
+
From f7166047dc3b12f6e3e621de3d709c095c2cc9c7 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Fri, 10 Apr 2015 05:01:11 -0300
Subject: [PATCH 015/478] Added - Portuguese translation to Kestrel
ApproximateTemp
---
addons/kestrel/stringtable.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/kestrel/stringtable.xml b/addons/kestrel/stringtable.xml
index 5f54fd6489..5478ccd69d 100644
--- a/addons/kestrel/stringtable.xml
+++ b/addons/kestrel/stringtable.xml
@@ -11,6 +11,7 @@
Odhadovaná teplota
Hőmérséklet nagyábol
Примерная температура
+ Temperatura Aproximada
Kestrel 4500NV
@@ -61,4 +62,4 @@
Закрыть Kestrel
-
\ No newline at end of file
+
From 37858ec430e769fb7384714fc3ac64f5ff74b588 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Fri, 10 Apr 2015 05:04:15 -0300
Subject: [PATCH 016/478] Added - Portuguese translation to laser_selfdesignate
---
addons/laser_selfdesignate/stringtable.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/addons/laser_selfdesignate/stringtable.xml b/addons/laser_selfdesignate/stringtable.xml
index 70f8912cfe..6af47505b3 100644
--- a/addons/laser_selfdesignate/stringtable.xml
+++ b/addons/laser_selfdesignate/stringtable.xml
@@ -4,9 +4,11 @@
Laser<br/>Designator On
+ Desiginador<br/>Laser Ligado
Laser<br/>Designator Off
+ Desiginador<br/>Laser Desligado
-
\ No newline at end of file
+
From a0a0cfbfbd3b6facb8533530b71070a488321074 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Fri, 10 Apr 2015 05:07:44 -0300
Subject: [PATCH 017/478] Added - Portuguese translation to laserpointer
---
addons/laserpointer/stringtable.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml
index 87b36618a6..d34c9caa38 100644
--- a/addons/laserpointer/stringtable.xml
+++ b/addons/laserpointer/stringtable.xml
@@ -5,15 +5,18 @@
Laser Pointer (red)
Laserpointer (rot)
+ Laser (vermelho)
Laser Pointer (green)
Laserpointer (grün)
+ Laser (verde)
Emits visible light.
Strahlt sichtbares Licht aus.
+ Emite luz visível
From 599ae092da8c78f484f45fa57d3b763d8d682ee2 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Fri, 10 Apr 2015 05:09:43 -0300
Subject: [PATCH 018/478] Changed - added dot on description
---
addons/laserpointer/stringtable.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml
index d34c9caa38..bd4a0cbba8 100644
--- a/addons/laserpointer/stringtable.xml
+++ b/addons/laserpointer/stringtable.xml
@@ -16,7 +16,7 @@
Emits visible light.
Strahlt sichtbares Licht aus.
- Emite luz visível
+ Emite luz visível.
From baf015ff5ab72d7a6305df86650238b8bbb66280 Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Fri, 10 Apr 2015 05:22:46 -0300
Subject: [PATCH 019/478] Added - Portuguese Translation to
logistics_uavbattery
The correct translation of "UAV" to Portuguese is indeed "VANT", but this term is not used as "UAV" is. In reality, most Portuguese speaking people knows what an "UAV" is but if you use the Portuguese translation they have no idea of what you are talking about.
Another alternative is to use the word "Drone". Everyone knows what a drone its, however, I find that the "UAV" is more in terms with the authenticity aspect of ACE3, since it the military uses the word "UAV" instead of "Drone"
Also, it seems that somebody wrote "UAV's" instead of "UAVs". If you intentd to use the plural, you should not use the Apostrophe. I am not correcting this since I am not sure if indeed this was intended for plural or not.
---
addons/logistics_uavbattery/stringtable.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/addons/logistics_uavbattery/stringtable.xml b/addons/logistics_uavbattery/stringtable.xml
index fbd9004290..6acb2b571d 100644
--- a/addons/logistics_uavbattery/stringtable.xml
+++ b/addons/logistics_uavbattery/stringtable.xml
@@ -10,7 +10,7 @@
Dron jest naładowany
A drón fel van töltve
Dron je nabitý
- O VANT está cheio
+ O UAV está cheio
Il drone è pieno
БПЛА заполнен
@@ -22,7 +22,7 @@
Potrzebujesz baterii UAV
Szükséged van egy UAV akkumulátorra
Potřebuješ UAV-Baterii
- Você precisa de uma Bateria para VANT
+ Você precisa de uma Bateria para UAVs
Hai bisogno di una Batteria UAV
Требуется аккумулятор БПЛА
@@ -46,8 +46,8 @@
Bateria UAV
UAV akkumulátor
UAV-Baterie
- Bateria para VANT
- Batteria UAV
+ Bateria para UAV
+ Batteria para UAVs
Аккумулятор БПЛА
@@ -58,7 +58,7 @@
Używana do naładowania UAV
Hordozható UAV-ok működéséhez való akkumulátor
Používané k dobíjení UAV
- Usada para reabastecer VANT
+ Usada para reabastecer o UAV
Usata per ricaricare la Batteria dell'UAV
Используется для подзарядки БПЛА
@@ -75,4 +75,4 @@
Подзаряжаем ...
-
\ No newline at end of file
+
From b5e5359795f7ba5648ff7a335b907993e9bd80e1 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Sat, 11 Apr 2015 00:35:18 -0500
Subject: [PATCH 020/478] CursorCentered - Localizations
---
addons/interact_menu/config.cpp | 3 ++-
addons/interact_menu/stringtable.xml | 8 +++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp
index 998098470e..9f1036dab9 100644
--- a/addons/interact_menu/config.cpp
+++ b/addons/interact_menu/config.cpp
@@ -27,6 +27,7 @@ class ACE_Settings {
value = 0;
typeName = "BOOL";
isClientSetable = 1;
- displayName = "Keep cursor centered";
+ displayName = "$STR_ACE_Interact_cursorKeepCentered";
+ description = "$STR_ACE_Interact_cursorKeepCenteredDescription";
};
};
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index 6e5ce8fdb2..fa37437b42 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
From 31a989795296d2012329487a275b42b7ecb75e8b Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Sat, 11 Apr 2015 03:07:15 -0300
Subject: [PATCH 021/478] Added - Portuguese translation to wirecutter
---
addons/logistics_wirecutter/stringtable.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/addons/logistics_wirecutter/stringtable.xml b/addons/logistics_wirecutter/stringtable.xml
index cf6e96c1aa..376476ef84 100644
--- a/addons/logistics_wirecutter/stringtable.xml
+++ b/addons/logistics_wirecutter/stringtable.xml
@@ -6,9 +6,11 @@
Wirecutter
Drahtschneider
Wirecutter
+ Cortador de Arame
Wirecutter
+ Cortador de Arame
Cut Fence
@@ -47,4 +49,4 @@
Забор вырезан
-
\ No newline at end of file
+
From 9d326ce9a5f002bcbc9162c556595221ead9506b Mon Sep 17 00:00:00 2001
From: VyMajoris
Date: Sat, 11 Apr 2015 03:10:39 -0300
Subject: [PATCH 022/478] Added - Portuguese translation to magazineRepack
---
addons/magazinerepack/stringtable.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml
index d8fd5ca177..b857e5e6f5 100644
--- a/addons/magazinerepack/stringtable.xml
+++ b/addons/magazinerepack/stringtable.xml
@@ -78,16 +78,19 @@
Repacking Finished
Wiederverpacken Fertig
Reembalaje Finalizado
+ Reorganização Terminada
Repacking Interrupted
Umpacken Unterbrochen
Reempaque Interrupted
+ Reorganização Interrompida
%1 Full and %2 Partial
%1 Vollständigen und %2 Teilweisen
%1 Total y %2 Parcial
+ %1 Total e %2 Parcial
-
\ No newline at end of file
+
From c8ebed234f84c6f6d64f881595ef0e3e66bc7bad Mon Sep 17 00:00:00 2001
From: esteldunedain
Date: Fri, 17 Apr 2015 01:01:31 -0300
Subject: [PATCH 023/478] Reword the group actions
---
addons/interaction/stringtable.xml | 60 +++++-------------------------
1 file changed, 10 insertions(+), 50 deletions(-)
diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml
index 9064e5c2d0..30e675a652 100644
--- a/addons/interaction/stringtable.xml
+++ b/addons/interaction/stringtable.xml
@@ -498,16 +498,8 @@
A Terra!
- Team<br/>Management
- Team<br/>Management
- Gestión<br/>de equipo
- Gestion<br/>d'équipe
- Zarządzanie<br/>oddziałem
- Správa<br/>týmu
- Управление<br/>группой
- Gerenciamento<br/>de Equipe
- Organizzazione<br/>Squadra
- Csapat<br/>kezelése
+ Group
+ Grupo
Red
@@ -558,52 +550,20 @@
Sárga
- Join Team<br/>Red
- Team Rot<br/>beitreten
- Unirse al<br/>equipo rojo
- Rejoindre<br/>Rouge
- Dołącz do drużyny<br/>czerwonej
- Připojit do<br/>Červeného týmu
- Присоединиться<br/>к красной группе
- Unir-se à<br/>Equipe Vermelha
- Entra nella<br/>Squadra Rossa
- Csatlakozás a<br/>piros csapathoz
+ Join Red
+ Unirse a rojo
- Join Team<br/>Green
- Team Grün<br/>beitreten
- Unirse al<br/>equipo verde
- Rejoindre<br/>Vert
- Dołącz do<br/>drużyny zielonej
- Připojit do<br/>Zeleného týmu
- Присоединиться<br/>к зеленой группе
- Unir-se à<br/>Equipe Verde
- Entra nella<br/>Squadra Verde
- Csatlakozás a<br/>zöld csapathoz
+ Join Green
+ Unirse a verde
- Join Team<br/>Blue
- Team Blau<br/>beitreten
- Unirse al<br/>equipo azul
- Rejoindre<br/>Bleu
- Dołącz do<br/>drużyny niebieskiej
- Připojit do<br/>Modrého týmu
- Присоединиться<br/>к синей группе
- Unir-se à<br/>Equipe Azul
- Entra nella<br/>Squadra Blu
- Csatlakozás a<br/>kék csapathoz
+ Join Blue
+ Unirse a azul
- Join Team<br/>Yellow
- Team Gelb<br/>beitreten
- Unirse al<br/>equipo amarillo
- Rejoindre<br/>Jaune
- Dołącz do<br/>drużyny żółtej
- Připojit do<br/>Žlutého týmu
- Присоединиться<br/>к желтой группе
- Unir-se à<br/>Equipe Amarela
- Entra nella<br/>Squadra Gialla
- Csatlakozás a<br/>sárga csapathoz
+ Join Yellow
+ Unirse a amarillo
You joined Team %1
From 80f37b9ad984208cb794cef098f5fa417ce009e6 Mon Sep 17 00:00:00 2001
From: esteldunedain
Date: Fri, 17 Apr 2015 01:13:05 -0300
Subject: [PATCH 024/478] Reword team actions on AI
---
addons/interaction/CfgVehicles.hpp | 8 ++++----
addons/interaction/stringtable.xml | 16 ++++++++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index bd36f42703..b8f90605a1 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -44,7 +44,7 @@ class CfgVehicles {
hotkey = "M";
class ACE_JoinTeamRed {
- displayName = "$STR_ACE_Interaction_JoinTeamRed";
+ displayName = "$STR_ACE_Interaction_AssignTeamRed";
distance = 5;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
statement = QUOTE([ARR_2(_target,'RED')] call DFUNC(joinTeam));
@@ -54,7 +54,7 @@ class CfgVehicles {
hotkey = "R";
};
class ACE_JoinTeamGreen {
- displayName = "$STR_ACE_Interaction_JoinTeamGreen";
+ displayName = "$STR_ACE_Interaction_AssignTeamGreen";
distance = 5;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
statement = QUOTE([ARR_2(_target,'GREEN')] call DFUNC(joinTeam));
@@ -64,7 +64,7 @@ class CfgVehicles {
hotkey = "G";
};
class ACE_JoinTeamBlue {
- displayName = "$STR_ACE_Interaction_JoinTeamBlue";
+ displayName = "$STR_ACE_Interaction_AssignTeamBlue";
distance = 5;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
statement = QUOTE([ARR_2(_target,'BLUE')] call DFUNC(joinTeam));
@@ -74,7 +74,7 @@ class CfgVehicles {
hotkey = "B";
};
class ACE_JoinTeamYellow {
- displayName = "$STR_ACE_Interaction_JoinTeamYellow";
+ displayName = "$STR_ACE_Interaction_AssignTeamYellow";
distance = 5;
condition = QUOTE(alive _target && {!isPlayer _target} && {_target in units group _player});
statement = QUOTE([ARR_2(_target,'YELLOW')] call DFUNC(joinTeam));
diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml
index 30e675a652..2eeb7652ec 100644
--- a/addons/interaction/stringtable.xml
+++ b/addons/interaction/stringtable.xml
@@ -549,6 +549,22 @@
Giallo
Sárga
+
+ Assign Red
+ Asignar a rojo
+
+
+ Assign Green
+ Asignar a verde
+
+
+ Assign Blue
+ Asignar a azul
+
+
+ Assign Yellow
+ Asignar a amarillo
+
Join Red
Unirse a rojo
From 4597da5c6c35f9969dac8d45b0e3b2b358ff012a Mon Sep 17 00:00:00 2001
From: simon84
Date: Fri, 17 Apr 2015 20:23:26 +0200
Subject: [PATCH 025/478] Revert "Revert "minor FCS changes (privatized
variables, unnecessary counters)""
This reverts commit 9f2dd6161364416d0f4564da3ca047cf1788329f.
---
addons/fcs/functions/fnc_getAngle.sqf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/fcs/functions/fnc_getAngle.sqf b/addons/fcs/functions/fnc_getAngle.sqf
index 03024d8b98..2ec9215bea 100644
--- a/addons/fcs/functions/fnc_getAngle.sqf
+++ b/addons/fcs/functions/fnc_getAngle.sqf
@@ -19,7 +19,7 @@
#include "script_component.hpp"
#define PRECISION 0.1
-private ["_distance","_angleTarget","_maxElev","_initSpeed","_airFriction","_timeToLive","_timeToLive","_simulationStep","_angle","_posTargetX","_posTargetY","_posX","_posY","_velocityX","_velocityY","_velocityMagnitude"];
+private ["_distance","_angleTarget","_maxElev","_initSpeed","_airFriction","_timeToLive","_timeToLive","_simulationStep","_angle","_posTargetX","_posTargetY","_posX","_posY","_velocityX","_velocityY","_velocityMagnitude","_angle1","_angle2","_f1","_f2","_temp"];
_distance = _this select 0;
_angleTarget = _this select 1;
@@ -73,7 +73,7 @@ if ((_this + [_maxElev]) call FUNC(traceBullet) < 0) exitWith {_maxElev - _angle
// Newton Method / Secand Method
_angle1 = _angleTarget;
_angle2 = _maxElev;
-_it2 = 0;
+//_it2 = 0;
_f1 = (_this + [_angle1]) call FUNC(traceBullet);
if ((abs _f1) <= PRECISION) exitWith {0};
@@ -83,7 +83,7 @@ while {(abs _f1) > PRECISION} do {
_angle1 = _angle2;
_angle2 = _temp;
_f1 = _f2;
- _it2 = _it2+1;
+ //_it2 = _it2+1;
};
//player globalChat format ["it1: %1 | _angle1: %2 | it2: %3 | _angle2: %4",_it1, _angle-_angleTarget, _it2, _angle2-_angleTarget];
From 25e017c30ba8b25cfbd1b16517d9c0e838237b04 Mon Sep 17 00:00:00 2001
From: simon84
Date: Fri, 17 Apr 2015 20:46:13 +0200
Subject: [PATCH 026/478] Revert "Revert "Revert "minor FCS changes (privatized
variables, unnecessary counters)"""
This reverts commit 4597da5c6c35f9969dac8d45b0e3b2b358ff012a.
---
addons/fcs/functions/fnc_getAngle.sqf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/fcs/functions/fnc_getAngle.sqf b/addons/fcs/functions/fnc_getAngle.sqf
index 2ec9215bea..03024d8b98 100644
--- a/addons/fcs/functions/fnc_getAngle.sqf
+++ b/addons/fcs/functions/fnc_getAngle.sqf
@@ -19,7 +19,7 @@
#include "script_component.hpp"
#define PRECISION 0.1
-private ["_distance","_angleTarget","_maxElev","_initSpeed","_airFriction","_timeToLive","_timeToLive","_simulationStep","_angle","_posTargetX","_posTargetY","_posX","_posY","_velocityX","_velocityY","_velocityMagnitude","_angle1","_angle2","_f1","_f2","_temp"];
+private ["_distance","_angleTarget","_maxElev","_initSpeed","_airFriction","_timeToLive","_timeToLive","_simulationStep","_angle","_posTargetX","_posTargetY","_posX","_posY","_velocityX","_velocityY","_velocityMagnitude"];
_distance = _this select 0;
_angleTarget = _this select 1;
@@ -73,7 +73,7 @@ if ((_this + [_maxElev]) call FUNC(traceBullet) < 0) exitWith {_maxElev - _angle
// Newton Method / Secand Method
_angle1 = _angleTarget;
_angle2 = _maxElev;
-//_it2 = 0;
+_it2 = 0;
_f1 = (_this + [_angle1]) call FUNC(traceBullet);
if ((abs _f1) <= PRECISION) exitWith {0};
@@ -83,7 +83,7 @@ while {(abs _f1) > PRECISION} do {
_angle1 = _angle2;
_angle2 = _temp;
_f1 = _f2;
- //_it2 = _it2+1;
+ _it2 = _it2+1;
};
//player globalChat format ["it1: %1 | _angle1: %2 | it2: %3 | _angle2: %4",_it1, _angle-_angleTarget, _it2, _angle2-_angleTarget];
From f6eeb5e3ba29821b099bf5c53739ee8f9f2b0256 Mon Sep 17 00:00:00 2001
From: KoffeinFlummi
Date: Wed, 22 Apr 2015 22:29:31 +0200
Subject: [PATCH 027/478] Add pain coefficient
---
addons/medical/ACE_Settings.hpp | 4 ++++
addons/medical/CfgVehicles.hpp | 6 ++++++
addons/medical/XEH_postInit.sqf | 2 +-
addons/medical/functions/fnc_moduleMedicalSettings.sqf | 1 +
4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp
index e7f60a14e8..0b600996d0 100644
--- a/addons/medical/ACE_Settings.hpp
+++ b/addons/medical/ACE_Settings.hpp
@@ -22,6 +22,10 @@ class ACE_Settings {
typeName = "SCALAR";
value = 1;
};
+ class GVAR(painCoefficient) {
+ typeName = "SCALAR";
+ value = 1;
+ };
class GVAR(enableAirway) {
typeName = "BOOL";
value = false;
diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp
index 2b1f7c9468..9f355cbc55 100644
--- a/addons/medical/CfgVehicles.hpp
+++ b/addons/medical/CfgVehicles.hpp
@@ -128,6 +128,12 @@ class CfgVehicles {
typeName = "NUMBER";
defaultValue = 1;
};
+ class painCoefficient {
+ displayName = "Pain coefficient";
+ description = "Coefficient to modify the pain intensity";
+ typeName = "NUMBER";
+ defaultValue = 1;
+ };
class keepLocalSettingsSynced {
displayName = "Sync status";
description = "Keep unit status synced. Recommended on.";
diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf
index 526990709b..b8152f08b8 100644
--- a/addons/medical/XEH_postInit.sqf
+++ b/addons/medical/XEH_postInit.sqf
@@ -166,7 +166,7 @@ GVAR(lastHeartBeatSound) = time;
// Pain effect
_strength = ACE_player getVariable [QGVAR(pain), 0];
- // _strength = _strength * (ACE_player getVariable [QGVAR(coefPain), GVAR(coefPain)]); @todo
+ _strength = _strength * (ACE_player getVariable [QGVAR(painCoefficient), GVAR(painCoefficient)]);
if (GVAR(painEffectType) == 1) then {
GVAR(effectPainCC) ppEffectEnable false;
if ((ACE_player getVariable [QGVAR(pain), 0]) > 0 && {alive ACE_player}) then {
diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf
index 34dd063a4d..9771a07db6 100644
--- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf
+++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf
@@ -34,4 +34,5 @@ if !(_activated) exitWith {};
[_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule);
+[_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(keepLocalSettingsSynced), "keepLocalSettingsSynced"] call EFUNC(common,readSettingFromModule);
From 74ca85cbd99d1c1eb525762d5430db5f201a0bfb Mon Sep 17 00:00:00 2001
From: KoffeinFlummi
Date: Wed, 22 Apr 2015 22:36:41 +0200
Subject: [PATCH 028/478] Change getBloodLoss to expect an array
---
addons/medical/XEH_postInit.sqf | 4 ++--
addons/medical/functions/fnc_getBloodLoss.sqf | 16 +++++++++-------
.../functions/fnc_getBloodVolumeChange.sqf | 2 +-
.../medical/functions/fnc_getHeartRateChange.sqf | 4 ++--
.../medical/functions/fnc_handleUnitVitals.sqf | 2 +-
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf
index b8152f08b8..15aa362409 100644
--- a/addons/medical/XEH_postInit.sqf
+++ b/addons/medical/XEH_postInit.sqf
@@ -131,7 +131,7 @@ GVAR(effectTimeBlood) = time;
};
};
- _bleeding = ACE_player call FUNC(getBloodLoss);
+ _bleeding = [ACE_player] call FUNC(getBloodLoss);
// Bleeding Indicator
if (_bleeding > 0 and GVAR(effectTimeBlood) + 3.5 < time) then {
GVAR(effectTimeBlood) = time;
@@ -250,7 +250,7 @@ if (USE_WOUND_EVENT_SYNC) then {
[
{(((_this select 0) getvariable [QGVAR(bloodVolume), 100]) < 65)},
{(((_this select 0) getvariable [QGVAR(pain), 0]) > 0.9)},
- {(((_this select 0) call FUNC(getBloodLoss)) > 0.25)},
+ {(([_this select 0] call FUNC(getBloodLoss)) > 0.25)},
{((_this select 0) getvariable [QGVAR(inReviveState), false])},
{((_this select 0) getvariable [QGVAR(inCardiacArrest), false])},
{((_this select 0) getvariable ["ACE_isDead", false])},
diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf
index f6b26f7686..aa94d7dc33 100644
--- a/addons/medical/functions/fnc_getBloodLoss.sqf
+++ b/addons/medical/functions/fnc_getBloodLoss.sqf
@@ -15,15 +15,17 @@
#define BLOODLOSSRATE_BASIC 0.2
-private ["_totalBloodLoss","_tourniquets","_openWounds", "_value", "_cardiacOutput", "_internalWounds"];
-// TODO Only use this calculation if medium or higher, otherwise use vanilla calculations (for basic medical).
+private ["_unit", "_totalBloodLoss","_tourniquets","_openWounds", "_value", "_cardiacOutput", "_internalWounds"];
+
+_unit = _this select 0;
+
_totalBloodLoss = 0;
// Advanced medical bloodloss handling
if (GVAR(level) >= 2) then {
- _tourniquets = _this getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]];
- _openWounds = _this getvariable [QGVAR(openWounds), []];
- //_cardiacOutput = [_this] call FUNC(getCardiacOutput);
+ _tourniquets = _unit getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]];
+ _openWounds = _unit getvariable [QGVAR(openWounds), []];
+ //_cardiacOutput = [_unit] call FUNC(getCardiacOutput);
{
if ((_tourniquets select (_x select 2)) == 0) then {
@@ -34,7 +36,7 @@ if (GVAR(level) >= 2) then {
};
}foreach _openWounds;
- _internalWounds = _this getvariable [QGVAR(internalWounds), []];
+ _internalWounds = _unit getvariable [QGVAR(internalWounds), []];
{
_totalBloodLoss = _totalBloodLoss + ((_x select 4) * (_x select 3));
}foreach _internalWounds;
@@ -42,6 +44,6 @@ if (GVAR(level) >= 2) then {
// cap the blood loss to be no greater as the current cardiac output
//(_totalBloodLoss min _cardiacOutput);
} else {
- _totalBloodLoss = BLOODLOSSRATE_BASIC * (damage _this);
+ _totalBloodLoss = BLOODLOSSRATE_BASIC * (damage _unit);
};
_totalBloodLoss * (GVAR(bleedingCoefficient) max 0);
diff --git a/addons/medical/functions/fnc_getBloodVolumeChange.sqf b/addons/medical/functions/fnc_getBloodVolumeChange.sqf
index f94c5d5b7b..23eba4a0c7 100644
--- a/addons/medical/functions/fnc_getBloodVolumeChange.sqf
+++ b/addons/medical/functions/fnc_getBloodVolumeChange.sqf
@@ -34,7 +34,7 @@ private ["_unit","_bloodVolume","_bloodVolumeChange", "_ivVolume"];
_unit = _this select 0;
_bloodVolume = _unit getvariable [QGVAR(bloodVolume), 100];
-_bloodVolumeChange = -(_unit call FUNC(getBloodLoss));
+_bloodVolumeChange = -([_unit] call FUNC(getBloodLoss));
if (_bloodVolume < 100.0) then {
{
diff --git a/addons/medical/functions/fnc_getHeartRateChange.sqf b/addons/medical/functions/fnc_getHeartRateChange.sqf
index e7bc9407d2..f3fec64053 100644
--- a/addons/medical/functions/fnc_getHeartRateChange.sqf
+++ b/addons/medical/functions/fnc_getHeartRateChange.sqf
@@ -20,7 +20,7 @@ _unit = _this select 0;
_hrIncrease = 0;
if (!(_unit getvariable [QGVAR(inCardiacArrest),false])) then {
_heartRate = _unit getvariable [QGVAR(heartRate), 80];
- _bloodLoss = _unit call FUNC(getBloodLoss);
+ _bloodLoss = [_unit] call FUNC(getBloodLoss);
_adjustment = _unit getvariable [QGVAR(heartRateAdjustments), []];
{
@@ -83,4 +83,4 @@ if (!(_unit getvariable [QGVAR(inCardiacArrest),false])) then {
_hrIncrease = _hrIncrease - HEART_RATE_MODIFIER;
};
};
-_hrIncrease
\ No newline at end of file
+_hrIncrease
diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf
index 411f64b49e..f986a095de 100644
--- a/addons/medical/functions/fnc_handleUnitVitals.sqf
+++ b/addons/medical/functions/fnc_handleUnitVitals.sqf
@@ -43,7 +43,7 @@ if (_bloodVolume < 90) then {
};
};
-if ((_unit call FUNC(getBloodLoss)) > 0) then {
+if (([_unit] call FUNC(getBloodLoss)) > 0) then {
if !(_unit getvariable [QGVAR(isBleeding), false]) then {
_unit setvariable [QGVAR(isBleeding), true, true];
};
From d10f4d543d3a2c4cbaff379447a4002f3e20ea77 Mon Sep 17 00:00:00 2001
From: KoffeinFlummi
Date: Wed, 22 Apr 2015 22:38:48 +0200
Subject: [PATCH 029/478] Enable unit specific bleeding coefficient
---
addons/medical/functions/fnc_getBloodLoss.sqf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/medical/functions/fnc_getBloodLoss.sqf b/addons/medical/functions/fnc_getBloodLoss.sqf
index aa94d7dc33..7fe108670f 100644
--- a/addons/medical/functions/fnc_getBloodLoss.sqf
+++ b/addons/medical/functions/fnc_getBloodLoss.sqf
@@ -46,4 +46,4 @@ if (GVAR(level) >= 2) then {
} else {
_totalBloodLoss = BLOODLOSSRATE_BASIC * (damage _unit);
};
-_totalBloodLoss * (GVAR(bleedingCoefficient) max 0);
+_totalBloodLoss * ((_unit getVariable [QGVAR(bleedingCoefficient), GVAR(bleedingCoefficient)]) max 0);
From 84e19375152b963bfcad3c5dc19e48cf714a9c36 Mon Sep 17 00:00:00 2001
From: KoffeinFlummi
Date: Wed, 22 Apr 2015 23:50:37 +0200
Subject: [PATCH 030/478] Add damage threshold to basic
---
.../functions/fnc_handleDamage_basic.sqf | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/addons/medical/functions/fnc_handleDamage_basic.sqf b/addons/medical/functions/fnc_handleDamage_basic.sqf
index aa9c2f61df..3c94aba248 100644
--- a/addons/medical/functions/fnc_handleDamage_basic.sqf
+++ b/addons/medical/functions/fnc_handleDamage_basic.sqf
@@ -24,13 +24,20 @@
#define ARMDAMAGETRESHOLD2 1.7
#define UNCONSCIOUSNESSTRESHOLD 0.7
-private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_damage"];
+private ["_unit", "_selectionName", "_damage", "_shooter", "_projectile", "_threshold"];
-_unit = _this select 0;
-_selectionName = _this select 1;
-_damage = _this select 2;
-_shooter = _this select 3;
-_projectile = _this select 4;
+_unit = _this select 0;
+_selectionName = _this select 1;
+_damage = _this select 2;
+_shooter = _this select 3;
+_projectile = _this select 4;
+
+// Apply damage treshold / coefficient
+_threshold = [
+ _unit getVariable [QGVAR(damageThreshold), GVAR(AIDamageThreshold)],
+ _unit getVariable [QGVAR(damageThreshold), GVAR(playerDamageThreshold)]
+] select ([_unit] call EFUNC(common,isPlayer));
+_damage = _damage * (1 / _threshold);
// This is a new hit, reset variables.
// Note: sometimes handleDamage spans over 2 or even 3 frames.
From d1c95ba8a19fbe6d3cae1a3c7d68c76dd97b6ed5 Mon Sep 17 00:00:00 2001
From: KoffeinFlummi
Date: Thu, 23 Apr 2015 11:31:27 +0200
Subject: [PATCH 031/478] Add maximum unconsciousness time option
---
addons/medical/ACE_Settings.hpp | 4 ++++
addons/medical/CfgVehicles.hpp | 6 ++++++
addons/medical/XEH_respawn.sqf | 8 +++++++-
.../functions/fnc_moduleMedicalSettings.sqf | 1 +
.../medical/functions/fnc_setUnconscious.sqf | 19 +++++++++++++++++++
5 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp
index 0b600996d0..40a28fb4d9 100644
--- a/addons/medical/ACE_Settings.hpp
+++ b/addons/medical/ACE_Settings.hpp
@@ -63,6 +63,10 @@ class ACE_Settings {
typeName = "BOOL";
value = 0;
};
+ class GVAR(maxUnconsciousTime) {
+ typeName = "SCALAR";
+ value = -1;
+ };
class GVAR(maxReviveTime) {
typeName = "SCALAR";
value = 120;
diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp
index 9f355cbc55..6aa3f82d60 100644
--- a/addons/medical/CfgVehicles.hpp
+++ b/addons/medical/CfgVehicles.hpp
@@ -122,6 +122,12 @@ class CfgVehicles {
typeName = "BOOL";
defaultValue = 0;
};
+ class maxUnconsciousTime {
+ displayName = "Max. Uncon. Time";
+ description = "Maximum time a unit can be unconscious before dying. Negative Values disable this.";
+ typeName = "NUMBER";
+ defaultValue = -1;
+ };
class bleedingCoefficient {
displayName = "Bleeding coefficient";
description = "Coefficient to modify the bleeding speed";
diff --git a/addons/medical/XEH_respawn.sqf b/addons/medical/XEH_respawn.sqf
index ac6cc2d6ef..0a95e064fd 100644
--- a/addons/medical/XEH_respawn.sqf
+++ b/addons/medical/XEH_respawn.sqf
@@ -8,7 +8,13 @@ if !(local _unit) exitWith {};
[_unit] call FUNC(init);
-//Reset captive status for respawning unit
+// Reset captive status for respawning unit
if (!(_unit getVariable ["ACE_isUnconscious", false])) then {
[_unit, QGVAR(unconscious), false] call EFUNC(common,setCaptivityStatus);
};
+
+// Remove maximum unconsciousness time handler
+_maxUnconHandle = _unit getVariable [QGVAR(maxUnconTimeHandle), -1];
+if (_maxUnconHandle > 0) then {
+ [_maxUnconHandle] call CBA_fnc_removePerFrameHandler;
+};
diff --git a/addons/medical/functions/fnc_moduleMedicalSettings.sqf b/addons/medical/functions/fnc_moduleMedicalSettings.sqf
index 9771a07db6..dd7422c40e 100644
--- a/addons/medical/functions/fnc_moduleMedicalSettings.sqf
+++ b/addons/medical/functions/fnc_moduleMedicalSettings.sqf
@@ -33,6 +33,7 @@ if !(_activated) exitWith {};
[_logic, QGVAR(AIDamageThreshold), "AIDamageThreshold"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(enableUnsconsiousnessAI), "enableUnsconsiousnessAI"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(preventInstaDeath), "preventInstaDeath"] call EFUNC(common,readSettingFromModule);
+[_logic, QGVAR(maxUnconsciousTime), "maxUnconsciousTime"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(bleedingCoefficient), "bleedingCoefficient"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(painCoefficient), "painCoefficient"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(keepLocalSettingsSynced), "keepLocalSettingsSynced"] call EFUNC(common,readSettingFromModule);
diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf
index c5809f8c8e..84c5618168 100644
--- a/addons/medical/functions/fnc_setUnconscious.sqf
+++ b/addons/medical/functions/fnc_setUnconscious.sqf
@@ -22,6 +22,15 @@ _unit = _this select 0;
_set = if (count _this > 1) then {_this select 1} else {true};
_minWaitingTime = if (count _this > 2) then {_this select 2} else {DEFAULT_DELAY};
+// No change, fuck off. (why is there no xor?)
+if (_set isEqualTo (_unit getVariable ["ACE_isUnconscious", false])) exitWith {};
+
+// Remove maximum unconsciousness time handler
+_maxUnconHandle = _unit getVariable [QGVAR(maxUnconTimeHandle), -1];
+if (_maxUnconHandle > 0) then {
+ [_maxUnconHandle] call CBA_fnc_removePerFrameHandler;
+};
+
if !(_set) exitwith {
_unit setvariable ["ACE_isUnconscious", false, true];
};
@@ -86,4 +95,14 @@ _startingTime = time;
[DFUNC(unconsciousPFH), 0.1, [_unit,_animState, _originalPos, _startingTime, _minWaitingTime, false, vehicle _unit isKindOf "ParachuteBase"] ] call CBA_fnc_addPerFrameHandler;
+// Maximum unconsciousness time
+_maxUnconTime = _unit getVariable [QGVAR(maxUnconsciousTime), GVAR(maxUnconsciousTime)];
+if (_maxUnconTime >= 0) then {
+ _handle = [{
+ _unit = _this select 0;
+ [_unit] call FUNC(setDead);
+ }, [_unit], _maxUnconTime, 0.5] call EFUNC(common,waitAndExecute);
+ _unit setVariable [QGVAR(maxUnconTimeHandle), _handle];
+};
+
["medical_onUnconscious", [_unit, true]] call EFUNC(common,globalEvent);
From 79cce947040d7dc3a7c2ab32ae0241b11d5ef881 Mon Sep 17 00:00:00 2001
From: Grzegorz Sikora
Date: Wed, 22 Apr 2015 13:17:43 +0200
Subject: [PATCH 032/478] PL translation
---
addons/ballistics/stringtable.xml | 5 ++++-
addons/interact_menu/stringtable.xml | 6 ++++++
addons/realisticnames/stringtable.xml | 17 ++++++++++++++++-
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 49b39c0af6..d06e87a7b9 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -1,4 +1,5 @@
+
@@ -990,6 +991,7 @@
6.5mm Creedmor 30Rnd Mag
+ Magazynek 6,5mm Creedmor 30rd
6.5mm CM
@@ -1000,6 +1002,7 @@
Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM
+ Kaliber: 6,5mm Creedmor<br />Pociski: 30<br />Używany w: MXM
.338 10Rnd Mag (300gr Sierra MatchKing HPBT)
@@ -1104,4 +1107,4 @@
Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5
-
+
\ No newline at end of file
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index 55d67788f4..984acd92be 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -1,4 +1,5 @@
+
Interaction - Shadow Max
+ Interakcja - Cień max
Interaction - Shadow Min
+ Interakcja - Cień min
\ No newline at end of file
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index 1fcf116d1e..507fd9b5a2 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -1,4 +1,5 @@
+
@@ -1515,6 +1516,7 @@
SG 556 7.62 mm
SG 556 7.62 mm
SG 556 7.62 мм
+ SG 556 7,62 mm
SG 556 7.62 mm (Black)
@@ -1522,6 +1524,7 @@
SG 556 7.62 mm (Noir)
SG 556 7.62 mm (Negro)
SG 556 7.62 мм (черный)
+ SG 556 7,62 mm (czarny)
SG 556 7.62 mm (Khaki)
@@ -1529,6 +1532,7 @@
SG 556 7.62 mm (Kaki)
SG 556 7.62 mm (Caqui)
SG 556 7.62 мм (хаки)
+ SG 556 7,62 mm (khaki)
SG 556 7.62 mm (Sand)
@@ -1536,6 +1540,7 @@
SG 556 7.62 mm (Beige)
SG 556 7.62 mm (Arena)
SG 556 7.62 мм (песочный)
+ SG 556 7,62 mm (piaskowy)
SG 556 7.62 mm (Camo)
@@ -1543,6 +1548,7 @@
SG 556 7.62 mm (Camo)
SG 556 7.62 mm (Camuflaje)
SG 556 7.62 мм (камо)
+ SG 556 7,62 mm (kamuflaż)
SG 556 7.62 mm (Woodland)
@@ -1550,6 +1556,7 @@
SG 556 7.62 mm (Woodland)
SG 556 7.62 mm (Bosque)
SG 556 7.62 мм (лесной)
+ SG 556 7,62 mm (leśny)
SG 556 7.62 mm (provisional) spotter
@@ -1557,6 +1564,7 @@
SG 556 7.62 mm (provisoire) Observateur
SG 556 7.62 mm (provisional) observador
SG 556 7.62 мм (provisional) корректировщик
+ SG 556 7,62 mm (prowizoryczny) obserwator
TODO: ASP-1 Kir 12.7 mm
@@ -1613,6 +1621,7 @@
M14 7.62 mm
M14 7.62 mm
M14 7.62 мм
+ M14 7,62 mm
M14 7.62 mm (Camo)
@@ -1620,6 +1629,7 @@
M14 7.62 mm (Camo)
M14 7.62 mm (Camuflaje)
M14 7.62 мм (Камо)
+ M14 7,62 mm (kamuflaż)
M14 7.62 mm (Olive)
@@ -1627,6 +1637,7 @@
M14 7.62 mm (Olive)
M14 7.62 mm (Oliva)
M14 7.62 мм (Олива)
+ M14 7,62 mm (oliwkowy)
TODO: Navid 9.3 mm
@@ -1655,6 +1666,7 @@
LWMMG .338
LWMMG .338
LWMMG .338
+ LWMMG .338
LWMMG .338 (MTP)
@@ -1662,6 +1674,7 @@
LWMMG .338 (MTP)
LWMMG .338 (MTP)
LWMMG .338 (MTP)
+ LWMMG .338 (MTP)
LWMMG .338 (Black)
@@ -1669,6 +1682,7 @@
LWMMG .338 (Noir)
LWMMG .338 (Negro)
LWMMG .338 (Черный)
+ LWMMG .338 (czarny)
LWMMG .338 (Sand)
@@ -1676,6 +1690,7 @@
SPMG .338 (Beige)
LWMMG .338 (Arena)
LWMMG .338 (Песочный)
+ LWMMG .338 (piaskowy)
-
+
\ No newline at end of file
From d7b961043b9580724daaedcedc049d8daf3b6945 Mon Sep 17 00:00:00 2001
From: KoffeinFlummi
Date: Fri, 24 Apr 2015 22:20:16 +0200
Subject: [PATCH 033/478] Remove animation reset before falling unconscious
This caused the unit to briefly move to the default animation,
which looked shite.
---
addons/medical/functions/fnc_setUnconscious.sqf | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf
index 84c5618168..633718f163 100644
--- a/addons/medical/functions/fnc_setUnconscious.sqf
+++ b/addons/medical/functions/fnc_setUnconscious.sqf
@@ -71,8 +71,6 @@ if (vehicle _unit == _unit) then {
_unit addWeapon "ACE_FakePrimaryWeapon";
};
_unit selectWeapon (primaryWeapon _unit);
- _unit switchMove "";
- _unit playmoveNow "";
};
// We are storing the current animation, so we can use it later on when waking the unit up inside a vehicle
@@ -89,7 +87,15 @@ if (GVAR(moveUnitsFromGroupOnUnconscious)) then {
};
[_unit, QGVAR(unconscious), true] call EFUNC(common,setCaptivityStatus);
-[_unit, [_unit] call EFUNC(common,getDeathAnim), 1, true] call EFUNC(common,doAnimation);
+_anim = [_unit] call EFUNC(common,getDeathAnim)
+[_unit, _anim, 1, true] call EFUNC(common,doAnimation);
+[{
+ _unit = _this select 0;
+ _anim = _this select 1;
+ if (_unit getVariable "ACE_isUnconscious") then {
+ [_unit, _anim, 2, true] call EFUNC(common,doAnimation);
+ };
+}, [_unit, _anim], 2, 1] call EFUNC(common,waitAndExecute);
_startingTime = time;
From 664d08d4aa729767d366c855c38af199d3139f76 Mon Sep 17 00:00:00 2001
From: commy2
Date: Sat, 25 Apr 2015 08:23:54 +0200
Subject: [PATCH 034/478] add option to only use action when clicking
---
addons/interact_menu/XEH_clientInit.sqf | 6 ++----
addons/interact_menu/config.cpp | 12 +++++++++---
.../functions/fnc_handlePlayerChanged.sqf | 6 +++++-
addons/interact_menu/functions/fnc_keyUp.sqf | 6 ++++++
addons/interact_menu/stringtable.xml | 6 +++++-
5 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf
index b8a8fc899b..1a7dba3065 100644
--- a/addons/interact_menu/XEH_clientInit.sqf
+++ b/addons/interact_menu/XEH_clientInit.sqf
@@ -32,8 +32,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Statement
[0] call FUNC(keyDown)
-},
-{[0] call FUNC(keyUp)},
+},{[0,false] call FUNC(keyUp)},
[219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key
["ACE3", QGVAR(SelfInteractKey), (localize "STR_ACE_Interact_Menu_SelfInteractKey"),
@@ -42,8 +41,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)];
if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false};
// Statement
[1] call FUNC(keyDown)
-},
-{[1] call FUNC(keyUp)},
+},{[1,false] call FUNC(keyUp)},
[219, [false, true, false]], false] call cba_fnc_addKeybind; //Left Windows Key + Ctrl/Strg
diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp
index c79c9cd6d1..5ca0ebdc5f 100644
--- a/addons/interact_menu/config.cpp
+++ b/addons/interact_menu/config.cpp
@@ -42,25 +42,31 @@ class ACE_Settings {
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_ColorTextMax";
- };
+ };
class GVAR(colorTextMin) {
value[] = {1, 1, 1, 0.25};
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_ColorTextMin";
- };
+ };
class GVAR(colorShadowMax) {
value[] = {0, 0, 0, 1};
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_ColorShadowMax";
- };
+ };
class GVAR(colorShadowMin) {
value[] = {0, 0, 0, 0.25};
typeName = "COLOR";
isClientSettable = 1;
displayName = "$STR_ACE_Interact_Menu_ColorShadowMin";
};
+ class GVAR(actionOnKeyRelease) {
+ value = 1;
+ typeName = "BOOL";
+ isClientSettable = 1;
+ displayName = "$STR_ACE_Interact_Menu_ActionOnKeyRelease";
+ };
};
class ACE_Extensions {
diff --git a/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf b/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf
index fe25853733..f1f6e78f6d 100644
--- a/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf
+++ b/addons/interact_menu/functions/fnc_handlePlayerChanged.sqf
@@ -15,7 +15,11 @@ EXPLODE_2_PVT(_this,_newUnit,_oldUnit);
// add to new unit
private "_ehid";
-_ehid = [_newUnit, "DefaultAction", {EGVAR(interact_menu,openedMenuType) >= 0}, {}] call EFUNC(common,addActionEventHandler);
+_ehid = [_newUnit, "DefaultAction", {GVAR(openedMenuType) >= 0}, {
+ if !(GVAR(actionOnKeyRelease)) then {
+ [GVAR(openedMenuType),true] call FUNC(keyUp);
+ };
+}] call EFUNC(common,addActionEventHandler);
_newUnit setVariable [QGVAR(AAEHID), _ehid];
diff --git a/addons/interact_menu/functions/fnc_keyUp.sqf b/addons/interact_menu/functions/fnc_keyUp.sqf
index 735130e69a..7b24497802 100644
--- a/addons/interact_menu/functions/fnc_keyUp.sqf
+++ b/addons/interact_menu/functions/fnc_keyUp.sqf
@@ -12,6 +12,9 @@
*/
#include "script_component.hpp"
+private "_calledByClicking";
+_calledByClicking = _this select 1;
+
// Exit if there's no menu opened
if (GVAR(openedMenuType) < 0) exitWith {true};
@@ -29,6 +32,9 @@ if(GVAR(actionSelected)) then {
// Clear the conditions caches
["clearConditionCaches", []] call EFUNC(common,localEvent);
+ // exit scope if selecting an action on key release is disabled
+ if (!(GVAR(actionOnKeyRelease)) && !_calledByClicking) exitWith {};
+
// Check the action conditions
_actionData = GVAR(selectedAction) select 0;
if ([_target, _player, _actionData select 6] call (_actionData select 4)) then {
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index 55d67788f4..d9e2e1366b 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -83,5 +83,9 @@
Interaction - Shadow Min
+
-
\ No newline at end of file
+
From 55529d03963416ba0051268ea2914202bf95eab6 Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Sat, 25 Apr 2015 09:41:55 +0200
Subject: [PATCH 035/478] Added support for switching from 3d selections to
radial menu
---
addons/medical/ACE_Medical_Actions.hpp | 12 ++++++------
addons/medical/ACE_Settings.hpp | 9 +++++++++
addons/medical/CfgVehicles.hpp | 5 ++++-
addons/medical/stringtable.xml | 13 +++++++++++++
4 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/addons/medical/ACE_Medical_Actions.hpp b/addons/medical/ACE_Medical_Actions.hpp
index ed5670f814..e3292105b0 100644
--- a/addons/medical/ACE_Medical_Actions.hpp
+++ b/addons/medical/ACE_Medical_Actions.hpp
@@ -3,7 +3,7 @@ class ACE_Head {
displayName = "$STR_ACE_Interaction_Head";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation));
- condition = "true";
+ ACTION_CONDITION
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -75,7 +75,7 @@ class ACE_Torso {
displayName = "$STR_ACE_Interaction_Torso";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 1)] call DFUNC(displayPatientInformation));
- condition = "true";
+ ACTION_CONDITION
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -175,7 +175,7 @@ class ACE_ArmLeft {
displayName = "$STR_ACE_Interaction_ArmLeft";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 2)] call DFUNC(displayPatientInformation));
- condition = "true";
+ ACTION_CONDITION
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -332,7 +332,7 @@ class ACE_ArmRight {
displayName = "$STR_ACE_Interaction_ArmRight";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 3)] call DFUNC(displayPatientInformation));
- condition = "true";
+ ACTION_CONDITION
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -486,7 +486,7 @@ class ACE_LegLeft {
displayName = "$STR_ACE_Interaction_LegLeft";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 4)] call DFUNC(displayPatientInformation));
- condition = "true";
+ ACTION_CONDITION
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
@@ -628,7 +628,7 @@ class ACE_LegRight {
displayName = "$STR_ACE_Interaction_LegRight";
runOnHover = 1;
statement = QUOTE([ARR_3(_target, true, 5)] call DFUNC(displayPatientInformation));
- condition = "true";
+ ACTION_CONDITION
EXCEPTIONS
icon = PATHTOF(UI\icons\medical_cross.paa);
distance = MEDICAL_ACTION_DISTANCE;
diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp
index e7f60a14e8..c3531915db 100644
--- a/addons/medical/ACE_Settings.hpp
+++ b/addons/medical/ACE_Settings.hpp
@@ -143,4 +143,13 @@ class ACE_Settings {
typeName = "BOOL";
value = 0;
};
+
+ class GVAR(menuTypeStyle) {
+ displayName = "$STR_ACE_Medical_menuTypeDisplay";
+ description = "$STR_ACE_Medical_menuTypeDescription";
+ typeName = "SCALAR";
+ value = 0;
+ values[] = {"$STR_ACE_Medical_useSelection", "$STR_ACE_Medical_useRadial"};
+ isClientSettable = 1;
+ };
};
diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp
index 2b1f7c9468..648aa8e420 100644
--- a/addons/medical/CfgVehicles.hpp
+++ b/addons/medical/CfgVehicles.hpp
@@ -428,6 +428,7 @@ class CfgVehicles {
class ACE_Actions {
// Include actions in body parts for treatment while in the open
#define EXCEPTIONS exceptions[] = {};
+ #define ACTION_CONDITION condition = QUOTE(GVAR(menuTypeStyle) == 0);
#include "ACE_Medical_Actions.hpp"
// Create a consolidates medical menu for treatment while boarded
@@ -436,12 +437,14 @@ class CfgVehicles {
displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical";
runOnHover = 1;
exceptions[] = {"isNotInside"};
- condition = QUOTE(vehicle _target != _target);
+ condition = QUOTE(vehicle _target != _target || GVAR(menuTypeStyle) == 1);
statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation));
icon = PATHTOF(UI\icons\medical_cross.paa);
#undef EXCEPTIONS
+ #undef ACTION_CONDITION
#define EXCEPTIONS exceptions[] = {"isNotInside"};
+ #define ACTION_CONDITION condition = "true";
#include "ACE_Medical_Actions.hpp"
};
class GVAR(loadPatient) {
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 53c587bec0..316425d6b4 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -1635,5 +1635,18 @@
Aberración cromática
Aberration chromatique
+
+
+
+ Selections (3d)
+
+
+ Radial
+
+
\ No newline at end of file
From 73f387d3e3778d8ac3b92d532602204918c58377 Mon Sep 17 00:00:00 2001
From: commy2
Date: Sat, 25 Apr 2015 11:55:39 +0200
Subject: [PATCH 036/478] outline interaction menu text
---
addons/interact_menu/functions/fnc_renderIcon.sqf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf
index 9107b6d998..91a200ee89 100644
--- a/addons/interact_menu/functions/fnc_renderIcon.sqf
+++ b/addons/interact_menu/functions/fnc_renderIcon.sqf
@@ -33,9 +33,9 @@ if(_icon == "") then {
};
_text = if (GVAR(UseListMenu)) then {
- format ["%5 ", _icon, _iconColor, _textColor, _shadowColor, _text]
+ format ["%5 ", _icon, _iconColor, _textColor, _shadowColor, _text]
} else {
- format ["%5 ", _icon, _iconColor, _textColor, _shadowColor, "ace_breakLine" callExtension _text];
+ format ["%5 ", _icon, _iconColor, _textColor, _shadowColor, "ace_breakLine" callExtension _text];
};
_ctrl ctrlSetStructuredText (parseText _text);
From 274663e1b9fb833e27ab3ab4c3f936c0d5695726 Mon Sep 17 00:00:00 2001
From: Dimaslg
Date: Sat, 25 Apr 2015 18:53:45 +0200
Subject: [PATCH 037/478] Spanish Translation
Minor fixes and spelling mistakes.
---
addons/ballistics/stringtable.xml | 16 +++++++++-------
addons/disposable/stringtable.xml | 4 ++--
addons/dragging/stringtable.xml | 4 ++--
addons/explosives/stringtable.xml | 6 +++---
addons/fcs/stringtable.xml | 4 ++--
addons/flashsuppressors/stringtable.xml | 14 +++++++-------
addons/grenades/stringtable.xml | 4 ++--
addons/interact_menu/stringtable.xml | 4 ++++
addons/interaction/stringtable.xml | 4 ++--
addons/kestrel4500/stringtable.xml | 4 ++--
addons/laser_selfdesignate/stringtable.xml | 4 ++--
addons/laserpointer/stringtable.xml | 8 ++++----
addons/magazinerepack/stringtable.xml | 8 ++++----
addons/medical/stringtable.xml | 11 +++++------
addons/microdagr/stringtable.xml | 4 ++--
addons/missileguidance/stringtable.xml | 16 ++++++++--------
addons/nametags/stringtable.xml | 6 +++---
addons/nightvision/stringtable.xml | 16 ++++++++--------
addons/optionsmenu/stringtable.xml | 8 ++++----
addons/overheating/stringtable.xml | 2 +-
addons/realisticnames/stringtable.xml | 6 +++---
addons/reload/stringtable.xml | 8 ++++----
addons/vehiclelock/stringtable.xml | 18 +++++++++---------
addons/weaponselect/stringtable.xml | 14 +++++++-------
24 files changed, 99 insertions(+), 94 deletions(-)
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 49b39c0af6..e65b91f926 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -273,7 +273,7 @@
7.62mm Tracer
7,62 mm Nyomjelző
7,62mm Leuchtspur
- 7,62mm trazadora
+ 7,62mm Trazadora
7,62mm Traçantes
7,62mm Smugacz
7.62mm Svítící
@@ -380,7 +380,7 @@
.338 NM Tracer
.338 NM Svítící
.338 NM Traçante
- .338 NM trazadora
+ .338 NM Trazadora
.338 NM трассирующие
@@ -456,7 +456,7 @@
9,3mm Smugacz
9.3mm Svítící
9.3mm Traçante
- 9.3mm trazadora
+ 9.3mm Trazadora
9,3 мм трассирующие
@@ -507,7 +507,7 @@
9,3mm Smugacz
9.3mm Svítící
9.3mm Traçante
- 9.3mm trazadora
+ 9.3mm Trazadora
9,3 мм трассирующие
@@ -903,7 +903,7 @@
Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20
-
+
7.62mm 20Rnd Mag (Mk248 Mod 0)
Magazynek 7,62mm 20rd (Mk248 Mod 0)
@@ -984,12 +984,13 @@
Caliber: 6.5x47mm (HPBT Scenar)<br />Rounds: 30<br />Used in: MXM
Calibre: 6.5x47mm (HPBT Scenar)<br />Cartouches: 30
- Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30
+ Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30<br />Se usa en: MXM
Kaliber: 6,5x47 mm (HPBT Scenar)<br />Pociski: 30
Калибр: 6,5x47 мм (HPBT Scenar)<br />Патронов: 30
6.5mm Creedmor 30Rnd Mag
+ Cargador de 30 balas de 6.5mm Creedmor
6.5mm CM
@@ -1000,6 +1001,7 @@
Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM
+ Calibre: 6.5mm Creedmor<br />Balas: 30<br />Se usa en: MXM
.338 10Rnd Mag (300gr Sierra MatchKing HPBT)
@@ -1104,4 +1106,4 @@
Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5
-
+
\ No newline at end of file
diff --git a/addons/disposable/stringtable.xml b/addons/disposable/stringtable.xml
index 7f57998157..b97efca5f4 100644
--- a/addons/disposable/stringtable.xml
+++ b/addons/disposable/stringtable.xml
@@ -29,10 +29,10 @@
Missile préchargé Dummy
Přednabitá dummy střela
Wstępnie załadowana atrapa pocisku
- Preloaded Missile Dummy
+ Precargado misil inerte
Előtöltött műrakéta
Предзаряженная ракетная болванка
Missile stupido precaricato
-
+
\ No newline at end of file
diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml
index 521ab87006..990f91144e 100644
--- a/addons/dragging/stringtable.xml
+++ b/addons/dragging/stringtable.xml
@@ -28,7 +28,7 @@
Item too heavy
Gegenstand ist zu schwer
- Articulo demasiado pesado
+ Objeto demasiado pesado
Przedmiot jest zbyt ciężki
Objet trop lourd
Não é possível carregar o item devido a seu peso
@@ -50,4 +50,4 @@
Нести
-
+
\ No newline at end of file
diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml
index 8e941b1f2a..7071de32a5 100644
--- a/addons/explosives/stringtable.xml
+++ b/addons/explosives/stringtable.xml
@@ -208,7 +208,7 @@
Add to Speed Dial
Zur Schnellauswahl hinzufügen
- Agregar a marcado rápido
+ Añadir a marcado rápido
Dodaj do szybkiego wybierania
Ajouter à la composition rapide
Přidat jako rychlou volbu
@@ -364,7 +364,7 @@
-
+
\ No newline at end of file
diff --git a/addons/fcs/stringtable.xml b/addons/fcs/stringtable.xml
index 857f511fca..6c785ae47b 100644
--- a/addons/fcs/stringtable.xml
+++ b/addons/fcs/stringtable.xml
@@ -14,7 +14,7 @@
Zeroed To
Haltepunkt
- Fijado a
+ Ajustado a
Wyzerowany na
Nastaveno na
Zéroté à
@@ -72,4 +72,4 @@
СУО обнулен.
-
+
\ No newline at end of file
diff --git a/addons/flashsuppressors/stringtable.xml b/addons/flashsuppressors/stringtable.xml
index d3185fc2b0..a806ba8fa6 100644
--- a/addons/flashsuppressors/stringtable.xml
+++ b/addons/flashsuppressors/stringtable.xml
@@ -12,7 +12,7 @@
Tlumič plamene (6,5 mm)
Cache-flamme (6,5 mm)
Пламегаситель (6,5 мм)
- Supresor (6,5 mm)
+ Bocacha (6,5 mm)
Flash Suppressor (7.62 mm)
@@ -24,7 +24,7 @@
Tlumič plamene (7,62 mm)
Cache-flamme (7,62 mm)
Пламегаситель (7,62 мм)
- Supresor (7,62 mm)
+ Bocacha (7,62 mm)
Flash Suppressor (5.56 mm)
@@ -36,7 +36,7 @@
Tlumič plamene (5,56 mm)
Cache-flamme (5,56 mm)
Пламегаситель (5,56 мм)
- Supresor (5,56 mm)
+ Bocacha (5,56 mm)
Flash Suppressor (.45 ACP)
@@ -48,7 +48,7 @@
Tlumič plamene (.45 ACP)
Cache-flamme (.45 ACP)
Пламегаситель (.45 ACP)
- Supresor (.45 ACP)
+ Bocacha (.45 ACP)
Flash Suppressor (9 mm)
@@ -60,7 +60,7 @@
Tlumič plamene (9 mm)
Cache-flamme (9 mm)
Пламегаситель (9 мм)
- Supresor (9 mm)
+ Bocacha (9 mm)
Flash Suppressor (.338)
@@ -72,7 +72,7 @@
Tlumič záblesku (.338)
Cache-flamme (.338)
Пламегаситель (.338)
- Supresor (.338)
+ Bocacha (.338)
Flash Suppressor (9.3 mm)
@@ -84,7 +84,7 @@
Tlumič záblesku (9,3 mm)
Cache-flamme (9,3 mm)
Пламегаситель (9,3 мм)
- Supresor (9,3 mm)
+ Bocacha (9,3 mm)
\ No newline at end of file
diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml
index 7f8321d6c6..b5c3a6a35b 100644
--- a/addons/grenades/stringtable.xml
+++ b/addons/grenades/stringtable.xml
@@ -53,7 +53,7 @@
Roll Grenade
Granate rollen
- Rodar granada
+ Lanzamiento raso
Po ziemi
Po zemi
Lancer roulé
@@ -89,7 +89,7 @@
Also known as flashbang. Causes immediate flash blindness, deafness, tinnitus, and inner ear disturbance.
Verursacht temporäre Blind- und Taubheit.
- Produce de manera inmediata ceguera, sordera, tinitus y afecta el oído interior.
+ Tambien conocida como granada cegadora. Produce de manera inmediata ceguera, sordera, tinitus y afecta el oído interior.
Les grenades incapacitantes servent à désorienter ou distraire une menace pendant quelques secondes.
Znany też jako flashbang. Powoduje natychmiastową tymczasową ślepotę, głuchotę, dzwonienie w uszach i inne zaburzenia ucha wewnętrznego.
Omračující granát je taktická nesmrtící zbraň používaná při záchraně rukojmí a zvládání davu.
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index 55d67788f4..264bc6c645 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -73,15 +73,19 @@
Interaction - Shadow Max
+ Interacción - Ampliar sombra
Interaction - Shadow Min
+ Interacción - Reducir sombra
\ No newline at end of file
diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml
index 38902f80cf..50bcac8fb3 100644
--- a/addons/interaction/stringtable.xml
+++ b/addons/interaction/stringtable.xml
@@ -104,7 +104,7 @@
-
+
\ No newline at end of file
diff --git a/addons/kestrel4500/stringtable.xml b/addons/kestrel4500/stringtable.xml
index 2703e34e9f..a71c2dc094 100644
--- a/addons/kestrel4500/stringtable.xml
+++ b/addons/kestrel4500/stringtable.xml
@@ -18,7 +18,7 @@
Anemomentr skrzydełkowy Kestrel 4500
Карманная метеостанция Kestrel 4500NV
Station météo portable Kestrel 4500
- Kestrel 4500 Pocket Weather Tracker
+ Estación meteorológica Kestrel 4500
Kestrel 4500 Taschenwettermessgerät
@@ -46,7 +46,7 @@
Убрать Kestrel 4500NV
Cacher Kestrel 4500
Nascondi Kestrel 4500
- Esconder Kestrel 4500
+ Ocultar Kestrel 4500
Kestrel 4500 wegstecken
diff --git a/addons/laser_selfdesignate/stringtable.xml b/addons/laser_selfdesignate/stringtable.xml
index f587763bce..bf870355dd 100644
--- a/addons/laser_selfdesignate/stringtable.xml
+++ b/addons/laser_selfdesignate/stringtable.xml
@@ -4,7 +4,7 @@
Laser Designator On
Lasermarkierer an
- Laser Designador encendido
+ Designador láser encendido
ЛЦУ ВКЛ
Laserový značkovač zapnut
Desygnator laserowy wł.
@@ -15,7 +15,7 @@
Laser Designator Off
Lasermarkierer aus
- Laser Designador apagado
+ Designador láser apagado
ЛЦУ ВЫКЛ
Laserový značkovat vypnut
Desygnator laserowy wył.
diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml
index 8fa38e24dd..d63767d982 100644
--- a/addons/laserpointer/stringtable.xml
+++ b/addons/laserpointer/stringtable.xml
@@ -43,7 +43,7 @@
<t color='#9cf953'>Użyj: </t>wł./wył. laser
<t color='#9cf953'>Uso: </t>Ativar/Desativar laser
<t color='#9cf953'>Использовать: </t>ВКЛ/ВЫКЛ лазер
- <t color='#9cf953'>Usar: </t>encender/apagar láser
+ <t color='#9cf953'>Usar: </t>Encender/Apagar Láser
<t color='#9cf953'>Használat: </t>Lézer BE/KI kapcsolása
@@ -52,7 +52,7 @@
Laser
Лазер
Laser
- Laser
+ Láser
IR Laser
@@ -60,7 +60,7 @@
Laser IR
ИК-лазер
Laser IR
- Laser IR
+ Láser IR
Switch Laser / IR Laser
@@ -69,7 +69,7 @@
Изменить режим Лазер / ИК-лазер
Changer Laser / Laser IR
Alterna Laser / IR Laser
- Cambiar Laser / Laser IR
+ Cambiar láser / Láser IR
\ No newline at end of file
diff --git a/addons/magazinerepack/stringtable.xml b/addons/magazinerepack/stringtable.xml
index 9ea10924ac..c78f71ef89 100644
--- a/addons/magazinerepack/stringtable.xml
+++ b/addons/magazinerepack/stringtable.xml
@@ -78,7 +78,7 @@
Repacking Finished
Réorganisation terminée
Wiederverpacken Fertig
- Reembalaje finalizado
+ Reorganización finalizada
Перепаковка завершена
Páskování dokončeno
Przepakowywanie zakończone
@@ -89,7 +89,7 @@
Repacking Interrupted
Réorganisation interrompue
Umpacken Unterbrochen
- Reembalaje interrumpido
+ Reorganización interrumpida
Перепаковка прервана
Páskování přerušeno
Przepakowywanie przerwane
@@ -100,7 +100,7 @@
%1 Full and %2 Partial
%1 plein(s) et %2 partiel(s)
%1 Vollständigen und %2 Teilweisen
- %1 Total y %2 Parcial
+ %1 Llenos y %2 Incompletos
%1 полных и %2 неполных
%1 plný a %2 částečně
Pełnych: %1.<br/>Częściowo pełnych: %2.
@@ -108,4 +108,4 @@
%1 pieno e %2 parziale
-
+
\ No newline at end of file
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 9220eb6671..cbd6c98ed8 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -1343,7 +1343,6 @@
He is not in pain
-
Bandaged
Bandé
@@ -1456,7 +1455,7 @@
Load Patient Into
Patient Einladen
- Cargar el paciente en
+ Cargar al paciente en
Załaduj pacjenta
Naložit pacianta do
Погрузить пациента в
@@ -1468,7 +1467,7 @@
Unload Patient
Patient Ausladen
- Descargar el paciente
+ Descargar al paciente
Wyładuj pacjenta
Vyložit pacienta
Выгрузить пациента
@@ -1479,7 +1478,7 @@
Unload patient
- Descargar el paciente
+ Descargar al paciente
Выгрузить пациента
Wyładuj pacjenta
Débarquer le patient
@@ -1488,7 +1487,7 @@
Load patient
- Cargar el paciente en
+ Cargar al paciente en
Погрузить пациента
Załaduj pacjenta
Embarquer le patient
@@ -1533,7 +1532,7 @@
%1 has given an IV
- %1 has puesto una IV
+ %1 ha puesto una IV
%1 провел переливание
%1 podał IV
%1 a administré une IV
diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml
index 91d83646b4..53c47314d8 100644
--- a/addons/microdagr/stringtable.xml
+++ b/addons/microdagr/stringtable.xml
@@ -237,7 +237,7 @@
Toggle MicroDAGR Display Mode
MicoDAGR Anzeigemodus Wechseln
- Conmutar modo de pantalla del MicroDAGR
+ Cambiar modo de pantalla del MicroDAGR
Сменить режим показа MicroDAGR
Przełącz GUI MicroDAGR
Basculer le mode d'affichage MicroDAGR
@@ -279,4 +279,4 @@
Chiudi MicroDAGR
-
+
\ No newline at end of file
diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index 59a80df0dc..e6dc35a964 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -4,7 +4,7 @@
Advanced Missile Guidance
- Avanzada Misiles Orientación
+ Guía de Misiles Avanzada
Guidage avancé de missile
Zaawansowane naprowadzanie rakiet
Erweitertes Raketenlenksystem
@@ -17,11 +17,11 @@
Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types.
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.
- 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.
+ 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 sistema requerido para armas de tipo misil.
Hydra-70 DAGR Missile
-
+ Misil Hydra-70 DAGR
Hydra-70 DAGR
Hydra-70 DAGR
Hydra-70 DAGR Rackete
@@ -33,7 +33,7 @@
DAGR
-
+ DAGR
DAGR
DAGR
DAGR
@@ -45,7 +45,7 @@
Hydra-70 DAGR Laser Guided Missile
-
+ Misil guiado por láser Hydra-70 DAGR
Missile à guidage Hydra-70 DAGR
Laserowo naprowadzana rakieta Hydra-70 DAGR
Hydra-70 DAGR lasergelenkte Rakete
@@ -57,7 +57,7 @@
Hellfire II AGM-114K Missile
-
+ Misil Hellfire II AGM-114K
Hellfire II AGM-114K
Hellfire II AGM-114K
Hellfire II AGM-114K
@@ -69,7 +69,7 @@
AGM-114K
-
+ AGM-114K
AGM-114K
AGM-114K
AGM-114K
@@ -81,7 +81,7 @@
Hellfire II AGM-114K Laser Guided Missile
-
+ Misil guiado por láser Hellfire II AGM-114K
Missile à guidage laser Hellfire II AGM-114K
Laserowo naprowadzana rakieta Hellfire II AGM-114K
Hellfire II AGM-114K Lasergelenkte Rakete
diff --git a/addons/nametags/stringtable.xml b/addons/nametags/stringtable.xml
index e224ce61e4..db6c44256f 100644
--- a/addons/nametags/stringtable.xml
+++ b/addons/nametags/stringtable.xml
@@ -27,7 +27,7 @@
Show player name only on cursor (requires player names)
Pokaż imiona graczy tylko pod kursorem (wymagana opcja Pokaż imiona graczy)
- Mostrar nombres solo en el cursor (requiere Mostrar nombres de jugadores)
+ Mostrar nombres de jugadores solo al apuntarles (requiere Mostrar nombres de jugadores)
Zeige Spielernamen nur an, wenn die Maus auf sie gerrichtet ist (benötigt Spielernamen)
Noms uniquement sous le curseur (si noms affichés)
Zobrazit jméno hráče jenom na kurzor (vyžaduje jména hráčů)
@@ -39,7 +39,7 @@
Show player name only on keypress (requires player names)
Spielernamen nur auf Tastendruck anzeigen (benötigt Spielernamen)
- Mostrar nombres solo al pulsar (requiere Mostrar nombres de jugadores)
+ Mostrar nombres solo al pulsar la tecla(requiere Mostrar nombres de jugadores)
Noms uniquement sur pression de la touche (si noms affichés)
Zobrazit jména hráčů jen na klávesu (vyžaduje jména hráčů)
Pokaż imiona graczy tylko po przytrzymaniu klawisza (wymagana opcja Pokaż imiona graczy)
@@ -104,4 +104,4 @@
Colore nametag di default (membri non del gruppo)
-
+
\ No newline at end of file
diff --git a/addons/nightvision/stringtable.xml b/addons/nightvision/stringtable.xml
index a2e24d79df..4ba86aa4d2 100644
--- a/addons/nightvision/stringtable.xml
+++ b/addons/nightvision/stringtable.xml
@@ -10,7 +10,7 @@
Gogle noktowizyjne (Gen1)
Óculos de visão noturna (Gen1)
ПНВ (Gen1)
- Sistema de visión nocturna (Gen1)
+ Gafas de visión nocturna (Gen1)
Éjjellátó szemüveg (1. Gen.)
@@ -22,7 +22,7 @@
Gogle noktowizyjne (Gen2)
Óculos de visão noturna (Gen2)
ПНВ (Gen2)
- Sistema de visión nocturna (Gen2)
+ Gafas de visión nocturna (Gen2)
Éjjellátó szemüveg (2. Gen.)
@@ -34,7 +34,7 @@
Gogle noktowizyjne (Gen3)
Óculos de visão noturna (Gen3)
ПНВ (Gen3)
- Sistema de visión nocturna (Gen3)
+ Gafas de visión nocturna (Gen3)
Éjjellátó szemüveg (3. Gen.)
@@ -46,7 +46,7 @@
Gogle noktowizyjne (Gen3, brązowe)
Óculos de visão noturna (Gen3, marrons)
ПНВ (Gen3, коричневый)
- Sistema de visión nocturna (Gen3, marrón)
+ Gafas de visión nocturna (Gen3, marrón)
Éjjellátó szemüveg (3. Gen., barna)
@@ -58,7 +58,7 @@
Gogle noktowizyjne (Gen3, zielone)
Óculos de visão noturna (Gen3, verdes)
ПНВ (Gen3, зеленый)
- Sistema de visión nocturna (Gen3, verde)
+ Gafas de visión nocturna (Gen3, verde)
Éjjellátó szemüveg (3. Gen., zöld)
@@ -70,7 +70,7 @@
Gogle noktowizyjne (Gen3, czarne)
Óculos de visão noturna (Gen3, pretos)
ПНВ (Gen3, черный)
- Sistema de visión nocturna (Gen3, negro)
+ Gafas de visión nocturna (Gen3, negro)
Éjjellátó szemüveg (3. Gen., fekete)
@@ -82,13 +82,13 @@
Gogle noktowizyjne (Gen4)
Óculos de visão noturna (Gen4)
ПНВ (Gen4)
- Sistema de visión nocturna (Gen4)
+ Gafas de visión nocturna (Gen4)
Éjjellátó szemüveg (4. Gen.)
NV Goggles (Wide)
NS-Brille (Weitwinkel)
- Sistema de visión nocturna (Panorámicas)
+ Gafas de visión nocturna (Panorámicas)
Gogle noktowizyjne (panoramiczne)
Noktovizor (Širokoúhlý)
ПНВ (Широкоугольный)
diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index bc8d6dcdec..2ef75b9bf2 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -119,7 +119,7 @@
-Wymaga najnowszej wersji CBA A3 . Odwied nas na Facebook | YouTube | Twitter | Reddit
+Wymaga najnowszej wersji CBA A3 . Odwiedź nas na Facebook | YouTube | Twitter | Reddit
-**ACE3** to efekt wsplnego wysiku grup moderw odpowiedzialnych za **ACE2**, **AGM** oraz **CSE** w celu zwikszenia realizmu i autentycznoci Arma 3.
+**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 cakowicie **otwarty rdowo** i wszelki wkad w rozwj jest mile widziany. Moesz bez przeszkd prowadzi swoj wasn dostosowan wersj, o ile zmiany jakie wprowadzisz bd otwarte dla publiki zgodnie z GNU General Public License ([GPLv2](https://github.com/acemod/ACE3/blob/master/LICENSE)).
+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 moduowo**, dziki temu prawie kady dostarczony plik PBO moe zosta atwo usunity z konfiguracji. Dziki temu, grupa moe prowadzi wasn, dostosowan do siebie, wersj ACE wyczajc elementy, ktrych nie potrzebuj, lub ktre po prostu nie dziaaj z innymi addonami. Moduy same w sobie np. system medyczny, posiadaj wiele moliwoci konfiguracji, pozwalajc mission designerom dostosowa oglne dowiadczenie z gry.
+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.
-### Gwne cechy
-* Cakowicie nowy system akcji/interakcji 3D
+### Główne cechy
+* Całkowicie nowy system akcji/interakcji 3D
* Wydajna i niezawodna struktura
-* Skupienie na moduowoci i customizacji
-* Elastyczny system ustawie i konfiguracji opcji u klienta i serwera
-* Ulepszony system medyczny z rnymi stopniami zaawansowania (podstawowy/rozszerzony) skupiony na grywalnoci i realizmowi
-* Prawidowa i spjna synchronizowana pogoda
+* 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
-* Moliwo brania jecw
-* Rozszerzony system adunkw wybuchowych, wczajc w to uycie rnego rodzaju zapalnikw
-* Ulepszenia mapy - stawianie markerw i przybory mapy
+* 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
-* Przeciganie i przenoszenie
-* Realistyczne nazwy pojazdw i broni
-* System kontroli ognia (SKO) dla pojazdw opancerzonych oraz migowcw
+* 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 podcinienia
+* Symulacja strefy backblastu i podciśnienia
* Jednorazowe wyrzutnie
-* Realistyczne siy G
-* Zamykanie pojazdw na kluczyk
+* Realistyczne siły G
+* Zamykanie pojazdów na kluczyk
* Realistyczne tryby termowizji oraz noktowizji
-* Przepakowywanie magazynkw
+* Przepakowywanie magazynków
* Realistyczna mechanika przegrzewania broni
-* Symulacja guchoty bitewnej (tymczasowej utraty suchu)
+* Symulacja głuchoty bitewnej (tymczasowej utraty słuchu)
* Ulepszona fizyka ragdoll
-* Ulepszona interakcja dla asystentw i amunicyjnych
+* Ulepszona interakcja dla asystentów i amunicyjnych
* Regulowane celowniki snajperskie
-* Usunite animacje bezczynnoci z opuszczon broni
-* Usunite gosy awatara gracza
-* Skakanie przez przeszkody, wspinanie si na ciany i przecinanie potw
-* Urzdzenia Vector, MicroDAGR, Kestrel
-***i wiele wiele wicej...***
+* 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
+***i wiele wiele więcej...***
### Poradniki i instrukcje
-Jeeli zainstalowae ACE3 lecz masz problem ze zrozumieniem jak to wszystko dziaa, lub gdzie zacz, zacznij od przeczytania tego:
+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)
-#### Wsppraca
-Moesz pomc w rozwoju addonu szukajc potencjalnych bugw w naszym kodzie, lub zgaszajc nowe funkcje. Aby wnie swj wkad do ACE, po prostu zforkuj to repozytorium na swoje konto GitHub i zgo swoje pull requesty do przegldu przez innych wsppracownikw. Pamitaj, aby doda siebie do listy autorw kadego PBO jakie edytujesz oraz do pliku ['AUTHORS.txt'](https://github.com/acemod/ACE3/blob/master/AUTHORS.txt) dodajc take swj adres e-mail.
+#### 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.
-Uywaj naszego [Issue Tracker-a](https://github.com/acemod/ACE3/issues) aby zgasza bugi, proponowa nowe funkcje lub sugerowa zmiany do aktualnie istniejcych. Zobacz take:
-* [Jak zgosi bug-a](http://ace3mod.com/wiki/user/how-to-report-an-issue.html)
-* [Jak zgosi feature request-a](http://ace3mod.com/wiki/user/how-to-make-a-feature-request.html)
+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 pomc nam w testowaniu najnowszych zmian rozwojowych, pobierz nasz master branch ([bezporednio](https://github.com/acemod/ACE3/archive/master.zip), lub [korzystajc z git](https://help.github.com/articles/fetching-a-remote/)), a nastpnie z testowego build-a:
-* [Konfiguracja rodowiska do testw](http://ace3mod.com/wiki/development/setting-up-the-development-environment.html) intrukcja krok-po-kroku jak poprawnie ustawi i zbudowa wersj ACE do celw testowych.
\ No newline at end of file
+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.
\ No newline at end of file
From 8ac6f61fcf6cf863f034373a5e205f155edcd595 Mon Sep 17 00:00:00 2001
From: simon84
Date: Tue, 28 Apr 2015 00:36:37 +0200
Subject: [PATCH 061/478] added some translations
added some translations
---
addons/ballistics/stringtable.xml | 82 +++++++++++++++++++++++++-
addons/interact_menu/stringtable.xml | 5 ++
addons/medical/stringtable.xml | 10 +++-
addons/missileguidance/stringtable.xml | 1 +
addons/mk6mortar/stringtable.xml | 32 +++++-----
addons/optionsmenu/stringtable.xml | 3 +-
addons/realisticnames/stringtable.xml | 30 +++++++++-
7 files changed, 144 insertions(+), 19 deletions(-)
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 4dc27fd2fc..0cd0ea0df2 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -574,6 +574,7 @@
Chargeur 9x19mm 16Cps
Cargador de 16 balas de 9x19mm
Магазин из 16-ти 9х19 мм
+ 9x19mm 20-Schuss-Magazin
9x19mm
@@ -581,6 +582,7 @@
9x19mm
9x19mm
9х19 мм
+ 9x19mm
9x19mm 30Rnd Mag
@@ -588,6 +590,7 @@
9x19mm 30Cps
Cargador de 16 balas de 9x19mm
Магазин из 16-ти 9х19 мм
+ 9x19mm 30-Schuss-Magazin
9x19mm 30Rnd Mag
@@ -595,6 +598,7 @@
9x19mm 30Cps
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
+ 9x19mm 30-Schuss-Magazin
9x19mm
@@ -602,6 +606,7 @@
9x19mm
9x19mm
9х19 мм
+ 9x19mm
9x19mm 30Rnd Mag
@@ -609,6 +614,7 @@
9x19mm 30Cps
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
+ 9x19mm 30-Schuss-Magazin
7.62x54mm 10Rnd Tracer IR-DIM Mag
@@ -616,6 +622,7 @@
Chargeur 7.62x54mm 10Rnd Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
+ 7,62x54 10-Schuss-Magazin IR-DIM Leuchtspur
7.62mm IR-DIM
@@ -623,6 +630,7 @@
7.62mm IR-DIM
7.62mm IR-DIM
7,62 мм ИК-трассирующие
+ 7,62x54 IR-DIM
7.62x54mm 10Rnd Tracer IR-DIM Mag
@@ -630,6 +638,7 @@
Chargeur 7.62x54mm 10Cps Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
+ 7,62x54 10-Schuss-Magazin IR-DIM Leuchtspur
6.5mm 100Rnd Tracer IR-DIM Mag
@@ -637,6 +646,7 @@
Chargeur 6.5mm 100Rnd Traçante IR-DIM
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
+ 6,5mm 100-Schuss-Magazin IR-DIM Leuchtspur
6.5mm IR-DIM
@@ -644,6 +654,7 @@
6.5mm IR-DIM
6.5mm IR-DIM
6,5 мм ИК-трассирующие
+ 6,5mm IR-DIM
6.5mm 100Rnd Tracer IR-DIM Mag<br />Rounds: 100<br />Used in: MX LSW
@@ -651,6 +662,7 @@
Chargeur 6.5mm 100Rnd Traçante IR-DIM
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
+ 6,5mm 100-Schuss-Magazin IR-DIM Leuchtspur<br />Schuss: 100<br />Verwendet für: MXLSW
6.5mm 200Rnd Tracer IR-DIM Belt
@@ -658,6 +670,7 @@
Bande 6.5mm 200Rnd Traçante IR-DIM
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
+ 6,5mm 200-Schuss-Gurt IR-DIM Leuchtspur
6.5mm IR-DIM
@@ -665,6 +678,7 @@
6.5mm IR-DIM
6.5mm IR-DIM
6,5 мм ИК-трассирующие
+ 6,5mm IR-DIM
6.5mm 200Rnd Tracer IR-DIM Belt<br />Rounds: 200<br />Used in: Stoner 99 LMG
@@ -672,6 +686,7 @@
Bande 6.5mm 200Cps Traçante IR-DIM
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
+ 6,5mm 200-Schuss-Gurt IR-DIM Leuchtspur<br />Schuss: 200<br />Verwendet für: Stoner 99 LMG
5.56mm 30Rnd Mag (Mk262)
@@ -679,6 +694,7 @@
5.56mm 30Cps (Mk262)
Cargador de 30 balas de 5.56mm (Mk262)
Магазин из 30-ти 5.56 мм Mk262
+ 5,56mm 30-Schuss-Magazin (Mk262)
5.56mm Mk262
@@ -686,6 +702,7 @@
5.56mm Mk262
5.56mm Mk262
5,56 мм Mk262
+ 5,56mm Mk262
Caliber: 5.56x45 mm NATO (Mk262)<br />Rounds: 30
@@ -693,6 +710,7 @@
Calibre: 5.56x45 mm NATO (Mk262)<br />Cartouches: 30
Calibre: 5.56x45 mm NATO (Mk262)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk262)<br />Патронов: 30
+ Kaliber: 5,56x45mm NATO (Mk262)<br />Schuss: 30
5.56mm 30Rnd Mag (Mk318)
@@ -700,6 +718,7 @@
5.56mm 30Cps (Mk318)
Cargador de 30 balas de 5.56mm (Mk318)
Магазин из 30-ти 5.56 мм (Mk318)
+ 5,56mm 30-Schuss-Magazin (Mk318)
5.56mm Mk318
@@ -707,6 +726,7 @@
5.56mm Mk318
5.56mm Mk318
5.56 мм Mk318
+ 5,56mm Mk318
Caliber: 5.56x45 mm NATO (Mk318)<br />Rounds: 30
@@ -714,6 +734,7 @@
Calibre: 5.56x45 mm NATO (Mk318)<br />Cartouches: 30
Calibre: 5.56x45 mm NATO (Mk318)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk318)<br />Патронов: 30
+ Kaliber: 5,56x45mm NATO (Mk318)<br />Schuss: 30
5.56mm 30Rnd Mag (M995 AP)
@@ -721,6 +742,7 @@
5.56mm 30Cps (M995 AP)
Cargador de 30 balas de 5.56mm (M995 AP)
Магазин из 30-ти 5.56 мм (M995 AP)
+ 5,56mm 30-Schuss-Magazin (M995AP)
5.56mm AP
@@ -728,6 +750,7 @@
5.56mm AP
5.56mm AP
5.56 мм AP
+ 5,56mm AP
Caliber: 5.56x45 mm NATO (M995 AP)<br />Rounds: 30
@@ -735,6 +758,7 @@
Calibre: 5.56x45 mm NATO (M995 AP)<br />Cartouches: 30
Calibre: 5.56x45 mm NATO (M995 AP)<br />Balas: 30
Калибр: 5,56x45 мм NATO (M995 AP)<br />Патронов: 30
+ Kaliber: 5,56x45mm NATO (M995 AP)<br />Schuss: 30
7.62mm 10Rnd Mag (M118LR)
@@ -742,6 +766,7 @@
7.62mm 10Cps (M118LR)
Cargador de 10 balas de 7.62mm (M118LR)
Магазин из 10-ти 7,62 мм (M118LR)
+ 7,62mm 10-Schuss-Magazin (M118LR)
7.62mm M118LR
@@ -749,6 +774,7 @@
7.62mm M118LR
7.62mm (M118LR)
7,62 мм M118LR
+ 7,62mm M118LR
Caliber: 7.62x51 mm NATO (M118LR)<br />Rounds: 10
@@ -756,6 +782,7 @@
Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 10
+ Kaliber: 7,62x51mm NATO (M118LR)<br />Schuss: 10
7.62mm 20Rnd Mag (M118LR)
@@ -763,6 +790,7 @@
7.62mm 20Cps (M118LR)
Cargador de 20 balas de 7.62mm (M118LR)
Магазин из 20-ти 7,62 мм (M118LR)
+ 7,62mm 20-Schuss-Magazin (M118LR)
7.62mm M118LR
@@ -770,6 +798,7 @@
7.62mm M118LR
7.62mm (M118LR)
7,62 мм M118LR
+ 7,62mm M118LR
Caliber: 7.62x51 mm NATO (M118LR)<br />Rounds: 20
@@ -777,6 +806,7 @@
Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 20
+ Kaliber: 7,62x51mm NATO (M118LR)<br />Schuss: 20
7.62mm 10Rnd Mag (Mk316 Mod 0)
@@ -784,6 +814,7 @@
7.62mm 10Cps (Mk316 Mod 0)
Cargador de 10 balas de 7.62mm (Mk316 Mod 0)
Магазин из 10-ти 7,62 мм (Mk316 Mod 0)
+ 7,62mm 10-Schuss-Magazin (Mk316 Mod 0)
7.62mm Mk316
@@ -791,6 +822,7 @@
7.62mm Mk316
7.62mm Mk316
7,62 мм Mk316
+ 7.62mm Mk316
Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 10
@@ -798,6 +830,7 @@
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 10
+ Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Schuss: 10
7.62mm 20Rnd Mag (Mk316 Mod 0)
@@ -805,6 +838,7 @@
7.62mm 20Cps (Mk316 Mod 0)
Cargador de 20 balas de 7.62mm (Mk316 Mod 0)
Магазин из 20-ти 7,62 мм (Mk316 Mod 0)
+ 7.62mm 20-Schuss-Magazin (Mk316 Mod 0)
7.62mm Mk316
@@ -812,6 +846,7 @@
7.62mm Mk316
7.62mm Mk316
7,62 мм Mk316
+ 7.62mm Mk316
Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 20
@@ -819,6 +854,7 @@
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 20
+ Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Schuss: 20
7.62mm 10Rnd Mag (Mk319 Mod 0)
@@ -826,6 +862,7 @@
7.62mm 10Cps (Mk319 Mod 0)
Cargador de 10 balas de 7.62mm (Mk319 Mod 0)
Магазин из 10-ти 7,62 мм (Mk319 Mod 0)
+ 7,62mm 10-Schuss-Magazin (Mk319 Mod 0)
7.62mm Mk319
@@ -833,6 +870,7 @@
7.62mm Mk319
7.62mm Mk319
7,62mm Mk319
+ 7.62mm Mk319
Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 10
@@ -840,6 +878,7 @@
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 10
+ Kaliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Schuss: 10
7.62mm 20Rnd Mag (Mk319 Mod 0)
@@ -847,6 +886,7 @@
7.62mm 20Cps (Mk319 Mod 0)
Cargador de 20 balas de 7.62mm (Mk319 Mod 0)
Магазин из 20-ти 7,62 мм (Mk319 Mod 0)
+ 7,62mm 20-Schuss-Magazin (Mk319 Mod 0)
7.62mm Mk319
@@ -854,6 +894,7 @@
7.62mm Mk319
7.62mm Mk319
7,62 мм Mk319
+ 7.62mm Mk319
Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 20
@@ -861,6 +902,7 @@
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 20
+ Kaliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Schuss: 20
7.62mm 10Rnd Mag (M993 AP)
@@ -868,6 +910,7 @@
7.62mm 10Cps (M993 AP)
Cargador de 10 balas de 7.62mm (M993 AP)
Магазин из 10-ти 7,62 мм (M993 AP)
+ 7,62mm 10-Schuss-Magazin (M993 AP)
7.62mm AP
@@ -875,6 +918,7 @@
7.62mm AP
7.62mm AP
7,62mm AP
+ 7,62mm AP
Caliber: 7.62x51 mm NATO (M993 AP)<br />Rounds: 10
@@ -882,6 +926,7 @@
Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 10
+ Kaliber: 7.62x51 mm NATO (M993 AP)<br />Schuss: 10
7.62mm 20Rnd Mag (M993 AP)
@@ -889,6 +934,7 @@
7.62mm 20Cps (M993 AP)
Cargador de 20 balas de 7.62mm (M993 AP)
Магазин из 20-ти 7,62 мм (M993 AP)
+ 7,62mm 20-Schuss-Magazin (M993 AP)
7.62mm AP
@@ -896,6 +942,7 @@
7.62mm AP
7.62mm AP
7,62 мм AP
+ 7,62mm AP
Caliber: 7.62x51 mm NATO (M993 AP)<br />Rounds: 20
@@ -903,13 +950,15 @@
Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20
-
+ Kaliber: 7.62x51 mm NATO (M993 AP)<br />Schuss: 20
+
7.62mm 20Rnd Mag (Mk248 Mod 0)
Magazynek 7,62mm 20rd (Mk248 Mod 0)
7.62mm 20Cps (Mk248 Mod 0)
Cargador de 20 balas de 7.62mm (Mk248 Mod 0)
Магазин из 20-ти 7,62 мм (Mk248 Mod 0)
+ 7,62mm 20-Schuss-Magazin (Mk248 Mod 0)
7.62mm (Mk248 Mod 0)
@@ -917,6 +966,7 @@
7.62mm (Mk248 Mod 0)
7.62mm (Mk248 Mod 0)
7,62 мм (Mk248 Mod 0)
+ 7,62mm (Mk248 Mod 0)
Caliber: 7.62x67 mm NATO (Mk248 Mod 0)<br />Rounds: 20
@@ -924,6 +974,7 @@
Calibre: 7.62x67mm NATO (Mk248 Mod 0)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Mk248 Mod 0)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 0)<br />Патронов: 20
+ Kaliber: 7.62x51 mm NATO (Mk248 Mod 0)<br />Schuss: 20
7.62mm 20Rnd Mag (Mk248 Mod 1)
@@ -931,6 +982,7 @@
7.62mm 20Cps (Mk248 Mod 1)
Cargador de 20 balas de 7.62mm (Mk248 Mod 1)
Магазин из 20-ти 7,62 мм (Mk248 Mod 1)
+ 7,62mm 20-Schuss-Magazin (Mk248 Mod 1)
7.62mm (Mk248 Mod 1)
@@ -938,6 +990,7 @@
7.62mm (Mk248 Mod 1)
7.62mm (Mk248 Mod 1)
7,62 мм (Mk248 Mod 1)
+ 7,62mm (Mk248 Mod 1)
Caliber: 7.62x67 mm NATO (Mk248 Mod 1)<br />Rounds: 20
@@ -945,6 +998,7 @@
Calibre: 7.62x67mm NATO (Mk248 Mod 1)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Mk248 Mod 1)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 1)<br />Патронов: 20
+ Kaliber: 7.62x51 mm NATO (Mk248 Mod 1)<br />Schuss: 20
7.62mm 20Rnd Mag (Berger Hybrid OTM)
@@ -952,6 +1006,7 @@
7.62 20Cps (Berger Hybrid OTM)
Cargador de 20 balas de 7.62mm (Berger Hybrid OTM)
Магазин из 20-ти 7,62 мм (Berger Hybrid OTM)
+ 7,62mm 20-Schuss-Magazin (Berger Hybrid OTM)
7.62mm (OTM)
@@ -959,6 +1014,7 @@
7.62mm (OTM)
7.62mm (OTM)
7,62 мм (OTM)
+ 7,62mm (OTM)
Caliber: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Rounds: 20
@@ -966,6 +1022,7 @@
Calibre: 7.62x67mm NATO (Berger Hybrid OTM)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Berger Hybrid OTM)<br />Патронов: 20
+ Kaliber: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Schuss: 20
6.5x47mm 30Rnd Mag (HPBT Scenar)
@@ -973,6 +1030,7 @@
Cargador de 30 balas de 6.5x47mm (HPBT Scenar)
Magazynek 6,5x47 mm 30rd (HPBT Scenar)
Магазин из 30-ти 6,5x47 мм (HPBT Scenar)
+ 6,5x47mm 30-Schuss-Magazin (HPBT Scenar)
6.5mm Lapua
@@ -980,6 +1038,7 @@
6.5mm Lapua
6,5mm Lapua
6,5 мм Lapua
+ 6,5 Lapua
Caliber: 6.5x47mm (HPBT Scenar)<br />Rounds: 30<br />Used in: MXM
@@ -987,10 +1046,12 @@
Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30
Kaliber: 6,5x47 mm (HPBT Scenar)<br />Pociski: 30
Калибр: 6,5x47 мм (HPBT Scenar)<br />Патронов: 30
+ Kaliber: 6,5x47 mm (HPBT Scenar)<br />Schuss: 30<br />Verwendet für: MXM
6.5mm Creedmor 30Rnd Mag
Magazynek 6,5mm Creedmor 30rd
+ 6,5mm Creedmor 30-Schuss-Magazin
6.5mm CM
@@ -998,10 +1059,12 @@
6.5mm CM
6,5mm CM
6,5 мм CM
+ 6,5mm CM
Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM
Kaliber: 6,5mm Creedmor<br />Pociski: 30<br />Używany w: MXM
+ Kaliber: 6,5x47 mm Creedmor<br />Schuss: 30<br />Verwendet für: MXM
.338 10Rnd Mag (300gr Sierra MatchKing HPBT)
@@ -1009,6 +1072,7 @@
Cargador de 10 balas de 8.6x70mm (300gr Sierra MatchKing HPBT)
Magazynek .338 10rd (300gr Sierra MatchKing HPBT)
Магазин из 10-ти .338 (300 гран Sierra MatchKing HPBT)
+ .338 10-Schuss-Magazin (300gr Sierra MatchKing HPBT)
.338 (HPBT)
@@ -1016,6 +1080,7 @@
.338 (HPBT)
.338 (HPBT)
.338 (HPBT)
+ .338 (HPBT)
Caliber: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Rounds: 10
@@ -1023,6 +1088,7 @@
Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Balas: 10
Kaliber: 8,6x70 mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10
Калибр: .338 (300 гран Sierra MatchKing HPBT)<br />Патронов: 10
+ Kaliber: 8,6x70 mm (300gr Sierra MatchKing HPBT)<br />Schuss: 10
.338 10Rnd Mag (API526)
@@ -1030,6 +1096,7 @@
Cargador de 10 balas de .338 (API526)
Magazynek .338 10rd (API526)
Магазин из 10-ти .338 (API526)
+ .338 10-Schuss-Magazin (API526)
.338 AP
@@ -1037,6 +1104,7 @@
.338 AP
.338 AP
.338 бронебойные
+ .338 (AP)
Caliber: 8.6x70mm (API526)<br />Rounds: 10
@@ -1044,6 +1112,7 @@
Calibre: 8.6x70mm (API526)<br />Balas: 10
Kaliber: 8,6x70 mm (API526)<br />Pociski: 10
Калибр: .338 (API526)<br />Патронов: 10
+ Kaliber: 8,6x70 mm (API526)<br />Schuss: 10
12.7x99mm 5Rnd Mag
@@ -1051,6 +1120,7 @@
Cargador de 5 balas de 12.7x99mm
Magazynek 12,7x99 mm 5rd
Магазин из 5-ти 12,7x99 мм
+ 12,7x99mm 5-Schuss-Magazin
12.7mm
@@ -1058,6 +1128,7 @@
12.7mm
12,7mm
12,7 мм
+ 12,7mm
Caliber: 12.7x99mm<br />Rounds: 5
@@ -1065,24 +1136,28 @@
Calibre: 12.7x99mm<br />Balas: 5
Kaliber: 12,7x99 mm<br />Pociski: 5
Калибр: 12,7x99 мм<br />Патронов: 5
+ Kaliber: 12,7x99mm<br />Schuss: 5
12.7x99mm API 5Rnd Mag
12.7x99mm API 5Cps
Cargador de 5 balas de 12.7x99mm API
Magazynek 12,7x99mm API 5rd
+ 12,7x99mm 5-Schuss-Magazin (API)
12.7mm API
12.7mm API
12.7mm API
12,7mm API
+ 12,7mm API
Caliber: 12.7x99mm API<br />Rounds: 5
Calibre: 12.7x99mm API<br />Cartouches: 5
Calibre: 12.7x99mm API<br />Balas: 5
Kaliber: 12,7x99 mm API<br />Pociski: 5
+ Kaliber:12,7x99mm API<br />Schuss: 5
12.7x99mm 5Rnd Mag (AMAX)
@@ -1090,6 +1165,7 @@
Cargador de 5 balas de 12.7x99mm (AMAX)
Magazynek 12,7x99 mm 5rd (AMAX)
Магазин из 5-ти 12,7x99 мм (A-MAX)
+ 12,7x99mm 5-Schuss-Magazin (AMAX)
12.7mm
@@ -1097,6 +1173,7 @@
12.7mm
12,7mm
12,7 мм
+ 12,7mm
Caliber: 12.7x99mm (AMAX)<br />Rounds: 5
@@ -1104,6 +1181,7 @@
Calibre: 12.7x99mm (AMAX)<br />Balas: 5
Kaliber: 12,7x99 mm (AMAX)<br />Pociski: 5
Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5
+ Kaliber:12,7x99mm (AMAX)<br />Schuss: 5
-
+
\ No newline at end of file
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index 48ee00f475..8b4a594026 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -18,6 +18,7 @@
Toujours afficher le curseur pour les interactions
Mostra sempre il cursore per le interazioni
Zawsze wyświetlaj kursor dla interakcji
+ Immer den Cursor für Fremd-Interaktionen anzeigen
Interaction - Shadow Max
Interakcja - Cień max
Interaction - Ombre Max
+ Interaktionstextschatten Max
Interaction - Shadow Min
Interakcja - Cień min
Interaction - Ombre Min
+ Interaktionstextschatten Min
\ No newline at end of file
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index ec6b3aa374..491511092e 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -1084,6 +1084,7 @@
Personal Aid Kit for in field stitching or advanced treatment
W znacznym stopniu poprawia stan pacjenta
Полевая аптчека для продвинутого лечения и зашивания ран
+ Persönliches Verbandspäckchen zum ambulanten Nähen und fortgeschrittener Behandlung.
Use Personal Aid Kit
@@ -1423,30 +1424,37 @@
Patient %1<br/>is %2.<br/>%3.<br/>%4
Пациент %1<br/>%2.<br/>%3.<br/>%4
+ Patient %1<br/>ist %2.<br/>%3.<br/>%4
alive
жив
+ lebendig
dead
мертв
+ tot
He's lost some blood
Есть кровопотеря
+ Er hat etwas Blut verloren
He hasn't lost blood
Нет кровопотери
+ Er hat kein Blut verloren
He is in pain
Испытывает боль
+ Er hat Schmerzen
He is not in pain
Не испытывает боли
+ Er hat keine Schmerzen
Bandaged
@@ -1942,4 +1950,4 @@
Перелом
-
+
\ No newline at end of file
diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index e0923981f3..791e7c1c30 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -17,6 +17,7 @@
Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types.
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.
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.
+ Das Erweiterte Raketenlenksystem, auch AMG genannt, bietet viele Verbesserungen zum Aufschalten und Feuern mittels gelenkten Raketen.
Hydra-70 DAGR Missile
diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml
index 19d68d8eb1..465585b9f0 100644
--- a/addons/mk6mortar/stringtable.xml
+++ b/addons/mk6mortar/stringtable.xml
@@ -1,17 +1,21 @@
-
-
- 82mm Rangetable
-
-
- Range Table for the MK6 82mm Mortar
-
-
- Open 82mm Rangetable
-
-
- Charge
-
-
+
+
+ 82mm Rangetable
+ 82mm Distanztabelle
+
+
+ Range Table for the MK6 82mm Mortar
+ Distanztabelle für den Mk6 82mm Mortar
+
+
+ Open 82mm Rangetable
+ Öffne 82mm Distanztabelle
+
+
+ Charge
+ Ladung
+
+
\ No newline at end of file
diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index cdbdcf72a0..8a86563690 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -218,6 +218,7 @@
Menu option: taille de l'UI
Skalowanie UI menu ustawień
Opción de escalado del menú UI
+ UI Skalierung
-
+
\ No newline at end of file
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index 5e9aaa701d..2d189568f8 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -1487,6 +1487,7 @@
Noreen "Bad News" ULR
Noreen "Bad News" ULR
Noreen "Bad News" ULR
+ Noreen "Bad News" ULR
Noreen "Bad News" ULR (Black)
@@ -1494,6 +1495,7 @@
Noreen "Bad News" ULR (Noir)
Noreen "Bad News" ULR (Negro)
Noreen "Bad News" ULR (черный)
+ Noreen "Bad News" ULR (Schwarz)
Noreen "Bad News" ULR (Camo)
@@ -1501,6 +1503,7 @@
Noreen "Bad News" ULR (Camo)
Noreen "Bad News" ULR (Camuflaje)
Noreen "Bad News" ULR (камо)
+ Noreen "Bad News" ULR (Camo)
Noreen "Bad News" ULR (Sand)
@@ -1508,6 +1511,7 @@
Noreen "Bad News" ULR (Beige)
Noreen "Bad News" ULR (Arena)
Noreen "Bad News" ULR (песочный)
+ Noreen "Bad News" ULR (Sand)
SIG 556
@@ -1516,6 +1520,7 @@
SIG 556
SIG 556
SIG 556
+ SIG 556
SIG 556 (Black)
@@ -1524,6 +1529,7 @@
SIG 556 (Negro)
SIG 556 (черный)
SIG 556 (czarny)
+ SIG 556 (Schwarz)
SIG 556 (Khaki)
@@ -1532,6 +1538,7 @@
SIG 556 (Caqui)
SIG 556 (хаки)
SIG 556 (khaki)
+ SIG 556 (Khaki)
SIG 556 (Sand)
@@ -1540,6 +1547,7 @@
SIG 556 (Arena)
SIG 556 (песочный)
SIG 556 (piaskowy)
+ SIG 556 (Sand)
SIG 556 (Camo)
@@ -1548,6 +1556,7 @@
SIG 556 (Camuflaje)
SIG 556 (камо)
SIG 556 (kamuflaż)
+ SIG 556 (Camo)
SIG 556 (Woodland)
@@ -1556,6 +1565,7 @@
SIG 556 (Bosque)
SIG 556 (лесной)
SIG 556 (leśny)
+ SIG 556 (Woodland)
SIG 556 (provisional) spotter
@@ -1564,6 +1574,7 @@
SIG 556 (provisional) observador
SIG 556 (provisional) корректировщик
SIG 556 (prowizoryczny) obserwator
+ SIG 556 (provisorisch) Beobachter
ASP-1 Kir
@@ -1571,6 +1582,7 @@
ASP-1 Kir
ASP-1 Kir
ASP-1 Kir
+ ASP-1 Kir
ASP-1 Kir (Black)
@@ -1578,6 +1590,7 @@
ASP-1 Kir (Noir)
ASP-1 Kir (Negro)
ASP-1 Kir (черный)
+ ASP-1 Kir (Schwarz)
ASP-1 Kir (Tan)
@@ -1585,6 +1598,7 @@
ASP-1 Kir (Tan)
ASP-1 Kir (Tan)
ASP-1 Kir (бронзовый)
+ ASP-1 Kir (Hellbraun)
Cyrus
@@ -1592,6 +1606,7 @@
Cyrus
Cyrus
Cyrus
+ Cyrus
Cyrus (Black)
@@ -1599,6 +1614,7 @@
Cyrus (Noir)
Cyrus (Negro)
Cyrus (черный)
+ Cyrus (Schwarz)
Cyrus (Hex)
@@ -1606,6 +1622,7 @@
Cyrus (Hex)
Cyrus (Hex)
Cyrus (гекс)
+ Cyrus (Hex)
Cyrus (Tan)
@@ -1613,6 +1630,7 @@
Cyrus (Tan)
Cyrus (Tan)
Cyrus (бронза)
+ Cyrus (Hellbraun)
M14
@@ -1621,6 +1639,7 @@
M14
M14
M14
+ M14
M14 (Camo)
@@ -1629,6 +1648,7 @@
M14 (Camuflaje)
M14 (Камо)
M14 (kamuflaż)
+ M14 (Camo)
M14 (Olive)
@@ -1637,6 +1657,7 @@
M14 (Oliva)
M14 (Олива)
M14 (oliwkowy)
+ M14 (Olive)
HK121
@@ -1644,6 +1665,7 @@
HK121
HK121
HK121
+ HK121
HK121 (Hex)
@@ -1651,6 +1673,7 @@
HK121 (Hex)
HK121 (Hex)
HK121 (гекс)
+ HK121 (Hex)
HK121 (Tan)
@@ -1658,6 +1681,7 @@
HK121 (Tan)
HK121 (Tan)
HK121 (бронза)
+ HK121 (Hellbraun)
LWMMG
@@ -1666,6 +1690,7 @@
LWMMG
LWMMG
LWMMG
+ LWMMG
LWMMG (MTP)
@@ -1674,6 +1699,7 @@
LWMMG (MTP)
LWMMG (MTP)
LWMMG (MTP)
+ LWMMG (MTP)
LWMMG (Black)
@@ -1682,6 +1708,7 @@
LWMMG (Negro)
LWMMG (Черный)
LWMMG (czarny)
+ LWMMG (Schwarz)
LWMMG (Sand)
@@ -1690,6 +1717,7 @@
LWMMG (Arena)
LWMMG (Песочный)
LWMMG (piaskowy)
+ LWMMG (Sand)
-
+
\ No newline at end of file
From f8b8d7dd165eae627550c949e4b78def6af1bf99 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Tue, 28 Apr 2015 00:08:28 -0500
Subject: [PATCH 062/478] Set Lock on postInit so spawned vehicles are set
---
addons/vehiclelock/CfgEventHandlers.hpp | 23 ++++++++
addons/vehiclelock/CfgVehicles.hpp | 57 ++++++++++++-------
addons/vehiclelock/XEH_preInit.sqf | 1 +
addons/vehiclelock/config.cpp | 4 ++
.../functions/fnc_handleVehicleInitPost.sqf | 39 +++++++++++++
.../vehiclelock/functions/fnc_moduleInit.sqf | 23 +-------
.../functions/fnc_onOpenInventory.sqf | 2 +-
7 files changed, 105 insertions(+), 44 deletions(-)
create mode 100644 addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf
diff --git a/addons/vehiclelock/CfgEventHandlers.hpp b/addons/vehiclelock/CfgEventHandlers.hpp
index cf704d000c..85db25d4a0 100644
--- a/addons/vehiclelock/CfgEventHandlers.hpp
+++ b/addons/vehiclelock/CfgEventHandlers.hpp
@@ -15,3 +15,26 @@ class Extended_InventoryOpened_EventHandlers {
};
};
};
+class Extended_InitPost_EventHandlers {
+ class CAManBase {
+ class ADDON {
+ serverInit = QUOTE(_this call FUNC(handleUnitInitPost));
+ };
+ };
+ class Car {
+ class ADDON {
+ serverInit = QUOTE(_this call FUNC(handleVehicleInitPost));
+ };
+ };
+ class Tank {
+ class ADDON {
+ serverInit = QUOTE(_this call FUNC(handleVehicleInitPost));
+ };
+ };
+ class Helicopter {
+ class ADDON {
+ serverInit = QUOTE(_this call FUNC(handleVehicleInitPost));
+ };
+ };
+};
+
diff --git a/addons/vehiclelock/CfgVehicles.hpp b/addons/vehiclelock/CfgVehicles.hpp
index 65ad0568d6..94bcf34317 100644
--- a/addons/vehiclelock/CfgVehicles.hpp
+++ b/addons/vehiclelock/CfgVehicles.hpp
@@ -1,50 +1,65 @@
#define MACRO_LOCK_ACTIONS \
- class ACE_MainActions { \
+ class ACE_SelfActions { \
class ACE_unlockVehicle { \
displayName = "$STR_ACE_Vehicle_Action_UnLock"; \
- distance = 4; \
condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(2,3)]}); \
statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,false)])] call EFUNC(common,targetEvent)); \
- showDisabled = 0; \
priority = 0.3; \
icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \
}; \
class ACE_lockVehicle { \
displayName = "$STR_ACE_Vehicle_Action_Lock"; \
- distance = 4; \
condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(0,1)]}); \
statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,true)])] call EFUNC(common,targetEvent)); \
- showDisabled = 0; \
priority = 0.2; \
icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \
}; \
class ACE_lockpickVehicle { \
displayName = "$STR_ACE_Vehicle_Action_Lockpick"; \
- distance = 4; \
condition = QUOTE([ARR_3(_player, _target, 'canLockpick')] call FUNC(lockpick)); \
statement = QUOTE([ARR_3(_player, _target, 'startLockpick')] call FUNC(lockpick)); \
- showDisabled = 0; \
priority = 0.1; \
}; \
+ }; \
+ class ACE_Actions { \
+ class ACE_MainActions { \
+ class ACE_unlockVehicle { \
+ displayName = "$STR_ACE_Vehicle_Action_UnLock"; \
+ distance = 4; \
+ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(2,3)]}); \
+ statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,false)])] call EFUNC(common,targetEvent)); \
+ priority = 0.3; \
+ icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \
+ }; \
+ class ACE_lockVehicle { \
+ displayName = "$STR_ACE_Vehicle_Action_Lock"; \
+ distance = 4; \
+ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(0,1)]}); \
+ statement = QUOTE([ARR_3('VehicleLock_SetVehicleLock', [_target], [ARR_2(_target,true)])] call EFUNC(common,targetEvent)); \
+ priority = 0.2; \
+ icon = QUOTE(PATHTOF(UI\key_menuIcon_ca.paa)); \
+ }; \
+ class ACE_lockpickVehicle { \
+ displayName = "$STR_ACE_Vehicle_Action_Lockpick"; \
+ distance = 4; \
+ condition = QUOTE([ARR_3(_player, _target, 'canLockpick')] call FUNC(lockpick)); \
+ statement = QUOTE([ARR_3(_player, _target, 'startLockpick')] call FUNC(lockpick)); \
+ priority = 0.1; \
+ }; \
+ }; \
};
class CfgVehicles {
class LandVehicle;
class Car: LandVehicle {
- class ACE_Actions {
- MACRO_LOCK_ACTIONS
- };
+ MACRO_LOCK_ACTIONS
};
class Tank: LandVehicle {
- class ACE_Actions {
- MACRO_LOCK_ACTIONS
- };
+ MACRO_LOCK_ACTIONS
};
class Air;
class Helicopter: Air {
- class ACE_Actions {
- MACRO_LOCK_ACTIONS
- };
+ MACRO_LOCK_ACTIONS
};
class Logic;
@@ -55,7 +70,7 @@ class CfgVehicles {
author = "$STR_ACE_Common_ACETeam";
category = "ACE";
displayName = "Vehicle Lock Setup";
- function = QUOTE(DFUNC(moduleInit));
+ function = QFUNC(moduleInit);
scope = 2;
isGlobal = 0;
icon = QUOTE(PATHTOF(UI\Icon_Module_VehicleLock_ca.paa));
@@ -67,9 +82,9 @@ class CfgVehicles {
typeName = "BOOL";
defaultValue = 0;
};
- class SetLockState {
- displayName = "Set Lock State"; // Argument label
- description = "Set lock state for all vehicles on map at start"; // Tooltip description
+ class VehicleStartingLockState {
+ displayName = "Vehicle Starting Lock State"; // Argument label
+ description = "Set lock state for all vehicles (removes ambiguous lock states)"; // Tooltip description
typeName = "NUMBER"; // Value type, can be "NUMBER", "STRING" or "BOOL"
class values {
class None {name = "As Is"; value = 0; default = 1;};
@@ -93,7 +108,7 @@ class CfgVehicles {
author = "$STR_ACE_Common_ACETeam";
category = "ACE";
displayName = "Vehicle Key Assign";
- function = QUOTE(DFUNC(moduleSync));
+ function = QFUNC(moduleSync);
scope = 2;
isGlobal = 0;
icon = QUOTE(PATHTOF(UI\Icon_Module_VehicleKey_ca.paa));
diff --git a/addons/vehiclelock/XEH_preInit.sqf b/addons/vehiclelock/XEH_preInit.sqf
index bdab28fc75..18a7062c24 100644
--- a/addons/vehiclelock/XEH_preInit.sqf
+++ b/addons/vehiclelock/XEH_preInit.sqf
@@ -4,6 +4,7 @@ ADDON = false;
PREP(addKeyForVehicle);
PREP(getVehicleSideKey);
+PREP(handleVehicleInitPost);
PREP(hasKeyForVehicle);
PREP(lockpick);
PREP(moduleInit);
diff --git a/addons/vehiclelock/config.cpp b/addons/vehiclelock/config.cpp
index 248a1e7ca0..608a892b45 100644
--- a/addons/vehiclelock/config.cpp
+++ b/addons/vehiclelock/config.cpp
@@ -20,6 +20,10 @@ class ACE_Settings {
class GVAR(LockVehicleInventory) {
value = 0;
typeName = "BOOL";
+ };
+ class GVAR(VehicleStartingLockState) {
+ value = -1;
+ typeName = "SCALAR";
};
};
diff --git a/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf b/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf
new file mode 100644
index 0000000000..df875b1859
--- /dev/null
+++ b/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf
@@ -0,0 +1,39 @@
+/*
+ * Author: PabstMirror
+ * Function for sync module. Assigns keys for all synced vehicles to any players that are synced.
+ *
+ * Arguments:
+ * 0: Vehicle
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [car] call ACE_VehicleLock_fnc_handleVehicleInitPost
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+PARAMS_1(_vehicle);
+
+if (!isServer) exitWith {};
+if (GVAR(VehicleStartingLockState) == -1) exitWith {};
+
+[{
+ private ["_lock"];
+ PARAMS_1(_vehicle);
+ if ((_vehicle isKindOf "Car") || {_vehicle isKindOf "Tank"} || {_vehicle isKindOf "Helicopter"}) then {
+ //set lock state (eliminates the ambigious 1-"Default" and 3-"Locked for Player" states)
+ _lock = switch (GVAR(VehicleStartingLockState)) do {
+ case (0): {(locked _vehicle) in [2, 3]};
+ case (1):{true};
+ case (2):{false};
+ };
+ if (((_lock) && {(locked _vehicle) != 2}) || {(!_lock) && {(locked _vehicle) != 0}}) then {
+ TRACE_3("Setting Lock State",_lock,(typeOf _vehicle),_vehicle);
+ ["VehicleLock_SetVehicleLock", [_vehicle], [_vehicle, _lock]] call EFUNC(common,targetEvent);
+ };
+ };
+ //Delay call until mission start (so everyone has the eventHandler's installed)
+}, [_vehicle], 0.25, 0.25] call EFUNC(common,waitAndExecute);
\ No newline at end of file
diff --git a/addons/vehiclelock/functions/fnc_moduleInit.sqf b/addons/vehiclelock/functions/fnc_moduleInit.sqf
index c26e8aacbd..510b8ec7be 100644
--- a/addons/vehiclelock/functions/fnc_moduleInit.sqf
+++ b/addons/vehiclelock/functions/fnc_moduleInit.sqf
@@ -17,8 +17,6 @@
*/
#include "script_component.hpp"
-private ["_sideKeysAssignment", "_setLockState", "_lock"];
-
PARAMS_3(_logic,_syncedUnits,_activated);
if (!_activated) exitWith {WARNING("Vehicle Lock Init Module - placed but not active");};
@@ -27,23 +25,4 @@ if (!isServer) exitWith {};
//Set the GVAR for default lockpick strength
[_logic, QGVAR(DefaultLockpickStrength), "DefaultLockpickStrength"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(LockVehicleInventory), "LockVehicleInventory"] call EFUNC(common,readSettingFromModule);
-
-_setLockState = _logic getVariable["SetLockState", 0];
-[{
- PARAMS_1(_setLockState);
- {
- if ((_x isKindOf "Car") || {_x isKindOf "Tank"} || {_x isKindOf "Helicopter"}) then {
- //set lock state (eliminates the ambigious 1-"Default" and 3-"Locked for Player" states)
- _lock = switch (_setLockState) do {
- case (0): {(locked _x) in [2, 3]};
- case (1):{true};
- case (2):{false};
- };
- if (((_lock) && {(locked _x) != 2}) || {(!_lock) && {(locked _x) != 0}}) then {
- TRACE_3("Setting Lock State", _lock, (typeOf _x), _x);
- ["VehicleLock_SetVehicleLock", [_x], [_x, _lock]] call EFUNC(common,targetEvent);
- };
- };
- } forEach vehicles;
- //Delay call until mission start (so everyone has the eventHandler's installed)
-}, [_setLockState], 0.25, 0.25] call EFUNC(common,waitAndExecute);
+[_logic, QGVAR(VehicleStartingLockState), "VehicleStartingLockState"] call EFUNC(common,readSettingFromModule);
diff --git a/addons/vehiclelock/functions/fnc_onOpenInventory.sqf b/addons/vehiclelock/functions/fnc_onOpenInventory.sqf
index 65c3068dce..8199f4b850 100644
--- a/addons/vehiclelock/functions/fnc_onOpenInventory.sqf
+++ b/addons/vehiclelock/functions/fnc_onOpenInventory.sqf
@@ -34,7 +34,7 @@ if (GVAR(LockVehicleInventory) && //if setting not enabled
playSound "ACE_Sound_Click";
//don't open the vehicles inventory
_handeled = true;
- //Just opens a dummy groundContainer
+ //Just opens a dummy groundContainer (so the player can still see their own inventory)
ACE_player action ["Gear", objNull];
};
From 1d434949de5bc25952c725ddeeb90a8f1f1a0a08 Mon Sep 17 00:00:00 2001
From: NukeDev
Date: Tue, 28 Apr 2015 17:46:35 +0200
Subject: [PATCH 063/478] Some Italian Translation's Changes
---
addons/common/stringtable.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml
index de10a60893..49cdba1583 100644
--- a/addons/common/stringtable.xml
+++ b/addons/common/stringtable.xml
@@ -380,7 +380,7 @@
Set the desired location of the progress bar on your screen.
Setze die gewünschte Position der Fortschrittsanzeige fest.
Seleccionar la ubicación deseada de la barra de progreso en tu pantalla
- Modifica la posizione su schermo della barra di avanzamento.
+ Modifica la posizione della barra di avanzamernto sullo schermo
Установите желаемое положение строки состояния на экране.
Ustaw pożądaną lokalizację paska postępu na ekranie
Appliquer la position de la barre de progression sur l'écran
@@ -391,7 +391,7 @@
Hint Background color
Hintergrundfarbe der Hinweise
Color de fondo de las notificaciones
- Sfondo dei Suggerimenti
+ Colore di sfondo dei Suggerimenti
Цвет фона всплывающих подсказок
Kolor tła powiadomień
Notification: couleur de l'arrière plan
@@ -413,7 +413,7 @@
Hint text font color
Textfarbe der Hinweise
Color del texto de las notificaciones
- Testo dei Suggerimenti
+ Il colore del Testo dei Suggerimenti
Цвет шрифта всплывающих подсказок
Kolor tekstu powiadomień
Notification: couleur du texte
@@ -424,7 +424,7 @@
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.
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.
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.
- 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.
+ 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.
Цвет шрифта текста всплывающих подсказок АСЕ. Этот цвет является стандартным для всего текста, транслирующегося через систему подсказок АСЕ, если не установлено другого цвета для текста подсказок.
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.
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
@@ -447,7 +447,7 @@
Die Bananen (Musa) sind eine Pflanzengattung in der Familie der Bananengewächse (Musaceae) innerhalb der Einkeimblättrigen Pflanzen (Monokotyledonen).
Una banana es una fruta comestible, botanicamente una baya, producida por varios tipos de grandes plantas herbáceas del género Musa.
Banán je protáhlé ovoce a plod banánovníku (epigeická bobule).
- 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.
+ 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.
Банан - это съедобный фрукт, ягода с ботанической точки зрения, произрастающий на нескольких видах травянистых растениях рода Банан (Musa).
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.
Rodzaj roślin z rodziny bananowatych, obejmujący około 80 gatunków.<br />Przedstawiciele są typowymi przedstawicielami flory międzyzwrotnikowej Azji, Afryki i Australii.<br />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.
From b5524fb3eee275106a0b85b0638f6fc7a7cc9575 Mon Sep 17 00:00:00 2001
From: Josuan Albin
Date: Tue, 28 Apr 2015 18:00:09 +0200
Subject: [PATCH 064/478] French pass
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
---
AUTHORS.txt | 1 +
addons/aircraft/stringtable.xml | 6 +-
addons/atragmx/stringtable.xml | 3 +-
addons/dragging/stringtable.xml | 4 +-
addons/explosives/stringtable.xml | 6 +-
addons/medical/stringtable.xml | 79 +++++++++++++++++++++++---
addons/missileguidance/stringtable.xml | 3 +-
addons/mk6mortar/stringtable.xml | 7 ++-
addons/realisticnames/stringtable.xml | 24 ++++----
9 files changed, 101 insertions(+), 32 deletions(-)
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 17ae9dd7c0..415598e188 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -30,6 +30,7 @@ ACCtomeek
Adanteh
aeroson
Aggr094
+Alganthe
Anthariel
BlackQwar
Brakoviejo
diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml
index 57fecc2a44..3a67e11449 100644
--- a/addons/aircraft/stringtable.xml
+++ b/addons/aircraft/stringtable.xml
@@ -29,7 +29,7 @@
Open Cargo Door
Laderampe öffnen
Abrir compuerta de carga
- Ourvir rampe cargo
+ Ourvir la rampe
Otwórz drzwi ładowni
Otevřít nákladní prostor
Rakodórámpa nyitása
@@ -40,7 +40,7 @@
Close Cargo Door
Laderampe schließen
Cerrar compuerta de carga
- Fermer rampe cargo
+ Fermer la rampe
Zamknij drzwi ładowni
Zavřít nákladní prostor
Rakodórámpa zárása
@@ -48,4 +48,4 @@
Chiudi la porta del cargo
-
+
\ No newline at end of file
diff --git a/addons/atragmx/stringtable.xml b/addons/atragmx/stringtable.xml
index f3825c405a..f6bafa7762 100644
--- a/addons/atragmx/stringtable.xml
+++ b/addons/atragmx/stringtable.xml
@@ -27,6 +27,7 @@
Защищенный КПК с ATragMX
PDA rugerizada con ATragMX
Robuster PDA mit ATragMX
+ PDA robuste avec ATragMX
Open ATragMX
@@ -37,4 +38,4 @@
ATragMX öffnen
-
+
\ No newline at end of file
diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml
index 521ab87006..b53816e796 100644
--- a/addons/dragging/stringtable.xml
+++ b/addons/dragging/stringtable.xml
@@ -7,7 +7,7 @@
Arrastrar
Ciągnij
Táhnout
- Tracter
+ Trainer
Ziehen
Arrastar
Trascina
@@ -50,4 +50,4 @@
Нести
-
+
\ No newline at end of file
diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml
index 8e941b1f2a..c6e386468c 100644
--- a/addons/explosives/stringtable.xml
+++ b/addons/explosives/stringtable.xml
@@ -42,7 +42,7 @@
Sprengstoffcode: %1
Código del explosivo: %1
Kod ładunku: %1
- Code explosif: %1
+ Code de l'explosif: %1
Kód výbušniny: %1
Robbanóanyag kódja: %1
Código do explosivo: %1
@@ -222,7 +222,7 @@
Löschen
Borrar
Usuń
- Désamorçé
+ Effacer
Čistý
Libera
Törlés
@@ -502,4 +502,4 @@
Raccogli
-
+
\ No newline at end of file
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 9f1c9e4b4d..ed8568a717 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -5,23 +5,27 @@
INJURIES
VERLETZUNGEN
ТРАВМЫ
+ BLESSURES
No injuries on this bodypart ...
Körperteil nicht verletzt ...
Данная часть тела не повреждена ...
+ Aucune blessures sur cette partie du corps
Litter Simulation Detail
Detale zużytych medykamentów
Detalle de simulación de basura
Количество мусора от медицины
+ Niveau de simulation des détritus
Litter simulation detail level sets the number of litter items which will be locally spawned in the client. Excessive amounts in local areas could cause FPS lag, so this is a client only setting.
Opcja ta ustawia liczbę zużytych medykamentów, jakie pojawiają się lokalnie wokół gracza. Ich zbyt duża ilość może spowodować spadki FPS, dlatego jest to ustawienie tylko po stronie klienta.
Detalle simulación de basura establece el número de artículos de basura que se generan a nivel local en el cliente. Las cantidades excesivas en áreas locales podrían causar caída de rendimiento, así que esto es un ajuste de cliente únicamente.
Устанавливает количество мусора, который появляется после использования мед. препаратов. Большое количество мусора может уменьшить производительность, поэтому данная настройка локальна для клиента.
+ Le nieau de simulation des détritus règle la quantité de déchets qui vont être créer localement dans le client. Des quantitées excessive dans certaines zones locales aurait pu causer des chutes D'IPS, donc c'est une option client uniquement.
Inject Atropine
@@ -53,7 +57,7 @@
Wstrzyknij morfinę
Aplikovat morfin
Ввести морфин
- Morphine
+ Injecter de la morphine
Morfium beadása
Injetar Morfina
Inietta Morfina
@@ -340,7 +344,7 @@
Проверить пульс
Zkontrolovat pulz
Sprawdź tętno
- Vérifier les pulsations
+ Vérifier le pouls
Pulzus ellenőrzése
Controlla il polso
@@ -370,6 +374,7 @@
No entries on this triage card.
Keine Einträge auf der Triagekarte
Нет записей.
+ Aucune entrée sur cette carte de triage
Tourniquet
@@ -378,7 +383,7 @@
Жгут
Škrtidlo
Staza
- Garrot
+ Tourniquet
Érszorító
Laccio emostatico
@@ -389,7 +394,7 @@
Снять жгут
Sundat škrtidlo
Zdejmij stazę
- Enlever le garrot
+ Enlever le Tourniquet
Érszorító leszedése
Rimuovi laccio emostatico
@@ -397,21 +402,25 @@
Diagnose
Diagnose
Диагностика
+ Diagnostiquer
Diagnosing ...
Diagnostizieren ...
Диагностика ...
+ Diagnostic en cours
CPR
HLW
Сердечно-легочная реанимация
+ RPC
Performing CPR ...
HLW durchführen ...
Сердечно-легочная реанимация ...
+ RPC en cours
Give Blood IV (1000ml)
@@ -518,7 +527,7 @@
Menor
Несрочная помощь
Normalny
- Léger
+ Mineur
Minimální
Enyhe
Minore
@@ -649,7 +658,7 @@
Tourniquet [CAT]
Жгут
Torniquete [CAT]
- Garrot [CAT]
+ Tourniquet [CAT]
Staza [typ. CAT]
Škrtidlo [CAT]
Érszorító [CAT]
@@ -763,7 +772,7 @@
Tourniquet [CAT]
Жгут
Torniquete (CAT)
- Garrot (CAT)
+ Tourniquet (CAT)
Staza (typ. CAT)
Škrtidlo (CAT)
Érszorító (CAT)
@@ -1064,7 +1073,7 @@
Personal Aid Kit
Аптечка
Botiquín de primeros auxilios
- Équipement de support vital
+ Trousse de premiers soins
Apteczka osobista
Persönliches Verbandpäckchen
Elsősegélycsomag
@@ -1085,11 +1094,13 @@
W znacznym stopniu poprawia stan pacjenta
Полевая аптчека для продвинутого лечения и зашивания ран
Persönliches Verbandspäckchen zum ambulanten Nähen und fortgeschrittener Behandlung.
+ Trousse de premiers soins pour coudre sur le terrain et traitements avancés.
Use Personal Aid Kit
Verbandpäckchen benutzen
Использовать аптечку
+ Utiliser la Trousse de premier soins
Surgical Kit
@@ -1125,6 +1136,7 @@
Use Surgical Kit
Operationsset benutzen
Использовать хирургический набор
+ Utiliser la trousse chirugicale
Bodybag
@@ -1180,6 +1192,7 @@
%1 checked Blood Pressure: %2
%1 kontrollierte Blutdruck: %2
%1 проверил артериальное давление: %2
+ %1 à vérifié la tension: %2
You checked %1
@@ -1255,21 +1268,25 @@
Low
Niedrig
Низкое
+ Faible
Normal
Normal
Нормальное
+ Normale
High
Hoch
Высокое
+ Haute
No Blood Pressure
Kein Blutdruck
Артериальное давление отсутствует
+ Aucune tension
Pulse
@@ -1305,25 +1322,29 @@
%1 checked Heart Rate: %2
%1 kontrollierte Herzfrequenz: %2
%1 проверил пульс: %2
+ %1 à vérifié le rythme cardiaque: %2
Weak
Schwach
Слабый
+ Faible
Normal
Normal
Нормальный
+ Normal
Strong
Stark
Сильный
+ Fort
You find a Heart Rate of %2
- Rythme carquiaque de %2
+ Rythme cardiaque de %2
Пульс %2 уд./мин.
El ritmo cardíaco es de %2
Wyczuwasz tętno o wartości %2
@@ -1425,36 +1446,43 @@
Patient %1<br/>is %2.<br/>%3.<br/>%4
Пациент %1<br/>%2.<br/>%3.<br/>%4
Patient %1<br/>ist %2.<br/>%3.<br/>%4
+ Patient %1<br/>est %2.<br/>%3.<br/>
alive
жив
lebendig
+ vivant
dead
мертв
tot
+ mort
He's lost some blood
Есть кровопотеря
Er hat etwas Blut verloren
+ Il à perdu du sang
He hasn't lost blood
Нет кровопотери
Er hat kein Blut verloren
+ il n'a pas perdu de sang
He is in pain
Испытывает боль
Er hat Schmerzen
+ il souffre
He is not in pain
Не испытывает боли
Er hat keine Schmerzen
+ Il ne souffre pas
Bandaged
@@ -1788,182 +1816,215 @@
Scrape
Kratzer
Ссадина
+ Eraflure
Minor Scrape
Kleiner Kratzer
Малая ссадина
+ Eraflure Mineure
Medium Scrape
Mittlerer Kratzer
Средняя ссадина
+ Moyenne Eraflure
Large Scrape
Großer Kratzer
Большая ссадина
+ Large Eraflure
Avulsion
Avulsion
Рваная рана
+ Avulsion
Minor Avulsion
Kleine Avulsion
Малая рваная рана
+ Avulsion Mineure
Medium Avulsion
Mittlere Avulsion
Средняя рваная рана
+ Avulsion Moyenne
Large Avulsion
Große Avulsion
Большая рваная рана
+ Large Avulsion
Bruise
Prellung
Ушиб
+ Hématome
Minor Bruise
Kleine Prellung
Малый ушиб
+ Hématome Mineur
Medium Bruise
Mittlere Prellung
Средний ушиб
+ Hématome Moyen
Large Bruise
Große Prellung
Большой ушиб
+ Large Hématome
Crushed tissue
Quetschverletzung
Компресионная травма
+ Tissu écrasé
Minor crushed tissue
Kleine Quetschverletzung
Малая компрессионная травма
+ Tissu écrasé Mineur
Medium crushed tissue
Mittlere Quetschverletzung
Средняя компрессионная травма
+ Tissu écrasé Moyen
Large crushed tissue
Große Quetschverletzung
Большая компрессионная травма
+ Tissu écrasé Large
Cut
Schnittwunde
Резаная рана
+ Coupure
Small Cut
Kleine Schnittwunde
Малая резаная рана
Pomniejsza rana cięta
+ Petite Coupure
Medium Cut
Mittlere Schnittwunde
Средняя резаная рана
Średnia rana cięta
+ Moyenne Coupure
Large Cut
Große Schnittwunde
Большая резаная рана
Duża rana cięta
+ Large Coupure
Tear
Riss
Рваная рана
Rozerwanie skóry
+ Déchirure
Small Tear
Kleiner Riss
Малая рваная рана
Pomniejsze rozerwanie skóry
+ Petite Déchirure
Medium Tear
Mittlerer Riss
Средняя рваная рана
Średnie rozerwanie skóry
+ Moyenne Déchirure
Large Tear
Großer Riss
Большая рваная рана
Duże rozerwanie skóry
+ Large Déchirure
Velocity Wound
Ballistisches Trauma
Огнестрельная рана
Rana postrzałowa
+ Blessure de vélocité
Smal Velocity Wound
Kleines Ballistisches Trauma
Малая огнестрельная рана
Pomniejsza rana postrzałowa
+ Petite Bessure de vélocité
Medium Velocity Wound
Mittleres Ballistisches Trauma
Средняя огнестрельная рана
Średnia rana postrzałowa
+ Moyenne Blessure de vélocité
Large Velocity Wound
Großes Ballistisches Trauma
Большая огнестрельная рана
Duża rana postrzałowa
+ Large Blessure de vélocité
Puncture Wound
Stichwunde
Колотая рана
Rana kłuta
+ Blessure de perforation
Minor Puncture Wound
Kleine Stichwunde
Малая колотая рана
Pomniejsza rana kłuta
+ Blessure de perforation Mineure
Medium Puncture Wound
Mittlere Stichwunde
Средняя колотая рана
Średnia rana kłuta
+ Blessure de perforation Moyenne
Large Puncture Wound
Große Stichwunde
Большая колотая рана
Duża rana kłuta
+ Large Blessure de perforation
Broken Femur
Gebrochener Oberschenkelknochen
Перелом
Zkłamana kość udowa
+ Femur Cassé
\ No newline at end of file
diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index 791e7c1c30..6840f11e42 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -18,6 +18,7 @@
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.
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.
Das Erweiterte Raketenlenksystem, auch AMG genannt, bietet viele Verbesserungen zum Aufschalten und Feuern mittels gelenkten Raketen.
+ 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.
Hydra-70 DAGR Missile
@@ -46,7 +47,7 @@
Hydra-70 DAGR Laser Guided Missile
- Missile à guidage Hydra-70 DAGR
+ Missile à guidage laser Hydra-70 DAGR
Laserowo naprowadzana rakieta Hydra-70 DAGR
Hydra-70 DAGR lasergelenkte Rakete
Hydra-70 DAGR laserem naváděná střela
diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml
index 45e2112562..fb330ff0e3 100644
--- a/addons/mk6mortar/stringtable.xml
+++ b/addons/mk6mortar/stringtable.xml
@@ -5,20 +5,25 @@
82mm Rangetable
82mm Distanztabelle
Tabela strzelnicza 82mm
+ table de tir 82mm
Range Table for the MK6 82mm Mortar
Distanztabelle für den Mk6 82mm Mortar
Tabela strzelnicza dla moździerza 82mm MK6
+ Table de tir pour le mortier MK6 82mm
Open 82mm Rangetable
Öffne 82mm Distanztabelle
Otwórz tabelę strzelniczą 82mm
+ ouvrir la table de tir 82mm
Charge
- Ładunek
+ Ladung
+ Charge
+ Ładunek
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index 02f84cbb24..0a072d023e 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -305,7 +305,7 @@
HEMTT médico
HEMTT Medyczny
HEMTT Zdravotnický
- HEMTT Sanitaire
+ HEMTT Médical
HEMTT Медицинский
HEMTT Médico
HEMTT (egészségügyi)
@@ -485,7 +485,7 @@
KamAZ médico
KamAZ Medyczny
KAMAZ Zdravotnický
- KamAZ Sanitaire
+ KamAZ Médical
КамАЗ Медицинский
KamAZ Médico
KamAZ (egészségügyi)
@@ -665,7 +665,7 @@
Typhoon médico
Typhoon Medyczny
Typhoon zdravotnický
- Typhoon Sanitaire
+ Typhoon Médical
Тайфун Медицинский
Typhoon Médico
Typhoon (egészségügyi)
@@ -726,7 +726,7 @@
CH-47I Chinook (nieuzbrojony)
CH-47I Chinook (невооруженный)
CH-47I Chinook (neozbrojený)
- CH-47I Chinook (Neozbrojený)
+ CH-47I Chinook (non-armé)
CH-47I Chinook (fegyvertelen)
@@ -867,7 +867,7 @@
M18A1 Claymore
Mina kierunkowa M18A1 Claymore
Mina Claymore M18A1
- M18A1 Claymore Mine antipersonnel à effet dirigé
+ M18A1 Claymore
M18A1 Клеймор
M18A1 Claymore
M18A1 Claymore akna
@@ -891,7 +891,7 @@
Bloque de demolición M112
Ładunek burzący M112
Výbušná nálož M112
- Pétard M112
+ M112 Block de Démolition
M112 подрывной заряд
M112 Carga de Demolição
M112 romboló tömb
@@ -1011,7 +1011,7 @@
Mina antipersona VS-50
Mina przeciwpiechotna VS-50
Protipěchotní mina VS-50
- VS-50 Mine antipersonnel à pression
+ VS-50 Mine AP
VS-50 Противопехотная мина
VS-50 Mina antipessoal
VS-50 gyalogsági taposóakna
@@ -1023,7 +1023,7 @@
Mina antipersona M26
Mina przeciwpiechotna M26
Šrapnelová mina M26
- M26 Mine antipersonnel bondissante
+ M26 Mine AP bondissante
M26 Противопехотная мина
M26 Mina saltadora antipessoal
M26 gyalogsági ugróakna
@@ -1035,7 +1035,7 @@
Mina antipersona de alambre PMR-3
Mina przeciwpiechotna PMR-3
Nástražná mina PMR-3
- PMR-3 Mine antipersonnel à traction
+ PMR-3 Mine AP à traction
PMR-3 Противопехотная мина
PMR-3 Mina antipessoal (armadilha)
PMR-3 botlódrótos gyalogsági akna
@@ -1136,7 +1136,7 @@
Mini-Spike (PALR)
Mini-Spike (PT)
Mini-Spike (AT)
- Mini-Spike (AT)
+ Mini-Spike (AC)
Mini-Spike (Tankelhárító)
Mini-Spike (AT)
Mini-Spike (AT)
@@ -1156,7 +1156,7 @@
MX (Schwarz)
MX (Czarny)
MX (černý)
- MX ( Noir)
+ MX (Noir)
MX (Fekete)
MX (Negro)
MX (черный)
@@ -1196,7 +1196,7 @@
MX 3GL (Schwarz)
MX 3GL (Czarny)
MX 3GL (černý)
- MX 3 GL (Noir)
+ MX 3GL (Noir)
MX 3GL (Fekete)
MX 3GL (Negro)
MX 3GL (черный)
From bcda77c5c7882caef9d199995ca5ce99a94dbf9b Mon Sep 17 00:00:00 2001
From: Grzegorz Sikora
Date: Tue, 28 Apr 2015 18:03:35 +0200
Subject: [PATCH 065/478] PL translation
---
addons/medical/stringtable.xml | 43 +++++++++++++++++++++++++++
addons/realisticnames/stringtable.xml | 15 ++++++++++
2 files changed, 58 insertions(+)
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 9f1c9e4b4d..4191c00c2e 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -1,15 +1,18 @@
+
INJURIES
VERLETZUNGEN
ТРАВМЫ
+ OBRAŻENIA
No injuries on this bodypart ...
Körperteil nicht verletzt ...
Данная часть тела не повреждена ...
+ Brak obrażeń na tej części ciała ...
Litter Simulation Detail
@@ -370,6 +373,7 @@
No entries on this triage card.
Keine Einträge auf der Triagekarte
Нет записей.
+ Brak wpisów w tej karcie segregacyjnej.
Tourniquet
@@ -397,21 +401,25 @@
Diagnose
Diagnose
Диагностика
+ Diagnoza
Diagnosing ...
Diagnostizieren ...
Диагностика ...
+ Diagnozowanie ...
CPR
HLW
Сердечно-легочная реанимация
+ RKO
Performing CPR ...
HLW durchführen ...
Сердечно-легочная реанимация ...
+ Przeprowadzanie RKO ...
Give Blood IV (1000ml)
@@ -1090,6 +1098,7 @@
Use Personal Aid Kit
Verbandpäckchen benutzen
Использовать аптечку
+ Użyj apteczki osobistej
Surgical Kit
@@ -1125,6 +1134,7 @@
Use Surgical Kit
Operationsset benutzen
Использовать хирургический набор
+ Zszyj rany
Bodybag
@@ -1180,6 +1190,7 @@
%1 checked Blood Pressure: %2
%1 kontrollierte Blutdruck: %2
%1 проверил артериальное давление: %2
+ %1 sprawdził ciśnienie krwi: %2
You checked %1
@@ -1255,21 +1266,25 @@
Low
Niedrig
Низкое
+ Niskie
Normal
Normal
Нормальное
+ Normalne
High
Hoch
Высокое
+ Wysokie
No Blood Pressure
Kein Blutdruck
Артериальное давление отсутствует
+ Brak ciśnienia krwi
Pulse
@@ -1305,21 +1320,25 @@
%1 checked Heart Rate: %2
%1 kontrollierte Herzfrequenz: %2
%1 проверил пульс: %2
+ %1 sprawdził tętno: %2
Weak
Schwach
Слабый
+ Słabe
Normal
Normal
Нормальный
+ Normalne
Strong
Stark
Сильный
+ Silne
You find a Heart Rate of %2
@@ -1425,36 +1444,43 @@
Patient %1<br/>is %2.<br/>%3.<br/>%4
Пациент %1<br/>%2.<br/>%3.<br/>%4
Patient %1<br/>ist %2.<br/>%3.<br/>%4
+ Pacjent %1<br/>jest %2.<br/>%3.<br/>%4
alive
жив
lebendig
+ żywy
dead
мертв
tot
+ martwy
He's lost some blood
Есть кровопотеря
Er hat etwas Blut verloren
+ Stracił trochę krwi
He hasn't lost blood
Нет кровопотери
Er hat kein Blut verloren
+ Nie stracił krwi
He is in pain
Испытывает боль
Er hat Schmerzen
+ Odczuwa ból
He is not in pain
Не испытывает боли
Er hat keine Schmerzen
+ Nie odczuwa bólu
Bandaged
@@ -1788,86 +1814,103 @@
Scrape
Kratzer
Ссадина
+ Draśnięcie
Minor Scrape
Kleiner Kratzer
Малая ссадина
+ Pomniejsze draśnięcie
Medium Scrape
Mittlerer Kratzer
Средняя ссадина
+ Średnie draśnięcie
Large Scrape
Großer Kratzer
Большая ссадина
+ Duże draśnięcie
Avulsion
Avulsion
Рваная рана
+ Rana płatowa
Minor Avulsion
Kleine Avulsion
Малая рваная рана
+ Pomniejsza rana płatowa
Medium Avulsion
Mittlere Avulsion
Средняя рваная рана
+ Średnia rana płatowa
Large Avulsion
Große Avulsion
Большая рваная рана
+ Duża rana płatowa
Bruise
Prellung
Ушиб
+ Stłuczenie
Minor Bruise
Kleine Prellung
Малый ушиб
+ Pomniejsze stłuczenie
Medium Bruise
Mittlere Prellung
Средний ушиб
+ Średnie stłuczenie
Large Bruise
Große Prellung
Большой ушиб
+ Duże stłuczenie
Crushed tissue
Quetschverletzung
Компресионная травма
+ Zgniecienie tkanek miękkich
Minor crushed tissue
Kleine Quetschverletzung
Малая компрессионная травма
+ Pomniejsze zgniecienie tkanek miękkich
Medium crushed tissue
Mittlere Quetschverletzung
Средняя компрессионная травма
+ Średnie zgniecienie tkanek miękkich
Large crushed tissue
Große Quetschverletzung
Большая компрессионная травма
+ Duże zgniecienie tkanek miękkich
Cut
Schnittwunde
Резаная рана
+ Rana cięta
Small Cut
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index 02f84cbb24..b3176de9e3 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -1,4 +1,5 @@
+
@@ -1488,6 +1489,7 @@
Noreen "Bad News" ULR
Noreen "Bad News" ULR
Noreen "Bad News" ULR
+ Noreen "Bad News" ULR
Noreen "Bad News" ULR (Black)
@@ -1496,6 +1498,7 @@
Noreen "Bad News" ULR (Negro)
Noreen "Bad News" ULR (черный)
Noreen "Bad News" ULR (Schwarz)
+ Noreen "Bad News" ULR (czarny)
Noreen "Bad News" ULR (Camo)
@@ -1504,6 +1507,7 @@
Noreen "Bad News" ULR (Camuflaje)
Noreen "Bad News" ULR (камо)
Noreen "Bad News" ULR (Camo)
+ Noreen "Bad News" ULR (kamuflaż)
Noreen "Bad News" ULR (Sand)
@@ -1512,6 +1516,7 @@
Noreen "Bad News" ULR (Arena)
Noreen "Bad News" ULR (песочный)
Noreen "Bad News" ULR (Sand)
+ Noreen "Bad News" ULR (piaskowy)
SIG 556
@@ -1583,6 +1588,7 @@
ASP-1 Kir
ASP-1 Kir
ASP-1 Kir
+ ASP-1 Kir
ASP-1 Kir (Black)
@@ -1591,6 +1597,7 @@
ASP-1 Kir (Negro)
ASP-1 Kir (черный)
ASP-1 Kir (Schwarz)
+ ASP-1 Kir (czarny)
ASP-1 Kir (Tan)
@@ -1599,6 +1606,7 @@
ASP-1 Kir (Tan)
ASP-1 Kir (бронзовый)
ASP-1 Kir (Hellbraun)
+ ASP-1 Kir (Tan)
Cyrus
@@ -1607,6 +1615,7 @@
Cyrus
Cyrus
Cyrus
+ Cyrus
Cyrus (Black)
@@ -1615,6 +1624,7 @@
Cyrus (Negro)
Cyrus (черный)
Cyrus (Schwarz)
+ Cyrus (czarny)
Cyrus (Hex)
@@ -1623,6 +1633,7 @@
Cyrus (Hex)
Cyrus (гекс)
Cyrus (Hex)
+ Cyrus (hex)
Cyrus (Tan)
@@ -1631,6 +1642,7 @@
Cyrus (Tan)
Cyrus (бронза)
Cyrus (Hellbraun)
+ Cyrus (podpalany)
M14
@@ -1666,6 +1678,7 @@
HK121
HK121
HK121
+ HK121
HK121 (Hex)
@@ -1674,6 +1687,7 @@
HK121 (Hex)
HK121 (гекс)
HK121 (Hex)
+ HK121 (hex)
HK121 (Tan)
@@ -1682,6 +1696,7 @@
HK121 (Tan)
HK121 (бронза)
HK121 (Hellbraun)
+ HK121 (podpalany)
LWMMG
From b88618563d90394e8a369fe47738924c322801b3 Mon Sep 17 00:00:00 2001
From: Grzegorz
Date: Tue, 28 Apr 2015 18:05:27 +0200
Subject: [PATCH 066/478] Update stringtable.xml
---
addons/medical/stringtable.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 4191c00c2e..4072521c4c 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -1,5 +1,4 @@
-
@@ -2009,4 +2008,4 @@
Zkłamana kość udowa
-
\ No newline at end of file
+
From feeb897fb6d906f44c5fb060760112e6348946e7 Mon Sep 17 00:00:00 2001
From: Grzegorz
Date: Tue, 28 Apr 2015 18:05:43 +0200
Subject: [PATCH 067/478] Update stringtable.xml
---
addons/realisticnames/stringtable.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index b3176de9e3..e448743e8b 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -1,5 +1,4 @@
-
@@ -1735,4 +1734,4 @@
LWMMG (Sand)
-
\ No newline at end of file
+
From db82df62146a9bdc5f2150284a21e0f590287714 Mon Sep 17 00:00:00 2001
From: NukeDev
Date: Tue, 28 Apr 2015 18:10:35 +0200
Subject: [PATCH 068/478] Italian's Translation's Changes v2
---
addons/explosives/stringtable.xml | 5 +++--
addons/fcs/stringtable.xml | 3 ++-
addons/interact_menu/stringtable.xml | 4 ++++
addons/kestrel4500/stringtable.xml | 1 +
addons/laserpointer/stringtable.xml | 2 ++
addons/logistics_wirecutter/stringtable.xml | 4 +++-
addons/medical/stringtable.xml | 24 ++++++++++-----------
7 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml
index 8e941b1f2a..04b1f1982e 100644
--- a/addons/explosives/stringtable.xml
+++ b/addons/explosives/stringtable.xml
@@ -478,6 +478,7 @@
Detonador de hombre muerto
Dead Man's Switch
Кнопка мертвеца
+ Detonatore a rilascio
Used to remotely trigger explosives when released.
@@ -488,7 +489,7 @@
Utilizado para detonar explosivos remotamente al soltarlo.
Robbanóanyagok távoli robbantásához való, elengedéskor gyújt.
Используется для дистанционного подрыва, после смерти оператора.
- Usato per attivare esplosivi quando rilasciato
+ Usato per attivare esplosivi al momento del rilascio
Pick up
@@ -502,4 +503,4 @@
Raccogli
-
+
\ No newline at end of file
diff --git a/addons/fcs/stringtable.xml b/addons/fcs/stringtable.xml
index 857f511fca..16ed66e078 100644
--- a/addons/fcs/stringtable.xml
+++ b/addons/fcs/stringtable.xml
@@ -10,6 +10,7 @@
Iluminar objetivo / Medir distancia
Подсветить цель / Замерить расстояние
Célpont lézerezése / Távolság Bemérése
+ Misura la distanza
Zeroed To
@@ -72,4 +73,4 @@
СУО обнулен.
-
+
\ No newline at end of file
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index 48ee00f475..8fb98889b1 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -76,21 +76,25 @@
Interaction - Text Max
Interakcja - Tekst max
Interaction -Texte Max
+ Interazioni - Testo Massimo
Interaction - Shadow Max
Interakcja - Cień max
Interaction - Ombre Max
+ Interazioni - Ombra Massima
Interaction - Shadow Min
Interakcja - Cień min
Interaction - Ombre Min
+ Interazioni - Ombra Minima
\ No newline at end of file
diff --git a/addons/kestrel4500/stringtable.xml b/addons/kestrel4500/stringtable.xml
index 2703e34e9f..be46058016 100644
--- a/addons/kestrel4500/stringtable.xml
+++ b/addons/kestrel4500/stringtable.xml
@@ -20,6 +20,7 @@
Station météo portable Kestrel 4500
Kestrel 4500 Pocket Weather Tracker
Kestrel 4500 Taschenwettermessgerät
+ Kestrel 4500 Indicatore Meteorologico Tascabile
Open Kestrel 4500
diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml
index 8fa38e24dd..eb35821ac1 100644
--- a/addons/laserpointer/stringtable.xml
+++ b/addons/laserpointer/stringtable.xml
@@ -53,6 +53,7 @@
Лазер
Laser
Laser
+ Laser
IR Laser
@@ -61,6 +62,7 @@
ИК-лазер
Laser IR
Laser IR
+ Laser IR
Switch Laser / IR Laser
diff --git a/addons/logistics_wirecutter/stringtable.xml b/addons/logistics_wirecutter/stringtable.xml
index 129075f001..f0149f2454 100644
--- a/addons/logistics_wirecutter/stringtable.xml
+++ b/addons/logistics_wirecutter/stringtable.xml
@@ -10,6 +10,7 @@
Štípací kleště
Nożyce do cięcia drutu
Drótvágó
+ Pinze da Taglio
Wirecutter
@@ -20,6 +21,7 @@
Służą do cięcia drutu i płotów
Pince coupante
Drótok, huzalok, és kábelek vágására alkalmas olló.
+ Pinze da Taglio
Cut Fence
@@ -58,4 +60,4 @@
Забор разрезан
-
+
\ No newline at end of file
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index e930016187..8bcd17cef7 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -4,22 +4,26 @@
INJURIES
VERLETZUNGEN
+ LESIONI
No injuries on this bodypart ...
Körperteil nicht verletzt ...
+ Non ci sono lesioni in questa parte del corpo ...
Litter Simulation Detail
Detale zużytych medykamentów
Detalle de simulación de basura
Количество мусора от медицины
+ Dettagli Simulazione Rifiuti
Litter simulation detail level sets the number of litter items which will be locally spawned in the client. Excessive amounts in local areas could cause FPS lag, so this is a client only setting.
Opcja ta ustawia liczbę zużytych medykamentów, jakie pojawiają się lokalnie wokół gracza. Ich zbyt duża ilość może spowodować spadki FPS, dlatego jest to ustawienie tylko po stronie klienta.
Detalle simulación de basura establece el número de artículos de basura que se generan a nivel local en el cliente. Las cantidades excesivas en áreas locales podrían causar caída de rendimiento, así que esto es un ajuste de cliente únicamente.
Устанавливает количество мусора, который появляется после использования мед. препаратов. Большое количество мусора может уменьшить производительность, поэтому данная настройка локальна для клиента.
+ Il livello di dettagli della simulazione dei rifiuti indica il numero di rifiuti che verranno creati localmente nel client. La creazione di troppi rifiuti in aree locali potrebbe causare lag e calo di FPS. Questo è un settaggio client.
Inject Atropine
@@ -367,6 +371,7 @@
No entries on this triage card.
Keine Einträge auf der Triagekarte
+ Nessuna voce sulla Triage Card
Tourniquet
@@ -393,18 +398,22 @@
Diagnose
Diagnose
+ Diagnosi
Diagnosing ...
Diagnostizieren ...
+ Diagnosi in corso...
CPR
HLW
+ RCP
Performing CPR ...
HLW durchführen ...
+ Eseguendo RCP...
Give Blood IV (1000ml)
@@ -688,7 +697,7 @@
Bandage fait d'un matériel spécial utilisé pour couvrir une blessure, qui peut etre appliqué dès que le saignement a été stoppé.
Opatrunek materiałowy, używany do przykrywania ran, zakładany na ranę po zatamowaniu krwawienia.
Egy különleges anyagú kötszer sebek betakarására, amelyet a vérzés elállítása után helyeznek fel.
- Una benda apposta, utilizzata per coprire una ferita, la quale è applicato sopra di essa una volta fermata l'emorragia.
+ Una benda apposita, utilizzata per coprire una ferita, la quale è applicata sopra di essa una volta fermata l'emorragia.
Packing Bandage
@@ -717,7 +726,7 @@
Bandage servant à recouvrir les blessures pour arrêter les hémmoragies et faciliter la guérisson. Recouvrir une blessure est optionnel dans le cas de blessures polytraumatiques
Opatrunek stosowany w celu zatrzymania krwawienia i osłony większych ran.
Egy kötszerfajta, melyet a sebek nyomására használnak a vérzés elállítása és sebgyógyulás érdekében. A nyomókötés egy lehetőség nagyobb polytraumatikus sérülések esetén.
- Un bendaggio usato per bendare ferite con emorragie e facilitare la guarigione. Bendare una ferita è una opzione su ferite di vario tipo.
+ Un bendaggio usato per coprire la ferita, fermare il sanguinamento e facilitarne la guarigione. Questa tecnica è opzionale su ferite multiple.
Ein Verband, um die Wunde abzudecken und die Wundheilung zu fördern. Wunden abdecken ist eine Option bei größeren Polytraumen
@@ -1422,7 +1431,6 @@
He is not in pain
-
Bandaged
Bandé
@@ -1767,7 +1775,6 @@
Large Scrape
Großer Kratzer
-
Avulsion
Avulsion
@@ -1784,7 +1791,6 @@
Large Avulsion
Große Avulsion
-
Bruise
Prellung
@@ -1801,7 +1807,6 @@
Large Bruise
Große Prellung
-
Crushed tissue
Quetschverletzung
@@ -1818,7 +1823,6 @@
Large crushed tissue
Große Quetschverletzung
-
Cut
Schnittwunde
@@ -1835,7 +1839,6 @@
Large Cut
Große Schnittwunde
-
Tear
Riss
@@ -1852,7 +1855,6 @@
Large Tear
Großer Riss
-
Velocity Wound
Ballistisches Trauma
@@ -1869,7 +1871,6 @@
Large Velocity Wound
Großes Ballistisches Trauma
-
Puncture Wound
Stichwunde
@@ -1886,10 +1887,9 @@
Large Puncture Wound
Große Stichwunde
-
Broken Femur
Gebrochener Oberschenkelknochen
-
+
\ No newline at end of file
From 67a4b7ea3010bb4bfe60a7832de509f319b96db7 Mon Sep 17 00:00:00 2001
From: NukeDev
Date: Tue, 28 Apr 2015 18:12:05 +0200
Subject: [PATCH 069/478] Authors.txt
---
AUTHORS.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 17ae9dd7c0..20528a2381 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -49,6 +49,7 @@ Ghost
GieNkoV
gpgpgpgp
Grzegorz
+Gianmarco Varriale (TeamNuke)
Hamburger SV
Harakhti
havena
From 908c204893b1435ffdf33b234ecf2da814cb1a9c Mon Sep 17 00:00:00 2001
From: ulteq
Date: Tue, 28 Apr 2015 18:24:24 +0200
Subject: [PATCH 070/478] Replaced Tabs with Spaces
---
addons/mk6mortar/stringtable.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml
index fb330ff0e3..1dfdd1b470 100644
--- a/addons/mk6mortar/stringtable.xml
+++ b/addons/mk6mortar/stringtable.xml
@@ -5,25 +5,25 @@
82mm Rangetable
82mm Distanztabelle
Tabela strzelnicza 82mm
- table de tir 82mm
+ table de tir 82mm
Range Table for the MK6 82mm Mortar
Distanztabelle für den Mk6 82mm Mortar
Tabela strzelnicza dla moździerza 82mm MK6
- Table de tir pour le mortier MK6 82mm
+ Table de tir pour le mortier MK6 82mm
Open 82mm Rangetable
Öffne 82mm Distanztabelle
Otwórz tabelę strzelniczą 82mm
- ouvrir la table de tir 82mm
+ ouvrir la table de tir 82mm
Charge
Ladung
- Charge
- Ładunek
+ Charge
+ Ładunek
From d0c7a378411dd26d56f7905615c1871b1a9e3090 Mon Sep 17 00:00:00 2001
From: ulteq
Date: Tue, 28 Apr 2015 18:31:14 +0200
Subject: [PATCH 071/478] Minor stringtable fix
---
addons/overheating/stringtable.xml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml
index 4bb91688fa..9699c67ede 100644
--- a/addons/overheating/stringtable.xml
+++ b/addons/overheating/stringtable.xml
@@ -94,15 +94,15 @@
Sostiuisci la canna
- Swapping barrel...
- Lauf wird gewechselt...
- Cambiando el cañón...
- Wymienianie lufy...
+ Swapping barrel ...
+ Lauf wird gewechselt ...
+ Cambiando el cañón ...
+ Wymienianie lufy ...
Vyměňuji hlaveň ...
- Changement du canon...
+ Changement du canon ...
Смена ствола ...
- Cső kicserélése folyamatban...
- Substituindo cano...
+ Cső kicserélése folyamatban ...
+ Substituindo cano ...
Sto sostituendo la canna ...
@@ -118,7 +118,7 @@
Canna sostituita
- Check weapons temperature
+ Check weapon temperature
Temperatur der Waffe prüfen
Verificar temperatura del arma
Sprawdź temperaturę broni
@@ -131,6 +131,7 @@
Check weapon temperature
+ Waffentemperatur prüfen
Verificar temperatura del arma
Sprawdź temperaturę broni
Zkontrolovat teplotu zbraně
From a24466093045acb38a77b862927b094bd773d348 Mon Sep 17 00:00:00 2001
From: simon84
Date: Tue, 28 Apr 2015 19:25:45 +0200
Subject: [PATCH 072/478] German translation fixes
Unified some translations in "ballistics"
e.g. unit mm, Schuss->Patronen, decimal seperator
---
addons/ballistics/stringtable.xml | 110 +++++++++++++++---------------
1 file changed, 55 insertions(+), 55 deletions(-)
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 0cd0ea0df2..3c63557f03 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -5,7 +5,7 @@
6.5mm 30Rnd Tracer IR-DIM Mag
6,5 mm Nyomjelző IR-DIM 30-as Tár
- 6,5 mm 30-Schuss-Magazin Leuchtspur IR-DIM
+ 6,5mm 30-Schuss-Magazin Leuchtspur IR-DIM
Cargador de 30 balas trazadoras IR-DIM de 6,5mm
Ch. 6,5mm 30Cps Traçantes IR-DIM
Magazynek 6,5mm 30rd Smugacz IR-DIM
@@ -29,7 +29,7 @@
Caliber: 6.5x39 mm Tracer IR-DIM<br />Rounds: 30<br />Used in: MX/C/M/SW/3GL
Kaliber: 6,5x39 mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
- Kaliber: 6,5x39 mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
+ Kaliber: 6,5x39mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
Calibre: 6,5x39 mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
Calibre: 6,5x39 mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
Kaliber: 6,5x39 mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
@@ -41,7 +41,7 @@
6.5mm 30Rnd SD Mag
6,5 mm Halk 30-as Tár
- 6,5 mm 30-Schuss-Magazin SD
+ 6,5mm 30-Schuss-Magazin SD
Cargador de 30 balas SD de 6,5mm
Ch. 6,5mm 30Cps SD
Magazynek 6,5mm 30rd SD
@@ -65,7 +65,7 @@
Caliber: 6.5x39 mm SD<br />Rounds: 30<br />Used in: MX/C/M/SW/3GL
Kaliber: 6,5x39 mm Halk<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
- Kaliber: 6,5x39 mm SD<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
+ Kaliber: 6,5x39mm SD<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
Calibre: 6,5x39 mm SD<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
Calibre: 6,5x39 mm SD<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
Kaliber: 6,5x39 mm SD<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
@@ -77,7 +77,7 @@
6.5mm 30Rnd AP Mag
6,5 mm Páncéltörő 30-as Tár
- 6,5 mm 30-Schuss-Magazin AP
+ 6,5mm 30-Schuss-Magazin AP
Cargador de 30 balas AP de 6,5mm
Ch. 6,5mm 30Cps AP
Magazynek 6,5mm 30rd AP
@@ -101,7 +101,7 @@
Caliber: 6.5x39 mm AP<br />Rounds: 30<br />Used in: MX/C/M/SW/3GL
Kaliber: 6,5x39 mm Páncéltörő<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
- Kaliber: 6,5x39 mm AP<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
+ Kaliber: 6,5x39mm AP<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
Calibre: 6,5x39 mm AP<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
Calibre: 6,5x39 mm AP<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
Kaliber: 6,5x39 mm AP<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
@@ -114,7 +114,7 @@
6.5mm 30Rnd Tracer IR-DIM Mag
6,5mm IR-DIM Nyomjelző 30-as Tár
- 6,5 mm 30-Schuss-Magazin Leuchtspur IR-DIM
+ 6,5mm 30-Schuss-Magazin Leuchtspur IR-DIM
Cargador de 30 balas trazadoras IR-DIM de 6,5mm
Ch. 6,5mm 30Cps Traçantes IR-DIM
Magazynek 6,5mm 30rd Smugacz IR-DIM
@@ -138,7 +138,7 @@
Caliber: 6.5x39 mm Tracer IR-DIM<br />Rounds: 30<br />Used in: Katiba
Kaliber: 6,5x39 mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: Katiba
- Kaliber: 6,5x39 mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: Katiba
+ Kaliber: 6,5x39mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: Katiba
Calibre: 6,5x39 mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: Katiba
Calibre: 6,5x39 mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: Katiba
Kaliber: 6,5x39 mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: Katiba
@@ -150,7 +150,7 @@
6.5mm 30Rnd SD Mag
6,5 mm Halk 30-as Tár
- 6,5 mm 30-Schuss-Magazin SD
+ 6,5mm 30-Schuss-Magazin SD
Cargador de 30 balas SD de 6,5mm
Ch. 6,5mm 30Cps SD
Magazynek 6,5mm 30rd SD
@@ -174,7 +174,7 @@
Caliber: 6.5x39 mm SD<br />Rounds: 30<br />Used in: Katiba
Kaliber: 6,5x39 mm Halk<br />Lövedékek: 30<br />Használható: Katiba
- Kaliber: 6,5x39 mm SD<br />Patronen: 30<br />Eingesetzt von: Katiba
+ Kaliber: 6,5x39mm SD<br />Patronen: 30<br />Eingesetzt von: Katiba
Calibre: 6,5x39 mm SD<br />Balas: 30<br />Se usa en: Katiba
Calibre: 6,5x39 mm SD<br />Cartouches: 30<br />Utilisé dans: Katiba
Kaliber: 6,5x39 mm SD<br />Naboje: 30<br />Używane w: Katiba
@@ -186,7 +186,7 @@
6.5mm 30Rnd AP Mag
6,5 mm Páncéltörő 30-as Tár
- 6,5 mm 30-Schuss-Magazin AP
+ 6,5mm 30-Schuss-Magazin AP
Cargador de 30 balas AP de 6,5mm
Ch. 6,5mm 30Cps AP
Magazynek 6,5mm 30rd AP
@@ -210,7 +210,7 @@
Caliber: 6.5x39 mm AP<br />Rounds: 30<br />Used in: Katiba
Kaliber: 6,5x39 mm Páncéltörő<br />Lövedékek: 30<br />Használható: Katiba
- Kaliber: 6,5x39 mm AP<br />Patronen: 30<br />Eingesetzt von: Katiba
+ Kaliber: 6,5x39mm AP<br />Patronen: 30<br />Eingesetzt von: Katiba
Calibre: 6,5x39 mm AP<br />Balas: 30<br />Se usa en: Katiba
Calibre: 6,5x39 mm AP<br />Cartouches: 30<br />Utilisé dans: Katiba
Kaliber: 6,5x39 mm AP<br />Pociski: 30<br />Używane w: Katiba
@@ -223,7 +223,7 @@
5.56mm 30rnd Tracer IR-DIM Mag
5,56 mm Nyomjelző IR-DIM 30-as Tár
- 5,56 mm 30-Schuss-Magazin Leuchtspur IR-DIM
+ 5,56mm 30-Schuss-Magazin Leuchtspur IR-DIM
Cargador de 30 balas trazadoras IR-DIM de 5,56mm
Ch. 5,56mm 30Cps Traçantes IR-DIM
Magazynek 5,56mm 30rd Smugacz IR-DIM
@@ -247,7 +247,7 @@
Caliber: 5.56x45 mm Tracer IR-DIM<br />Rounds: 30<br />Used in: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Kaliber: 5,56x45 mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- Kaliber: 5,56x45 mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Kaliber: 5,56x45mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Calibre: 5,56x45 mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Calibre: 5,56x45 mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Kaliber: 5,56x45 mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
@@ -260,7 +260,7 @@
7.62mm 20rnd Tracer Mag
7,62 mm Nyomjelző IR-DIM 20-as Tár
- 7,62 mm 20-Schuss-Magazin Leuchtspur
+ 7,62mm 20-Schuss-Magazin Leuchtspur
Cargador de 20 balas trazadores de 7,62mm
Ch. 7,62mm 20Cps Traçantes
Magazynek 7,62mm 20rd Smugacz
@@ -284,7 +284,7 @@
Caliber: 7.62x51 mm Tracer<br />Rounds: 20<br />Used in: Mk18 ABR
Kaliber: 7,62x51 mm Nyomjelző<br />Lövedékek: 20<br />Használható: Mk18 ABR
- Kaliber: 7,62x51 mm Leuchtspur<br />Patronen: 20<br />Eingesetzt von: EBR
+ Kaliber: 7,62x51mm Leuchtspur<br />Patronen: 20<br />Eingesetzt von: EBR
Calibre: 7,62x51 mm Trazadora<br />Balas: 20<br />Se usa en: Mk18 ABR
Calibre: 7,62x51 mm Traçantes<br />Cartouches: 20<br />Utilisé dans: EBR
Kaliber: 7,62x51 mm Smugacz<br />Pociski: 20<br />Używane w: Mk18 ABR
@@ -320,7 +320,7 @@
Caliber: 7.62x51 mm Tracer IR-DIM<br />Rounds: 20<br />Used in: Mk18 ABR
Kaliber: 7,62x51 mm Nyomjelző IR-DIM<br />Lövedékek: 20<br />Használható: Mk18 ABR
- Kaliber: 7,62x51 mm Leuchtspur IR-DIM<br />Patronen: 20<br />Eingesetzt von: EBR
+ Kaliber: 7,62x51mm Leuchtspur IR-DIM<br />Patronen: 20<br />Eingesetzt von: EBR
Calibre: 7,62x51 mm Trazadoras IR-DIM<br />Balas: 20<br />Se usa en: Mk18 ABR
Calibre: 7,62x51 mm Traçantes IR-DIM<br />Cartouches: 20<br />Utilisé dans: EBR
Kaliber: 7,62x51 mm Smugacz IR-DIM<br />Pociski: 20<br />Używane w: Mk18 ABR
@@ -332,7 +332,7 @@
7.62mm 20Rnd SD Mag
7,62 mm Halk 20-as Tár
- 7,62 mm 20-Schuss-Magazin SD
+ 7,62mm 20-Schuss-Magazin SD
Cargador de 20 balas SD de 7,62mm
Ch. 7,62mm 20Cps SD
Magazynek 7,62mm 20rd SD
@@ -356,7 +356,7 @@
Caliber: 7.62x51 mm SD<br />Rounds: 20<br />Used in: Mk18 ABR
Kaliber: 7,62x51 mm Halk<br />Lövedékek: 20<br />Használható: Mk18 ABR
- Kaliber: 7,62x51 mm SD<br />Patronen: 20<br />Eingesetzt von: EBR
+ Kaliber: 7,62x51mm SD<br />Patronen: 20<br />Eingesetzt von: EBR
Calibre: 7,62x51 mm SD<br />Balas: 20<br />Se usa en: Mk18 ABR
Calibre: 7,62x51 mm SD<br />Cartouches: 20<br />Utilisé dans: EBR
Kaliber: 7,62x51 mm SD<br />Pociski: 20<br />Używane w: Mk18 ABR
@@ -385,7 +385,7 @@
Caliber: .338 Norma Magnum Tracer<br />Rounds: 130<br />Used in: SPMG
- Kaliber: .338 Norma Magnum Leuchtspur<br />Schuss: 130<br />Verwendet für: SPMG
+ Kaliber: .338 Norma Magnum Leuchtspur<br />Patronen: 130<br />Eingesetzt von: SPMG
Kaliber: .338 Norma Magnum Smugacz<br />Pociski: 130<br />Używany w: SPMG
Calibre: .338 Norma Magnum Traçante<br />Cartouches: 130<br />Utilisé dans: SPMG
Calibre: .338 Norma Magnum trazadora<br />Balas: 130<br />Se usa en: SPMG
@@ -410,7 +410,7 @@
Caliber: .338 Norma Magnum Tracer IR-DIM<br />Rounds: 130<br />Used in: SPMG
- Kaliber: .338 Norma Magnum Leuchtspur IR-DIM<br />Schuss: 130<br />Verwendet für: SPMG
+ Kaliber: .338 Norma Magnum Leuchtspur IR-DIM<br />Patronen: 130<br />Eingesetzt von: SPMG
Kaliber: .338 Norma Magnum Smugacz IR-DIM<br />Pociski: 130<br />Używany w: SPMG
Calibre: .338 Norma Magnum Traçante IR-DIM<br />Cartouches: 130<br />Utilisé dans: SPMG
Calibre: .338 Norma Magnum trazadora IR-DIM<br />Balas: 130<br />Se usa en: SPMG
@@ -435,7 +435,7 @@
Caliber: .338 Norma Magnum AP<br />Rounds: 130<br />Used in: SPMG
- Kaliber: .338 Norma Magnum Hartkern<br />Schuss: 130<br />Verwendet für: SPMG
+ Kaliber: .338 Norma Magnum Hartkern<br />Patronen: 130<br />Eingesetzt von: SPMG
Kaliber: .338 Norma Magnum AP<br />Pociski: 130<br />Używane w: SPMG
Calibre: .338 Norma Magnum AP<br />Cartouches: 130<br />Utilisé dans: SPMG
Calibre: .338 Norma Magnum AP<br />Balas: 130<br />Se usa en: SPMG
@@ -461,7 +461,7 @@
Caliber: 9.3x64mm Tracer<br />Rounds: 10<br />Used in: Cyrus
- Kaliber: 9,3x64mm Leuchtspur<br />Schuss: 10<br />Verwendet für: Cyrus
+ Kaliber: 9,3x64mm Leuchtspur<br />Patronen: 10<br />Eingesetzt von: Cyrus
Kaliber: 9,3x64 mm Smugacz<br />Pociski: 10<br />Używany w: Cyrus
Calibre: 9.3x64mm Traçante<br />Cartouches: 10<br />Utilisé dans: Cyrus
Calibre: 9.3x64mm trazadora<br />Balas: 10<br />Se usa en: Cyrus
@@ -486,7 +486,7 @@
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 10<br />Used in: Cyrus
- Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Schuss: 10<br />Verwendet für: Cyrus
+ Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Patronen: 10<br />Eingesetzt von: Cyrus
Kaliber: 9,3x64 mm Smugacz IR-DIM<br />Pociski: 10<br />Używany w: Cyrus
Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 10<br />Utilisé dans: Cyrus
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 10<br />Se usa en: Cyrus
@@ -512,7 +512,7 @@
Caliber: 9.3x64mm Tracer<br />Rounds: 150<br />Used in: Navid
- Kaliber: 9,3x64mm Leuchtspur<br />Schuss: 150<br />Verwendet für: Navid
+ Kaliber: 9,3x64mm Leuchtspur<br />Patronen: 150<br />Eingesetzt von: Navid
Kaliber: 9,3x64 mm Smugacz<br />Pociski: 150<br />Używane w: Navid
Calibre: 9.3x64mm Traçante<br />Cartouches: 150<br />Utilisé dans: Navid
Calibre: 9.3x64mm trazadora<br />Balas: 150<br />Se usa en: Navid
@@ -537,7 +537,7 @@
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 150<br />Used in: Navid
- Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Schuss: 150<br />Verwendet für: Navid
+ Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Patronen: 150<br />Eingesetzt von: Navid
Kaliber: 9,3x64 mm Smugacz IR-DIM<br />Pociski: 150<br />Używane w: Navid
Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 150<br />Utilisé dans: Navid
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 150<br />Se usa en: Navid
@@ -562,7 +562,7 @@
Caliber: 9.3x64mm AP<br />Rounds: 150<br />Used in: Navid
- Kaliber: 9,3x64mm Hartkern<br />Schuss: 150<br />Verwendet für: Navid
+ Kaliber: 9,3x64mm Hartkern<br />Patronen: 150<br />Eingesetzt von: Navid
Kaliber: 9,3x64 mm AP<br />Pociski: 150<br />Używane w: Navid
Calibre: 9.3x64mm AP<br />Cartouches: 150<br />Utilisé dans: Navid
Calibre: 9.3x64mm AP<br />Balas: 150<br />Se usa en: Navid
@@ -622,7 +622,7 @@
Chargeur 7.62x54mm 10Rnd Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
- 7,62x54 10-Schuss-Magazin IR-DIM Leuchtspur
+ 7,62x54mm 10-Schuss-Magazin IR-DIM Leuchtspur
7.62mm IR-DIM
@@ -630,7 +630,7 @@
7.62mm IR-DIM
7.62mm IR-DIM
7,62 мм ИК-трассирующие
- 7,62x54 IR-DIM
+ 7,62x54mm IR-DIM
7.62x54mm 10Rnd Tracer IR-DIM Mag
@@ -638,7 +638,7 @@
Chargeur 7.62x54mm 10Cps Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
- 7,62x54 10-Schuss-Magazin IR-DIM Leuchtspur
+ 7,62x54mm 10-Schuss-Magazin IR-DIM Leuchtspur
6.5mm 100Rnd Tracer IR-DIM Mag
@@ -662,7 +662,7 @@
Chargeur 6.5mm 100Rnd Traçante IR-DIM
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
- 6,5mm 100-Schuss-Magazin IR-DIM Leuchtspur<br />Schuss: 100<br />Verwendet für: MXLSW
+ 6,5mm 100-Schuss-Magazin IR-DIM Leuchtspur<br />Patronen: 100<br />Eingesetzt von: MXLSW
6.5mm 200Rnd Tracer IR-DIM Belt
@@ -686,7 +686,7 @@
Bande 6.5mm 200Cps Traçante IR-DIM
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
- 6,5mm 200-Schuss-Gurt IR-DIM Leuchtspur<br />Schuss: 200<br />Verwendet für: Stoner 99 LMG
+ 6,5mm 200-Schuss-Gurt IR-DIM Leuchtspur<br />Patronen: 200<br />Eingesetzt von: Stoner 99 LMG
5.56mm 30Rnd Mag (Mk262)
@@ -734,7 +734,7 @@
Calibre: 5.56x45 mm NATO (Mk318)<br />Cartouches: 30
Calibre: 5.56x45 mm NATO (Mk318)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk318)<br />Патронов: 30
- Kaliber: 5,56x45mm NATO (Mk318)<br />Schuss: 30
+ Kaliber: 5,56x45mm NATO (Mk318)<br />Patronen: 30
5.56mm 30Rnd Mag (M995 AP)
@@ -758,7 +758,7 @@
Calibre: 5.56x45 mm NATO (M995 AP)<br />Cartouches: 30
Calibre: 5.56x45 mm NATO (M995 AP)<br />Balas: 30
Калибр: 5,56x45 мм NATO (M995 AP)<br />Патронов: 30
- Kaliber: 5,56x45mm NATO (M995 AP)<br />Schuss: 30
+ Kaliber: 5,56x45mm NATO (M995 AP)<br />Patronen: 30
7.62mm 10Rnd Mag (M118LR)
@@ -782,7 +782,7 @@
Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 10
- Kaliber: 7,62x51mm NATO (M118LR)<br />Schuss: 10
+ Kaliber: 7,62x51mm NATO (M118LR)<br />Patronen: 10
7.62mm 20Rnd Mag (M118LR)
@@ -806,7 +806,7 @@
Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 20
- Kaliber: 7,62x51mm NATO (M118LR)<br />Schuss: 20
+ Kaliber: 7,62x51mm NATO (M118LR)<br />Patronen: 20
7.62mm 10Rnd Mag (Mk316 Mod 0)
@@ -830,7 +830,7 @@
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 10
- Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Schuss: 10
+ Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Patronen: 10
7.62mm 20Rnd Mag (Mk316 Mod 0)
@@ -854,7 +854,7 @@
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 20
- Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Schuss: 20
+ Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Patronen: 20
7.62mm 10Rnd Mag (Mk319 Mod 0)
@@ -870,7 +870,7 @@
7.62mm Mk319
7.62mm Mk319
7,62mm Mk319
- 7.62mm Mk319
+ 7,62mm Mk319
Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 10
@@ -878,7 +878,7 @@
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 10
- Kaliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Schuss: 10
+ Kaliber: 7,62x51mm NATO (Mk319 Mod 0)<br />Patronen: 10
7.62mm 20Rnd Mag (Mk319 Mod 0)
@@ -894,7 +894,7 @@
7.62mm Mk319
7.62mm Mk319
7,62 мм Mk319
- 7.62mm Mk319
+ 7,62mm Mk319
Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 20
@@ -902,7 +902,7 @@
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 20
- Kaliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Schuss: 20
+ Kaliber: 7,62x51mm NATO (Mk319 Mod 0)<br />Patronen: 20
7.62mm 10Rnd Mag (M993 AP)
@@ -926,7 +926,7 @@
Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 10
- Kaliber: 7.62x51 mm NATO (M993 AP)<br />Schuss: 10
+ Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 10
7.62mm 20Rnd Mag (M993 AP)
@@ -950,7 +950,7 @@
Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20
- Kaliber: 7.62x51 mm NATO (M993 AP)<br />Schuss: 20
+ Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 20
7.62mm 20Rnd Mag (Mk248 Mod 0)
@@ -974,7 +974,7 @@
Calibre: 7.62x67mm NATO (Mk248 Mod 0)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Mk248 Mod 0)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 0)<br />Патронов: 20
- Kaliber: 7.62x51 mm NATO (Mk248 Mod 0)<br />Schuss: 20
+ Kaliber: 7,62x51mm NATO (Mk248 Mod 0)<br />Patronen: 20
7.62mm 20Rnd Mag (Mk248 Mod 1)
@@ -998,7 +998,7 @@
Calibre: 7.62x67mm NATO (Mk248 Mod 1)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Mk248 Mod 1)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 1)<br />Патронов: 20
- Kaliber: 7.62x51 mm NATO (Mk248 Mod 1)<br />Schuss: 20
+ Kaliber: 7.62x51mm NATO (Mk248 Mod 1)<br />Patronen: 20
7.62mm 20Rnd Mag (Berger Hybrid OTM)
@@ -1022,7 +1022,7 @@
Calibre: 7.62x67mm NATO (Berger Hybrid OTM)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Berger Hybrid OTM)<br />Патронов: 20
- Kaliber: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Schuss: 20
+ Kaliber: 7.62x67mm NATO (Berger Hybrid OTM)<br />Patronen: 20
6.5x47mm 30Rnd Mag (HPBT Scenar)
@@ -1038,7 +1038,7 @@
6.5mm Lapua
6,5mm Lapua
6,5 мм Lapua
- 6,5 Lapua
+ 6,5mm Lapua
Caliber: 6.5x47mm (HPBT Scenar)<br />Rounds: 30<br />Used in: MXM
@@ -1046,7 +1046,7 @@
Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30
Kaliber: 6,5x47 mm (HPBT Scenar)<br />Pociski: 30
Калибр: 6,5x47 мм (HPBT Scenar)<br />Патронов: 30
- Kaliber: 6,5x47 mm (HPBT Scenar)<br />Schuss: 30<br />Verwendet für: MXM
+ Kaliber: 6,5x47mm (HPBT Scenar)<br />Patronen: 30<br />Eingesetzt von: MXM
6.5mm Creedmor 30Rnd Mag
@@ -1064,7 +1064,7 @@
Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM
Kaliber: 6,5mm Creedmor<br />Pociski: 30<br />Używany w: MXM
- Kaliber: 6,5x47 mm Creedmor<br />Schuss: 30<br />Verwendet für: MXM
+ Kaliber: 6,5x47mm Creedmor<br />Patronen: 30<br />Eingesetzt von: MXM
.338 10Rnd Mag (300gr Sierra MatchKing HPBT)
@@ -1088,7 +1088,7 @@
Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Balas: 10
Kaliber: 8,6x70 mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10
Калибр: .338 (300 гран Sierra MatchKing HPBT)<br />Патронов: 10
- Kaliber: 8,6x70 mm (300gr Sierra MatchKing HPBT)<br />Schuss: 10
+ Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Patronen: 10
.338 10Rnd Mag (API526)
@@ -1112,7 +1112,7 @@
Calibre: 8.6x70mm (API526)<br />Balas: 10
Kaliber: 8,6x70 mm (API526)<br />Pociski: 10
Калибр: .338 (API526)<br />Патронов: 10
- Kaliber: 8,6x70 mm (API526)<br />Schuss: 10
+ Kaliber: 8,6x70mm (API526)<br />Patronen: 10
12.7x99mm 5Rnd Mag
@@ -1136,7 +1136,7 @@
Calibre: 12.7x99mm<br />Balas: 5
Kaliber: 12,7x99 mm<br />Pociski: 5
Калибр: 12,7x99 мм<br />Патронов: 5
- Kaliber: 12,7x99mm<br />Schuss: 5
+ Kaliber: 12,7x99mm<br />Patronen: 5
12.7x99mm API 5Rnd Mag
@@ -1157,7 +1157,7 @@
Calibre: 12.7x99mm API<br />Cartouches: 5
Calibre: 12.7x99mm API<br />Balas: 5
Kaliber: 12,7x99 mm API<br />Pociski: 5
- Kaliber:12,7x99mm API<br />Schuss: 5
+ Kaliber:12,7x99mm API<br />Patronen: 5
12.7x99mm 5Rnd Mag (AMAX)
@@ -1181,7 +1181,7 @@
Calibre: 12.7x99mm (AMAX)<br />Balas: 5
Kaliber: 12,7x99 mm (AMAX)<br />Pociski: 5
Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5
- Kaliber:12,7x99mm (AMAX)<br />Schuss: 5
+ Kaliber:12,7x99mm (AMAX)<br />Patronen: 5
\ No newline at end of file
From c38fe384e3c53094b98bdf53a51655279a203b9c Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Tue, 28 Apr 2015 19:30:35 +0200
Subject: [PATCH 073/478] added default values for getvar's
---
addons/medical/functions/fnc_handleUnitVitals.sqf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf
index 411f64b49e..b806d1358f 100644
--- a/addons/medical/functions/fnc_handleUnitVitals.sqf
+++ b/addons/medical/functions/fnc_handleUnitVitals.sqf
@@ -66,13 +66,13 @@ if (_painStatus > 0) then {
if (GVAR(level) == 1) then {
// reduce pain
- if (_unit getVariable [QGVAR(pain), 0] > 0) then {
- _unit setVariable [QGVAR(pain), ((_unit getVariable QGVAR(pain)) - 0.001 * _interval) max 0, _syncValues];
+ if (_painStatus > 0) then {
+ _unit setVariable [QGVAR(pain), (_painStatus - 0.001 * _interval) max 0, _syncValues];
};
// reduce painkillers
if (_unit getVariable [QGVAR(morphine), 0] > 0) then {
- _unit setVariable [QGVAR(morphine), ((_unit getVariable QGVAR(morphine)) - 0.0015 * _interval) max 0, _syncValues];
+ _unit setVariable [QGVAR(morphine), ((_unit getVariable [QGVAR(morphine), 0]) - 0.0015 * _interval) max 0, _syncValues];
};
// bleeding
From 76393f31db563c98d1701a4f20d77130bb199802 Mon Sep 17 00:00:00 2001
From: ulteq
Date: Tue, 28 Apr 2015 19:31:38 +0200
Subject: [PATCH 074/478] Fixes: https://github.com/acemod/ACE3/issues/896
---
addons/recoil/functions/fnc_camshake.sqf | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/addons/recoil/functions/fnc_camshake.sqf b/addons/recoil/functions/fnc_camshake.sqf
index 737582b1cb..176d761b2b 100644
--- a/addons/recoil/functions/fnc_camshake.sqf
+++ b/addons/recoil/functions/fnc_camshake.sqf
@@ -33,8 +33,13 @@ _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 {
+ systemChat "noclass";
_recoil = [0, 0];
};
From e759989d33e8ae6fe0792b05cbf458e07b9bc36d Mon Sep 17 00:00:00 2001
From: ulteq
Date: Tue, 28 Apr 2015 19:33:00 +0200
Subject: [PATCH 075/478] Removed debug output
---
addons/recoil/functions/fnc_camshake.sqf | 1 -
1 file changed, 1 deletion(-)
diff --git a/addons/recoil/functions/fnc_camshake.sqf b/addons/recoil/functions/fnc_camshake.sqf
index 176d761b2b..806d48760b 100644
--- a/addons/recoil/functions/fnc_camshake.sqf
+++ b/addons/recoil/functions/fnc_camshake.sqf
@@ -39,7 +39,6 @@ if (isClass (configFile >> "CfgRecoils" >> _recoil)) then {
_recoil = [0, 0];
};
} else {
- systemChat "noclass";
_recoil = [0, 0];
};
From b119c85c57fd16dc81548e5bc9d4952c2207b26d Mon Sep 17 00:00:00 2001
From: simon84
Date: Tue, 28 Apr 2015 19:36:31 +0200
Subject: [PATCH 076/478] found some errors
---
addons/ballistics/stringtable.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 3c63557f03..b17cc307a9 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -296,7 +296,7 @@
7.62mm 20rnd Tracer IR-DIM Mag
7,62 mm Nyomjelző IR-DIM 20-as Tár
- 7,62 mm 20-Schuss-Magazin Leuchtspur IR-DIM
+ 7,62mm 20-Schuss-Magazin Leuchtspur IR-DIM
Cargador de 20 balas trazadoras IR-DIM de 7,62mm
Ch. 7,62mm 20Cps Traçantes IR-DIM
Magazynek 7,62mm 20rd Smugacz IR-DIM
@@ -710,7 +710,7 @@
Calibre: 5.56x45 mm NATO (Mk262)<br />Cartouches: 30
Calibre: 5.56x45 mm NATO (Mk262)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk262)<br />Патронов: 30
- Kaliber: 5,56x45mm NATO (Mk262)<br />Schuss: 30
+ Kaliber: 5,56x45mm NATO (Mk262)<br />Patronen: 30
5.56mm 30Rnd Mag (Mk318)
@@ -822,7 +822,7 @@
7.62mm Mk316
7.62mm Mk316
7,62 мм Mk316
- 7.62mm Mk316
+ 7,62mm Mk316
Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 10
@@ -830,7 +830,7 @@
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 10
- Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Patronen: 10
+ Kaliber: 7,62x51mm NATO (Mk316 Mod 0)<br />Patronen: 10
7.62mm 20Rnd Mag (Mk316 Mod 0)
@@ -838,7 +838,7 @@
7.62mm 20Cps (Mk316 Mod 0)
Cargador de 20 balas de 7.62mm (Mk316 Mod 0)
Магазин из 20-ти 7,62 мм (Mk316 Mod 0)
- 7.62mm 20-Schuss-Magazin (Mk316 Mod 0)
+ 7,62mm 20-Schuss-Magazin (Mk316 Mod 0)
7.62mm Mk316
@@ -846,7 +846,7 @@
7.62mm Mk316
7.62mm Mk316
7,62 мм Mk316
- 7.62mm Mk316
+ 7,62mm Mk316
Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 20
@@ -854,7 +854,7 @@
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 20
- Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Patronen: 20
+ Kaliber: 7,62x51mm NATO (Mk316 Mod 0)<br />Patronen: 20
7.62mm 10Rnd Mag (Mk319 Mod 0)
@@ -998,7 +998,7 @@
Calibre: 7.62x67mm NATO (Mk248 Mod 1)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Mk248 Mod 1)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 1)<br />Патронов: 20
- Kaliber: 7.62x51mm NATO (Mk248 Mod 1)<br />Patronen: 20
+ Kaliber: 7,62x51mm NATO (Mk248 Mod 1)<br />Patronen: 20
7.62mm 20Rnd Mag (Berger Hybrid OTM)
@@ -1022,7 +1022,7 @@
Calibre: 7.62x67mm NATO (Berger Hybrid OTM)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Berger Hybrid OTM)<br />Патронов: 20
- Kaliber: 7.62x67mm NATO (Berger Hybrid OTM)<br />Patronen: 20
+ Kaliber: 7,62x67mm NATO (Berger Hybrid OTM)<br />Patronen: 20
6.5x47mm 30Rnd Mag (HPBT Scenar)
From 0b4bb6e4c9fe9841cca973b46a11aaff8e8201cf Mon Sep 17 00:00:00 2001
From: NukeDev
Date: Tue, 28 Apr 2015 19:40:36 +0200
Subject: [PATCH 077/478] Italian's Translation fixes
atragmx, attach, ballistics, captives languages fixes
---
addons/atragmx/stringtable.xml | 5 +-
addons/attach/stringtable.xml | 3 +-
addons/ballistics/stringtable.xml | 106 +++++++++++++++++++++++++++++-
addons/captives/stringtable.xml | 3 +-
4 files changed, 112 insertions(+), 5 deletions(-)
diff --git a/addons/atragmx/stringtable.xml b/addons/atragmx/stringtable.xml
index f3825c405a..70b7acf1df 100644
--- a/addons/atragmx/stringtable.xml
+++ b/addons/atragmx/stringtable.xml
@@ -20,6 +20,7 @@
Abrir ATragMX
Ouvrir ATragMX
ATragMX öffnen
+ Apri ATragMX
Rugged PDA with ATragMX
@@ -27,6 +28,7 @@
Защищенный КПК с ATragMX
PDA rugerizada con ATragMX
Robuster PDA mit ATragMX
+ PDA Robusto con ATragMX
Open ATragMX
@@ -35,6 +37,7 @@
Abrir ATragMX
Ouvrir ATragMX
ATragMX öffnen
+ Apri ATragMX
-
+
\ No newline at end of file
diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml
index 70ed9666b4..c2ec045aa2 100644
--- a/addons/attach/stringtable.xml
+++ b/addons/attach/stringtable.xml
@@ -178,6 +178,7 @@
Připnutí selhalo
Przyczepianie nie powiodło się
Hozzácsatolás sikertelen
+ Impossibile Attaccare
%1<br/>Attached
@@ -204,4 +205,4 @@
%1<br/>отсоединен(-а)
-
+
\ No newline at end of file
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 4dc27fd2fc..8c063ab568 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -373,6 +373,7 @@
Bande .338 NM 130Cps Traçante
Cinta de 130 balas trazadoras de .338 NM
Лента из 130-ти .338 NM трассирующих
+ .338 NM 130Rnd Tracciante Belt
.338 NM Tracer
@@ -382,6 +383,7 @@
.338 NM Traçante
.338 NM trazadora
.338 NM трассирующие
+ .338 NM 130Rnd Tracciante
Caliber: .338 Norma Magnum Tracer<br />Rounds: 130<br />Used in: SPMG
@@ -390,6 +392,7 @@
Calibre: .338 Norma Magnum Traçante<br />Cartouches: 130<br />Utilisé dans: SPMG
Calibre: .338 Norma Magnum trazadora<br />Balas: 130<br />Se usa en: SPMG
Калибр: .338 Norma Magnum трассирующие<br />Патронов: 130<br />Используются в: SPMG
+ Calibro: .338 Norma Magnum Tracciante<br />Munizioni: 130<br />In uso su: SPMG
.338 NM 130Rnd IR-DIM Belt
@@ -398,6 +401,7 @@
Bande .338 NM 130Cps IR-DIM
Cinta de 130 balas IR-DIM de .338 NM
Лента из 130-ти .338 NM ИК-трассирующих
+ .338 NM 130Rnd IR-DIM Belt
.338 NM IR-DIM
@@ -407,6 +411,7 @@
.338 NM IR-DIM
.338 NM IR-DIM
.338 NM ИК-трассирующие
+ .338 NM IR-DIM
Caliber: .338 Norma Magnum Tracer IR-DIM<br />Rounds: 130<br />Used in: SPMG
@@ -415,6 +420,7 @@
Calibre: .338 Norma Magnum Traçante IR-DIM<br />Cartouches: 130<br />Utilisé dans: SPMG
Calibre: .338 Norma Magnum trazadora IR-DIM<br />Balas: 130<br />Se usa en: SPMG
Калибр: .338 Norma Magnum ИК-трассирующие<br />Патронов: 130<br />Используются с: SPMG
+ Calibro: .338 Norma Magnum Tracciante IR-DIM<br />Munizioni: 130<br />In uso su: SPMG
.338 NM 130Rnd AP Belt
@@ -423,6 +429,7 @@
Bande .338 NM 130Cps AP
Cinta de 130 balas AP de .338 NM
Лента из 130-ти .338 NM бронебойных
+ .338 NM 130Rnd AP Belt
.338 NM AP
@@ -432,6 +439,7 @@
.338 NM AP
.338 NM AP
.338 NM бронебойные
+ .338 NM AP
Caliber: .338 Norma Magnum AP<br />Rounds: 130<br />Used in: SPMG
@@ -440,6 +448,7 @@
Calibre: .338 Norma Magnum AP<br />Cartouches: 130<br />Utilisé dans: SPMG
Calibre: .338 Norma Magnum AP<br />Balas: 130<br />Se usa en: SPMG
Калибр: .338 Norma Magnum бронебойные<br />Патронов: 130<br />Используются с: SPMG
+ Calibro: .338 Norma Magnum AP<br />Munizioni: 130<br />In uso su: SPMG
@@ -449,6 +458,7 @@
Chargeur 9.3mm 10Cps Traçante
Cargador de 10 balas trazadoras de 9.3mm
Магазин из 10-ти 9,3 мм трассирующих
+ 9.3mm 10Rnd Tracer Mag
9.3mm Tracer
@@ -458,6 +468,7 @@
9.3mm Traçante
9.3mm trazadora
9,3 мм трассирующие
+ 9.3mm Tracer
Caliber: 9.3x64mm Tracer<br />Rounds: 10<br />Used in: Cyrus
@@ -466,6 +477,7 @@
Calibre: 9.3x64mm Traçante<br />Cartouches: 10<br />Utilisé dans: Cyrus
Calibre: 9.3x64mm trazadora<br />Balas: 10<br />Se usa en: Cyrus
Калибр: 9,3x64 мм трассирующие<br />Патронов: 10<br />Используются с: Cyrus
+ Calibro: 9.3x64mm Tracer<br />Munizioni: 10<br />In uso su: Cyrus
9.3mm 10Rnd Tracer IR-DIM Mag
@@ -474,6 +486,7 @@
Chargeur 9.3mm 10Cps Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 9.3mm
Магазин из 10-ти 9,3 мм ИК-трассирующих
+ 9.3mm 10Rnd Tracciante IR-DIM Mag
9.3mm IR-DIM
@@ -483,6 +496,7 @@
9.3mm IR-DIM
9.3mm IR-DIM
9,3 мм ИК-трассирующие
+ 9.3mm IR-DIM
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 10<br />Used in: Cyrus
@@ -491,6 +505,7 @@
Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 10<br />Utilisé dans: Cyrus
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 10<br />Se usa en: Cyrus
Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 10<br />Используются с: Cyrus
+ Calibro: 9.3x64mm Tracciante IR-DIM<br />Munizioni: 10<br />In uso su: Cyrus
@@ -500,6 +515,7 @@
Bande 9.3mm 150Cps Traçante
Cinta de 150 balas trazadoras de 9.3mm
Лента из 150-ти 9,3 мм трассирующих
+ 9.3mm 150Rnd Tracer Belt
9.3mm Tracer
@@ -509,6 +525,7 @@
9.3mm Traçante
9.3mm trazadora
9,3 мм трассирующие
+ 9.3mm Tracciante
Caliber: 9.3x64mm Tracer<br />Rounds: 150<br />Used in: Navid
@@ -517,6 +534,7 @@
Calibre: 9.3x64mm Traçante<br />Cartouches: 150<br />Utilisé dans: Navid
Calibre: 9.3x64mm trazadora<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм трассирующие<br />Патронов: 150<br />Используются с: Навид
+ Calibro: 9.3x64mm Tracciante<br />Munizioni: 150<br />In uso su: Navid
9.3mm 150Rnd Tracer IR-DIM Belt
@@ -525,6 +543,7 @@
Bande 9.3mm 150Cps Traçante IR-DIM
Cinta de 150 balas trazadoras IR-DIM de 9.3mm
Лента из 150-ти 9,3 мм ИК-трассирующих
+ 9.3mm 150Rnd Tracciante IR-DIM Belt
9.3mm IR-DIM
@@ -534,6 +553,7 @@
9.3mm IR-DIM
9.3mm IR-DIM
9,3 мм ИК-трассирующие
+ 9.3mm IR-DIM
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 150<br />Used in: Navid
@@ -542,6 +562,7 @@
Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 150<br />Utilisé dans: Navid
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 150<br />Используются с: Навид
+ Calibro: 9.3x64mm Tracciante IR-DIM<br />Munizioni: 150<br />In uso su: Navid
9.3mm 150Rnd AP Belt
@@ -550,6 +571,7 @@
Bande 9.3mm 150Cps AP
Cinta de 150 balas AP de 9.3mm
Лента из 150-ти 9,3 мм бронебойных
+ 9.3mm 150Rnd AP Belt
9.3mm AP
@@ -559,6 +581,7 @@
9.3mm AP
9.3mm AP
9,3 мм бронебойные
+ 9.3mm AP
Caliber: 9.3x64mm AP<br />Rounds: 150<br />Used in: Navid
@@ -567,6 +590,7 @@
Calibre: 9.3x64mm AP<br />Cartouches: 150<br />Utilisé dans: Navid
Calibre: 9.3x64mm AP<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм бронебойные<br />Патронов: 150<br />Используются с: Навид
+ Calibro: 9.3x64mm AP<br />Munizioni: 150<br />In uso su: Navid
9x19mm 16Rnd Mag
@@ -574,6 +598,7 @@
Chargeur 9x19mm 16Cps
Cargador de 16 balas de 9x19mm
Магазин из 16-ти 9х19 мм
+ 9x19mm 16Rnd Mag
9x19mm
@@ -581,6 +606,7 @@
9x19mm
9x19mm
9х19 мм
+ 9x19mm
9x19mm 30Rnd Mag
@@ -588,6 +614,7 @@
9x19mm 30Cps
Cargador de 16 balas de 9x19mm
Магазин из 16-ти 9х19 мм
+ 9x19mm 30Rnd Mag
9x19mm 30Rnd Mag
@@ -595,6 +622,7 @@
9x19mm 30Cps
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
+ 9x19mm 30Rnd Mag
9x19mm
@@ -602,6 +630,7 @@
9x19mm
9x19mm
9х19 мм
+ 9x19mm
9x19mm 30Rnd Mag
@@ -609,6 +638,7 @@
9x19mm 30Cps
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
+ 9x19mm 30Rnd Mag
7.62x54mm 10Rnd Tracer IR-DIM Mag
@@ -616,6 +646,7 @@
Chargeur 7.62x54mm 10Rnd Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
+ 7.62x54mm 10Munizioni Traccianti IR-DIM Mag
7.62mm IR-DIM
@@ -623,6 +654,7 @@
7.62mm IR-DIM
7.62mm IR-DIM
7,62 мм ИК-трассирующие
+ 7.62mm IR-DIM
7.62x54mm 10Rnd Tracer IR-DIM Mag
@@ -630,6 +662,7 @@
Chargeur 7.62x54mm 10Cps Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
+ 7.62x54mm 10Munizioni Traccianti IR-DIM Mag
6.5mm 100Rnd Tracer IR-DIM Mag
@@ -637,6 +670,7 @@
Chargeur 6.5mm 100Rnd Traçante IR-DIM
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
+ 6.5mm 100Munizioni Traccianti IR-DIM Mag
6.5mm IR-DIM
@@ -644,6 +678,7 @@
6.5mm IR-DIM
6.5mm IR-DIM
6,5 мм ИК-трассирующие
+ 6.5mm IR-DIM
6.5mm 100Rnd Tracer IR-DIM Mag<br />Rounds: 100<br />Used in: MX LSW
@@ -651,6 +686,7 @@
Chargeur 6.5mm 100Rnd Traçante IR-DIM
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
+ 6.5mm 100Rnd Tracer IR-DIM Mag<br />Munizioni: 100<br />In uso su: MX LSW
6.5mm 200Rnd Tracer IR-DIM Belt
@@ -658,6 +694,7 @@
Bande 6.5mm 200Rnd Traçante IR-DIM
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
+ 6.5mm 200Rnd Tracer IR-DIM Belt
6.5mm IR-DIM
@@ -665,6 +702,7 @@
6.5mm IR-DIM
6.5mm IR-DIM
6,5 мм ИК-трассирующие
+ 6.5mm IR-DIM
6.5mm 200Rnd Tracer IR-DIM Belt<br />Rounds: 200<br />Used in: Stoner 99 LMG
@@ -672,6 +710,7 @@
Bande 6.5mm 200Cps Traçante IR-DIM
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
+ 6.5mm 200Rnd Tracer IR-DIM Belt<br />Munizioni: 200<br />In uso su: Stoner 99 LMG
5.56mm 30Rnd Mag (Mk262)
@@ -679,6 +718,7 @@
5.56mm 30Cps (Mk262)
Cargador de 30 balas de 5.56mm (Mk262)
Магазин из 30-ти 5.56 мм Mk262
+ 5.56mm 30Rnd Mag (Mk262)
5.56mm Mk262
@@ -686,6 +726,7 @@
5.56mm Mk262
5.56mm Mk262
5,56 мм Mk262
+ 5.56mm Mk262
Caliber: 5.56x45 mm NATO (Mk262)<br />Rounds: 30
@@ -693,6 +734,7 @@
Calibre: 5.56x45 mm NATO (Mk262)<br />Cartouches: 30
Calibre: 5.56x45 mm NATO (Mk262)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk262)<br />Патронов: 30
+ Calibro: 5.56x45 mm NATO (Mk262)<br />Munizioni: 30
5.56mm 30Rnd Mag (Mk318)
@@ -700,6 +742,7 @@
5.56mm 30Cps (Mk318)
Cargador de 30 balas de 5.56mm (Mk318)
Магазин из 30-ти 5.56 мм (Mk318)
+ 5.56mm 30Rnd Mag (Mk318)
5.56mm Mk318
@@ -707,6 +750,7 @@
5.56mm Mk318
5.56mm Mk318
5.56 мм Mk318
+ 5.56mm Mk318
Caliber: 5.56x45 mm NATO (Mk318)<br />Rounds: 30
@@ -714,6 +758,7 @@
Calibre: 5.56x45 mm NATO (Mk318)<br />Cartouches: 30
Calibre: 5.56x45 mm NATO (Mk318)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk318)<br />Патронов: 30
+ Calibro: 5.56x45 mm NATO (Mk318)<br />Munizioni: 30
5.56mm 30Rnd Mag (M995 AP)
@@ -721,6 +766,7 @@
5.56mm 30Cps (M995 AP)
Cargador de 30 balas de 5.56mm (M995 AP)
Магазин из 30-ти 5.56 мм (M995 AP)
+ 5.56mm 30Rnd Mag (M995 AP)
5.56mm AP
@@ -728,6 +774,7 @@
5.56mm AP
5.56mm AP
5.56 мм AP
+ 5.56mm AP
Caliber: 5.56x45 mm NATO (M995 AP)<br />Rounds: 30
@@ -735,6 +782,7 @@
Calibre: 5.56x45 mm NATO (M995 AP)<br />Cartouches: 30
Calibre: 5.56x45 mm NATO (M995 AP)<br />Balas: 30
Калибр: 5,56x45 мм NATO (M995 AP)<br />Патронов: 30
+ Calibro: 5.56x45 mm NATO (M995 AP)<br />Munizioni: 30
7.62mm 10Rnd Mag (M118LR)
@@ -742,6 +790,7 @@
7.62mm 10Cps (M118LR)
Cargador de 10 balas de 7.62mm (M118LR)
Магазин из 10-ти 7,62 мм (M118LR)
+ 7.62mm 10Rnd Mag (M118LR)
7.62mm M118LR
@@ -749,6 +798,7 @@
7.62mm M118LR
7.62mm (M118LR)
7,62 мм M118LR
+ 7.62mm M118LR
Caliber: 7.62x51 mm NATO (M118LR)<br />Rounds: 10
@@ -756,6 +806,7 @@
Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 10
+ Calibro: 7.62x51 mm NATO (M118LR)<br />Munizioni: 10
7.62mm 20Rnd Mag (M118LR)
@@ -763,6 +814,7 @@
7.62mm 20Cps (M118LR)
Cargador de 20 balas de 7.62mm (M118LR)
Магазин из 20-ти 7,62 мм (M118LR)
+ 7.62mm 20Rnd Mag (M118LR)
7.62mm M118LR
@@ -770,6 +822,7 @@
7.62mm M118LR
7.62mm (M118LR)
7,62 мм M118LR
+ 7.62mm M118LR
Caliber: 7.62x51 mm NATO (M118LR)<br />Rounds: 20
@@ -777,6 +830,7 @@
Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 20
+ Calibro: 7.62x51 mm NATO (M118LR)<br />Munizioni: 20
7.62mm 10Rnd Mag (Mk316 Mod 0)
@@ -784,6 +838,7 @@
7.62mm 10Cps (Mk316 Mod 0)
Cargador de 10 balas de 7.62mm (Mk316 Mod 0)
Магазин из 10-ти 7,62 мм (Mk316 Mod 0)
+ 7.62mm 10Rnd Mag (Mk316 Mod 0)
7.62mm Mk316
@@ -791,6 +846,7 @@
7.62mm Mk316
7.62mm Mk316
7,62 мм Mk316
+ 7.62mm Mk316
Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 10
@@ -798,6 +854,7 @@
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 10
+ Calibro: 7.62x51 mm NATO (Mk316 Mod 0)<br />Munizioni: 10
7.62mm 20Rnd Mag (Mk316 Mod 0)
@@ -805,6 +862,7 @@
7.62mm 20Cps (Mk316 Mod 0)
Cargador de 20 balas de 7.62mm (Mk316 Mod 0)
Магазин из 20-ти 7,62 мм (Mk316 Mod 0)
+ 7.62mm 20Rnd Mag (Mk316 Mod 0)
7.62mm Mk316
@@ -812,6 +870,7 @@
7.62mm Mk316
7.62mm Mk316
7,62 мм Mk316
+ 7.62mm Mk316
Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 20
@@ -819,6 +878,7 @@
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 20
+ Calibro: 7.62x51 mm NATO (Mk316 Mod 0)<br />Munizioni: 20
7.62mm 10Rnd Mag (Mk319 Mod 0)
@@ -826,6 +886,7 @@
7.62mm 10Cps (Mk319 Mod 0)
Cargador de 10 balas de 7.62mm (Mk319 Mod 0)
Магазин из 10-ти 7,62 мм (Mk319 Mod 0)
+ 7.62mm 10Rnd Mag (Mk319 Mod 0)
7.62mm Mk319
@@ -833,6 +894,7 @@
7.62mm Mk319
7.62mm Mk319
7,62mm Mk319
+ 7.62mm Mk319
Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 10
@@ -840,6 +902,7 @@
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 10
+ Calibro: 7.62x51 mm NATO (Mk319 Mod 0)<br />Munizioni: 10
7.62mm 20Rnd Mag (Mk319 Mod 0)
@@ -847,6 +910,7 @@
7.62mm 20Cps (Mk319 Mod 0)
Cargador de 20 balas de 7.62mm (Mk319 Mod 0)
Магазин из 20-ти 7,62 мм (Mk319 Mod 0)
+ 7.62mm 20Rnd Mag (Mk319 Mod 0)
7.62mm Mk319
@@ -854,6 +918,7 @@
7.62mm Mk319
7.62mm Mk319
7,62 мм Mk319
+ 7.62mm Mk319
Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 20
@@ -861,6 +926,7 @@
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 20
+ Calibro: 7.62x51 mm NATO (Mk319 Mod 0)<br />Munizioni: 20
7.62mm 10Rnd Mag (M993 AP)
@@ -868,6 +934,7 @@
7.62mm 10Cps (M993 AP)
Cargador de 10 balas de 7.62mm (M993 AP)
Магазин из 10-ти 7,62 мм (M993 AP)
+ 7.62mm 10Rnd Mag (M993 AP)
7.62mm AP
@@ -875,6 +942,7 @@
7.62mm AP
7.62mm AP
7,62mm AP
+ 7.62mm AP
Caliber: 7.62x51 mm NATO (M993 AP)<br />Rounds: 10
@@ -882,6 +950,7 @@
Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 10
Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 10
+ Calibro: 7.62x51 mm NATO (M993 AP)<br />Munizioni: 10
7.62mm 20Rnd Mag (M993 AP)
@@ -889,6 +958,7 @@
7.62mm 20Cps (M993 AP)
Cargador de 20 balas de 7.62mm (M993 AP)
Магазин из 20-ти 7,62 мм (M993 AP)
+ 7.62mm 20Rnd Mag (M993 AP)
7.62mm AP
@@ -896,6 +966,7 @@
7.62mm AP
7.62mm AP
7,62 мм AP
+ 7.62mm AP
Caliber: 7.62x51 mm NATO (M993 AP)<br />Rounds: 20
@@ -903,13 +974,15 @@
Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 20
Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20
-
+ Calibro: 7.62x51 mm NATO (M993 AP)<br />Munizioni: 20
+
7.62mm 20Rnd Mag (Mk248 Mod 0)
Magazynek 7,62mm 20rd (Mk248 Mod 0)
7.62mm 20Cps (Mk248 Mod 0)
Cargador de 20 balas de 7.62mm (Mk248 Mod 0)
Магазин из 20-ти 7,62 мм (Mk248 Mod 0)
+ 7.62mm 20Rnd Mag (Mk248 Mod 0)
7.62mm (Mk248 Mod 0)
@@ -917,6 +990,7 @@
7.62mm (Mk248 Mod 0)
7.62mm (Mk248 Mod 0)
7,62 мм (Mk248 Mod 0)
+ 7.62mm (Mk248 Mod 0)
Caliber: 7.62x67 mm NATO (Mk248 Mod 0)<br />Rounds: 20
@@ -924,6 +998,7 @@
Calibre: 7.62x67mm NATO (Mk248 Mod 0)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Mk248 Mod 0)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 0)<br />Патронов: 20
+ Calibro: 7.62x67 mm NATO (Mk248 Mod 0)<br />Munizioni: 20
7.62mm 20Rnd Mag (Mk248 Mod 1)
@@ -931,6 +1006,7 @@
7.62mm 20Cps (Mk248 Mod 1)
Cargador de 20 balas de 7.62mm (Mk248 Mod 1)
Магазин из 20-ти 7,62 мм (Mk248 Mod 1)
+ 7.62mm 20Rnd Mag (Mk248 Mod 1)
7.62mm (Mk248 Mod 1)
@@ -938,6 +1014,7 @@
7.62mm (Mk248 Mod 1)
7.62mm (Mk248 Mod 1)
7,62 мм (Mk248 Mod 1)
+ 7.62mm (Mk248 Mod 1)
Caliber: 7.62x67 mm NATO (Mk248 Mod 1)<br />Rounds: 20
@@ -945,6 +1022,7 @@
Calibre: 7.62x67mm NATO (Mk248 Mod 1)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Mk248 Mod 1)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 1)<br />Патронов: 20
+ Calibro: 7.62x67 mm NATO (Mk248 Mod 1)<br />Munizioni: 20
7.62mm 20Rnd Mag (Berger Hybrid OTM)
@@ -952,6 +1030,7 @@
7.62 20Cps (Berger Hybrid OTM)
Cargador de 20 balas de 7.62mm (Berger Hybrid OTM)
Магазин из 20-ти 7,62 мм (Berger Hybrid OTM)
+ 7.62mm 20Rnd Mag (Berger Hybrid OTM)
7.62mm (OTM)
@@ -959,6 +1038,7 @@
7.62mm (OTM)
7.62mm (OTM)
7,62 мм (OTM)
+ 7.62mm (OTM)
Caliber: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Rounds: 20
@@ -966,6 +1046,7 @@
Calibre: 7.62x67mm NATO (Berger Hybrid OTM)<br />Cartouches: 20
Calibre: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Berger Hybrid OTM)<br />Патронов: 20
+ Calibro: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Munizioni: 20
6.5x47mm 30Rnd Mag (HPBT Scenar)
@@ -973,6 +1054,7 @@
Cargador de 30 balas de 6.5x47mm (HPBT Scenar)
Magazynek 6,5x47 mm 30rd (HPBT Scenar)
Магазин из 30-ти 6,5x47 мм (HPBT Scenar)
+ 6.5x47mm 30Rnd Mag (HPBT Scenar)
6.5mm Lapua
@@ -980,6 +1062,7 @@
6.5mm Lapua
6,5mm Lapua
6,5 мм Lapua
+ 6.5mm Lapua
Caliber: 6.5x47mm (HPBT Scenar)<br />Rounds: 30<br />Used in: MXM
@@ -987,10 +1070,12 @@
Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30
Kaliber: 6,5x47 mm (HPBT Scenar)<br />Pociski: 30
Калибр: 6,5x47 мм (HPBT Scenar)<br />Патронов: 30
+ Calibro: 6.5x47mm (HPBT Scenar)<br />Munizioni: 30<br />In uso su: MXM
6.5mm Creedmor 30Rnd Mag
Magazynek 6,5mm Creedmor 30rd
+ 6.5mm Creedmor 30Rnd Mag
6.5mm CM
@@ -998,10 +1083,12 @@
6.5mm CM
6,5mm CM
6,5 мм CM
+ 6.5mm CM
Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM
Kaliber: 6,5mm Creedmor<br />Pociski: 30<br />Używany w: MXM
+ Calibro: 6.5mm Creedmor<br />Munizioni: 30<br />In uso su: MXM
.338 10Rnd Mag (300gr Sierra MatchKing HPBT)
@@ -1009,6 +1096,7 @@
Cargador de 10 balas de 8.6x70mm (300gr Sierra MatchKing HPBT)
Magazynek .338 10rd (300gr Sierra MatchKing HPBT)
Магазин из 10-ти .338 (300 гран Sierra MatchKing HPBT)
+ .338 10Munizioni Mag (300gr Sierra MatchKing HPBT)
.338 (HPBT)
@@ -1016,6 +1104,7 @@
.338 (HPBT)
.338 (HPBT)
.338 (HPBT)
+ .338 (HPBT)
Caliber: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Rounds: 10
@@ -1023,6 +1112,7 @@
Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Balas: 10
Kaliber: 8,6x70 mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10
Калибр: .338 (300 гран Sierra MatchKing HPBT)<br />Патронов: 10
+ Calibro: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Munizioni: 10
.338 10Rnd Mag (API526)
@@ -1030,6 +1120,7 @@
Cargador de 10 balas de .338 (API526)
Magazynek .338 10rd (API526)
Магазин из 10-ти .338 (API526)
+ .338 10Rnd Mag (API526)
.338 AP
@@ -1037,6 +1128,7 @@
.338 AP
.338 AP
.338 бронебойные
+ .338 AP
Caliber: 8.6x70mm (API526)<br />Rounds: 10
@@ -1044,6 +1136,7 @@
Calibre: 8.6x70mm (API526)<br />Balas: 10
Kaliber: 8,6x70 mm (API526)<br />Pociski: 10
Калибр: .338 (API526)<br />Патронов: 10
+ Calibro: 8.6x70mm (API526)<br />Munizioni: 10
12.7x99mm 5Rnd Mag
@@ -1051,6 +1144,7 @@
Cargador de 5 balas de 12.7x99mm
Magazynek 12,7x99 mm 5rd
Магазин из 5-ти 12,7x99 мм
+ 12.7x99mm 5Rnd Mag
12.7mm
@@ -1058,6 +1152,7 @@
12.7mm
12,7mm
12,7 мм
+ 12.7mm
Caliber: 12.7x99mm<br />Rounds: 5
@@ -1065,24 +1160,28 @@
Calibre: 12.7x99mm<br />Balas: 5
Kaliber: 12,7x99 mm<br />Pociski: 5
Калибр: 12,7x99 мм<br />Патронов: 5
+ Calibro: 12.7x99mm<br />Munizioni: 5
12.7x99mm API 5Rnd Mag
12.7x99mm API 5Cps
Cargador de 5 balas de 12.7x99mm API
Magazynek 12,7x99mm API 5rd
+ 12.7x99mm API 5Rnd Mag
12.7mm API
12.7mm API
12.7mm API
12,7mm API
+ 12.7mm API
Caliber: 12.7x99mm API<br />Rounds: 5
Calibre: 12.7x99mm API<br />Cartouches: 5
Calibre: 12.7x99mm API<br />Balas: 5
Kaliber: 12,7x99 mm API<br />Pociski: 5
+ Calibro: 12.7x99mm API<br />Munizioni: 5
12.7x99mm 5Rnd Mag (AMAX)
@@ -1090,6 +1189,7 @@
Cargador de 5 balas de 12.7x99mm (AMAX)
Magazynek 12,7x99 mm 5rd (AMAX)
Магазин из 5-ти 12,7x99 мм (A-MAX)
+ 12.7x99mm 5Rnd Mag (AMAX)
12.7mm
@@ -1097,6 +1197,7 @@
12.7mm
12,7mm
12,7 мм
+ 12.7mm
Caliber: 12.7x99mm (AMAX)<br />Rounds: 5
@@ -1104,6 +1205,7 @@
Calibre: 12.7x99mm (AMAX)<br />Balas: 5
Kaliber: 12,7x99 mm (AMAX)<br />Pociski: 5
Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5
+ Calibro: 12.7x99mm (AMAX)<br />Munizioni: 5
-
+
\ No newline at end of file
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index 55a9f6211a..1f6bcaa3ca 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -119,6 +119,7 @@
Ekwipunek rewidowanej osoby
Инвентарь обысканного человека
Inventário da pessoa revistada
+ Inventario delle persone perquisite
Frisk person
@@ -188,4 +189,4 @@
Niente selezionato
-
+
\ No newline at end of file
From 85ce5e3729f7db0663cae5220e885dc211701ce8 Mon Sep 17 00:00:00 2001
From: ulteq
Date: Tue, 28 Apr 2015 19:43:36 +0200
Subject: [PATCH 078/478] Unified spacing
---
addons/ballistics/stringtable.xml | 356 +++++++++++++++---------------
1 file changed, 178 insertions(+), 178 deletions(-)
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 3c63557f03..1bb970b8a4 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -4,7 +4,7 @@
6.5mm 30Rnd Tracer IR-DIM Mag
- 6,5 mm Nyomjelző IR-DIM 30-as Tár
+ 6,5mm Nyomjelző IR-DIM 30-as Tár
6,5mm 30-Schuss-Magazin Leuchtspur IR-DIM
Cargador de 30 balas trazadoras IR-DIM de 6,5mm
Ch. 6,5mm 30Cps Traçantes IR-DIM
@@ -16,31 +16,31 @@
6.5mm IR-DIM
- 6,5 mm IR-DIM
+ 6,5mm IR-DIM
6,5mm IR-DIM
6,5mm IR-DIM
6,5mm IR-DIM
6,5mm IR-DIM
6.5mm IR-DIM
6,5mm IR-DIM
- 6.5 IR-DIM
+ 6.5mm IR-DIM
6,5 мм ИК-трассирующие
- Caliber: 6.5x39 mm Tracer IR-DIM<br />Rounds: 30<br />Used in: MX/C/M/SW/3GL
- Kaliber: 6,5x39 mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
+ Caliber: 6.5x39mm Tracer IR-DIM<br />Rounds: 30<br />Used in: MX/C/M/SW/3GL
+ Kaliber: 6,5x39mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
Kaliber: 6,5x39mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
- Calibre: 6,5x39 mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
- Calibre: 6,5x39 mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
- Kaliber: 6,5x39 mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
- Ráže: 6.5x39 mm Svítící IR-DIM<br />Munice: 30<br />Použití: MX/C/M/SW/3GL
- Calibre: 6,5x39 mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL
- Calibro: 6.5x39 mm Traccianti IR-DIM <br />Munizioni: 30<br />In uso su: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
+ Kaliber: 6,5x39mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
+ Ráže: 6.5x39mm Svítící IR-DIM<br />Munice: 30<br />Použití: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL
+ Calibro: 6.5x39mm Traccianti IR-DIM <br />Munizioni: 30<br />In uso su: MX/C/M/SW/3GL
Калибр: 6,5x39 мм ИК-трассирующие<br />Патронов: 30<br />Используются с: MX/C/M/SW/3GL
6.5mm 30Rnd SD Mag
- 6,5 mm Halk 30-as Tár
+ 6,5mm Halk 30-as Tár
6,5mm 30-Schuss-Magazin SD
Cargador de 30 balas SD de 6,5mm
Ch. 6,5mm 30Cps SD
@@ -52,7 +52,7 @@
6.5mm SD
- 6,5 mm Halk
+ 6,5mm Halk
6,5mm SD
6,5mm SD
6,5mm SD
@@ -63,20 +63,20 @@
6,5 мм дозвуковые
- Caliber: 6.5x39 mm SD<br />Rounds: 30<br />Used in: MX/C/M/SW/3GL
- Kaliber: 6,5x39 mm Halk<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
+ Caliber: 6.5x39mm SD<br />Rounds: 30<br />Used in: MX/C/M/SW/3GL
+ Kaliber: 6,5x39mm Halk<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
Kaliber: 6,5x39mm SD<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
- Calibre: 6,5x39 mm SD<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
- Calibre: 6,5x39 mm SD<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
- Kaliber: 6,5x39 mm SD<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
- Ráže: 6.5x39 mm SD<br />Munice: 30<br />Použití: MX/C/M/SW/3GL
- Calibre: 6,5x39 mm SD<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL
- Calibro: 6.5x39 mm Sil.<br />Munizioni: 30<br />In uso su: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm SD<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
+ Kaliber: 6,5x39mm SD<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
+ Ráže: 6.5x39mm SD<br />Munice: 30<br />Použití: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm SD<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL
+ Calibro: 6.5x39mm Sil.<br />Munizioni: 30<br />In uso su: MX/C/M/SW/3GL
Калибр: 6,5x39 мм дозвуковые<br />Патронов: 30<br />Используются с: MX/C/M/SW/3GL
6.5mm 30Rnd AP Mag
- 6,5 mm Páncéltörő 30-as Tár
+ 6,5mm Páncéltörő 30-as Tár
6,5mm 30-Schuss-Magazin AP
Cargador de 30 balas AP de 6,5mm
Ch. 6,5mm 30Cps AP
@@ -88,7 +88,7 @@
6.5mm AP
- 6,5 mm Páncéltörő
+ 6,5mm Páncéltörő
6,5mm AP
6,5mm AP
6,5mm AP
@@ -99,15 +99,15 @@
6,5 мм бронебойные
- Caliber: 6.5x39 mm AP<br />Rounds: 30<br />Used in: MX/C/M/SW/3GL
- Kaliber: 6,5x39 mm Páncéltörő<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
+ Caliber: 6.5x39mm AP<br />Rounds: 30<br />Used in: MX/C/M/SW/3GL
+ Kaliber: 6,5x39mm Páncéltörő<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
Kaliber: 6,5x39mm AP<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
- Calibre: 6,5x39 mm AP<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
- Calibre: 6,5x39 mm AP<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
- Kaliber: 6,5x39 mm AP<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
- Ráže: 6.5x39 mm AP<br />Munice: 30<br />Použití: MX/C/M/SW/3GL
- Calibre: 6,5x39 mm AP<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL
- Calibro: 6.5x39 mm AP<br />Munizioni: 30<br />In uso su: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm AP<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
+ Kaliber: 6,5x39mm AP<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
+ Ráže: 6.5x39mm AP<br />Munice: 30<br />Použití: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm AP<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL
+ Calibro: 6.5x39mm AP<br />Munizioni: 30<br />In uso su: MX/C/M/SW/3GL
Калибр: 6,5x39 мм бронебойные<br />Патронов: 30<br />Используются с: MX/C/M/SW/3GL
@@ -136,20 +136,20 @@
6,5 мм ИК-трассирующие
- Caliber: 6.5x39 mm Tracer IR-DIM<br />Rounds: 30<br />Used in: Katiba
- Kaliber: 6,5x39 mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: Katiba
+ Caliber: 6.5x39mm Tracer IR-DIM<br />Rounds: 30<br />Used in: Katiba
+ Kaliber: 6,5x39mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: Katiba
Kaliber: 6,5x39mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: Katiba
- Calibre: 6,5x39 mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: Katiba
- Calibre: 6,5x39 mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: Katiba
- Kaliber: 6,5x39 mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: Katiba
- Ráže: 6.5x39 mm Svítící IR-DIM<br />Munice: 30<br />Použití: Katiba
- Calibre: 6,5x39 mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: Katiba
- Calibro: 6.5x39 mm Tracciant IR-DIM<br />Munizioni: 30<br />In uso su: Katiba
+ Calibre: 6,5x39mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: Katiba
+ Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: Katiba
+ Kaliber: 6,5x39mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: Katiba
+ Ráže: 6.5x39mm Svítící IR-DIM<br />Munice: 30<br />Použití: Katiba
+ Calibre: 6,5x39mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: Katiba
+ Calibro: 6.5x39mm Tracciant IR-DIM<br />Munizioni: 30<br />In uso su: Katiba
Калибр: 6,5x39 мм ИК-трассирующие<br />Патронов: 30<br />Используются с: Katiba
6.5mm 30Rnd SD Mag
- 6,5 mm Halk 30-as Tár
+ 6,5mm Halk 30-as Tár
6,5mm 30-Schuss-Magazin SD
Cargador de 30 balas SD de 6,5mm
Ch. 6,5mm 30Cps SD
@@ -161,7 +161,7 @@
6.5mm SD
- 6,5 mm Halk
+ 6,5mm Halk
6,5mm SD
6,5mm SD
6,5mm SD
@@ -172,20 +172,20 @@
6,5 мм дозвуковые
- Caliber: 6.5x39 mm SD<br />Rounds: 30<br />Used in: Katiba
- Kaliber: 6,5x39 mm Halk<br />Lövedékek: 30<br />Használható: Katiba
+ Caliber: 6.5x39mm SD<br />Rounds: 30<br />Used in: Katiba
+ Kaliber: 6,5x39mm Halk<br />Lövedékek: 30<br />Használható: Katiba
Kaliber: 6,5x39mm SD<br />Patronen: 30<br />Eingesetzt von: Katiba
- Calibre: 6,5x39 mm SD<br />Balas: 30<br />Se usa en: Katiba
- Calibre: 6,5x39 mm SD<br />Cartouches: 30<br />Utilisé dans: Katiba
- Kaliber: 6,5x39 mm SD<br />Naboje: 30<br />Używane w: Katiba
- Ráže: 6.5x39 mm SD<br />Munice: 30<br />Použití: Katiba
- Calibre: 6,5x39 mm SD<br />Projéteis: 30<br />Usado em: Katiba
- Calibro: 6.5x39 mm Sil.<br />Munizioni: 30<br />In uso su: Katiba
+ Calibre: 6,5x39mm SD<br />Balas: 30<br />Se usa en: Katiba
+ Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé dans: Katiba
+ Kaliber: 6,5x39mm SD<br />Naboje: 30<br />Używane w: Katiba
+ Ráže: 6.5x39mm SD<br />Munice: 30<br />Použití: Katiba
+ Calibre: 6,5x39mm SD<br />Projéteis: 30<br />Usado em: Katiba
+ Calibro: 6.5x39mm Sil.<br />Munizioni: 30<br />In uso su: Katiba
Калибр: 6,5x39 мм дозвуковые<br />Патронов: 30<br />Используются с: Katiba
6.5mm 30Rnd AP Mag
- 6,5 mm Páncéltörő 30-as Tár
+ 6,5mm Páncéltörő 30-as Tár
6,5mm 30-Schuss-Magazin AP
Cargador de 30 balas AP de 6,5mm
Ch. 6,5mm 30Cps AP
@@ -197,7 +197,7 @@
6.5mm AP
- 6,5 mm Páncéltörő
+ 6,5mm Páncéltörő
6,5mm AP
6,5mm AP
6,5mm AP
@@ -208,21 +208,21 @@
6,5 мм бронебойные
- Caliber: 6.5x39 mm AP<br />Rounds: 30<br />Used in: Katiba
- Kaliber: 6,5x39 mm Páncéltörő<br />Lövedékek: 30<br />Használható: Katiba
+ Caliber: 6.5x39mm AP<br />Rounds: 30<br />Used in: Katiba
+ Kaliber: 6,5x39mm Páncéltörő<br />Lövedékek: 30<br />Használható: Katiba
Kaliber: 6,5x39mm AP<br />Patronen: 30<br />Eingesetzt von: Katiba
- Calibre: 6,5x39 mm AP<br />Balas: 30<br />Se usa en: Katiba
- Calibre: 6,5x39 mm AP<br />Cartouches: 30<br />Utilisé dans: Katiba
- Kaliber: 6,5x39 mm AP<br />Pociski: 30<br />Używane w: Katiba
- Ráže: 6.5x39 mm AP<br />Munice: 30<br />Použití: Katiba
- Calibre: 6,5x39 mm AP<br />Projéteis: 30<br />Usado em: Katiba
- Calibro: 6.5x39 mm AP<br />Munizioni: 30<br />In uso su: Katiba
+ Calibre: 6,5x39mm AP<br />Balas: 30<br />Se usa en: Katiba
+ Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé dans: Katiba
+ Kaliber: 6,5x39mm AP<br />Pociski: 30<br />Używane w: Katiba
+ Ráže: 6.5x39mm AP<br />Munice: 30<br />Použití: Katiba
+ Calibre: 6,5x39mm AP<br />Projéteis: 30<br />Usado em: Katiba
+ Calibro: 6.5x39mm AP<br />Munizioni: 30<br />In uso su: Katiba
Калибр: 6,5x39 мм бронебойные<br />Патронов: 30<br />Используются с: Katiba
5.56mm 30rnd Tracer IR-DIM Mag
- 5,56 mm Nyomjelző IR-DIM 30-as Tár
+ 5,56mm Nyomjelző IR-DIM 30-as Tár
5,56mm 30-Schuss-Magazin Leuchtspur IR-DIM
Cargador de 30 balas trazadoras IR-DIM de 5,56mm
Ch. 5,56mm 30Cps Traçantes IR-DIM
@@ -234,7 +234,7 @@
5.56mm IR-DIM
- 5,56 mm IR-DIM
+ 5,56mm IR-DIM
5,56mm IR-DIM
5,56mm IR-DIM
5,56mm IR-DIM
@@ -245,21 +245,21 @@
5,56 мм ИК-трассирующие
- Caliber: 5.56x45 mm Tracer IR-DIM<br />Rounds: 30<br />Used in: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- Kaliber: 5,56x45 mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Caliber: 5.56x45mm Tracer IR-DIM<br />Rounds: 30<br />Used in: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Kaliber: 5,56x45mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Kaliber: 5,56x45mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- Calibre: 5,56x45 mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- Calibre: 5,56x45 mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- Kaliber: 5,56x45 mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- Ráže: 5.56x45 mm Svítící IR-DIM<br />Munice: 30<br />Použití: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- Calibre: 5,56x45 mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- Calibro: 5.56x45 mm Traccianti IR-DIM<br />Munizioni: 30<br />In uso su: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Calibre: 5,56x45mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Calibre: 5,56x45mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Kaliber: 5,56x45mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Ráže: 5.56x45mm Svítící IR-DIM<br />Munice: 30<br />Použití: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Calibre: 5,56x45mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Calibro: 5.56x45mm Traccianti IR-DIM<br />Munizioni: 30<br />In uso su: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Калибр: 5,56x45 мм ИК-трассирующие<br />Патронов: 30<br />Используются с: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
7.62mm 20rnd Tracer Mag
- 7,62 mm Nyomjelző IR-DIM 20-as Tár
+ 7,62mm Nyomjelző IR-DIM 20-as Tár
7,62mm 20-Schuss-Magazin Leuchtspur
Cargador de 20 balas trazadores de 7,62mm
Ch. 7,62mm 20Cps Traçantes
@@ -271,7 +271,7 @@
7.62mm Tracer
- 7,62 mm Nyomjelző
+ 7,62mm Nyomjelző
7,62mm Leuchtspur
7,62mm trazadora
7,62mm Traçantes
@@ -282,21 +282,21 @@
7,62 мм трассирущие
- Caliber: 7.62x51 mm Tracer<br />Rounds: 20<br />Used in: Mk18 ABR
- Kaliber: 7,62x51 mm Nyomjelző<br />Lövedékek: 20<br />Használható: Mk18 ABR
+ Caliber: 7.62x51mm Tracer<br />Rounds: 20<br />Used in: Mk18 ABR
+ Kaliber: 7,62x51mm Nyomjelző<br />Lövedékek: 20<br />Használható: Mk18 ABR
Kaliber: 7,62x51mm Leuchtspur<br />Patronen: 20<br />Eingesetzt von: EBR
- Calibre: 7,62x51 mm Trazadora<br />Balas: 20<br />Se usa en: Mk18 ABR
- Calibre: 7,62x51 mm Traçantes<br />Cartouches: 20<br />Utilisé dans: EBR
- Kaliber: 7,62x51 mm Smugacz<br />Pociski: 20<br />Używane w: Mk18 ABR
- Ráže: 7.62x51 mm Svítící<br />Munice: 20<br />Použití: Mk18 ABR
- Calibre: 7,62x51 mm Traçante<br />Projéteis: 20<br />Usado em: Mk18 ABR
- Calibro: 7.62x51 mm Traccianti<br />Munizioni: 20<br />In uso su: Mk18 ABR
+ Calibre: 7,62x51mm Trazadora<br />Balas: 20<br />Se usa en: Mk18 ABR
+ Calibre: 7,62x51mm Traçantes<br />Cartouches: 20<br />Utilisé dans: EBR
+ Kaliber: 7,62x51mm Smugacz<br />Pociski: 20<br />Używane w: Mk18 ABR
+ Ráže: 7.62x51mm Svítící<br />Munice: 20<br />Použití: Mk18 ABR
+ Calibre: 7,62x51mm Traçante<br />Projéteis: 20<br />Usado em: Mk18 ABR
+ Calibro: 7.62x51mm Traccianti<br />Munizioni: 20<br />In uso su: Mk18 ABR
Калибр: 7,62x51 мм трассирующие<br />Патронов: 20<br />Используются с: Mk18 ABR
7.62mm 20rnd Tracer IR-DIM Mag
- 7,62 mm Nyomjelző IR-DIM 20-as Tár
- 7,62 mm 20-Schuss-Magazin Leuchtspur IR-DIM
+ 7,62mm Nyomjelző IR-DIM 20-as Tár
+ 7,62mm 20-Schuss-Magazin Leuchtspur IR-DIM
Cargador de 20 balas trazadoras IR-DIM de 7,62mm
Ch. 7,62mm 20Cps Traçantes IR-DIM
Magazynek 7,62mm 20rd Smugacz IR-DIM
@@ -307,7 +307,7 @@
7.62mm IR-DIM
- 7,62 mm IR-DIM
+ 7,62mm IR-DIM
7,62mm IR-DIM
7,62mm IR-DIM
7,62mm IR-DIM
@@ -318,20 +318,20 @@
7,62 мм ИК-трассирующие
- Caliber: 7.62x51 mm Tracer IR-DIM<br />Rounds: 20<br />Used in: Mk18 ABR
- Kaliber: 7,62x51 mm Nyomjelző IR-DIM<br />Lövedékek: 20<br />Használható: Mk18 ABR
+ Caliber: 7.62x51mm Tracer IR-DIM<br />Rounds: 20<br />Used in: Mk18 ABR
+ Kaliber: 7,62x51mm Nyomjelző IR-DIM<br />Lövedékek: 20<br />Használható: Mk18 ABR
Kaliber: 7,62x51mm Leuchtspur IR-DIM<br />Patronen: 20<br />Eingesetzt von: EBR
- Calibre: 7,62x51 mm Trazadoras IR-DIM<br />Balas: 20<br />Se usa en: Mk18 ABR
- Calibre: 7,62x51 mm Traçantes IR-DIM<br />Cartouches: 20<br />Utilisé dans: EBR
- Kaliber: 7,62x51 mm Smugacz IR-DIM<br />Pociski: 20<br />Używane w: Mk18 ABR
- Ráže: 7.62x51 mm Svítící IR-DIM<br />Munice: 20<br />Použití: Mk18 ABR
- Calibre: 7,62x51 mm Traçante IR-DIM<br />Projéteis: 20<br />Usado em: Mk18 ABR
- Calibro: 7.62x51 mm Traccianti IR-DIM<br />Munizioni: 20<br />In uso su: Mk18 ABR
+ Calibre: 7,62x51mm Trazadoras IR-DIM<br />Balas: 20<br />Se usa en: Mk18 ABR
+ Calibre: 7,62x51mm Traçantes IR-DIM<br />Cartouches: 20<br />Utilisé dans: EBR
+ Kaliber: 7,62x51mm Smugacz IR-DIM<br />Pociski: 20<br />Używane w: Mk18 ABR
+ Ráže: 7.62x51mm Svítící IR-DIM<br />Munice: 20<br />Použití: Mk18 ABR
+ Calibre: 7,62x51mm Traçante IR-DIM<br />Projéteis: 20<br />Usado em: Mk18 ABR
+ Calibro: 7.62x51mm Traccianti IR-DIM<br />Munizioni: 20<br />In uso su: Mk18 ABR
Калибр: 7,62x51 мм ИК-трассирующие<br />Патронов: 20<br />Используются с: Mk18 ABR
7.62mm 20Rnd SD Mag
- 7,62 mm Halk 20-as Tár
+ 7,62mm Halk 20-as Tár
7,62mm 20-Schuss-Magazin SD
Cargador de 20 balas SD de 7,62mm
Ch. 7,62mm 20Cps SD
@@ -343,7 +343,7 @@
7.62mm SD
- 7,62 mm Halk
+ 7,62mm Halk
7,62mm SD
7,62mm SD
7,62mm SD
@@ -354,15 +354,15 @@
7,62 мм дозвуковые
- Caliber: 7.62x51 mm SD<br />Rounds: 20<br />Used in: Mk18 ABR
- Kaliber: 7,62x51 mm Halk<br />Lövedékek: 20<br />Használható: Mk18 ABR
+ Caliber: 7.62x51mm SD<br />Rounds: 20<br />Used in: Mk18 ABR
+ Kaliber: 7,62x51mm Halk<br />Lövedékek: 20<br />Használható: Mk18 ABR
Kaliber: 7,62x51mm SD<br />Patronen: 20<br />Eingesetzt von: EBR
- Calibre: 7,62x51 mm SD<br />Balas: 20<br />Se usa en: Mk18 ABR
- Calibre: 7,62x51 mm SD<br />Cartouches: 20<br />Utilisé dans: EBR
- Kaliber: 7,62x51 mm SD<br />Pociski: 20<br />Używane w: Mk18 ABR
- Ráže: 7.62x51 mm SD<br />Munice: 20<br />Použití: Mk18 ABR
- Calibre: 7,62x51 mm SD<br />Projéteis: 20<br />Usado em: Mk18 ABR
- Calibro: 7.62x51 mm Sil.<br />Munizioni: 20<br />In uso su: Mk18 ABR
+ Calibre: 7,62x51mm SD<br />Balas: 20<br />Se usa en: Mk18 ABR
+ Calibre: 7,62x51mm SD<br />Cartouches: 20<br />Utilisé dans: EBR
+ Kaliber: 7,62x51mm SD<br />Pociski: 20<br />Używane w: Mk18 ABR
+ Ráže: 7.62x51mm SD<br />Munice: 20<br />Použití: Mk18 ABR
+ Calibre: 7,62x51mm SD<br />Projéteis: 20<br />Usado em: Mk18 ABR
+ Calibro: 7.62x51mm Sil.<br />Munizioni: 20<br />In uso su: Mk18 ABR
Калибр: 7,62x51 мм дозвуковые<br />Патронов: 20<br />Используются с: Mk18 ABR
@@ -462,7 +462,7 @@
Caliber: 9.3x64mm Tracer<br />Rounds: 10<br />Used in: Cyrus
Kaliber: 9,3x64mm Leuchtspur<br />Patronen: 10<br />Eingesetzt von: Cyrus
- Kaliber: 9,3x64 mm Smugacz<br />Pociski: 10<br />Używany w: Cyrus
+ Kaliber: 9,3x64mm Smugacz<br />Pociski: 10<br />Używany w: Cyrus
Calibre: 9.3x64mm Traçante<br />Cartouches: 10<br />Utilisé dans: Cyrus
Calibre: 9.3x64mm trazadora<br />Balas: 10<br />Se usa en: Cyrus
Калибр: 9,3x64 мм трассирующие<br />Патронов: 10<br />Используются с: Cyrus
@@ -487,7 +487,7 @@
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 10<br />Used in: Cyrus
Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Patronen: 10<br />Eingesetzt von: Cyrus
- Kaliber: 9,3x64 mm Smugacz IR-DIM<br />Pociski: 10<br />Używany w: Cyrus
+ Kaliber: 9,3x64mm Smugacz IR-DIM<br />Pociski: 10<br />Używany w: Cyrus
Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 10<br />Utilisé dans: Cyrus
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 10<br />Se usa en: Cyrus
Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 10<br />Используются с: Cyrus
@@ -513,7 +513,7 @@
Caliber: 9.3x64mm Tracer<br />Rounds: 150<br />Used in: Navid
Kaliber: 9,3x64mm Leuchtspur<br />Patronen: 150<br />Eingesetzt von: Navid
- Kaliber: 9,3x64 mm Smugacz<br />Pociski: 150<br />Używane w: Navid
+ Kaliber: 9,3x64mm Smugacz<br />Pociski: 150<br />Używane w: Navid
Calibre: 9.3x64mm Traçante<br />Cartouches: 150<br />Utilisé dans: Navid
Calibre: 9.3x64mm trazadora<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм трассирующие<br />Патронов: 150<br />Используются с: Навид
@@ -538,7 +538,7 @@
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 150<br />Used in: Navid
Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Patronen: 150<br />Eingesetzt von: Navid
- Kaliber: 9,3x64 mm Smugacz IR-DIM<br />Pociski: 150<br />Używane w: Navid
+ Kaliber: 9,3x64mm Smugacz IR-DIM<br />Pociski: 150<br />Używane w: Navid
Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 150<br />Utilisé dans: Navid
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 150<br />Используются с: Навид
@@ -563,7 +563,7 @@
Caliber: 9.3x64mm AP<br />Rounds: 150<br />Used in: Navid
Kaliber: 9,3x64mm Hartkern<br />Patronen: 150<br />Eingesetzt von: Navid
- Kaliber: 9,3x64 mm AP<br />Pociski: 150<br />Używane w: Navid
+ Kaliber: 9,3x64mm AP<br />Pociski: 150<br />Używane w: Navid
Calibre: 9.3x64mm AP<br />Cartouches: 150<br />Utilisé dans: Navid
Calibre: 9.3x64mm AP<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм бронебойные<br />Патронов: 150<br />Используются с: Навид
@@ -618,7 +618,7 @@
7.62x54mm 10Rnd Tracer IR-DIM Mag
- Magazynek 7,62x54 mm 10rd Smugacz IR-DIM
+ Magazynek 7,62x54mm 10rd Smugacz IR-DIM
Chargeur 7.62x54mm 10Rnd Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
@@ -634,7 +634,7 @@
7.62x54mm 10Rnd Tracer IR-DIM Mag
- Magazynek 7,62x54 mm 10rd Smugacz IR-DIM
+ Magazynek 7,62x54mm 10rd Smugacz IR-DIM
Chargeur 7.62x54mm 10Cps Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
@@ -705,10 +705,10 @@
5,56mm Mk262
- Caliber: 5.56x45 mm NATO (Mk262)<br />Rounds: 30
- Kaliber: 5,56x45 mm NATO (Mk262)<br />Pociski: 30
- Calibre: 5.56x45 mm NATO (Mk262)<br />Cartouches: 30
- Calibre: 5.56x45 mm NATO (Mk262)<br />Balas: 30
+ Caliber: 5.56x45mm NATO (Mk262)<br />Rounds: 30
+ Kaliber: 5,56x45mm NATO (Mk262)<br />Pociski: 30
+ Calibre: 5.56x45mm NATO (Mk262)<br />Cartouches: 30
+ Calibre: 5.56x45mm NATO (Mk262)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk262)<br />Патронов: 30
Kaliber: 5,56x45mm NATO (Mk262)<br />Schuss: 30
@@ -729,10 +729,10 @@
5,56mm Mk318
- Caliber: 5.56x45 mm NATO (Mk318)<br />Rounds: 30
- Kaliber: 5,56x45 mm NATO (Mk318)<br />Pociski: 30
- Calibre: 5.56x45 mm NATO (Mk318)<br />Cartouches: 30
- Calibre: 5.56x45 mm NATO (Mk318)<br />Balas: 30
+ Caliber: 5.56x45mm NATO (Mk318)<br />Rounds: 30
+ Kaliber: 5,56x45mm NATO (Mk318)<br />Pociski: 30
+ Calibre: 5.56x45mm NATO (Mk318)<br />Cartouches: 30
+ Calibre: 5.56x45mm NATO (Mk318)<br />Balas: 30
Калибр: 5,56x45 мм NATO (Mk318)<br />Патронов: 30
Kaliber: 5,56x45mm NATO (Mk318)<br />Patronen: 30
@@ -753,10 +753,10 @@
5,56mm AP
- Caliber: 5.56x45 mm NATO (M995 AP)<br />Rounds: 30
- Kaliber: 5,56x45 mm NATO (M995 AP)<br />Pociski: 30
- Calibre: 5.56x45 mm NATO (M995 AP)<br />Cartouches: 30
- Calibre: 5.56x45 mm NATO (M995 AP)<br />Balas: 30
+ Caliber: 5.56x45mm NATO (M995 AP)<br />Rounds: 30
+ Kaliber: 5,56x45mm NATO (M995 AP)<br />Pociski: 30
+ Calibre: 5.56x45mm NATO (M995 AP)<br />Cartouches: 30
+ Calibre: 5.56x45mm NATO (M995 AP)<br />Balas: 30
Калибр: 5,56x45 мм NATO (M995 AP)<br />Патронов: 30
Kaliber: 5,56x45mm NATO (M995 AP)<br />Patronen: 30
@@ -777,10 +777,10 @@
7,62mm M118LR
- Caliber: 7.62x51 mm NATO (M118LR)<br />Rounds: 10
- Kaliber: 7,62x51 mm NATO (M118LR)<br />Pociski: 10
- Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 10
- Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 10
+ Caliber: 7.62x51mm NATO (M118LR)<br />Rounds: 10
+ Kaliber: 7,62x51mm NATO (M118LR)<br />Pociski: 10
+ Calibre: 7.62x51mm NATO (M118LR)<br />Cartouches: 10
+ Calibre: 7.62x51mm NATO (M118LR)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 10
Kaliber: 7,62x51mm NATO (M118LR)<br />Patronen: 10
@@ -801,10 +801,10 @@
7,62mm M118LR
- Caliber: 7.62x51 mm NATO (M118LR)<br />Rounds: 20
- Kaliber: 7,62x51 mm NATO (M118LR)<br />Pociski: 20
- Calibre: 7.62x51 mm NATO (M118LR)<br />Cartouches: 20
- Calibre: 7.62x51 mm NATO (M118LR)<br />Balas: 20
+ Caliber: 7.62x51mm NATO (M118LR)<br />Rounds: 20
+ Kaliber: 7,62x51mm NATO (M118LR)<br />Pociski: 20
+ Calibre: 7.62x51mm NATO (M118LR)<br />Cartouches: 20
+ Calibre: 7.62x51mm NATO (M118LR)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M118LR)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (M118LR)<br />Patronen: 20
@@ -825,12 +825,12 @@
7.62mm Mk316
- Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 10
- Kaliber: 7,62x51 mm NATO (Mk316 Mod 0)<br />Pociski: 10
- Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 10
- Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 10
+ Caliber: 7.62x51mm NATO (Mk316 Mod 0)<br />Rounds: 10
+ Kaliber: 7,62x51mm NATO (Mk316 Mod 0)<br />Pociski: 10
+ Calibre: 7.62x51mm NATO (Mk316 Mod 0)<br />Cartouches: 10
+ Calibre: 7.62x51mm NATO (Mk316 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 10
- Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Patronen: 10
+ Kaliber: 7.62x51mm NATO (Mk316 Mod 0)<br />Patronen: 10
7.62mm 20Rnd Mag (Mk316 Mod 0)
@@ -849,12 +849,12 @@
7.62mm Mk316
- Caliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Rounds: 20
- Kaliber: 7,62x51 mm NATO (Mk316 Mod 0)<br />Pociski: 20
- Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Cartouches: 20
- Calibre: 7.62x51 mm NATO (Mk316 Mod 0)<br />Balas: 20
+ Caliber: 7.62x51mm NATO (Mk316 Mod 0)<br />Rounds: 20
+ Kaliber: 7,62x51mm NATO (Mk316 Mod 0)<br />Pociski: 20
+ Calibre: 7.62x51mm NATO (Mk316 Mod 0)<br />Cartouches: 20
+ Calibre: 7.62x51mm NATO (Mk316 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk316 Mod 0)<br />Патронов: 20
- Kaliber: 7.62x51 mm NATO (Mk316 Mod 0)<br />Patronen: 20
+ Kaliber: 7.62x51mm NATO (Mk316 Mod 0)<br />Patronen: 20
7.62mm 10Rnd Mag (Mk319 Mod 0)
@@ -873,10 +873,10 @@
7,62mm Mk319
- Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 10
- Kaliber: 7,62x51 mm NATO (Mk319 Mod 0)<br />Pociski: 10
- Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 10
- Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 10
+ Caliber: 7.62x51mm NATO (Mk319 Mod 0)<br />Rounds: 10
+ Kaliber: 7,62x51mm NATO (Mk319 Mod 0)<br />Pociski: 10
+ Calibre: 7.62x51mm NATO (Mk319 Mod 0)<br />Cartouches: 10
+ Calibre: 7.62x51mm NATO (Mk319 Mod 0)<br />Balas: 10
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 10
Kaliber: 7,62x51mm NATO (Mk319 Mod 0)<br />Patronen: 10
@@ -897,10 +897,10 @@
7,62mm Mk319
- Caliber: 7.62x51 mm NATO (Mk319 Mod 0)<br />Rounds: 20
- Kaliber: 7,62x51 mm NATO (Mk319 Mod 0)<br />Pociski: 20
- Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Cartouches: 20
- Calibre: 7.62x51 mm NATO (Mk319 Mod 0)<br />Balas: 20
+ Caliber: 7.62x51mm NATO (Mk319 Mod 0)<br />Rounds: 20
+ Kaliber: 7,62x51mm NATO (Mk319 Mod 0)<br />Pociski: 20
+ Calibre: 7.62x51mm NATO (Mk319 Mod 0)<br />Cartouches: 20
+ Calibre: 7.62x51mm NATO (Mk319 Mod 0)<br />Balas: 20
Калибр: 7,62x51 мм NATO (Mk319 Mod 0)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (Mk319 Mod 0)<br />Patronen: 20
@@ -921,10 +921,10 @@
7,62mm AP
- Caliber: 7.62x51 mm NATO (M993 AP)<br />Rounds: 10
- Kaliber: 7,62x51 mm NATO (M993 AP)<br />Pociski: 10
- Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 10
- Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 10
+ Caliber: 7.62x51mm NATO (M993 AP)<br />Rounds: 10
+ Kaliber: 7,62x51mm NATO (M993 AP)<br />Pociski: 10
+ Calibre: 7.62x51mm NATO (M993 AP)<br />Cartouches: 10
+ Calibre: 7.62x51mm NATO (M993 AP)<br />Balas: 10
Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 10
Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 10
@@ -945,10 +945,10 @@
7,62mm AP
- Caliber: 7.62x51 mm NATO (M993 AP)<br />Rounds: 20
- Kaliber: 7,62x51 mm NATO (M993 AP)<br />Pociski: 20
- Calibre: 7.62x51 mm NATO (M993 AP)<br />Cartouches: 20
- Calibre: 7.62x51 mm NATO (M993 AP)<br />Balas: 20
+ Caliber: 7.62x51mm NATO (M993 AP)<br />Rounds: 20
+ Kaliber: 7,62x51mm NATO (M993 AP)<br />Pociski: 20
+ Calibre: 7.62x51mm NATO (M993 AP)<br />Cartouches: 20
+ Calibre: 7.62x51mm NATO (M993 AP)<br />Balas: 20
Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 20
@@ -969,10 +969,10 @@
7,62mm (Mk248 Mod 0)
- Caliber: 7.62x67 mm NATO (Mk248 Mod 0)<br />Rounds: 20
- Kaliber: 7,62x67 mm NATO (Mk248 Mod 0)<br />Pociski: 20
+ Caliber: 7.62x67mm NATO (Mk248 Mod 0)<br />Rounds: 20
+ Kaliber: 7,62x67mm NATO (Mk248 Mod 0)<br />Pociski: 20
Calibre: 7.62x67mm NATO (Mk248 Mod 0)<br />Cartouches: 20
- Calibre: 7.62x67 mm NATO (Mk248 Mod 0)<br />Balas: 20
+ Calibre: 7.62x67mm NATO (Mk248 Mod 0)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 0)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (Mk248 Mod 0)<br />Patronen: 20
@@ -993,10 +993,10 @@
7,62mm (Mk248 Mod 1)
- Caliber: 7.62x67 mm NATO (Mk248 Mod 1)<br />Rounds: 20
- Kaliber: 7,62x67 mm NATO (Mk248 Mod 1)<br />Pociski: 20
+ Caliber: 7.62x67mm NATO (Mk248 Mod 1)<br />Rounds: 20
+ Kaliber: 7,62x67mm NATO (Mk248 Mod 1)<br />Pociski: 20
Calibre: 7.62x67mm NATO (Mk248 Mod 1)<br />Cartouches: 20
- Calibre: 7.62x67 mm NATO (Mk248 Mod 1)<br />Balas: 20
+ Calibre: 7.62x67mm NATO (Mk248 Mod 1)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Mk248 Mod 1)<br />Патронов: 20
Kaliber: 7.62x51mm NATO (Mk248 Mod 1)<br />Patronen: 20
@@ -1017,10 +1017,10 @@
7,62mm (OTM)
- Caliber: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Rounds: 20
- Kaliber: 7,62x67 mm NATO (Berger Hybrid OTM)<br />Pociski: 20
+ Caliber: 7.62x67mm NATO (Berger Hybrid OTM)<br />Rounds: 20
+ Kaliber: 7,62x67mm NATO (Berger Hybrid OTM)<br />Pociski: 20
Calibre: 7.62x67mm NATO (Berger Hybrid OTM)<br />Cartouches: 20
- Calibre: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Balas: 20
+ Calibre: 7.62x67mm NATO (Berger Hybrid OTM)<br />Balas: 20
Калибр: 7,62x67 мм NATO (Berger Hybrid OTM)<br />Патронов: 20
Kaliber: 7.62x67mm NATO (Berger Hybrid OTM)<br />Patronen: 20
@@ -1028,7 +1028,7 @@
6.5x47mm 30Rnd Mag (HPBT Scenar)
6.5x47mm 30Cps (HPBT Scenar)
Cargador de 30 balas de 6.5x47mm (HPBT Scenar)
- Magazynek 6,5x47 mm 30rd (HPBT Scenar)
+ Magazynek 6,5x47mm 30rd (HPBT Scenar)
Магазин из 30-ти 6,5x47 мм (HPBT Scenar)
6,5x47mm 30-Schuss-Magazin (HPBT Scenar)
@@ -1044,7 +1044,7 @@
Caliber: 6.5x47mm (HPBT Scenar)<br />Rounds: 30<br />Used in: MXM
Calibre: 6.5x47mm (HPBT Scenar)<br />Cartouches: 30
Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30
- Kaliber: 6,5x47 mm (HPBT Scenar)<br />Pociski: 30
+ Kaliber: 6,5x47mm (HPBT Scenar)<br />Pociski: 30
Калибр: 6,5x47 мм (HPBT Scenar)<br />Патронов: 30
Kaliber: 6,5x47mm (HPBT Scenar)<br />Patronen: 30<br />Eingesetzt von: MXM
@@ -1075,18 +1075,18 @@
.338 10-Schuss-Magazin (300gr Sierra MatchKing HPBT)
- .338 (HPBT)
- .338 (HPBT)
- .338 (HPBT)
- .338 (HPBT)
- .338 (HPBT)
- .338 (HPBT)
+ .338 HPBT
+ .338 HPBT
+ .338 HPBT
+ .338 HPBT
+ .338 HPBT
+ .338 HPBT
Caliber: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Rounds: 10
Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Cartouches: 10
Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Balas: 10
- Kaliber: 8,6x70 mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10
+ Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10
Калибр: .338 (300 гран Sierra MatchKing HPBT)<br />Патронов: 10
Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Patronen: 10
@@ -1104,13 +1104,13 @@
.338 AP
.338 AP
.338 бронебойные
- .338 (AP)
+ .338 AP
Caliber: 8.6x70mm (API526)<br />Rounds: 10
Calibre: 8.6x70mm (API526)<br />Cartouches: 10
Calibre: 8.6x70mm (API526)<br />Balas: 10
- Kaliber: 8,6x70 mm (API526)<br />Pociski: 10
+ Kaliber: 8,6x70mm (API526)<br />Pociski: 10
Калибр: .338 (API526)<br />Патронов: 10
Kaliber: 8,6x70mm (API526)<br />Patronen: 10
@@ -1118,7 +1118,7 @@
12.7x99mm 5Rnd Mag
12.7x99mm 5Cps
Cargador de 5 balas de 12.7x99mm
- Magazynek 12,7x99 mm 5rd
+ Magazynek 12,7x99mm 5rd
Магазин из 5-ти 12,7x99 мм
12,7x99mm 5-Schuss-Magazin
@@ -1134,7 +1134,7 @@
Caliber: 12.7x99mm<br />Rounds: 5
Calibre: 12.7x99mm<br />Cartouches: 5
Calibre: 12.7x99mm<br />Balas: 5
- Kaliber: 12,7x99 mm<br />Pociski: 5
+ Kaliber: 12,7x99mm<br />Pociski: 5
Калибр: 12,7x99 мм<br />Патронов: 5
Kaliber: 12,7x99mm<br />Patronen: 5
@@ -1156,14 +1156,14 @@
Caliber: 12.7x99mm API<br />Rounds: 5
Calibre: 12.7x99mm API<br />Cartouches: 5
Calibre: 12.7x99mm API<br />Balas: 5
- Kaliber: 12,7x99 mm API<br />Pociski: 5
+ Kaliber: 12,7x99mm API<br />Pociski: 5
Kaliber:12,7x99mm API<br />Patronen: 5
12.7x99mm 5Rnd Mag (AMAX)
12.7x99mm 5Rnd Mag (AMAX)
Cargador de 5 balas de 12.7x99mm (AMAX)
- Magazynek 12,7x99 mm 5rd (AMAX)
+ Magazynek 12,7x99mm 5rd (AMAX)
Магазин из 5-ти 12,7x99 мм (A-MAX)
12,7x99mm 5-Schuss-Magazin (AMAX)
@@ -1179,7 +1179,7 @@
Caliber: 12.7x99mm (AMAX)<br />Rounds: 5
Calibre: 12.7x99mm (AMAX)<br />Cartouches: 5
Calibre: 12.7x99mm (AMAX)<br />Balas: 5
- Kaliber: 12,7x99 mm (AMAX)<br />Pociski: 5
+ Kaliber: 12,7x99mm (AMAX)<br />Pociski: 5
Калибр: 12,7x99 мм (A-MAX)<br />Патронов: 5
Kaliber:12,7x99mm (AMAX)<br />Patronen: 5
From 621e1513a0902f3cadda9e2f9ee834a4b1c86af0 Mon Sep 17 00:00:00 2001
From: bux578
Date: Tue, 28 Apr 2015 20:24:59 +0200
Subject: [PATCH 079/478] ballistic stringtable fixes
---
addons/ballistics/stringtable.xml | 106 +++++++++++++++---------------
1 file changed, 53 insertions(+), 53 deletions(-)
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 87ebafc831..f885a79691 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -5,7 +5,7 @@
6.5mm 30Rnd Tracer IR-DIM Mag
6,5mm Nyomjelző IR-DIM 30-as Tár
- 6,5mm 30-Schuss-Magazin Leuchtspur IR-DIM
+ 6,5mm 30-Patronen-Magazin Leuchtspur IR-DIM
Cargador de 30 balas trazadoras IR-DIM de 6,5mm
Ch. 6,5mm 30Cps Traçantes IR-DIM
Magazynek 6,5mm 30rd Smugacz IR-DIM
@@ -41,7 +41,7 @@
6.5mm 30Rnd SD Mag
6,5mm Halk 30-as Tár
- 6,5mm 30-Schuss-Magazin SD
+ 6,5mm 30-Patronen-Magazin SD
Cargador de 30 balas SD de 6,5mm
Ch. 6,5mm 30Cps SD
Magazynek 6,5mm 30rd SD
@@ -77,7 +77,7 @@
6.5mm 30Rnd AP Mag
6,5mm Páncéltörő 30-as Tár
- 6,5mm 30-Schuss-Magazin AP
+ 6,5mm 30-Patronen-Magazin AP
Cargador de 30 balas AP de 6,5mm
Ch. 6,5mm 30Cps AP
Magazynek 6,5mm 30rd AP
@@ -114,7 +114,7 @@
6.5mm 30Rnd Tracer IR-DIM Mag
6,5mm IR-DIM Nyomjelző 30-as Tár
- 6,5mm 30-Schuss-Magazin Leuchtspur IR-DIM
+ 6,5mm 30-Patronen-Magazin Leuchtspur IR-DIM
Cargador de 30 balas trazadoras IR-DIM de 6,5mm
Ch. 6,5mm 30Cps Traçantes IR-DIM
Magazynek 6,5mm 30rd Smugacz IR-DIM
@@ -150,7 +150,7 @@
6.5mm 30Rnd SD Mag
6,5mm Halk 30-as Tár
- 6,5mm 30-Schuss-Magazin SD
+ 6,5mm 30-Patronen-Magazin SD
Cargador de 30 balas SD de 6,5mm
Ch. 6,5mm 30Cps SD
Magazynek 6,5mm 30rd SD
@@ -186,7 +186,7 @@
6.5mm 30Rnd AP Mag
6,5mm Páncéltörő 30-as Tár
- 6,5mm 30-Schuss-Magazin AP
+ 6,5mm 30-Patronen-Magazin AP
Cargador de 30 balas AP de 6,5mm
Ch. 6,5mm 30Cps AP
Magazynek 6,5mm 30rd AP
@@ -223,7 +223,7 @@
5.56mm 30rnd Tracer IR-DIM Mag
5,56mm Nyomjelző IR-DIM 30-as Tár
- 5,56mm 30-Schuss-Magazin Leuchtspur IR-DIM
+ 5,56mm 30-Patronen-Magazin Leuchtspur IR-DIM
Cargador de 30 balas trazadoras IR-DIM de 5,56mm
Ch. 5,56mm 30Cps Traçantes IR-DIM
Magazynek 5,56mm 30rd Smugacz IR-DIM
@@ -260,7 +260,7 @@
7.62mm 20rnd Tracer Mag
7,62mm Nyomjelző IR-DIM 20-as Tár
- 7,62mm 20-Schuss-Magazin Leuchtspur
+ 7,62mm 20-Patronen-Magazin Leuchtspur
Cargador de 20 balas trazadores de 7,62mm
Ch. 7,62mm 20Cps Traçantes
Magazynek 7,62mm 20rd Smugacz
@@ -296,7 +296,7 @@
7.62mm 20rnd Tracer IR-DIM Mag
7,62mm Nyomjelző IR-DIM 20-as Tár
- 7,62mm 20-Schuss-Magazin Leuchtspur IR-DIM
+ 7,62mm 20-Patronen-Magazin Leuchtspur IR-DIM
Cargador de 20 balas trazadoras IR-DIM de 7,62mm
Ch. 7,62mm 20Cps Traçantes IR-DIM
Magazynek 7,62mm 20rd Smugacz IR-DIM
@@ -332,7 +332,7 @@
7.62mm 20Rnd SD Mag
7,62mm Halk 20-as Tár
- 7,62mm 20-Schuss-Magazin SD
+ 7,62mm 20-Patronen-Magazin SD
Cargador de 20 balas SD de 7,62mm
Ch. 7,62mm 20Cps SD
Magazynek 7,62mm 20rd SD
@@ -368,7 +368,7 @@
.338 NM 130Rnd Tracer Belt
- .338 NM 130-Schuss-Gurt Leuchtspur
+ .338 NM 130-Patronen-Gurt Leuchtspur
Taśma .338 NM 130rd Smugacz
Bande .338 NM 130Cps Traçante
Cinta de 130 balas trazadoras de .338 NM
@@ -393,7 +393,7 @@
.338 NM 130Rnd IR-DIM Belt
- .338 NM 130-Schuss-Gurt Leuchtspur IR-DIM
+ .338 NM 130-Patronen-Gurt Leuchtspur IR-DIM
Taśma .338 NM 130rd IR-DIM
Bande .338 NM 130Cps IR-DIM
Cinta de 130 balas IR-DIM de .338 NM
@@ -418,7 +418,7 @@
.338 NM 130Rnd AP Belt
- .338 NM 130-Schuss-Gurt Hartkern
+ .338 NM 130-Patronen-Gurt Hartkern
Taśma .338 NM 130rd AP
Bande .338 NM 130Cps AP
Cinta de 130 balas AP de .338 NM
@@ -444,7 +444,7 @@
9.3mm 10Rnd Tracer Mag
- 9,3mm 10-Schuss-Magazin Leuchtspur
+ 9,3mm 10-Patronen-Magazin Leuchtspur
Magazynek 9.3mm 10rd Smugacz
Chargeur 9.3mm 10Cps Traçante
Cargador de 10 balas trazadoras de 9.3mm
@@ -469,7 +469,7 @@
9.3mm 10Rnd Tracer IR-DIM Mag
- 9,3mm 10-Schuss-Magazin Leuchtspur IR-DIM
+ 9,3mm 10-Patronen-Magazin Leuchtspur IR-DIM
Magazynek 9,3mm 10rd Smugacz IR-DIM
Chargeur 9.3mm 10Cps Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 9.3mm
@@ -495,7 +495,7 @@
9.3mm 150Rnd Tracer Belt
- 9,3mm 150-Schuss-Gurt Leuchtspur
+ 9,3mm 150-Patronen-Gurt Leuchtspur
Taśma 9,3mm 150rd Smugacz
Bande 9.3mm 150Cps Traçante
Cinta de 150 balas trazadoras de 9.3mm
@@ -520,7 +520,7 @@
9.3mm 150Rnd Tracer IR-DIM Belt
- 9,3mm 150-Schuss-Gurt Leuchtspur IR-DIM
+ 9,3mm 150-Patronen-Gurt Leuchtspur IR-DIM
Taśma 9,3mm 150rd Smugacz IR-DIM
Bande 9.3mm 150Cps Traçante IR-DIM
Cinta de 150 balas trazadoras IR-DIM de 9.3mm
@@ -545,7 +545,7 @@
9.3mm 150Rnd AP Belt
- 9,3mm 150-Schuss-Gurt Hartkern
+ 9,3mm 150-Patronen-Gurt Hartkern
Taśma 9,3mm 150rd AP
Bande 9.3mm 150Cps AP
Cinta de 150 balas AP de 9.3mm
@@ -574,7 +574,7 @@
Chargeur 9x19mm 16Cps
Cargador de 16 balas de 9x19mm
Магазин из 16-ти 9х19 мм
- 9x19mm 20-Schuss-Magazin
+ 9x19mm 20-Patronen-Magazin
9x19mm
@@ -590,7 +590,7 @@
9x19mm 30Cps
Cargador de 16 balas de 9x19mm
Магазин из 16-ти 9х19 мм
- 9x19mm 30-Schuss-Magazin
+ 9x19mm 30-Patronen-Magazin
9x19mm 30Rnd Mag
@@ -598,7 +598,7 @@
9x19mm 30Cps
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
- 9x19mm 30-Schuss-Magazin
+ 9x19mm 30-Patronen-Magazin
9x19mm
@@ -614,7 +614,7 @@
9x19mm 30Cps
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
- 9x19mm 30-Schuss-Magazin
+ 9x19mm 30-Patronen-Magazin
7.62x54mm 10Rnd Tracer IR-DIM Mag
@@ -622,7 +622,7 @@
Chargeur 7.62x54mm 10Rnd Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
- 7,62x54mm 10-Schuss-Magazin IR-DIM Leuchtspur
+ 7,62x54mm 10-Patronen-Magazin IR-DIM Leuchtspur
7.62mm IR-DIM
@@ -638,7 +638,7 @@
Chargeur 7.62x54mm 10Cps Traçante IR-DIM
Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
- 7,62x54mm 10-Schuss-Magazin IR-DIM Leuchtspur
+ 7,62x54mm 10-Patronen-Magazin IR-DIM Leuchtspur
6.5mm 100Rnd Tracer IR-DIM Mag
@@ -646,7 +646,7 @@
Chargeur 6.5mm 100Rnd Traçante IR-DIM
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
- 6,5mm 100-Schuss-Magazin IR-DIM Leuchtspur
+ 6,5mm 100-Patronen-Magazin IR-DIM Leuchtspur
6.5mm IR-DIM
@@ -662,7 +662,7 @@
Chargeur 6.5mm 100Rnd Traçante IR-DIM
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
- 6,5mm 100-Schuss-Magazin IR-DIM Leuchtspur<br />Patronen: 100<br />Eingesetzt von: MXLSW
+ 6,5mm 100-Patronen-Magazin IR-DIM Leuchtspur<br />Patronen: 100<br />Eingesetzt von: MXLSW
6.5mm 200Rnd Tracer IR-DIM Belt
@@ -670,7 +670,7 @@
Bande 6.5mm 200Rnd Traçante IR-DIM
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
- 6,5mm 200-Schuss-Gurt IR-DIM Leuchtspur
+ 6,5mm 200-Patronen-Gurt IR-DIM Leuchtspur
6.5mm IR-DIM
@@ -686,7 +686,7 @@
Bande 6.5mm 200Cps Traçante IR-DIM
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
- 6,5mm 200-Schuss-Gurt IR-DIM Leuchtspur<br />Patronen: 200<br />Eingesetzt von: Stoner 99 LMG
+ 6,5mm 200-Patronen-Gurt IR-DIM Leuchtspur<br />Patronen: 200<br />Eingesetzt von: Stoner 99 LMG
5.56mm 30Rnd Mag (Mk262)
@@ -694,7 +694,7 @@
5.56mm 30Cps (Mk262)
Cargador de 30 balas de 5.56mm (Mk262)
Магазин из 30-ти 5.56 мм Mk262
- 5,56mm 30-Schuss-Magazin (Mk262)
+ 5,56mm 30-Patronen-Magazin (Mk262)
5.56mm Mk262
@@ -718,7 +718,7 @@
5.56mm 30Cps (Mk318)
Cargador de 30 balas de 5.56mm (Mk318)
Магазин из 30-ти 5.56 мм (Mk318)
- 5,56mm 30-Schuss-Magazin (Mk318)
+ 5,56mm 30-Patronen-Magazin (Mk318)
5.56mm Mk318
@@ -742,7 +742,7 @@
5.56mm 30Cps (M995 AP)
Cargador de 30 balas de 5.56mm (M995 AP)
Магазин из 30-ти 5.56 мм (M995 AP)
- 5,56mm 30-Schuss-Magazin (M995AP)
+ 5,56mm 30-Patronen-Magazin (M995AP)
5.56mm AP
@@ -766,7 +766,7 @@
7.62mm 10Cps (M118LR)
Cargador de 10 balas de 7.62mm (M118LR)
Магазин из 10-ти 7,62 мм (M118LR)
- 7,62mm 10-Schuss-Magazin (M118LR)
+ 7,62mm 10-Patronen-Magazin (M118LR)
7.62mm M118LR
@@ -790,7 +790,7 @@
7.62mm 20Cps (M118LR)
Cargador de 20 balas de 7.62mm (M118LR)
Магазин из 20-ти 7,62 мм (M118LR)
- 7,62mm 20-Schuss-Magazin (M118LR)
+ 7,62mm 20-Patronen-Magazin (M118LR)
7.62mm M118LR
@@ -814,7 +814,7 @@
7.62mm 10Cps (Mk316 Mod 0)
Cargador de 10 balas de 7.62mm (Mk316 Mod 0)
Магазин из 10-ти 7,62 мм (Mk316 Mod 0)
- 7,62mm 10-Schuss-Magazin (Mk316 Mod 0)
+ 7,62mm 10-Patronen-Magazin (Mk316 Mod 0)
7.62mm Mk316
@@ -838,7 +838,7 @@
7.62mm 20Cps (Mk316 Mod 0)
Cargador de 20 balas de 7.62mm (Mk316 Mod 0)
Магазин из 20-ти 7,62 мм (Mk316 Mod 0)
- 7,62mm 20-Schuss-Magazin (Mk316 Mod 0)
+ 7,62mm 20-Patronen-Magazin (Mk316 Mod 0)
7.62mm Mk316
@@ -862,7 +862,7 @@
7.62mm 10Cps (Mk319 Mod 0)
Cargador de 10 balas de 7.62mm (Mk319 Mod 0)
Магазин из 10-ти 7,62 мм (Mk319 Mod 0)
- 7,62mm 10-Schuss-Magazin (Mk319 Mod 0)
+ 7,62mm 10-Patronen-Magazin (Mk319 Mod 0)
7.62mm Mk319
@@ -886,7 +886,7 @@
7.62mm 20Cps (Mk319 Mod 0)
Cargador de 20 balas de 7.62mm (Mk319 Mod 0)
Магазин из 20-ти 7,62 мм (Mk319 Mod 0)
- 7,62mm 20-Schuss-Magazin (Mk319 Mod 0)
+ 7,62mm 20-Patronen-Magazin (Mk319 Mod 0)
7.62mm Mk319
@@ -910,7 +910,7 @@
7.62mm 10Cps (M993 AP)
Cargador de 10 balas de 7.62mm (M993 AP)
Магазин из 10-ти 7,62 мм (M993 AP)
- 7,62mm 10-Schuss-Magazin (M993 AP)
+ 7,62mm 10-Patronen-Magazin (M993 AP)
7.62mm AP
@@ -934,7 +934,7 @@
7.62mm 20Cps (M993 AP)
Cargador de 20 balas de 7.62mm (M993 AP)
Магазин из 20-ти 7,62 мм (M993 AP)
- 7,62mm 20-Schuss-Magazin (M993 AP)
+ 7,62mm 20-Patronen-Magazin (M993 AP)
7.62mm AP
@@ -958,7 +958,7 @@
7.62mm 20Cps (Mk248 Mod 0)
Cargador de 20 balas de 7.62mm (Mk248 Mod 0)
Магазин из 20-ти 7,62 мм (Mk248 Mod 0)
- 7,62mm 20-Schuss-Magazin (Mk248 Mod 0)
+ 7,62mm 20-Patronen-Magazin (Mk248 Mod 0)
7.62mm (Mk248 Mod 0)
@@ -982,7 +982,7 @@
7.62mm 20Cps (Mk248 Mod 1)
Cargador de 20 balas de 7.62mm (Mk248 Mod 1)
Магазин из 20-ти 7,62 мм (Mk248 Mod 1)
- 7,62mm 20-Schuss-Magazin (Mk248 Mod 1)
+ 7,62mm 20-Patronen-Magazin (Mk248 Mod 1)
7.62mm (Mk248 Mod 1)
@@ -1006,7 +1006,7 @@
7.62 20Cps (Berger Hybrid OTM)
Cargador de 20 balas de 7.62mm (Berger Hybrid OTM)
Магазин из 20-ти 7,62 мм (Berger Hybrid OTM)
- 7,62mm 20-Schuss-Magazin (Berger Hybrid OTM)
+ 7,62mm 20-Patronen-Magazin (Berger Hybrid OTM)
7.62mm (OTM)
@@ -1030,7 +1030,7 @@
Cargador de 30 balas de 6.5x47mm (HPBT Scenar)
Magazynek 6,5x47mm 30rd (HPBT Scenar)
Магазин из 30-ти 6,5x47 мм (HPBT Scenar)
- 6,5x47mm 30-Schuss-Magazin (HPBT Scenar)
+ 6,5x47mm 30-Patronen-Magazin (HPBT Scenar)
6.5mm Lapua
@@ -1051,7 +1051,7 @@
6.5mm Creedmor 30Rnd Mag
Magazynek 6,5mm Creedmor 30rd
- 6,5mm Creedmor 30-Schuss-Magazin
+ 6,5mm Creedmor 30-Patronen-Magazin
6.5mm CM
@@ -1062,8 +1062,8 @@
6,5mm CM
- Caliber: 6.5mm Creedmor<br />Rounds: 30<br />Used in: MXM
- Kaliber: 6,5mm Creedmor<br />Pociski: 30<br />Używany w: MXM
+ Caliber: 6.5x47mm Creedmor<br />Rounds: 30<br />Used in: MXM
+ Kaliber: 6,5x47mm Creedmor<br />Pociski: 30<br />Używany w: MXM
Kaliber: 6,5x47mm Creedmor<br />Patronen: 30<br />Eingesetzt von: MXM
@@ -1072,7 +1072,7 @@
Cargador de 10 balas de 8.6x70mm (300gr Sierra MatchKing HPBT)
Magazynek .338 10rd (300gr Sierra MatchKing HPBT)
Магазин из 10-ти .338 (300 гран Sierra MatchKing HPBT)
- .338 10-Schuss-Magazin (300gr Sierra MatchKing HPBT)
+ .338 10-Patronen-Magazin (300gr Sierra MatchKing HPBT)
.338 HPBT
@@ -1087,7 +1087,7 @@
Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Cartouches: 10
Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Balas: 10
Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10
- Калибр: .338 (300 гран Sierra MatchKing HPBT)<br />Патронов: 10
+ Калибр: 8,6x70mm (300 гран Sierra MatchKing HPBT)<br />Патронов: 10
Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Patronen: 10
@@ -1096,7 +1096,7 @@
Cargador de 10 balas de .338 (API526)
Magazynek .338 10rd (API526)
Магазин из 10-ти .338 (API526)
- .338 10-Schuss-Magazin (API526)
+ .338 10-Patronen-Magazin (API526)
.338 AP
@@ -1111,7 +1111,7 @@
Calibre: 8.6x70mm (API526)<br />Cartouches: 10
Calibre: 8.6x70mm (API526)<br />Balas: 10
Kaliber: 8,6x70mm (API526)<br />Pociski: 10
- Калибр: .338 (API526)<br />Патронов: 10
+ Калибр: 8,6x70mm (API526)<br />Патронов: 10
Kaliber: 8,6x70mm (API526)<br />Patronen: 10
@@ -1120,7 +1120,7 @@
Cargador de 5 balas de 12.7x99mm
Magazynek 12,7x99mm 5rd
Магазин из 5-ти 12,7x99 мм
- 12,7x99mm 5-Schuss-Magazin
+ 12,7x99mm 5-Patronen-Magazin
12.7mm
@@ -1143,7 +1143,7 @@
12.7x99mm API 5Cps
Cargador de 5 balas de 12.7x99mm API
Magazynek 12,7x99mm API 5rd
- 12,7x99mm 5-Schuss-Magazin (API)
+ 12,7x99mm 5-Patronen-Magazin (API)
12.7mm API
@@ -1165,7 +1165,7 @@
Cargador de 5 balas de 12.7x99mm (AMAX)
Magazynek 12,7x99mm 5rd (AMAX)
Магазин из 5-ти 12,7x99 мм (A-MAX)
- 12,7x99mm 5-Schuss-Magazin (AMAX)
+ 12,7x99mm 5-Patronen-Magazin (AMAX)
12.7mm
From 270f9f3662478ce55ab33b03fabae57a3a18a905 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Tue, 28 Apr 2015 13:26:52 -0500
Subject: [PATCH 080/478] Fix init order problem
---
addons/vehiclelock/config.cpp | 2 +-
.../vehiclelock/functions/fnc_handleVehicleInitPost.sqf | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/addons/vehiclelock/config.cpp b/addons/vehiclelock/config.cpp
index 608a892b45..76d5817d8d 100644
--- a/addons/vehiclelock/config.cpp
+++ b/addons/vehiclelock/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"PabstMirror"};
- authorUrl = "https://github.com/PabstMirror/";
+ authorUrl = "https://github.com/acemod/ACE3";
VERSION_CONFIG;
};
};
diff --git a/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf b/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf
index df875b1859..5a2bc3f7bd 100644
--- a/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf
+++ b/addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf
@@ -1,6 +1,7 @@
/*
* Author: PabstMirror
- * Function for sync module. Assigns keys for all synced vehicles to any players that are synced.
+ * For every lockable vehicle, sets the starting lock state to a sane value.
+ * Only run if the InitModule is placed.
*
* Arguments:
* 0: Vehicle
@@ -18,9 +19,10 @@
PARAMS_1(_vehicle);
if (!isServer) exitWith {};
-if (GVAR(VehicleStartingLockState) == -1) exitWith {};
[{
+ //If the module wasn't placed, just exit (needs to be in wait because objectInitEH is before moduleInit)
+ if (GVAR(VehicleStartingLockState) == -1) exitWith {};
private ["_lock"];
PARAMS_1(_vehicle);
if ((_vehicle isKindOf "Car") || {_vehicle isKindOf "Tank"} || {_vehicle isKindOf "Helicopter"}) then {
@@ -36,4 +38,4 @@ if (GVAR(VehicleStartingLockState) == -1) exitWith {};
};
};
//Delay call until mission start (so everyone has the eventHandler's installed)
-}, [_vehicle], 0.25, 0.25] call EFUNC(common,waitAndExecute);
\ No newline at end of file
+}, [_vehicle], 0.25, 0.25] call EFUNC(common,waitAndExecute);
From 9e0932eb5692a1a68f635dcf078cb6f12c985011 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Tue, 28 Apr 2015 13:31:47 -0500
Subject: [PATCH 081/478] Opps
---
addons/vehiclelock/CfgEventHandlers.hpp | 6 ------
1 file changed, 6 deletions(-)
diff --git a/addons/vehiclelock/CfgEventHandlers.hpp b/addons/vehiclelock/CfgEventHandlers.hpp
index 85db25d4a0..6fbbd5c243 100644
--- a/addons/vehiclelock/CfgEventHandlers.hpp
+++ b/addons/vehiclelock/CfgEventHandlers.hpp
@@ -16,11 +16,6 @@ class Extended_InventoryOpened_EventHandlers {
};
};
class Extended_InitPost_EventHandlers {
- class CAManBase {
- class ADDON {
- serverInit = QUOTE(_this call FUNC(handleUnitInitPost));
- };
- };
class Car {
class ADDON {
serverInit = QUOTE(_this call FUNC(handleVehicleInitPost));
@@ -37,4 +32,3 @@ class Extended_InitPost_EventHandlers {
};
};
};
-
From 95d83554da56d1018ad080ff33f3c71fd2a276c7 Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Tue, 28 Apr 2015 20:32:02 +0200
Subject: [PATCH 082/478] Added local treatment through remoteExec for basic
---
addons/medical/XEH_preInit.sqf | 2 ++
.../functions/fnc_treatmentBasic_bloodbag.sqf | 7 ++---
.../fnc_treatmentBasic_bloodbagLocal.sqf | 21 +++++++++++++++
.../functions/fnc_treatmentBasic_morphine.sqf | 11 ++------
.../fnc_treatmentBasic_morphineLocal.sqf | 27 +++++++++++++++++++
5 files changed, 54 insertions(+), 14 deletions(-)
create mode 100644 addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
create mode 100644 addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf
index 051f7da266..4f4ff5bc30 100644
--- a/addons/medical/XEH_preInit.sqf
+++ b/addons/medical/XEH_preInit.sqf
@@ -80,8 +80,10 @@ PREP(treatmentAdvanced_medication);
PREP(treatmentAdvanced_medicationLocal);
PREP(treatmentBasic_bandage);
PREP(treatmentBasic_bloodbag);
+PREP(treatmentBasic_bloodbagLocal);
PREP(treatmentBasic_epipen);
PREP(treatmentBasic_morphine);
+PREP(treatmentBasic_morphineLocal);
PREP(treatmentIV);
PREP(treatmentIVLocal);
PREP(treatmentTourniquet);
diff --git a/addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf b/addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
index 57563ad8fc..9d2c12280d 100644
--- a/addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
+++ b/addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
@@ -15,12 +15,9 @@
*/
#include "script_component.hpp"
-#define BLOODBAGHEAL 70
-private ["_caller", "_target","_className","_blood"];
+private ["_caller", "_target"];
_caller = _this select 0;
_target = _this select 1;
-_className = _this select 3;
-_blood = ((_target getVariable [QGVAR(bloodVolume), 100]) + BLOODBAGHEAL) min 100;
-_target setVariable [QGVAR(bloodVolume), _blood, true];
+[[_target], QUOTE(DFUNC(treatmentBasic_bloodbagLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
diff --git a/addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf b/addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
new file mode 100644
index 0000000000..9bbe04b35f
--- /dev/null
+++ b/addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
@@ -0,0 +1,21 @@
+/*
+ * Author: KoffeinFlummi
+ * Local callback when the bloodbag treatment is complete
+ *
+ * Arguments:
+ * 0: The patient
+ *
+ * Return Value:
+ * nil
+ *
+ * Public: No
+ */
+
+#include "script_component.hpp"
+#define BLOODBAGHEAL 70
+
+private ["_target","_blood"];
+_target = _this select 0;
+
+_blood = ((_target getVariable [QGVAR(bloodVolume), 100]) + BLOODBAGHEAL) min 100;
+_target setVariable [QGVAR(bloodVolume), _blood, true];
diff --git a/addons/medical/functions/fnc_treatmentBasic_morphine.sqf b/addons/medical/functions/fnc_treatmentBasic_morphine.sqf
index d8d793d0bc..048b314781 100644
--- a/addons/medical/functions/fnc_treatmentBasic_morphine.sqf
+++ b/addons/medical/functions/fnc_treatmentBasic_morphine.sqf
@@ -17,15 +17,8 @@
#include "script_component.hpp"
#define MORPHINEHEAL 0.4
-private ["_caller", "_target","_className","_blood","_morphine","_pain"];
+private ["_caller", "_target"];
_caller = _this select 0;
_target = _this select 1;
-_className = _this select 3;
-// reduce pain, pain sensitivity
-_morphine = ((_target getVariable [QGVAR(morphine), 0]) + MORPHINEHEAL) min 1;
-_target setVariable [QGVAR(morphine), _morphine, true];
-_pain = ((_target getVariable [QGVAR(pain), 0]) - MORPHINEHEAL) max 0;
-_target setVariable [QGVAR(pain), _pain, true];
-
-// @todo overdose
+[[_target], QUOTE(DFUNC(treatmentBasic_morphineLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */
diff --git a/addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf b/addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
new file mode 100644
index 0000000000..9dddf743e2
--- /dev/null
+++ b/addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
@@ -0,0 +1,27 @@
+/*
+ * Author: KoffeinFlummi
+ * Local callback when the morphine treatment is complete
+ *
+ * Arguments:
+ * 0: The medic
+ * 1: The patient
+ *
+ * Return Value:
+ * nil
+ *
+ * Public: No
+ */
+
+#include "script_component.hpp"
+#define MORPHINEHEAL 0.4
+
+private ["_target", "_morphine", "_pain"];
+_target = _this select 0;
+
+// reduce pain, pain sensitivity
+_morphine = ((_target getVariable [QGVAR(morphine), 0]) + MORPHINEHEAL) min 1;
+_target setVariable [QGVAR(morphine), _morphine, true];
+_pain = ((_target getVariable [QGVAR(pain), 0]) - MORPHINEHEAL) max 0;
+_target setVariable [QGVAR(pain), _pain, true];
+
+// @todo overdose
From ebbb88deffa078b057a1e62413f4a1c7c8053e81 Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Tue, 28 Apr 2015 20:32:29 +0200
Subject: [PATCH 083/478] Join in progress players will now be initialized
---
addons/medical/XEH_postInit.sqf | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf
index 526990709b..1819178432 100644
--- a/addons/medical/XEH_postInit.sqf
+++ b/addons/medical/XEH_postInit.sqf
@@ -266,6 +266,10 @@ if (USE_WOUND_EVENT_SYNC) then {
[ACE_player] call FUNC(itemCheck);
}] call EFUNC(common,addEventHandler);
-
// Networked litter
[QGVAR(createLitter), FUNC(handleCreateLitter), GVAR(litterCleanUpDelay)] call EFUNC(common,addSyncedEventHandler);
+
+["PlayerJip", {
+ diag_log format["[ACE] JIP Medical init for player"];
+ [player] call FUNC(init);
+}] call FUNC(addEventHandler);
From c06caa72092b41185646e83964e3523536b03d54 Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Tue, 28 Apr 2015 20:33:01 +0200
Subject: [PATCH 084/478] Only add JIP event for player clients
---
addons/medical/XEH_postInit.sqf | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf
index 1819178432..a3eb468442 100644
--- a/addons/medical/XEH_postInit.sqf
+++ b/addons/medical/XEH_postInit.sqf
@@ -269,7 +269,9 @@ if (USE_WOUND_EVENT_SYNC) then {
// Networked litter
[QGVAR(createLitter), FUNC(handleCreateLitter), GVAR(litterCleanUpDelay)] call EFUNC(common,addSyncedEventHandler);
-["PlayerJip", {
- diag_log format["[ACE] JIP Medical init for player"];
- [player] call FUNC(init);
-}] call FUNC(addEventHandler);
+if (hasInterface) then {
+ ["PlayerJip", {
+ diag_log format["[ACE] JIP Medical init for player"];
+ [player] call FUNC(init);
+ }] call FUNC(addEventHandler);
+};
From f606c248540bc03f12d28bb6306ef440fc13e625 Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Tue, 28 Apr 2015 20:47:11 +0200
Subject: [PATCH 085/478] fixes #901
---
.../medical/functions/fnc_actionDiagnose.sqf | 8 ++++++--
.../fnc_displayPatientInformation.sqf | 2 +-
.../medical/functions/fnc_handleUnitVitals.sqf | 18 ++++++++++++------
addons/medical/functions/fnc_init.sqf | 2 +-
.../fnc_treatmentAdvanced_fullHealLocal.sqf | 2 +-
addons/medical/stringtable.xml | 3 +++
6 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/addons/medical/functions/fnc_actionDiagnose.sqf b/addons/medical/functions/fnc_actionDiagnose.sqf
index 234cc6d303..886fa4752b 100644
--- a/addons/medical/functions/fnc_actionDiagnose.sqf
+++ b/addons/medical/functions/fnc_actionDiagnose.sqf
@@ -26,8 +26,12 @@ if (alive _target) then {
} else {
_genericMessages pushback "STR_ACE_MEDICAL_diagnoseDead";
};
-if (_target getvariable[QGVAR(hasLostBlood), false]) then {
- _genericMessages pushback "STR_ACE_MEDICAL_lostBlood";
+if (_target getvariable[QGVAR(hasLostBlood), 0] > 0) then {
+ if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then {
+ _genericMessages pushback "STR_ACE_MEDICAL_lostBloodALot";
+ } else {
+ _genericMessages pushback "STR_ACE_MEDICAL_lostBlood";
+ };
} else {
_genericMessages pushback "STR_ACE_MEDICAL_noBloodloss";
};
diff --git a/addons/medical/functions/fnc_displayPatientInformation.sqf b/addons/medical/functions/fnc_displayPatientInformation.sqf
index 1fc1051efa..a62bfcacbc 100644
--- a/addons/medical/functions/fnc_displayPatientInformation.sqf
+++ b/addons/medical/functions/fnc_displayPatientInformation.sqf
@@ -57,7 +57,7 @@ if (_show) then {
if (_target getvariable[QGVAR(isBleeding), false]) then {
_genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_BLEEDING", [1, 0.1, 0.1, 1]];
};
- if (_target getvariable[QGVAR(hasLostBlood), false]) then {
+ if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then {
_genericMessages pushback [localize "STR_ACE_MEDICAL_STATUS_LOST_BLOOD", [1, 0.1, 0.1, 1]];
};
diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf
index b806d1358f..e04b35955e 100644
--- a/addons/medical/functions/fnc_handleUnitVitals.sqf
+++ b/addons/medical/functions/fnc_handleUnitVitals.sqf
@@ -33,13 +33,19 @@ _bloodVolume = _bloodVolume max 0;
_unit setvariable [QGVAR(bloodVolume), _bloodVolume, _syncValues];
// Set variables for synchronizing information across the net
-if (_bloodVolume < 90) then {
- if !(_unit getvariable [QGVAR(hasLostBlood), false]) then {
- _unit setvariable [QGVAR(hasLostBlood), true, true];
- };
+if (_bloodVolume < 100) then {
+ if ((_bloodVolume < 90 && (GVAR(level) == 2)) || _bloodVolume <= 30) then {
+ if (_unit getvariable [QGVAR(hasLostBlood), 0] != 2) then {
+ _unit setvariable [QGVAR(hasLostBlood), 2, true];
+ };
+ } else {
+ if (_unit getvariable [QGVAR(hasLostBlood), 0] != 1) then {
+ _unit setvariable [QGVAR(hasLostBlood), 1, true];
+ };
+ }
} else {
- if (_unit getvariable [QGVAR(hasLostBlood),false]) then {
- _unit setvariable [QGVAR(hasLostBlood), false, true];
+ if (_unit getvariable [QGVAR(hasLostBlood), 0] != 0) then {
+ _unit setvariable [QGVAR(hasLostBlood), 0, true];
};
};
diff --git a/addons/medical/functions/fnc_init.sqf b/addons/medical/functions/fnc_init.sqf
index d01a63b3a5..80e8d9ba19 100644
--- a/addons/medical/functions/fnc_init.sqf
+++ b/addons/medical/functions/fnc_init.sqf
@@ -60,7 +60,7 @@ _unit setvariable [QGVAR(airwayCollapsed), false];
_unit setvariable [QGVAR(addedToUnitLoop), false, true];
_unit setvariable [QGVAR(inCardiacArrest), false, true];
_unit setVariable ["ACE_isUnconscious", false, true];
-_unit setvariable [QGVAR(hasLostBlood), false, true];
+_unit setvariable [QGVAR(hasLostBlood), 0, true];
_unit setvariable [QGVAR(isBleeding), false, true];
_unit setvariable [QGVAR(hasPain), false, true];
_unit setvariable [QGVAR(amountOfReviveLives), GVAR(amountOfReviveLives), true];
diff --git a/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf b/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
index 77f6d7f44c..e385c5f7c0 100644
--- a/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
+++ b/addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
@@ -55,7 +55,7 @@ if (alive _target) exitwith {
_target setvariable [QGVAR(inCardiacArrest), false, true];
_target setvariable [QGVAR(inReviveState), false, true];
_target setVariable ["ACE_isUnconscious", false, true];
- _target setvariable [QGVAR(hasLostBlood), false, true];
+ _target setvariable [QGVAR(hasLostBlood), 0, true];
_target setvariable [QGVAR(isBleeding), false, true];
_target setvariable [QGVAR(hasPain), false, true];
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 52baf9bbe3..7d3c2a6db4 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -1497,6 +1497,9 @@
Il à perdu du sang
Stracił trochę krwi
+
+ He's lost a lot of blood
+
He hasn't lost blood
Нет кровопотери
From 956b5e355898039e3365796c83b8ff0a8037dd4f Mon Sep 17 00:00:00 2001
From: Dimaslg
Date: Tue, 28 Apr 2015 21:01:48 +0200
Subject: [PATCH 086/478] Spanish Translation
Minor fixes and some things at the Medical system translated.
---
addons/laserpointer/stringtable.xml | 2 +-
addons/medical/stringtable.xml | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/addons/laserpointer/stringtable.xml b/addons/laserpointer/stringtable.xml
index d63767d982..6ef8be6a57 100644
--- a/addons/laserpointer/stringtable.xml
+++ b/addons/laserpointer/stringtable.xml
@@ -43,7 +43,7 @@
<t color='#9cf953'>Użyj: </t>wł./wył. laser
<t color='#9cf953'>Uso: </t>Ativar/Desativar laser
<t color='#9cf953'>Использовать: </t>ВКЛ/ВЫКЛ лазер
- <t color='#9cf953'>Usar: </t>Encender/Apagar Láser
+ <t color='#9cf953'>Usar: </t>Encender/Apagar láser
<t color='#9cf953'>Használat: </t>Lézer BE/KI kapcsolása
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index cbd6c98ed8..a96f2bb887 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -1324,24 +1324,31 @@
Patient %1<br/>is %2.<br/>%3.<br/>%4
+ El paciente %1<br/>está %2.<br/>%3.<br/>%4
alive
+ vivo
dead
+ muerto
He's lost some blood
+ Ha perdido algo de sangre
He hasn't lost blood
+ No ha perdido sangre
He is in pain
+ Tiene dolor
He is not in pain
+ No tiene dolor
Bandaged
From 1512e4c367ceb1f214d8d7473fd0d291522b81ef Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Tue, 28 Apr 2015 14:09:26 -0500
Subject: [PATCH 087/478] isClientSettable spelling
---
addons/interact_menu/config.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp
index ad58d8433e..36172d734f 100644
--- a/addons/interact_menu/config.cpp
+++ b/addons/interact_menu/config.cpp
@@ -28,7 +28,7 @@ class ACE_Settings {
class GVAR(cursorKeepCentered) {
value = 0;
typeName = "BOOL";
- isClientSetable = 1;
+ isClientSettable = 1;
displayName = "$STR_ACE_Interact_cursorKeepCentered";
description = "$STR_ACE_Interact_cursorKeepCenteredDescription";
};
From a854b90b00b5854e0604d7cb639cb572acb76bea Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Tue, 28 Apr 2015 22:19:30 +0200
Subject: [PATCH 088/478] Increased level at which a lot of blood message gets
shown in basic medical
---
addons/medical/functions/fnc_handleUnitVitals.sqf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/medical/functions/fnc_handleUnitVitals.sqf b/addons/medical/functions/fnc_handleUnitVitals.sqf
index e04b35955e..0e01ef654c 100644
--- a/addons/medical/functions/fnc_handleUnitVitals.sqf
+++ b/addons/medical/functions/fnc_handleUnitVitals.sqf
@@ -34,7 +34,7 @@ _unit setvariable [QGVAR(bloodVolume), _bloodVolume, _syncValues];
// Set variables for synchronizing information across the net
if (_bloodVolume < 100) then {
- if ((_bloodVolume < 90 && (GVAR(level) == 2)) || _bloodVolume <= 30) then {
+ if ((_bloodVolume < 90 && (GVAR(level) == 2)) || _bloodVolume <= 45) then {
if (_unit getvariable [QGVAR(hasLostBlood), 0] != 2) then {
_unit setvariable [QGVAR(hasLostBlood), 2, true];
};
From 414a50fb9b9376dc671706dbfe58190c62bf4ca4 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Tue, 28 Apr 2015 15:40:36 -0500
Subject: [PATCH 089/478] Fix Dragging StanceChange Anim
---
addons/dragging/CfgMovesBasic.hpp | 8 ++++++++
addons/dragging/config.cpp | 1 +
2 files changed, 9 insertions(+)
create mode 100644 addons/dragging/CfgMovesBasic.hpp
diff --git a/addons/dragging/CfgMovesBasic.hpp b/addons/dragging/CfgMovesBasic.hpp
new file mode 100644
index 0000000000..de15271416
--- /dev/null
+++ b/addons/dragging/CfgMovesBasic.hpp
@@ -0,0 +1,8 @@
+class CfgMovesBasic {
+ class Actions {
+ class MoveWithInjuredManDragger;
+ class MoveWithInjuredManDraggerRfl: MoveWithInjuredManDragger {
+ Up = "amovpercmstpsraswrfldnon";
+ };
+ };
+};
diff --git a/addons/dragging/config.cpp b/addons/dragging/config.cpp
index c58aab607e..cc843d4a68 100644
--- a/addons/dragging/config.cpp
+++ b/addons/dragging/config.cpp
@@ -14,3 +14,4 @@ class CfgPatches {
#include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp"
+#include "CfgMovesBasic.hpp"
From a80e11d025913233efc852399b9e7d953a873510 Mon Sep 17 00:00:00 2001
From: ulteq
Date: Wed, 29 Apr 2015 01:33:26 +0200
Subject: [PATCH 090/478] Fixed some 7.62 tracer magazines: *Made use of the
ACE_20Rnd_762x51_Mag_Tracer magazine *Fixed ACE_10Rnd_762x54_Tracer_mag
(inheritance, stringtable, tracersEvery)
---
addons/ballistics/CfgMagazines.hpp | 3 ++-
addons/ballistics/CfgVehicles.hpp | 4 ++++
addons/ballistics/CfgWeapons.hpp | 3 +++
addons/ballistics/stringtable.xml | 32 +++++++++++++++---------------
4 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/addons/ballistics/CfgMagazines.hpp b/addons/ballistics/CfgMagazines.hpp
index 9ead13c962..32121e4e87 100644
--- 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 {
diff --git a/addons/ballistics/CfgVehicles.hpp b/addons/ballistics/CfgVehicles.hpp
index c43782d024..82e7fef5e3 100644
--- 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);
diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
index 7e647d2605..0f9dbcfbe4 100644
--- 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",
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index f885a79691..dc9df9db34 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -617,28 +617,28 @@
9x19mm 30-Patronen-Magazin
- 7.62x54mm 10Rnd Tracer IR-DIM Mag
- Magazynek 7,62x54mm 10rd Smugacz IR-DIM
- Chargeur 7.62x54mm 10Rnd Traçante IR-DIM
- Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
+ 7.62x54mm 10Rnd Tracer Mag
+ Magazynek 7,62x54mm 10rd Smugacz
+ Chargeur 7.62x54mm 10Rnd Traçante
+ Cargador de 10 balas trazadoras de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
- 7,62x54mm 10-Patronen-Magazin IR-DIM Leuchtspur
+ 7,62x54mm 10-Patronen-Magazin Leuchtspur
- 7.62mm IR-DIM
- 7,62mm IR-DIM
- 7.62mm IR-DIM
- 7.62mm IR-DIM
- 7,62 мм ИК-трассирующие
- 7,62x54mm IR-DIM
+ 7.62mm
+ 7,62mm
+ 7.62mm
+ 7.62mm
+ 7,62 мм
+ 7,62x54mm
- 7.62x54mm 10Rnd Tracer IR-DIM Mag
- Magazynek 7,62x54mm 10rd Smugacz IR-DIM
- Chargeur 7.62x54mm 10Cps Traçante IR-DIM
- Cargador de 10 balas trazadoras IR-DIM de 7.62x54mm
+ 7.62x54mm 10Rnd Tracer Mag
+ Magazynek 7,62x54mm 10rd Smugacz
+ Chargeur 7.62x54mm 10Cps Traçante
+ Cargador de 10 balas trazadoras de 7.62x54mm
Магазин из 10-ти 7,62 мм ИК-трассирующих
- 7,62x54mm 10-Patronen-Magazin IR-DIM Leuchtspur
+ 7,62x54mm 10-Patronen-Magazin Leuchtspur
6.5mm 100Rnd Tracer IR-DIM Mag
From 3eb2bdfc8467aa7432312466a1bfb4bac9a52924 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Tue, 28 Apr 2015 21:17:29 -0500
Subject: [PATCH 091/478] Display Name Progress Text
---
addons/medical/ACE_Medical_Treatments.hpp | 8 +++++---
addons/medical/stringtable.xml | 3 +++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/addons/medical/ACE_Medical_Treatments.hpp b/addons/medical/ACE_Medical_Treatments.hpp
index 85bcab9616..fced8c93bf 100644
--- a/addons/medical/ACE_Medical_Treatments.hpp
+++ b/addons/medical/ACE_Medical_Treatments.hpp
@@ -196,7 +196,7 @@ class ACE_Medical_Actions {
};
class SurgicalKit: fieldDressing {
displayName = "";
- displayNameProgress = "";
+ displayNameProgress = "$STR_ACE_Medical_TreatmentAction";
items[] = {"ACE_surgicalKit"};
treatmentLocations[] = {QGVAR(useLocation_SurgicalKit)};
requiredMedic = QGVAR(medicSetting_SurgicalKit);
@@ -208,7 +208,7 @@ class ACE_Medical_Actions {
};
class PersonalAidKit: fieldDressing {
displayName = "";
- displayNameProgress = "";
+ displayNameProgress = "$STR_ACE_Medical_TreatmentAction";
items[] = {"ACE_personalAidKit"};
treatmentLocations[] = {QGVAR(useLocation_PAK)};
requiredMedic = QGVAR(medicSetting_PAK);
@@ -225,7 +225,7 @@ class ACE_Medical_Actions {
};
class CheckPulse: fieldDressing {
displayName = "";
- displayNameProgress = "";
+ displayNameProgress = "$STR_ACE_MEDICAL_CHECK_PULSE_CONTENT";
treatmentLocations[] = {"All"};
requiredMedic = 0;
treatmentTime = 2;
@@ -240,9 +240,11 @@ class ACE_Medical_Actions {
};
class CheckBloodPressure: CheckPulse {
callbackSuccess = QUOTE(DFUNC(actionCheckBloodPressure));
+ displayNameProgress = "$STR_ACE_MEDICAL_CHECK_BLOODPRESSURE_CONTENT";
};
class CheckResponse: CheckPulse {
callbackSuccess = QUOTE(DFUNC(actionCheckResponse));
+ displayNameProgress = "$STR_ACE_MEDICAL_CHECK_RESPONSE_CONTENT";
};
class RemoveTourniquet: CheckPulse {
treatmentTime = 2.5;
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 7d3c2a6db4..dda25fd5ad 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -2080,5 +2080,8 @@
Zkłamana kość udowa
Femur Cassé
+
+ Treating...
+
\ No newline at end of file
From 409851dd8ce9faeb352d7f88f6fdc2762e90ea3a Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Tue, 28 Apr 2015 23:57:11 -0500
Subject: [PATCH 092/478] Attach the real explosive
---
addons/explosives/functions/fnc_onLanded.sqf | 9 ++++++++-
.../explosives/functions/fnc_placeExplosive.sqf | 15 ++++++++++++---
addons/explosives/functions/fnc_startTimer.sqf | 1 +
addons/explosives/functions/fnc_triggerType.sqf | 5 ++++-
addons/explosives/script_component.hpp | 2 ++
5 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/addons/explosives/functions/fnc_onLanded.sqf b/addons/explosives/functions/fnc_onLanded.sqf
index 59487e651c..f2ed729b1a 100644
--- a/addons/explosives/functions/fnc_onLanded.sqf
+++ b/addons/explosives/functions/fnc_onLanded.sqf
@@ -1,7 +1,10 @@
/*
* Author: Garth 'L-H' de Wet
+ * Handles the "EpeContactStart" event when placing the explosive.
*
* Arguments:
+ * 0: Explosive Placing Object
+ * 1: Colliding Object
*
* Return Value:
* None
@@ -14,19 +17,23 @@
#include "script_component.hpp"
EXPLODE_2_PVT(_this,_explosive,_hitTarget);
+TRACE_2("Explosive EpeContactStart",_explosive,_hitTarget);
+
if ((_explosive getVariable [QGVAR(Handled), false])) exitWith {};
_explosive setVariable [QGVAR(Handled), true];
if (!isNull _hitTarget && {_hitTarget isKindOf "AllVehicles"}) then {
+ TRACE_1("Attaching to",_hitTarget);
_explosive attachTo [_hitTarget];
private "_dir";
- _dir = _setup getVariable [QGVAR(Direction), 0];
+ _dir = _explosive getVariable [QGVAR(Direction), 0];
_dir = _dir - (getDir _hitTarget);
[[_explosive, _dir, 0], QFUNC(setPosition)] call EFUNC(common,execRemoteFnc);
} else {
[{
EXPLODE_2_PVT(_this,_player,_explosive);
private "_pos";
+ _pos = getPosASL _explosive;
if (surfaceIsWater _pos) then {
_pos = getPosASL _explosive;
_explosive setPosASL _pos;
diff --git a/addons/explosives/functions/fnc_placeExplosive.sqf b/addons/explosives/functions/fnc_placeExplosive.sqf
index 228e8eef23..4bed019d47 100644
--- a/addons/explosives/functions/fnc_placeExplosive.sqf
+++ b/addons/explosives/functions/fnc_placeExplosive.sqf
@@ -21,10 +21,14 @@
* Public: Yes
*/
#include "script_component.hpp"
-private ["_ammo", "_explosive"];
+private ["_ammo", "_explosive", "_attachedTo", "_expPos", "_magazineTrigger"];
EXPLODE_6_PVT(_this,_unit,_pos,_dir,_magazineClass,_triggerConfig,_triggerSpecificVars);
-if (count _this > 6) then {
- deleteVehicle (_this select 6);
+DEFAULT_PARAM(6,_setupPlaceholderObject,objNull);
+
+_attachedTo = objNull;
+if (!isNull _setupPlaceholderObject) then {
+ _attachedTo = attachedTo _setupPlaceholderObject;
+ deleteVehicle _setupPlaceholderObject;
};
if (isNil "_triggerConfig") exitWith {
@@ -57,6 +61,11 @@ _expPos = getPosATL _explosive;
_defuseHelper setPosATL (((getPosATL _defuseHelper) vectorAdd (_pos vectorDiff _expPos)));
_explosive setPosATL _pos;
+if (!isNull _attachedTo) then {
+ TRACE_1("Attaching Live Explosive",_attachedTo);
+ _explosive attachTo [_attachedTo];
+};
+
if (isText(_triggerConfig >> "onPlace") && {[_unit,_explosive,_magazineClass,_triggerSpecificVars]
call compile (getText (_triggerConfig >> "onPlace"))}) exitWith {_explosive};
[[_explosive, _dir, getNumber (_magazineTrigger >> "pitch")], QFUNC(setPosition)] call EFUNC(common,execRemoteFnc);
diff --git a/addons/explosives/functions/fnc_startTimer.sqf b/addons/explosives/functions/fnc_startTimer.sqf
index 13da62ec29..9d2ca0aee4 100644
--- a/addons/explosives/functions/fnc_startTimer.sqf
+++ b/addons/explosives/functions/fnc_startTimer.sqf
@@ -19,6 +19,7 @@
EXPLODE_2_PVT(_this,_explosive,_delay);
[{
+ private ["_explosive"];
_explosive = _this;
if (!isNull _explosive) then {
[_explosive, -1, [_explosive, 0]] call FUNC(detonateExplosive);
diff --git a/addons/explosives/functions/fnc_triggerType.sqf b/addons/explosives/functions/fnc_triggerType.sqf
index fc6a0b90c1..f9d8790a56 100644
--- a/addons/explosives/functions/fnc_triggerType.sqf
+++ b/addons/explosives/functions/fnc_triggerType.sqf
@@ -14,7 +14,10 @@
* Public: Yes
*/
#include "script_component.hpp"
-private "_result";
+
+private["_result", "_config", "_count", "_index", "_supports"];
+// IGNORE_PRIVATE_WARNING(_supports);
+
_result = [];
_config = getArray (ConfigFile >> "CfgMagazines" >> (_this select 0) >> "ACE_Triggers" >> "SupportedTriggers");
_count = count _config;
diff --git a/addons/explosives/script_component.hpp b/addons/explosives/script_component.hpp
index 60c7e88d06..5ff12b8ba3 100644
--- a/addons/explosives/script_component.hpp
+++ b/addons/explosives/script_component.hpp
@@ -1,6 +1,8 @@
#define COMPONENT explosives
#include "\z\ace\addons\main\script_mod.hpp"
+// #define DEBUG_MODE_FULL
+
#ifdef DEBUG_ENABLED_EXPLOSIVES
#define DEBUG_MODE_FULL
#endif
From e56838be36be55723dae18375b6e0abc79d031c4 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Wed, 29 Apr 2015 00:05:02 -0500
Subject: [PATCH 093/478] Private Variables
---
addons/explosives/XEH_postInit.sqf | 2 +-
addons/explosives/functions/fnc_addCellphoneIED.sqf | 6 +++++-
addons/explosives/functions/fnc_addClacker.sqf | 2 +-
.../explosives/functions/fnc_addDetonateActions.sqf | 2 +-
.../explosives/functions/fnc_addExplosiveActions.sqf | 2 +-
.../functions/fnc_addTransmitterActions.sqf | 2 +-
addons/explosives/functions/fnc_addTriggerActions.sqf | 3 +--
addons/explosives/functions/fnc_canDefuse.sqf | 2 +-
addons/explosives/functions/fnc_detonateExplosive.sqf | 11 ++++++-----
addons/explosives/functions/fnc_dialPhone.sqf | 2 +-
addons/explosives/functions/fnc_getDetonators.sqf | 2 ++
.../explosives/functions/fnc_getPlacedExplosives.sqf | 2 ++
addons/explosives/functions/fnc_hasExplosives.sqf | 2 ++
.../explosives/functions/fnc_hasPlacedExplosives.sqf | 2 ++
addons/explosives/functions/fnc_module.sqf | 3 +++
addons/explosives/functions/fnc_place_Approve.sqf | 2 +-
addons/explosives/functions/fnc_setupExplosive.sqf | 2 +-
addons/explosives/functions/fnc_startDefuse.sqf | 5 ++++-
18 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf
index a4a55f8609..998f73ccaf 100644
--- a/addons/explosives/XEH_postInit.sqf
+++ b/addons/explosives/XEH_postInit.sqf
@@ -37,7 +37,7 @@ player addEventHandler ["Killed", {
} count _deadman;
}];
player addEventHandler ["Take", {
- private ["_item", "_getter", "_giver", "_config"];
+ private ["_item", "_getter", "_giver", "_config", "_detonators"];
_item = _this select 2;
_getter = _this select 0;
_giver = _this select 1;
diff --git a/addons/explosives/functions/fnc_addCellphoneIED.sqf b/addons/explosives/functions/fnc_addCellphoneIED.sqf
index 3be21df559..953476861b 100644
--- a/addons/explosives/functions/fnc_addCellphoneIED.sqf
+++ b/addons/explosives/functions/fnc_addCellphoneIED.sqf
@@ -17,7 +17,11 @@
* Public: No
*/
#include "script_component.hpp"
+
EXPLODE_4_PVT(_this,_unit,_explosive,_magazineClass,_extra);
+
+private["_config", "_detonators", "_hasRequired", "_requiredItems", "_code", "_count", "_codeSet"];
+
// Config is the last item in the list of passed in items.
_config = (_this select 3) select (count (_this select 3) - 1);
@@ -29,7 +33,7 @@ _detonators = [_unit] call FUNC(getDetonators);
_hasRequired = false;
};
} count _requiredItems;
-private ["_code", "_count", "_codeSet"];
+
_codeSet = false;
while {!_codeSet} do {
_code = str(round (random 9999));
diff --git a/addons/explosives/functions/fnc_addClacker.sqf b/addons/explosives/functions/fnc_addClacker.sqf
index 7e3529f931..b25c1e1bcd 100644
--- a/addons/explosives/functions/fnc_addClacker.sqf
+++ b/addons/explosives/functions/fnc_addClacker.sqf
@@ -17,7 +17,7 @@
* Public: Yes
*/
#include "script_component.hpp"
-private ["_clacker", "_config", "_requiredItems", "_hasRequired"];
+private ["_clacker", "_config", "_requiredItems", "_hasRequired", "_detonators"];
EXPLODE_3_PVT(_this,_unit,_explosive,_magazineClass);
// Config is the last item in the list of passed in items.
_config = (_this select 3) select (count (_this select 3) - 1);
diff --git a/addons/explosives/functions/fnc_addDetonateActions.sqf b/addons/explosives/functions/fnc_addDetonateActions.sqf
index 5081040233..5c94649608 100644
--- a/addons/explosives/functions/fnc_addDetonateActions.sqf
+++ b/addons/explosives/functions/fnc_addDetonateActions.sqf
@@ -15,7 +15,7 @@
* Public: No
*/
#include "script_component.hpp"
-private ["_result", "_item", "_children"];
+private ["_result", "_item", "_children", "_range", "_required"];
EXPLODE_2_PVT(_this,_unit,_detonator);
_range = GetNumber (ConfigFile >> "CfgWeapons" >> _detonator >> "ACE_Range");
diff --git a/addons/explosives/functions/fnc_addExplosiveActions.sqf b/addons/explosives/functions/fnc_addExplosiveActions.sqf
index 29a2eed608..214b41602c 100644
--- a/addons/explosives/functions/fnc_addExplosiveActions.sqf
+++ b/addons/explosives/functions/fnc_addExplosiveActions.sqf
@@ -11,7 +11,7 @@
* Public: No
*/
#include "script_component.hpp"
-private ["_mags", "_item", "_index", "_children"];
+private ["_mags", "_item", "_index", "_children", "_itemCount", "_list"];
EXPLODE_1_PVT(_this,_unit);
diff --git a/addons/explosives/functions/fnc_addTransmitterActions.sqf b/addons/explosives/functions/fnc_addTransmitterActions.sqf
index 6408eb2ec7..abaa57decc 100644
--- a/addons/explosives/functions/fnc_addTransmitterActions.sqf
+++ b/addons/explosives/functions/fnc_addTransmitterActions.sqf
@@ -14,7 +14,7 @@
* Public: No
*/
#include "script_component.hpp"
-private ["_items", "_unit", "_children", "_config"];
+private ["_unit", "_children", "_config", "_detonators"];
_unit = _this select 0;
_detonators = [_unit] call FUNC(getDetonators);
_children = [];
diff --git a/addons/explosives/functions/fnc_addTriggerActions.sqf b/addons/explosives/functions/fnc_addTriggerActions.sqf
index e9c2dca0e6..6f4ece163c 100644
--- a/addons/explosives/functions/fnc_addTriggerActions.sqf
+++ b/addons/explosives/functions/fnc_addTriggerActions.sqf
@@ -15,8 +15,7 @@
* Public: No
*/
#include "script_component.hpp"
-private ["_hasRequiredItems","_triggerTypes", "_children",
- "_detonators", "_required", "_magTriggers"];
+private ["_hasRequiredItems","_triggerTypes", "_children", "_detonators", "_required", "_magTriggers"];
EXPLODE_2_PVT(_this,_magazine,_explosive);
_detonators = [ACE_player] call FUNC(getDetonators);
diff --git a/addons/explosives/functions/fnc_canDefuse.sqf b/addons/explosives/functions/fnc_canDefuse.sqf
index cd04564a9f..ef4bd10a83 100644
--- a/addons/explosives/functions/fnc_canDefuse.sqf
+++ b/addons/explosives/functions/fnc_canDefuse.sqf
@@ -14,7 +14,7 @@
* Public: Yes
*/
#include "script_component.hpp"
-private ["_specialist"];
+private ["_isSpecialist"];
EXPLODE_2_PVT(_this,_unit,_target);
if (isNull(_target getVariable [QGVAR(Explosive),objNull])) exitWith {
deleteVehicle _target;
diff --git a/addons/explosives/functions/fnc_detonateExplosive.sqf b/addons/explosives/functions/fnc_detonateExplosive.sqf
index f05a265c3a..e4dfc2f7fc 100644
--- a/addons/explosives/functions/fnc_detonateExplosive.sqf
+++ b/addons/explosives/functions/fnc_detonateExplosive.sqf
@@ -19,7 +19,7 @@
* Public: Yes
*/
#include "script_component.hpp"
-private ["_result", "_ignoreRange", "_helper"];
+private ["_result", "_ignoreRange", "_helper", "_pos"];
EXPLODE_3_PVT(_this,_unit,_range,_item);
_ignoreRange = (_range == -1);
_result = true;
@@ -46,10 +46,11 @@ if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhe
};
};
[{
- _explosive = _this;
- if (!isNull _explosive) then {
- _explosive setDamage 1;
- };
+ private ["_explosive"];
+ _explosive = _this;
+ if (!isNull _explosive) then {
+ _explosive setDamage 1;
+ };
}, _item select 0, _item select 1, 0] call EFUNC(common,waitAndExecute);
_result
diff --git a/addons/explosives/functions/fnc_dialPhone.sqf b/addons/explosives/functions/fnc_dialPhone.sqf
index f00fa8a970..aa163b027f 100644
--- a/addons/explosives/functions/fnc_dialPhone.sqf
+++ b/addons/explosives/functions/fnc_dialPhone.sqf
@@ -15,7 +15,7 @@
* Public: Yes
*/
#include "script_component.hpp"
-private ["_arr", "_ran", "_i","_speedDial"];
+private ["_arr", "_ran", "_i"];
EXPLODE_2_PVT(_this,_unit,_code);
if (_unit getVariable [QGVAR(Dialing),false]) exitWith {};
if !(alive _unit) exitWith {};
diff --git a/addons/explosives/functions/fnc_getDetonators.sqf b/addons/explosives/functions/fnc_getDetonators.sqf
index 26bde9b190..9df13c266a 100644
--- a/addons/explosives/functions/fnc_getDetonators.sqf
+++ b/addons/explosives/functions/fnc_getDetonators.sqf
@@ -14,6 +14,8 @@
* Public: Yes
*/
#include "script_component.hpp"
+// IGNORE_PRIVATE_WARNING(_detonators);
+
private ["_unit", "_items", "_result", "_config"];
_unit = _this select 0;
_items = (items _unit);
diff --git a/addons/explosives/functions/fnc_getPlacedExplosives.sqf b/addons/explosives/functions/fnc_getPlacedExplosives.sqf
index 1164972047..0c2080923a 100644
--- a/addons/explosives/functions/fnc_getPlacedExplosives.sqf
+++ b/addons/explosives/functions/fnc_getPlacedExplosives.sqf
@@ -16,6 +16,8 @@
* Public: Yes
*/
#include "script_component.hpp"
+// IGNORE_PRIVATE_WARNING(_allExplosives,_deadmanExplosives);
+
private ["_unit", "_clackerList", "_adjustedList", "_list", "_filter"];
_unit = _this select 0;
_filter = nil;
diff --git a/addons/explosives/functions/fnc_hasExplosives.sqf b/addons/explosives/functions/fnc_hasExplosives.sqf
index 794cebc57d..bd790bd12f 100644
--- a/addons/explosives/functions/fnc_hasExplosives.sqf
+++ b/addons/explosives/functions/fnc_hasExplosives.sqf
@@ -14,6 +14,8 @@
* Public: Yes
*/
#include "script_component.hpp"
+// IGNORE_PRIVATE_WARNING(_hasExplosives);
+
private ["_unit", "_result", "_magazines"];
_result = false;
_unit = _this select 0;
diff --git a/addons/explosives/functions/fnc_hasPlacedExplosives.sqf b/addons/explosives/functions/fnc_hasPlacedExplosives.sqf
index 4a6ccc9de8..174bc07fbc 100644
--- a/addons/explosives/functions/fnc_hasPlacedExplosives.sqf
+++ b/addons/explosives/functions/fnc_hasPlacedExplosives.sqf
@@ -14,4 +14,6 @@
* Public: Yes
*/
#include "script_component.hpp"
+// IGNORE_PRIVATE_WARNING(_hasPlacedExplosives);
+
(count (_this call FUNC(getPlacedExplosives)) > 0)
diff --git a/addons/explosives/functions/fnc_module.sqf b/addons/explosives/functions/fnc_module.sqf
index 3e522e9a70..4080b41bde 100644
--- a/addons/explosives/functions/fnc_module.sqf
+++ b/addons/explosives/functions/fnc_module.sqf
@@ -15,6 +15,9 @@
*/
#include "script_component.hpp"
if !(isServer) exitWith {};
+
+private["_activated", "_logic"];
+
_logic = _this select 0;
_activated = _this select 2;
diff --git a/addons/explosives/functions/fnc_place_Approve.sqf b/addons/explosives/functions/fnc_place_Approve.sqf
index 0082a9bd6a..f133dbb080 100644
--- a/addons/explosives/functions/fnc_place_Approve.sqf
+++ b/addons/explosives/functions/fnc_place_Approve.sqf
@@ -19,7 +19,7 @@ if (GVAR(pfeh_running)) then {
[QGVAR(Placement),"OnEachFrame"] call CALLSTACK(BIS_fnc_removeStackedEventHandler);
GVAR(pfeh_running) = false;
};
-private ["_mag", "_setup", "_player"];
+private ["_setup", "_player", "_dir"];
_setup = GVAR(Setup);
GVAR(Setup) = objNull;
[GVAR(placer), "ACE_Explosives", false] call EFUNC(Common,setForceWalkStatus);
diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf
index ea3a086274..a0aad3d1ab 100644
--- a/addons/explosives/functions/fnc_setupExplosive.sqf
+++ b/addons/explosives/functions/fnc_setupExplosive.sqf
@@ -28,7 +28,7 @@ GVAR(Setup) setVariable [QGVAR(class), _class, true];
GVAR(TweakedAngle) = 180;
[QGVAR(Placement),"OnEachFrame", {
- private "_player";
+ private ["_player", "_pos"];
_player = ACE_player;
if (GVAR(placer) != _player) exitWith {
call FUNC(place_Cancel);
diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf
index 7eacdd33e1..d3631fdb5f 100644
--- a/addons/explosives/functions/fnc_startDefuse.sqf
+++ b/addons/explosives/functions/fnc_startDefuse.sqf
@@ -16,11 +16,14 @@
*/
#include "script_component.hpp"
EXPLODE_2_PVT(_this,_unit,_target);
+
+private["_actionToPlay"];
+
_target = attachedTo (_target);
_fnc_DefuseTime = {
EXPLODE_2_PVT(_this,_specialist,_target);
-
+ private ["_defuseTime"];
_defuseTime = 5;
if (isNumber(ConfigFile >> "CfgAmmo" >> typeOf (_target) >> "ACE_DefuseTime")) then {
_defuseTime = getNumber(ConfigFile >> "CfgAmmo" >> typeOf (_target) >> "ACE_DefuseTime");
From d7d43ce3b1c922b647f9eaa4cd0fe53f8b2911bb Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Wed, 29 Apr 2015 01:26:13 -0500
Subject: [PATCH 094/478] #828 - Private Variables for Interact Menu
---
addons/interact_menu/XEH_clientInit.sqf | 2 +-
addons/interact_menu/functions/fnc_compileMenu.sqf | 3 +--
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf | 4 ++--
addons/interact_menu/functions/fnc_createAction.sqf | 1 +
addons/interact_menu/functions/fnc_findActionNode.sqf | 2 +-
addons/interact_menu/functions/fnc_removeActionFromClass.sqf | 2 +-
addons/interact_menu/functions/fnc_render.sqf | 2 +-
addons/interact_menu/functions/fnc_renderActionPoints.sqf | 2 +-
addons/interact_menu/functions/fnc_renderBaseMenu.sqf | 2 +-
addons/interact_menu/functions/fnc_renderIcon.sqf | 2 +-
addons/interact_menu/functions/fnc_renderMenu.sqf | 2 +-
addons/interact_menu/functions/fnc_renderSelector.sqf | 3 ++-
addons/interact_menu/functions/fnc_setupTextColors.sqf | 2 +-
addons/interact_menu/functions/fnc_splitPath.sqf | 2 +-
addons/interact_menu/script_component.hpp | 2 ++
15 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf
index faabf773f4..5714b77e16 100644
--- 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);
};
diff --git a/addons/interact_menu/functions/fnc_compileMenu.sqf b/addons/interact_menu/functions/fnc_compileMenu.sqf
index bd2023a90d..f5296ec9cf 100644
--- 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 = [];
diff --git a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
index 0258b3dc8a..e4c449ce80 100644
--- 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 = [];
diff --git a/addons/interact_menu/functions/fnc_createAction.sqf b/addons/interact_menu/functions/fnc_createAction.sqf
index fb3f05b7b5..a7d939722e 100644
--- 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 {
diff --git a/addons/interact_menu/functions/fnc_findActionNode.sqf b/addons/interact_menu/functions/fnc_findActionNode.sqf
index 4027b7a852..b8639754d2 100644
--- 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 {
diff --git a/addons/interact_menu/functions/fnc_removeActionFromClass.sqf b/addons/interact_menu/functions/fnc_removeActionFromClass.sqf
index 898228d6d8..c407273258 100644
--- 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);
diff --git a/addons/interact_menu/functions/fnc_render.sqf b/addons/interact_menu/functions/fnc_render.sqf
index 01a550eb91..06c155ac54 100644
--- 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];
diff --git a/addons/interact_menu/functions/fnc_renderActionPoints.sqf b/addons/interact_menu/functions/fnc_renderActionPoints.sqf
index 78d5418e5a..8e6cb7d390 100644
--- 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 = {
diff --git a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf
index a5214ddcbe..8df24f9e55 100644
--- 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);
diff --git a/addons/interact_menu/functions/fnc_renderIcon.sqf b/addons/interact_menu/functions/fnc_renderIcon.sqf
index ec56c5a653..642464028d 100644
--- 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", "_pos"];
+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];
diff --git a/addons/interact_menu/functions/fnc_renderMenu.sqf b/addons/interact_menu/functions/fnc_renderMenu.sqf
index e80e9d41ab..a050374786 100644
--- 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);
diff --git a/addons/interact_menu/functions/fnc_renderSelector.sqf b/addons/interact_menu/functions/fnc_renderSelector.sqf
index ca2f06d63f..569fa79198 100644
--- a/addons/interact_menu/functions/fnc_renderSelector.sqf
+++ b/addons/interact_menu/functions/fnc_renderSelector.sqf
@@ -15,12 +15,13 @@
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", "_pos"];
_ctrl = GVAR(iconCtrls) select GVAR(iconCount);
GVAR(iconCount) = GVAR(iconCount) + 1;
diff --git a/addons/interact_menu/functions/fnc_setupTextColors.sqf b/addons/interact_menu/functions/fnc_setupTextColors.sqf
index 5df9c589da..58f9995985 100644
--- 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 = {
diff --git a/addons/interact_menu/functions/fnc_splitPath.sqf b/addons/interact_menu/functions/fnc_splitPath.sqf
index 935e947b30..790ae83466 100644
--- 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);
diff --git a/addons/interact_menu/script_component.hpp b/addons/interact_menu/script_component.hpp
index a086b02613..3117065ca2 100644
--- 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
From f83f8dad0ee2b200ccfa372b8523a1b80901b3a3 Mon Sep 17 00:00:00 2001
From: ulteq
Date: Wed, 29 Apr 2015 09:27:49 +0200
Subject: [PATCH 095/478] Fixes: https://github.com/acemod/ACE3/issues/904
---
addons/scopes/functions/fnc_adjustScope.sqf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/scopes/functions/fnc_adjustScope.sqf b/addons/scopes/functions/fnc_adjustScope.sqf
index d13ff57ffc..31b85f309e 100644
--- 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;
From 47d4446520a7c5f635fef4715ddd38514a42b3d0 Mon Sep 17 00:00:00 2001
From: PabstMirror
Date: Wed, 29 Apr 2015 02:34:47 -0500
Subject: [PATCH 096/478] Don't check intersection if distance < 1m
Related to #869
---
addons/interact_menu/functions/fnc_renderBaseMenu.sqf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf
index 8df24f9e55..841303bcdf 100644
--- a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf
+++ b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf
@@ -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
From 95536f0a94c36c7cb43e0e1ec9d263cfb995981e Mon Sep 17 00:00:00 2001
From: bux578
Date: Wed, 29 Apr 2015 10:10:30 +0200
Subject: [PATCH 097/478] update authors.txt
---
AUTHORS.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/AUTHORS.txt b/AUTHORS.txt
index d0f248e72f..7bae4a67d5 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -43,7 +43,7 @@ evromalarkey
Falke75
Ferenczi
Ferenzi
-Filip Basara (Logo)
+Filip Basara
FreeZbe
geraldbolso1899
Ghost
From cfbf3bd0535526df08579ce2e90803a286aa3b07 Mon Sep 17 00:00:00 2001
From: Bla1337
Date: Wed, 29 Apr 2015 11:20:21 +0300
Subject: [PATCH 098/478] Localization update
---
addons/ballistics/stringtable.xml | 38 +++++++-------
addons/interact_menu/stringtable.xml | 1 +
addons/interaction/stringtable.xml | 10 ++--
addons/medical/stringtable.xml | 4 +-
addons/missileguidance/stringtable.xml | 1 +
addons/mk6mortar/stringtable.xml | 4 ++
addons/optics/stringtable.xml | 4 +-
addons/optionsmenu/stringtable.xml | 1 +
addons/overheating/stringtable.xml | 2 +-
addons/realisticnames/stringtable.xml | 68 +++++++++++++-------------
addons/reloadlaunchers/stringtable.xml | 2 +-
addons/weaponselect/stringtable.xml | 4 +-
12 files changed, 75 insertions(+), 64 deletions(-)
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index dc9df9db34..bbc0f8e30f 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -741,7 +741,7 @@
Magazynek 5,56mm 30rd (M995 AP)
5.56mm 30Cps (M995 AP)
Cargador de 30 balas de 5.56mm (M995 AP)
- Магазин из 30-ти 5.56 мм (M995 AP)
+ Магазин из 30-ти 5.56 мм (M995 бронебойные)
5,56mm 30-Patronen-Magazin (M995AP)
@@ -749,7 +749,7 @@
5,56mm AP
5.56mm AP
5.56mm AP
- 5.56 мм AP
+ 5.56 мм бронебойные
5,56mm AP
@@ -757,7 +757,7 @@
Kaliber: 5,56x45mm NATO (M995 AP)<br />Pociski: 30
Calibre: 5.56x45mm NATO (M995 AP)<br />Cartouches: 30
Calibre: 5.56x45mm NATO (M995 AP)<br />Balas: 30
- Калибр: 5,56x45 мм NATO (M995 AP)<br />Патронов: 30
+ Калибр: 5,56x45 мм NATO (M995 бронебойные)<br />Патронов: 30
Kaliber: 5,56x45mm NATO (M995 AP)<br />Patronen: 30
@@ -869,7 +869,7 @@
7,62mm Mk319
7.62mm Mk319
7.62mm Mk319
- 7,62mm Mk319
+ 7,62 мм Mk319
7,62mm Mk319
@@ -909,7 +909,7 @@
Magazynek 7,62mm 10rd (M993 AP)
7.62mm 10Cps (M993 AP)
Cargador de 10 balas de 7.62mm (M993 AP)
- Магазин из 10-ти 7,62 мм (M993 AP)
+ Магазин из 10-ти 7,62 мм (M993 бронебойные)
7,62mm 10-Patronen-Magazin (M993 AP)
@@ -917,7 +917,7 @@
7,62mm AP
7.62mm AP
7.62mm AP
- 7,62mm AP
+ 7,62mm бронебойные
7,62mm AP
@@ -925,7 +925,7 @@
Kaliber: 7,62x51mm NATO (M993 AP)<br />Pociski: 10
Calibre: 7.62x51mm NATO (M993 AP)<br />Cartouches: 10
Calibre: 7.62x51mm NATO (M993 AP)<br />Balas: 10
- Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 10
+ Калибр: 7,62x51 мм NATO (M993 бронебойные)<br />Патронов: 10
Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 10
@@ -933,7 +933,7 @@
Magazynek 7,62mm 20rd (M993 AP)
7.62mm 20Cps (M993 AP)
Cargador de 20 balas de 7.62mm (M993 AP)
- Магазин из 20-ти 7,62 мм (M993 AP)
+ Магазин из 20-ти 7,62 мм (M993 бронебойные)
7,62mm 20-Patronen-Magazin (M993 AP)
@@ -941,7 +941,7 @@
7,62mm AP
7.62mm AP
7.62mm AP
- 7,62 мм AP
+ 7,62 мм бронебойные
7,62mm AP
@@ -949,7 +949,7 @@
Kaliber: 7,62x51mm NATO (M993 AP)<br />Pociski: 20
Calibre: 7.62x51mm NATO (M993 AP)<br />Cartouches: 20
Calibre: 7.62x51mm NATO (M993 AP)<br />Balas: 20
- Калибр: 7,62x51 мм NATO (M993 AP)<br />Патронов: 20
+ Калибр: 7,62x51 мм NATO (M993 бронебойные)<br />Патронов: 20
Kaliber: 7,62x51mm NATO (M993 AP)<br />Patronen: 20
@@ -1029,7 +1029,7 @@
6.5x47mm 30Cps (HPBT Scenar)
Cargador de 30 balas de 6.5x47mm (HPBT Scenar)
Magazynek 6,5x47mm 30rd (HPBT Scenar)
- Магазин из 30-ти 6,5x47 мм (HPBT Scenar)
+ Магазин из 30-ти 6,5x47 мм (экспансивные Scenar)
6,5x47mm 30-Patronen-Magazin (HPBT Scenar)
@@ -1045,12 +1045,13 @@
Calibre: 6.5x47mm (HPBT Scenar)<br />Cartouches: 30
Calibre: 6.5x47mm (HPBT Scenar)<br />Balas: 30
Kaliber: 6,5x47mm (HPBT Scenar)<br />Pociski: 30
- Калибр: 6,5x47 мм (HPBT Scenar)<br />Патронов: 30
+ Калибр: 6,5x47 мм (экспансивные Scenar)<br />Патронов: 30
Kaliber: 6,5x47mm (HPBT Scenar)<br />Patronen: 30<br />Eingesetzt von: MXM
6.5mm Creedmor 30Rnd Mag
Magazynek 6,5mm Creedmor 30rd
+ Магазин из 30-ти 6,5 мм Creedmor
6,5mm Creedmor 30-Patronen-Magazin
@@ -1071,7 +1072,7 @@
.338 10 Cps (300gr Sierra MatchKing HPBT)
Cargador de 10 balas de 8.6x70mm (300gr Sierra MatchKing HPBT)
Magazynek .338 10rd (300gr Sierra MatchKing HPBT)
- Магазин из 10-ти .338 (300 гран Sierra MatchKing HPBT)
+ Магазин из 10-ти .338 (300 гран Sierra MatchKing экспансивные)
.338 10-Patronen-Magazin (300gr Sierra MatchKing HPBT)
@@ -1079,7 +1080,7 @@
.338 HPBT
.338 HPBT
.338 HPBT
- .338 HPBT
+ .338 экспансивные
.338 HPBT
@@ -1087,7 +1088,7 @@
Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Cartouches: 10
Calibre: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Balas: 10
Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Pociski: 10
- Калибр: 8,6x70mm (300 гран Sierra MatchKing HPBT)<br />Патронов: 10
+ Калибр: 8,6x70mm (300 гран Sierra MatchKing экспансивные)<br />Патронов: 10
Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)<br />Patronen: 10
@@ -1103,7 +1104,7 @@
.338 AP
.338 AP
.338 AP
- .338 бронебойные
+ .338 AP
.338 AP
@@ -1111,7 +1112,7 @@
Calibre: 8.6x70mm (API526)<br />Cartouches: 10
Calibre: 8.6x70mm (API526)<br />Balas: 10
Kaliber: 8,6x70mm (API526)<br />Pociski: 10
- Калибр: 8,6x70mm (API526)<br />Патронов: 10
+ Калибр: 8,6x70 мм (API526)<br />Патронов: 10
Kaliber: 8,6x70mm (API526)<br />Patronen: 10
@@ -1143,6 +1144,7 @@
12.7x99mm API 5Cps
Cargador de 5 balas de 12.7x99mm API
Magazynek 12,7x99mm API 5rd
+ Магазин из 5-ти 12,7x99 мм (бронебойно-зажигательные)
12,7x99mm 5-Patronen-Magazin (API)
@@ -1150,6 +1152,7 @@
12.7mm API
12.7mm API
12,7mm API
+ 12.7 мм бронебойно-зажигательные
12,7mm API
@@ -1157,6 +1160,7 @@
Calibre: 12.7x99mm API<br />Cartouches: 5
Calibre: 12.7x99mm API<br />Balas: 5
Kaliber: 12,7x99mm API<br />Pociski: 5
+ Калибр: 12,7x99 мм бронебойно-зажигательные<br />Патронов: 5
Kaliber:12,7x99mm API<br />Patronen: 5
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index a5df7723b4..e31534427b 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -18,6 +18,7 @@
Toujours afficher le curseur pour les interactions
Mostra sempre il cursore per le interazioni
Zawsze wyświetlaj kursor dla interakcji
+ Показывать курсор (взаимодействие)
Immer den Cursor für Fremd-Interaktionen anzeigen
dead
- мертв
+ мёртв
tot
mort
martwy
@@ -1721,7 +1721,7 @@
%1 has given an IV
%1 has puesto una IV
- %1 провел переливание
+ %1 провёл переливание
%1 hat eine Infusion verabreicht
%1 podał IV
%1 a administré une IV
diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index 6840f11e42..15a87c31ba 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -17,6 +17,7 @@
Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types.
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.
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.
+ Продвинутое наведение ракет, или ПНР, обеспечивает множество усовершествований для наведения и стрельбы ракет. Также, это система, необходимая для всех ракетных типов оружия.
Das Erweiterte Raketenlenksystem, auch AMG genannt, bietet viele Verbesserungen zum Aufschalten und Feuern mittels gelenkten Raketen.
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.
diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml
index 1dfdd1b470..fe08d320e5 100644
--- a/addons/mk6mortar/stringtable.xml
+++ b/addons/mk6mortar/stringtable.xml
@@ -6,24 +6,28 @@
82mm Distanztabelle
Tabela strzelnicza 82mm
table de tir 82mm
+ 82 мм Таблица дальностей и прицелов
Range Table for the MK6 82mm Mortar
Distanztabelle für den Mk6 82mm Mortar
Tabela strzelnicza dla moździerza 82mm MK6
Table de tir pour le mortier MK6 82mm
+ Таблица дальностей и прицелов для MK6 82 мм мортиры
Open 82mm Rangetable
Öffne 82mm Distanztabelle
Otwórz tabelę strzelniczą 82mm
ouvrir la table de tir 82mm
+ Открыть 82 мм Таблицу дальностей и прицелов
Charge
Ladung
Charge
Ładunek
+ Зарядить
diff --git a/addons/optics/stringtable.xml b/addons/optics/stringtable.xml
index 56216f2cb1..f9964c4310 100644
--- a/addons/optics/stringtable.xml
+++ b/addons/optics/stringtable.xml
@@ -57,7 +57,7 @@
MRCO (2D)
MRCO (2D)
MRCO (2D)
- Прицел MRCO (2D)
+ MRCO (2D)
MRCO (2D)
MRCO (2D)
@@ -69,7 +69,7 @@
MRCO (PIP)
MRCO (PIP)
MRCO (PIP)
- Прицел MRCO (PIP)
+ MRCO (PIP)
MRCO (PIP)
MRCO (PIP)
diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index 8a86563690..1beec5d7df 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -218,6 +218,7 @@
Menu option: taille de l'UI
Skalowanie UI menu ustawień
Opción de escalado del menú UI
+ Размер интерфейса меню настройки
UI Skalierung
diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml
index 9699c67ede..d21d2ad884 100644
--- a/addons/overheating/stringtable.xml
+++ b/addons/overheating/stringtable.xml
@@ -112,7 +112,7 @@
Lufa wymieniona
Hlaveň vyměněna
Canon changé
- Ствол сменен
+ Ствол сменён
Cső kicserélve
Cano substituído
Canna sostituita
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index 37e7b28700..cc99277d48 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -138,7 +138,7 @@
M-ATV (CKM)
M-ATV (TK)
M-ATV (HMG)
- M-ATV (Пулемет)
+ M-ATV (Пулемёт)
M-ATV (HMG)
M-ATV (nehézgéppuska)
M-ATV (HMG)
@@ -150,7 +150,7 @@
M-ATV (GMG)
M-ATV (Granátomet)
M-ATV (GMG)
- M-ATV (Гранатомет)
+ M-ATV (Гранатомёт)
M-ATV (GMG)
M-ATV (gránátgéppuska)
M-ATV (GMG)
@@ -366,7 +366,7 @@
Fennek (CKM)
Fennek (TK)
Fennek (HMG)
- Феннек (Пулемет)
+ Феннек (Пулемёт)
Fennek (HMG)
Fennek (nehézgéppuska)
Fennek (HMG)
@@ -378,7 +378,7 @@
Fennek (GMG)
Fennek (granátomet)
Fennek (GMG)
- Феннек (Гранатомет)
+ Феннек (Гранатомёт)
Fennek (GMG)
Fennek (gránátgéppuska)
Fennek (GMG)
@@ -438,7 +438,7 @@
KamAZ Transportowy (zakryty)
KAMAZ Valník (krytý)
KamAZ Transport (bâché)
- КамАЗ Траспортный (Крытый)
+ КамАЗ Траспортный (крытый)
KamAZ Transporte (coberto)
KamAZ szállítójármű (ponyvás)
KamAZ da trasporto (coperto)
@@ -510,7 +510,7 @@
Punisher (CKM)
Punisher (TK)
Punisher (HMG)
- Kаратель (Пулемет)
+ Kаратель (Пулемёт)
Punisher (HMG)
Punisher (nehézgéppuska)
Punisher (HMG)
@@ -522,7 +522,7 @@
Punisher (GMG)
Punisher (granátomet)
Punisher (GMG)
- Kаратель (Гранатомет)
+ Kаратель (Гранатомёт)
Punisher (GMG)
Punisher (gránátgéppuska)
Punisher (GMG)
@@ -534,7 +534,7 @@
T100 Black Eagle
T100 Black Eagle
T100 Black Eagle
- T100 Черный Орел
+ T100 Чёрный Орел
T100 Black Eagle
T100 Fekete Sas
T100 Black Eagle
@@ -606,7 +606,7 @@
Typhoon Transportowy (przykryty)
Typhoon valník (krytý)
Typhoon Transport (bâché)
- Тайфун Транспортный (kрытый)
+ Тайфун Транспортный (крытый)
Typhoon Transporte (coberto)
Typhoon szállítójármű (ponyvás)
Typhoon da trasporto (coperto)
@@ -988,7 +988,7 @@
Granat dymny M18 (Żółty)
M18 Kouřový Granát (žlutý)
M18 Grenade fumigène (Jaune)
- M183 дымовая граната (Жёлтые)
+ M183 дымовая граната (Жёлтый)
M18 Granada de fumaça (Amarela)
M18 füstgránát (Sárga)
M18 Granata fumogena (Giallo)
@@ -1159,7 +1159,7 @@
MX (Noir)
MX (Fekete)
MX (Negro)
- MX (черный)
+ MX (Чёрный)
MXC
@@ -1179,7 +1179,7 @@
MXC (Noir)
MXC (Fekete)
MXC (Negro)
- MXC (черный)
+ MXC (Чёрный)
MX 3GL
@@ -1199,7 +1199,7 @@
MX 3GL (Noir)
MX 3GL (Fekete)
MX 3GL (Negro)
- MX 3GL (черный)
+ MX 3GL (Чёрный)
MX LSW
@@ -1219,7 +1219,7 @@
MX LSW (Noir)
MX LSW (Fekete)
MX LSW (Negro)
- MX LSW (черный)
+ MX LSW (Чёрный)
MXM
@@ -1239,7 +1239,7 @@
MXM (Noir)
MXM (Fekete)
MXM (Negro)
- MXM (черный)
+ MXM (Чёрный)
KH2002 Sama
@@ -1279,7 +1279,7 @@
F2000 (Camo)
F2000 (Terepmintás)
F2000 (Camuflaje)
- F2000 (камо)
+ F2000 (Камо)
F2000
@@ -1299,7 +1299,7 @@
F2000 Tactical (Camo)
F2000 Tactical (Terepmintás)
F2000 Tactical (Camuflaje)
- F2000 Tactical (камо)
+ F2000 Tactical (Камо)
F2000 Tactical
@@ -1319,7 +1319,7 @@
F2000 EGLM (Camo)
F2000 EGLM (Terepmintás)
F2000 EGLM (Camuflaje)
- F2000 EGLM (камо)
+ F2000 EGLM (Камо)
F2000 EGLM
@@ -1495,7 +1495,7 @@
Noreen "Bad News" ULR (Black)
Noreen "Bad News" ULR (Noir)
Noreen "Bad News" ULR (Negro)
- Noreen "Bad News" ULR (черный)
+ Noreen "Bad News" ULR (Чёрный)
Noreen "Bad News" ULR (Schwarz)
Noreen "Bad News" ULR (czarny)
@@ -1504,7 +1504,7 @@
Noreen "Bad News" ULR (Camo)
Noreen "Bad News" ULR (Camo)
Noreen "Bad News" ULR (Camuflaje)
- Noreen "Bad News" ULR (камо)
+ Noreen "Bad News" ULR (Камо)
Noreen "Bad News" ULR (Camo)
Noreen "Bad News" ULR (kamuflaż)
@@ -1513,7 +1513,7 @@
Noreen "Bad News" ULR (Sand)
Noreen "Bad News" ULR (Beige)
Noreen "Bad News" ULR (Arena)
- Noreen "Bad News" ULR (песочный)
+ Noreen "Bad News" ULR (Песочный)
Noreen "Bad News" ULR (Sand)
Noreen "Bad News" ULR (piaskowy)
@@ -1531,7 +1531,7 @@
SIG 556 (Black)
SIG 556 (Noir)
SIG 556 (Negro)
- SIG 556 (черный)
+ SIG 556 (Чёрный)
SIG 556 (czarny)
SIG 556 (Schwarz)
@@ -1540,7 +1540,7 @@
SIG 556 (Khaki)
SIG 556 (Kaki)
SIG 556 (Caqui)
- SIG 556 (хаки)
+ SIG 556 (Хаки)
SIG 556 (khaki)
SIG 556 (Khaki)
@@ -1549,7 +1549,7 @@
SIG 556 (Sand)
SIG 556 (Beige)
SIG 556 (Arena)
- SIG 556 (песочный)
+ SIG 556 (Песочный)
SIG 556 (piaskowy)
SIG 556 (Sand)
@@ -1558,7 +1558,7 @@
SIG 556 (Camo)
SIG 556 (Camo)
SIG 556 (Camuflaje)
- SIG 556 (камо)
+ SIG 556 (Камо)
SIG 556 (kamuflaż)
SIG 556 (Camo)
@@ -1567,7 +1567,7 @@
SIG 556 (Woodland)
SIG 556 (Woodland)
SIG 556 (Bosque)
- SIG 556 (лесной)
+ SIG 556 (Лесной)
SIG 556 (leśny)
SIG 556 (Woodland)
@@ -1594,7 +1594,7 @@
ASP-1 Kir (Black)
ASP-1 Kir (Noir)
ASP-1 Kir (Negro)
- ASP-1 Kir (черный)
+ ASP-1 Kir (Чёрный)
ASP-1 Kir (Schwarz)
ASP-1 Kir (czarny)
@@ -1603,7 +1603,7 @@
ASP-1 Kir (Tan)
ASP-1 Kir (Tan)
ASP-1 Kir (Tan)
- ASP-1 Kir (бронзовый)
+ ASP-1 Kir (Бронзовый)
ASP-1 Kir (Hellbraun)
ASP-1 Kir (Tan)
@@ -1621,7 +1621,7 @@
Cyrus (Black)
Cyrus (Noir)
Cyrus (Negro)
- Cyrus (черный)
+ Cyrus (Чёрный)
Cyrus (Schwarz)
Cyrus (czarny)
@@ -1630,7 +1630,7 @@
Cyrus (Hex)
Cyrus (Hex)
Cyrus (Hex)
- Cyrus (гекс)
+ Cyrus (Гекс)
Cyrus (Hex)
Cyrus (hex)
@@ -1639,7 +1639,7 @@
Cyrus (Tan)
Cyrus (Tan)
Cyrus (Tan)
- Cyrus (бронза)
+ Cyrus (Бронза)
Cyrus (Hellbraun)
Cyrus (podpalany)
@@ -1684,7 +1684,7 @@
HK121 (Hex)
HK121 (Hex)
HK121 (Hex)
- HK121 (гекс)
+ HK121 (Гекс)
HK121 (Hex)
HK121 (hex)
@@ -1693,7 +1693,7 @@
HK121 (Tan)
HK121 (Tan)
HK121 (Tan)
- HK121 (бронза)
+ HK121 (Бронза)
HK121 (Hellbraun)
HK121 (podpalany)
@@ -1720,7 +1720,7 @@
LWMMG (Black)
LWMMG (Noir)
LWMMG (Negro)
- LWMMG (Черный)
+ LWMMG (Чёрный)
LWMMG (czarny)
LWMMG (Schwarz)
diff --git a/addons/reloadlaunchers/stringtable.xml b/addons/reloadlaunchers/stringtable.xml
index bb949040d0..3a73918745 100644
--- a/addons/reloadlaunchers/stringtable.xml
+++ b/addons/reloadlaunchers/stringtable.xml
@@ -28,7 +28,7 @@
Lanceur chargé
Panzerabwehr geladen
Lanzador cargado
- ПУ заряжено
+ ПУ заряжена
Odpalovač nabit
Wyrzutnia załadowana
Kilövő betöltve
diff --git a/addons/weaponselect/stringtable.xml b/addons/weaponselect/stringtable.xml
index 6e06025620..a30b18f5dd 100644
--- a/addons/weaponselect/stringtable.xml
+++ b/addons/weaponselect/stringtable.xml
@@ -53,7 +53,7 @@
Seleccionar lanzador
Wybierz wyrzutnię
Zvolit Raketomet
- Выбрать гранатомет
+ Выбрать гранатомёт
Sélectionner Lanceur
Rakétavető Kiválasztása
Selecionar Lançador
@@ -65,7 +65,7 @@
Seleccionar lanzador de granadas
Wybierz granatnik
Zvolit Granátomet
- Выбрать подствольный гранатомет
+ Выбрать подствольный гранатомёт
Sélectionner Lance-grenades
Gránátvető Kiválasztása
Selecionar Lança-Granadas
From 7ca35bf823094c3d35c6820709958c7b9e263269 Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Wed, 29 Apr 2015 10:44:10 +0200
Subject: [PATCH 099/478] prevent multiple detonators of same type to be
displayed #835
As per @CorruptedHeart suggestion.
> Just needs a
> if (getNumber (_config >> "ACE_Detonator") == 1 && {!(_x in _result)}) then {
---
addons/explosives/functions/fnc_getDetonators.sqf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/explosives/functions/fnc_getDetonators.sqf b/addons/explosives/functions/fnc_getDetonators.sqf
index 26bde9b190..01a4d0129e 100644
--- 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;
From 87d1f7c2819a01c595290e4345fe94904d08093b Mon Sep 17 00:00:00 2001
From: ulteq
Date: Wed, 29 Apr 2015 12:24:56 +0200
Subject: [PATCH 100/478] Fixes:
https://github.com/acemod/ACE3/pull/909#issuecomment-97377112
---
addons/explosives/functions/fnc_detonateExplosive.sqf | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/addons/explosives/functions/fnc_detonateExplosive.sqf b/addons/explosives/functions/fnc_detonateExplosive.sqf
index e4dfc2f7fc..f79f38ae1e 100644
--- a/addons/explosives/functions/fnc_detonateExplosive.sqf
+++ b/addons/explosives/functions/fnc_detonateExplosive.sqf
@@ -19,19 +19,13 @@
* Public: Yes
*/
#include "script_component.hpp"
-private ["_result", "_ignoreRange", "_helper", "_pos"];
+private ["_result", "_ignoreRange", "_pos"];
EXPLODE_3_PVT(_this,_unit,_range,_item);
_ignoreRange = (_range == -1);
_result = true;
if (!_ignoreRange && {(_unit distance (_item select 0)) > _range}) exitWith {false};
-_helper = (attachedTo (_item select 0));
-if (!isNull(_helper)) then {
- detach (_item select 0);
- deleteVehicle _helper;
-};
-
if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhenDestroyed") == 0) then {
private ["_exp", "_previousExp"];
_previousExp = _item select 0;
From cec16d6a44f1c8b74e54732286711fe437c66f1b Mon Sep 17 00:00:00 2001
From: KoffeinFlummi
Date: Wed, 29 Apr 2015 12:58:02 +0200
Subject: [PATCH 101/478] 3 > 2
---
tools/stringtableduplicates.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/stringtableduplicates.py b/tools/stringtableduplicates.py
index b9b4920059..49f5bcb743 100755
--- 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
From d149db61e8ca98384a19e7b1381c9bc2f68452a5 Mon Sep 17 00:00:00 2001
From: commy2
Date: Wed, 29 Apr 2015 13:01:08 +0200
Subject: [PATCH 102/478] ace insignia, #906
---
addons/common/CfgUnitInsignia.hpp | 9 +++++++++
addons/common/config.cpp | 1 +
addons/common/data/ace3logo_ca.paa | Bin 0 -> 22016 bytes
3 files changed, 10 insertions(+)
create mode 100644 addons/common/CfgUnitInsignia.hpp
create mode 100644 addons/common/data/ace3logo_ca.paa
diff --git a/addons/common/CfgUnitInsignia.hpp b/addons/common/CfgUnitInsignia.hpp
new file mode 100644
index 0000000000..c12c17c0c0
--- /dev/null
+++ 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 = "";
+ };
+};
diff --git a/addons/common/config.cpp b/addons/common/config.cpp
index 16bd13fc0c..27647f8d00 100644
--- 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;
diff --git a/addons/common/data/ace3logo_ca.paa b/addons/common/data/ace3logo_ca.paa
new file mode 100644
index 0000000000000000000000000000000000000000..d3e6e20c7b3d08d692565170b06d6824e09d82c3
GIT binary patch
literal 22016
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
B%1ZzM
literal 0
HcmV?d00001
From 2068eaea7518d89acef37d245c313ea6933ae799 Mon Sep 17 00:00:00 2001
From: ulteq
Date: Wed, 29 Apr 2015 13:53:38 +0200
Subject: [PATCH 103/478] Added G_40mm_HE config, changed 40mm gurney_k values
---
addons/frag/CfgAmmo.hpp | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp
index 6490c94f22..aa98be80f7 100644
--- a/addons/frag/CfgAmmo.hpp
+++ b/addons/frag/CfgAmmo.hpp
@@ -68,29 +68,27 @@ class CfgAmmo {
GVAR(gurney_c) = 2320;
GVAR(gurney_k) = 1/2;
};
-
-
+
+ class G_40mm_HEDP: GrenadeBase {
+ // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M433
+ GVAR(classes)[] = {"ACE_frag_tiny_HD"};
+ GVAR(metal) = 200;
+ GVAR(charge) = 45;
+ GVAR(gurney_c) = 2830;
+ GVAR(gurney_k) = 1/2;
+ };
class G_40mm_HE: GrenadeBase {
- GVAR(classes)[] = {"ACE_frag_tiny_HD"};
- GVAR(metal) = 200;
- GVAR(charge) = 45;
- GVAR(gurney_c) = 2830;
- GVAR(gurney_k) = 3/5;
- };
-
- class ACE_G_40mm_HEDP: G_40mm_HE {
- GVAR(classes)[] = {"ACE_frag_tiny_HD"};
- GVAR(metal) = 200;
- GVAR(charge) = 45;
- GVAR(gurney_c) = 2830;
- GVAR(gurney_k) = 3/5;
- };
- class ACE_G_40mm_HE: ACE_G_40mm_HEDP {
+ // Source: http://www.inetres.com/gp/military/infantry/grenade/40mm_ammo.html#M441
GVAR(classes)[] = {"ACE_frag_tiny_HD"};
GVAR(metal) = 200;
GVAR(charge) = 32;
GVAR(gurney_c) = 2700;
- GVAR(gurney_k) = 3/5;
+ GVAR(gurney_k) = 1/2;
+ };
+
+ class ACE_G_40mm_HEDP: G_40mm_HEDP {
+ };
+ class ACE_G_40mm_HE: G_40mm_HE {
};
class ACE_G_40mm_Practice: ACE_G_40mm_HE {
GVAR(skip) = 1;
From dfbc9b74fd692a7c149b70896d9e8f15388581ae Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Wed, 29 Apr 2015 15:14:37 +0200
Subject: [PATCH 104/478] Added arsenalScope #913
---
addons/common/CfgWeapons.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/common/CfgWeapons.hpp b/addons/common/CfgWeapons.hpp
index cf8c06798e..59bb8f6b9a 100644
--- a/addons/common/CfgWeapons.hpp
+++ b/addons/common/CfgWeapons.hpp
@@ -15,7 +15,7 @@ class CfgWeapons {
class ACE_FakePrimaryWeapon: Rifle_Base_F {
scope = 2;
scopeCurator = 1;
-
+ scopeArsenal = 1;
displayName = "";
model = "\A3\Weapons_f\empty";
picture = "";
From 283e34779feb9544753ee5dc345f7fd249c69df9 Mon Sep 17 00:00:00 2001
From: jaynus
Date: Wed, 29 Apr 2015 07:05:48 -0700
Subject: [PATCH 105/478] Don't inherit
---
addons/missileguidance/functions/fnc_onFired.sqf | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf
index 7ada1d4442..6c6c2717bf 100644
--- a/addons/missileguidance/functions/fnc_onFired.sqf
+++ b/addons/missileguidance/functions/fnc_onFired.sqf
@@ -7,7 +7,7 @@ if(GVAR(enabled) < 1 || {!local _projectile} ) exitWith { false };
if( !isPlayer _shooter && { GVAR(enabled) < 2 } ) exitWith { false };
-private["_config", "_enabled", "_target", "_seekerType", "_attackProfile"];
+private["_config", "_configs", "_enabled", "_target", "_seekerType", "_attackProfile"];
private["_args", "_canUseLock", "_guidingUnit", "_launchPos", "_lockMode", "_targetPos", "_vanillaTarget"];
PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
@@ -15,7 +15,9 @@ PARAMS_7(_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
// Bail on not missile
if(! (_ammo isKindOf "MissileBase") ) exitWith { false };
-_config = configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON);
+_configs = configProperties [configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON), "true", false];
+if( (count _configs) < 1) exitWith {};
+_config = _configs select 1;
_enabled = getNumber ( _config >> "enabled");
// Bail if guidance is not enabled
From 5ec6bea71d8acc13834ae9c30c40be19c3221594 Mon Sep 17 00:00:00 2001
From: FreeZbe
Date: Wed, 29 Apr 2015 16:19:23 +0200
Subject: [PATCH 106/478] French: update stringtable
---
addons/interact_menu/stringtable.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index a5df7723b4..cc447c082e 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -76,7 +76,7 @@
@@ -103,9 +103,11 @@
Keep cursor centered
+ Garder le curseur au centre
Keeps cursor centered and pans the option menu around. Useful if screen size is limited.
+ Garde le curseur au milieu et dispose le menu des options autour. Utile si la taille de l'écran est limitée.
-
\ No newline at end of file
+
From ca7aeece904ad04cf1d5aaaa39506d950e213402 Mon Sep 17 00:00:00 2001
From: FreeZbe
Date: Wed, 29 Apr 2015 16:28:59 +0200
Subject: [PATCH 107/478] French: update stringtable
---
addons/ballistics/stringtable.xml | 88 ++++++++++++++++---------------
1 file changed, 45 insertions(+), 43 deletions(-)
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index dc9df9db34..83ddf4bec1 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -31,7 +31,7 @@
Kaliber: 6,5x39mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
Kaliber: 6,5x39mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
Calibre: 6,5x39mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
- Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé avec: MX/C/M/SW/3GL
Kaliber: 6,5x39mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
Ráže: 6.5x39mm Svítící IR-DIM<br />Munice: 30<br />Použití: MX/C/M/SW/3GL
Calibre: 6,5x39mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL
@@ -67,7 +67,7 @@
Kaliber: 6,5x39mm Halk<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
Kaliber: 6,5x39mm SD<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
Calibre: 6,5x39mm SD<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
- Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé avec: MX/C/M/SW/3GL
Kaliber: 6,5x39mm SD<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
Ráže: 6.5x39mm SD<br />Munice: 30<br />Použití: MX/C/M/SW/3GL
Calibre: 6,5x39mm SD<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL
@@ -103,7 +103,7 @@
Kaliber: 6,5x39mm Páncéltörő<br />Lövedékek: 30<br />Használható: MX/C/M/SW/3GL
Kaliber: 6,5x39mm AP<br />Patronen: 30<br />Eingesetzt von: MX/C/M/SW/3GL
Calibre: 6,5x39mm AP<br />Balas: 30<br />Se usa en: MX/C/M/SW/3GL
- Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé dans: MX/C/M/SW/3GL
+ Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé avec: MX/C/M/SW/3GL
Kaliber: 6,5x39mm AP<br />Pociski: 30<br />Używane w: MX/C/M/SW/3GL
Ráže: 6.5x39mm AP<br />Munice: 30<br />Použití: MX/C/M/SW/3GL
Calibre: 6,5x39mm AP<br />Projéteis: 30<br />Usado em: MX/C/M/SW/3GL
@@ -140,7 +140,7 @@
Kaliber: 6,5x39mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: Katiba
Kaliber: 6,5x39mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: Katiba
Calibre: 6,5x39mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: Katiba
- Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: Katiba
+ Calibre: 6,5x39mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé avec: Katiba
Kaliber: 6,5x39mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: Katiba
Ráže: 6.5x39mm Svítící IR-DIM<br />Munice: 30<br />Použití: Katiba
Calibre: 6,5x39mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: Katiba
@@ -176,7 +176,7 @@
Kaliber: 6,5x39mm Halk<br />Lövedékek: 30<br />Használható: Katiba
Kaliber: 6,5x39mm SD<br />Patronen: 30<br />Eingesetzt von: Katiba
Calibre: 6,5x39mm SD<br />Balas: 30<br />Se usa en: Katiba
- Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé dans: Katiba
+ Calibre: 6,5x39mm SD<br />Cartouches: 30<br />Utilisé avec: Katiba
Kaliber: 6,5x39mm SD<br />Naboje: 30<br />Używane w: Katiba
Ráže: 6.5x39mm SD<br />Munice: 30<br />Použití: Katiba
Calibre: 6,5x39mm SD<br />Projéteis: 30<br />Usado em: Katiba
@@ -212,7 +212,7 @@
Kaliber: 6,5x39mm Páncéltörő<br />Lövedékek: 30<br />Használható: Katiba
Kaliber: 6,5x39mm AP<br />Patronen: 30<br />Eingesetzt von: Katiba
Calibre: 6,5x39mm AP<br />Balas: 30<br />Se usa en: Katiba
- Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé dans: Katiba
+ Calibre: 6,5x39mm AP<br />Cartouches: 30<br />Utilisé avec: Katiba
Kaliber: 6,5x39mm AP<br />Pociski: 30<br />Używane w: Katiba
Ráže: 6.5x39mm AP<br />Munice: 30<br />Použití: Katiba
Calibre: 6,5x39mm AP<br />Projéteis: 30<br />Usado em: Katiba
@@ -249,7 +249,7 @@
Kaliber: 5,56x45mm Nyomjelző IR-DIM<br />Lövedékek: 30<br />Használható: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Kaliber: 5,56x45mm Leuchtspur IR-DIM<br />Patronen: 30<br />Eingesetzt von: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Calibre: 5,56x45mm Trazadoras IR-DIM<br />Balas: 30<br />Se usa en: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
- Calibre: 5,56x45mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé dans: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
+ Calibre: 5,56x45mm Traçantes IR-DIM<br />Cartouches: 30<br />Utilisé avec: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Kaliber: 5,56x45mm Smugacz IR-DIM<br />Pociski: 30<br />Używane w: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Ráže: 5.56x45mm Svítící IR-DIM<br />Munice: 30<br />Použití: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
Calibre: 5,56x45mm Traçante IR-DIM<br />Projéteis: 30<br />Usado em: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR
@@ -286,7 +286,7 @@
Kaliber: 7,62x51mm Nyomjelző<br />Lövedékek: 20<br />Használható: Mk18 ABR
Kaliber: 7,62x51mm Leuchtspur<br />Patronen: 20<br />Eingesetzt von: EBR
Calibre: 7,62x51mm Trazadora<br />Balas: 20<br />Se usa en: Mk18 ABR
- Calibre: 7,62x51mm Traçantes<br />Cartouches: 20<br />Utilisé dans: EBR
+ Calibre: 7,62x51mm Traçantes<br />Cartouches: 20<br />Utilisé avec: EBR
Kaliber: 7,62x51mm Smugacz<br />Pociski: 20<br />Używane w: Mk18 ABR
Ráže: 7.62x51mm Svítící<br />Munice: 20<br />Použití: Mk18 ABR
Calibre: 7,62x51mm Traçante<br />Projéteis: 20<br />Usado em: Mk18 ABR
@@ -322,7 +322,7 @@
Kaliber: 7,62x51mm Nyomjelző IR-DIM<br />Lövedékek: 20<br />Használható: Mk18 ABR
Kaliber: 7,62x51mm Leuchtspur IR-DIM<br />Patronen: 20<br />Eingesetzt von: EBR
Calibre: 7,62x51mm Trazadoras IR-DIM<br />Balas: 20<br />Se usa en: Mk18 ABR
- Calibre: 7,62x51mm Traçantes IR-DIM<br />Cartouches: 20<br />Utilisé dans: EBR
+ Calibre: 7,62x51mm Traçantes IR-DIM<br />Cartouches: 20<br />Utilisé avec: EBR
Kaliber: 7,62x51mm Smugacz IR-DIM<br />Pociski: 20<br />Używane w: Mk18 ABR
Ráže: 7.62x51mm Svítící IR-DIM<br />Munice: 20<br />Použití: Mk18 ABR
Calibre: 7,62x51mm Traçante IR-DIM<br />Projéteis: 20<br />Usado em: Mk18 ABR
@@ -358,7 +358,7 @@
Kaliber: 7,62x51mm Halk<br />Lövedékek: 20<br />Használható: Mk18 ABR
Kaliber: 7,62x51mm SD<br />Patronen: 20<br />Eingesetzt von: EBR
Calibre: 7,62x51mm SD<br />Balas: 20<br />Se usa en: Mk18 ABR
- Calibre: 7,62x51mm SD<br />Cartouches: 20<br />Utilisé dans: EBR
+ Calibre: 7,62x51mm SD<br />Cartouches: 20<br />Utilisé avec: EBR
Kaliber: 7,62x51mm SD<br />Pociski: 20<br />Używane w: Mk18 ABR
Ráže: 7.62x51mm SD<br />Munice: 20<br />Použití: Mk18 ABR
Calibre: 7,62x51mm SD<br />Projéteis: 20<br />Usado em: Mk18 ABR
@@ -387,7 +387,7 @@
Caliber: .338 Norma Magnum Tracer<br />Rounds: 130<br />Used in: SPMG
Kaliber: .338 Norma Magnum Leuchtspur<br />Patronen: 130<br />Eingesetzt von: SPMG
Kaliber: .338 Norma Magnum Smugacz<br />Pociski: 130<br />Używany w: SPMG
- Calibre: .338 Norma Magnum Traçante<br />Cartouches: 130<br />Utilisé dans: SPMG
+ Calibre: .338 Norma Magnum Traçante<br />Cartouches: 130<br />Utilisé avec: SPMG
Calibre: .338 Norma Magnum trazadora<br />Balas: 130<br />Se usa en: SPMG
Калибр: .338 Norma Magnum трассирующие<br />Патронов: 130<br />Используются в: SPMG
@@ -412,7 +412,7 @@
Caliber: .338 Norma Magnum Tracer IR-DIM<br />Rounds: 130<br />Used in: SPMG
Kaliber: .338 Norma Magnum Leuchtspur IR-DIM<br />Patronen: 130<br />Eingesetzt von: SPMG
Kaliber: .338 Norma Magnum Smugacz IR-DIM<br />Pociski: 130<br />Używany w: SPMG
- Calibre: .338 Norma Magnum Traçante IR-DIM<br />Cartouches: 130<br />Utilisé dans: SPMG
+ Calibre: .338 Norma Magnum Traçante IR-DIM<br />Cartouches: 130<br />Utilisé avec: SPMG
Calibre: .338 Norma Magnum trazadora IR-DIM<br />Balas: 130<br />Se usa en: SPMG
Калибр: .338 Norma Magnum ИК-трассирующие<br />Патронов: 130<br />Используются с: SPMG
@@ -437,7 +437,7 @@
Caliber: .338 Norma Magnum AP<br />Rounds: 130<br />Used in: SPMG
Kaliber: .338 Norma Magnum Hartkern<br />Patronen: 130<br />Eingesetzt von: SPMG
Kaliber: .338 Norma Magnum AP<br />Pociski: 130<br />Używane w: SPMG
- Calibre: .338 Norma Magnum AP<br />Cartouches: 130<br />Utilisé dans: SPMG
+ Calibre: .338 Norma Magnum AP<br />Cartouches: 130<br />Utilisé avec: SPMG
Calibre: .338 Norma Magnum AP<br />Balas: 130<br />Se usa en: SPMG
Калибр: .338 Norma Magnum бронебойные<br />Патронов: 130<br />Используются с: SPMG
@@ -463,7 +463,7 @@
Caliber: 9.3x64mm Tracer<br />Rounds: 10<br />Used in: Cyrus
Kaliber: 9,3x64mm Leuchtspur<br />Patronen: 10<br />Eingesetzt von: Cyrus
Kaliber: 9,3x64mm Smugacz<br />Pociski: 10<br />Używany w: Cyrus
- Calibre: 9.3x64mm Traçante<br />Cartouches: 10<br />Utilisé dans: Cyrus
+ Calibre: 9.3x64mm Traçante<br />Cartouches: 10<br />Utilisé avec: Cyrus
Calibre: 9.3x64mm trazadora<br />Balas: 10<br />Se usa en: Cyrus
Калибр: 9,3x64 мм трассирующие<br />Патронов: 10<br />Используются с: Cyrus
@@ -488,7 +488,7 @@
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 10<br />Used in: Cyrus
Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Patronen: 10<br />Eingesetzt von: Cyrus
Kaliber: 9,3x64mm Smugacz IR-DIM<br />Pociski: 10<br />Używany w: Cyrus
- Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 10<br />Utilisé dans: Cyrus
+ Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 10<br />Utilisé avec: Cyrus
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 10<br />Se usa en: Cyrus
Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 10<br />Используются с: Cyrus
@@ -514,7 +514,7 @@
Caliber: 9.3x64mm Tracer<br />Rounds: 150<br />Used in: Navid
Kaliber: 9,3x64mm Leuchtspur<br />Patronen: 150<br />Eingesetzt von: Navid
Kaliber: 9,3x64mm Smugacz<br />Pociski: 150<br />Używane w: Navid
- Calibre: 9.3x64mm Traçante<br />Cartouches: 150<br />Utilisé dans: Navid
+ Calibre: 9.3x64mm Traçante<br />Cartouches: 150<br />Utilisé avec: Navid
Calibre: 9.3x64mm trazadora<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм трассирующие<br />Патронов: 150<br />Используются с: Навид
@@ -539,7 +539,7 @@
Caliber: 9.3x64mm Tracer IR-DIM<br />Rounds: 150<br />Used in: Navid
Kaliber: 9,3x64mm Leuchtspur IR-DIM<br />Patronen: 150<br />Eingesetzt von: Navid
Kaliber: 9,3x64mm Smugacz IR-DIM<br />Pociski: 150<br />Używane w: Navid
- Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 150<br />Utilisé dans: Navid
+ Calibre: 9.3x64mm Traçante IR-DIM<br />Cartouches: 150<br />Utilisé avec: Navid
Calibre: 9.3x64mm trazadora IR-DIM<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм ИК-трассирующие<br />Патронов: 150<br />Используются с: Навид
@@ -564,7 +564,7 @@
Caliber: 9.3x64mm AP<br />Rounds: 150<br />Used in: Navid
Kaliber: 9,3x64mm Hartkern<br />Patronen: 150<br />Eingesetzt von: Navid
Kaliber: 9,3x64mm AP<br />Pociski: 150<br />Używane w: Navid
- Calibre: 9.3x64mm AP<br />Cartouches: 150<br />Utilisé dans: Navid
+ Calibre: 9.3x64mm AP<br />Cartouches: 150<br />Utilisé avec: Navid
Calibre: 9.3x64mm AP<br />Balas: 150<br />Se usa en: Navid
Калибр: 9,3x64 мм бронебойные<br />Патронов: 150<br />Используются с: Навид
@@ -587,7 +587,7 @@
9x19mm 30Rnd Mag
Magazynek 9x19mm 16rd
- 9x19mm 30Cps
+ Chargeur 9x19mm 30Cps
Cargador de 16 balas de 9x19mm
Магазин из 16-ти 9х19 мм
9x19mm 30-Patronen-Magazin
@@ -595,7 +595,7 @@
9x19mm 30Rnd Mag
Magazynek 9x19mm 30rd
- 9x19mm 30Cps
+ Chargeur 9x19mm 30Cps
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
9x19mm 30-Patronen-Magazin
@@ -611,7 +611,7 @@
9x19mm 30Rnd Mag
Magazynek 9x19mm 30rd
- 9x19mm 30Cps
+ Chargeur 9x19mm 30Cps
Cargador de 30 balas de 9x19mm
Магазин из 30-ти 9х19 мм
9x19mm 30-Patronen-Magazin
@@ -659,7 +659,7 @@
6.5mm 100Rnd Tracer IR-DIM Mag<br />Rounds: 100<br />Used in: MX LSW
Magazynek 6,5mm 100rd Smugacz IR-DIM
- Chargeur 6.5mm 100Rnd Traçante IR-DIM
+ Chargeur 6.5mm 100Rnd Traçante IR-DIM<br />Cartouches: 100<br />Utilisé avec: MX LSW
Cargador de 100 balas trazadoras IR-DIM de 6.5mm
Магазин из 100 6,5 мм ИК-трассирующих
6,5mm 100-Patronen-Magazin IR-DIM Leuchtspur<br />Patronen: 100<br />Eingesetzt von: MXLSW
@@ -683,7 +683,7 @@
6.5mm 200Rnd Tracer IR-DIM Belt<br />Rounds: 200<br />Used in: Stoner 99 LMG
Magazynek 6,5mm 200rd Smugacz IR-DIM
- Bande 6.5mm 200Cps Traçante IR-DIM
+ Bande 6.5mm 200Cps Traçante IR-DIM<br />Cartouches: 200<br />Utilisé avec: Stoner 99 LMG
Cinta de 200 balas trazadoras IR-DIM de 6.5mm
Магазин из 200-т 6,5 мм ИК-трассирующих
6,5mm 200-Patronen-Gurt IR-DIM Leuchtspur<br />Patronen: 200<br />Eingesetzt von: Stoner 99 LMG
@@ -715,7 +715,7 @@
5.56mm 30Rnd Mag (Mk318)
Magazynek 5,56mm 30rd (Mk318)
- 5.56mm 30Cps (Mk318)
+ Chargeur 5.56mm 30Cps (Mk318)
Cargador de 30 balas de 5.56mm (Mk318)
Магазин из 30-ти 5.56 мм (Mk318)
5,56mm 30-Patronen-Magazin (Mk318)
@@ -739,7 +739,7 @@
5.56mm 30Rnd Mag (M995 AP)
Magazynek 5,56mm 30rd (M995 AP)
- 5.56mm 30Cps (M995 AP)
+ Chargeur 5.56mm 30Cps (M995 AP)
Cargador de 30 balas de 5.56mm (M995 AP)
Магазин из 30-ти 5.56 мм (M995 AP)
5,56mm 30-Patronen-Magazin (M995AP)
@@ -763,7 +763,7 @@
7.62mm 10Rnd Mag (M118LR)
Magazynek 7,62mm 10rd (M118LR)
- 7.62mm 10Cps (M118LR)
+ Chargeur 7.62mm 10Cps (M118LR)
Cargador de 10 balas de 7.62mm (M118LR)
Магазин из 10-ти 7,62 мм (M118LR)
7,62mm 10-Patronen-Magazin (M118LR)
@@ -787,7 +787,7 @@
7.62mm 20Rnd Mag (M118LR)
Magazynek 7,62mm 20rd (M118LR)
- 7.62mm 20Cps (M118LR)
+ Chargeur 7.62mm 20Cps (M118LR)
Cargador de 20 balas de 7.62mm (M118LR)
Магазин из 20-ти 7,62 мм (M118LR)
7,62mm 20-Patronen-Magazin (M118LR)
@@ -811,7 +811,7 @@
7.62mm 10Rnd Mag (Mk316 Mod 0)
Magazynek 7,62mm 10rd (Mk316 Mod 0)
- 7.62mm 10Cps (Mk316 Mod 0)
+ Chargeur 7.62mm 10Cps (Mk316 Mod 0)
Cargador de 10 balas de 7.62mm (Mk316 Mod 0)
Магазин из 10-ти 7,62 мм (Mk316 Mod 0)
7,62mm 10-Patronen-Magazin (Mk316 Mod 0)
@@ -835,7 +835,7 @@
7.62mm 20Rnd Mag (Mk316 Mod 0)
Magazynek 7,62mm 20rd (Mk316 Mod 0)
- 7.62mm 20Cps (Mk316 Mod 0)
+ Chargeur 7.62mm 20Cps (Mk316 Mod 0)
Cargador de 20 balas de 7.62mm (Mk316 Mod 0)
Магазин из 20-ти 7,62 мм (Mk316 Mod 0)
7,62mm 20-Patronen-Magazin (Mk316 Mod 0)
@@ -859,7 +859,7 @@
7.62mm 10Rnd Mag (Mk319 Mod 0)
Magazynek 7,62mm 10rd (Mk319 Mod 0)
- 7.62mm 10Cps (Mk319 Mod 0)
+ Chargeur 7.62mm 10Cps (Mk319 Mod 0)
Cargador de 10 balas de 7.62mm (Mk319 Mod 0)
Магазин из 10-ти 7,62 мм (Mk319 Mod 0)
7,62mm 10-Patronen-Magazin (Mk319 Mod 0)
@@ -883,7 +883,7 @@
7.62mm 20Rnd Mag (Mk319 Mod 0)
Magazynek 7,62mm 20rd (Mk319 Mod 0)
- 7.62mm 20Cps (Mk319 Mod 0)
+ Chargeur 7.62mm 20Cps (Mk319 Mod 0)
Cargador de 20 balas de 7.62mm (Mk319 Mod 0)
Магазин из 20-ти 7,62 мм (Mk319 Mod 0)
7,62mm 20-Patronen-Magazin (Mk319 Mod 0)
@@ -907,7 +907,7 @@
7.62mm 10Rnd Mag (M993 AP)
Magazynek 7,62mm 10rd (M993 AP)
- 7.62mm 10Cps (M993 AP)
+ Chargeur 7.62mm 10Cps (M993 AP)
Cargador de 10 balas de 7.62mm (M993 AP)
Магазин из 10-ти 7,62 мм (M993 AP)
7,62mm 10-Patronen-Magazin (M993 AP)
@@ -931,7 +931,7 @@
7.62mm 20Rnd Mag (M993 AP)
Magazynek 7,62mm 20rd (M993 AP)
- 7.62mm 20Cps (M993 AP)
+ Chargeur 7.62mm 20Cps (M993 AP)
Cargador de 20 balas de 7.62mm (M993 AP)
Магазин из 20-ти 7,62 мм (M993 AP)
7,62mm 20-Patronen-Magazin (M993 AP)
@@ -955,7 +955,7 @@
7.62mm 20Rnd Mag (Mk248 Mod 0)
Magazynek 7,62mm 20rd (Mk248 Mod 0)
- 7.62mm 20Cps (Mk248 Mod 0)
+ Chargeur 7.62mm 20Cps (Mk248 Mod 0)
Cargador de 20 balas de 7.62mm (Mk248 Mod 0)
Магазин из 20-ти 7,62 мм (Mk248 Mod 0)
7,62mm 20-Patronen-Magazin (Mk248 Mod 0)
@@ -979,7 +979,7 @@
7.62mm 20Rnd Mag (Mk248 Mod 1)
Magazynek 7,62mm 20rd (Mk248 Mod 1)
- 7.62mm 20Cps (Mk248 Mod 1)
+ Chargeur 7.62mm 20Cps (Mk248 Mod 1)
Cargador de 20 balas de 7.62mm (Mk248 Mod 1)
Магазин из 20-ти 7,62 мм (Mk248 Mod 1)
7,62mm 20-Patronen-Magazin (Mk248 Mod 1)
@@ -1003,7 +1003,7 @@
7.62mm 20Rnd Mag (Berger Hybrid OTM)
Magazynek 7,62mm 20rd (Berger Hybrid OTM)
- 7.62 20Cps (Berger Hybrid OTM)
+ Chargeur 7.62 20Cps (Berger Hybrid OTM)
Cargador de 20 balas de 7.62mm (Berger Hybrid OTM)
Магазин из 20-ти 7,62 мм (Berger Hybrid OTM)
7,62mm 20-Patronen-Magazin (Berger Hybrid OTM)
@@ -1026,7 +1026,7 @@
6.5x47mm 30Rnd Mag (HPBT Scenar)
- 6.5x47mm 30Cps (HPBT Scenar)
+ Chargeur 6.5x47mm 30Cps (HPBT Scenar)
Cargador de 30 balas de 6.5x47mm (HPBT Scenar)
Magazynek 6,5x47mm 30rd (HPBT Scenar)
Магазин из 30-ти 6,5x47 мм (HPBT Scenar)
@@ -1052,6 +1052,7 @@
6.5mm Creedmor 30Rnd Mag
Magazynek 6,5mm Creedmor 30rd
6,5mm Creedmor 30-Patronen-Magazin
+ Chargeur 6.5mm Creedmor 30Cps
6.5mm CM
@@ -1065,10 +1066,11 @@
Caliber: 6.5x47mm Creedmor<br />Rounds: 30<br />Used in: MXM
Kaliber: 6,5x47mm Creedmor<br />Pociski: 30<br />Używany w: MXM
Kaliber: 6,5x47mm Creedmor<br />Patronen: 30<br />Eingesetzt von: MXM
+ Calibre: 6.5x47mm Creedmor <br />Cartouches: 30<br />Utilisé avec: MXM
.338 10Rnd Mag (300gr Sierra MatchKing HPBT)
- .338 10 Cps (300gr Sierra MatchKing HPBT)
+ Chargeur .338 10 Cps (300gr Sierra MatchKing HPBT)
Cargador de 10 balas de 8.6x70mm (300gr Sierra MatchKing HPBT)
Magazynek .338 10rd (300gr Sierra MatchKing HPBT)
Магазин из 10-ти .338 (300 гран Sierra MatchKing HPBT)
@@ -1092,7 +1094,7 @@
.338 10Rnd Mag (API526)
- .338 10Cps (API526)
+ Chargeur .338 10Cps (API526)
Cargador de 10 balas de .338 (API526)
Magazynek .338 10rd (API526)
Магазин из 10-ти .338 (API526)
@@ -1116,7 +1118,7 @@
12.7x99mm 5Rnd Mag
- 12.7x99mm 5Cps
+ Chargeur 12.7x99mm 5Cps
Cargador de 5 balas de 12.7x99mm
Magazynek 12,7x99mm 5rd
Магазин из 5-ти 12,7x99 мм
@@ -1140,7 +1142,7 @@
12.7x99mm API 5Rnd Mag
- 12.7x99mm API 5Cps
+ Chargeur 12.7x99mm API 5Cps
Cargador de 5 balas de 12.7x99mm API
Magazynek 12,7x99mm API 5rd
12,7x99mm 5-Patronen-Magazin (API)
@@ -1161,7 +1163,7 @@
12.7x99mm 5Rnd Mag (AMAX)
- 12.7x99mm 5Rnd Mag (AMAX)
+ Chargeur 12.7x99mm 5Rnd Mag (AMAX)
Cargador de 5 balas de 12.7x99mm (AMAX)
Magazynek 12,7x99mm 5rd (AMAX)
Магазин из 5-ти 12,7x99 мм (A-MAX)
@@ -1184,4 +1186,4 @@
Kaliber:12,7x99mm (AMAX)<br />Patronen: 5
-
\ No newline at end of file
+
From 73772d9de19a55ea3f3065ae01dba2b17755e597 Mon Sep 17 00:00:00 2001
From: NukeDev
Date: Wed, 29 Apr 2015 16:44:42 +0200
Subject: [PATCH 108/478] Other Fixes
---
addons/medical/stringtable.xml | 50 ++++++++++++++++++++++++++
addons/missileguidance/stringtable.xml | 1 +
2 files changed, 51 insertions(+)
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 8bcd17cef7..1a1968ba1f 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -1123,6 +1123,7 @@
Use Surgical Kit
Operationsset benutzen
+ Usa kit chirurgico
Bodybag
@@ -1177,6 +1178,7 @@
%1 checked Blood Pressure: %2
%1 kontrollierte Blutdruck: %2
+ %1 controllata pressione sanguigna: %2
You checked %1
@@ -1251,18 +1253,22 @@
Low
Niedrig
+ Basso
Normal
Normal
+ Normale
High
Hoch
+ Alto
No Blood Pressure
Kein Blutdruck
+ Nessuna Pressione Sanguigna
Pulse
@@ -1297,18 +1303,22 @@
%1 checked Heart Rate: %2
%1 kontrollierte Herzfrequenz: %2
+ %1 Controllata Frequenza Cardiaca: %2
Weak
Schwach
+ Lento
Normal
Normal
+ Normale
Strong
Stark
+ Veloce
You find a Heart Rate of %2
@@ -1412,24 +1422,31 @@
Patient %1<br/>is %2.<br/>%3.<br/>%4
+ Paziente %1<br/>è %2.<br/>%3.<br/>%4
alive
+ Vivo
dead
+ Morto
He's lost some blood
+ Ha perso molto sangue
He hasn't lost blood
+ Non ha perso sangue
He is in pain
+ è affetto da dolore
He is not in pain
+ Non è affetto da dolore
Bandaged
@@ -1762,134 +1779,167 @@
Scrape
Kratzer
+ Scorticatura
Minor Scrape
Kleiner Kratzer
+ Minima Scorticatura
Medium Scrape
Mittlerer Kratzer
+ Media Scorticatura
Large Scrape
Großer Kratzer
+ Alta Scorticatura
Avulsion
Avulsion
+ Avulsione
Minor Avulsion
Kleine Avulsion
+ Minima Avulsione
Medium Avulsion
Mittlere Avulsion
+ Media Avulsione
Large Avulsion
Große Avulsion
+ Alta Avulsione
Bruise
Prellung
+ Contusione
Minor Bruise
Kleine Prellung
+ Minima Contusione
Medium Bruise
Mittlere Prellung
+ Media Contusione
Large Bruise
Große Prellung
+ Alta Contusione
Crushed tissue
Quetschverletzung
+ Tessuto Schiacciato
Minor crushed tissue
Kleine Quetschverletzung
+ Minimo Tessuto Schiacciato
Medium crushed tissue
Mittlere Quetschverletzung
+ Medio Tessuto Schiacciato
Large crushed tissue
Große Quetschverletzung
+ Alto Tessuto Schiacciato
Cut
Schnittwunde
+ Taglio
Small Cut
Kleine Schnittwunde
+ Piccolo Taglio
Medium Cut
Mittlere Schnittwunde
+ Medio Taglio
Large Cut
Große Schnittwunde
+ Grande Taglio
Tear
Riss
+ Strappo
Small Tear
Kleiner Riss
+ Piccolo Strappo
Medium Tear
Mittlerer Riss
+ Medio Strappo
Large Tear
Großer Riss
+ Grande Strappo
Velocity Wound
Ballistisches Trauma
+ Velocità Ferita
Smal Velocity Wound
Kleines Ballistisches Trauma
+ Lenta Velocità Ferita
Medium Velocity Wound
Mittleres Ballistisches Trauma
+ Media Velocità Ferita
Large Velocity Wound
Großes Ballistisches Trauma
+ Alta Velocità Ferita
Puncture Wound
Stichwunde
+ Puntura Ferita
Minor Puncture Wound
Kleine Stichwunde
+ Piccola Puntura Ferita
Medium Puncture Wound
Mittlere Stichwunde
+ Media Puntura Ferita
Large Puncture Wound
Große Stichwunde
+ Grande Puntura Ferita
Broken Femur
Gebrochener Oberschenkelknochen
+ Femore Rotto
\ No newline at end of file
diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index e0923981f3..68da1c0cd8 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -17,6 +17,7 @@
Advanced missile guidance, or AMG, provides multiple enhancements to missile locking and firing. It is also a framework required for missile weapon types.
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.
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.
+ Guida dei missili avanzata, o AMG, offre diversi miglioramenti alla teleguida di missili. E' anche un sistema necessario per i tipi di armi missile.
Hydra-70 DAGR Missile
From d4dc5e6d858c2b64d17a288a604bf138d6c09a3b Mon Sep 17 00:00:00 2001
From: NukeDev
Date: Wed, 29 Apr 2015 17:22:20 +0200
Subject: [PATCH 109/478] Other Fixes 2
---
addons/overheating/stringtable.xml | 5 +-
addons/realisticnames/stringtable.xml | 76 ++++++++++++++++++++++++++-
addons/respawn/stringtable.xml | 8 ++-
addons/vehiclelock/stringtable.xml | 4 +-
4 files changed, 88 insertions(+), 5 deletions(-)
diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml
index 557bd6c915..32e45bdddf 100644
--- a/addons/overheating/stringtable.xml
+++ b/addons/overheating/stringtable.xml
@@ -10,6 +10,7 @@
Wyświetl tekst przy zacięciu broni
Affiche texte si enrayé
Szöveges értesítés kijelzése a fegyver elakadásakor
+ Visualizza testo in caso di inceppamento
Display a notification whenever your weapon gets jammed
@@ -20,6 +21,7 @@
Wyświetl powiadomienie za każdym razem, kiedy Twoja broń ulegnie zacięciu
Affiche une notification lors d'un enrayement
Egy szöveges értesítés jelenik meg, amikor a fegyver megakad
+ Visualizza una notifica in caso la tua arma si inceppasse
Spare barrel
@@ -138,6 +140,7 @@
Vérifier la température
Fegyverhő ellenőrzése
Проверить температуру оружия
+ Controlla la temperatura della canna
Checking temperature ...
@@ -164,4 +167,4 @@
Температура
-
+
\ No newline at end of file
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index 5e9aaa701d..d4dbf701f5 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -118,6 +118,7 @@
YABHON-R3 (штурмовик)
YABHON-R3 (CAS)
YABHON-R3 (Légitámogató)
+ YABHON-R3 (CAS)
M-ATV
@@ -728,6 +729,7 @@
CH-47I Chinook (neozbrojený)
CH-47I Chinook (Neozbrojený)
CH-47I Chinook (fegyvertelen)
+ CH-47I Chinook (disarmato)
A-10D Thunderbolt II
@@ -1050,6 +1052,7 @@
P99
P99
P99
+ P99
MP-443 Grach
@@ -1060,6 +1063,7 @@
MP-443 Grach
MP-443 Grach
МР-443 "Грач"
+ MP-443 Grach
ACP-C2
@@ -1070,6 +1074,7 @@
ACP-C2
ACP-C2
ACP-C2
+ ACP-C2
FNX-45 Tactical
@@ -1080,6 +1085,7 @@
FNX-45 Tactical
FNX-45 Tactical
FNX-45 Tactical
+ FNX-45 Tactical
Chiappa Rhino 60DS
@@ -1090,6 +1096,7 @@
Chiappa Rhino 6DS
Chiappa Rhino 60DS
Chiappa Rhino 60DS
+ Chiappa Rhino 6DS
Taurus Judge
@@ -1100,6 +1107,7 @@
Taurus Judge
Taurus Judge
Taurus Judge
+ Taurus Judge
NLAW
@@ -1110,6 +1118,7 @@
NLAW
NLAW
NLAW
+ NLAW
RPG-32
@@ -1120,6 +1129,7 @@
RPG-32
RPG-32
РПГ-32
+ RPG-32
Mini-Spike (AA)
@@ -1130,6 +1140,7 @@
Mini-Spike (Repülő-elhárító)
Mini-Spike (AA)
Mini-Spike (AA)
+ Mini-Spike (AA)
Mini-Spike (AT)
@@ -1140,6 +1151,7 @@
Mini-Spike (Tankelhárító)
Mini-Spike (AT)
Mini-Spike (AT)
+ Mini-Spike (AT)
MX
@@ -1150,6 +1162,7 @@
MX
MX
MX
+ MX
MX (Black)
@@ -1160,6 +1173,7 @@
MX (Fekete)
MX (Negro)
MX (черный)
+ MX (Nero)
MXC
@@ -1170,6 +1184,7 @@
MXC
MXC
MXC
+ MXC
MXC (Black)
@@ -1180,6 +1195,7 @@
MXC (Fekete)
MXC (Negro)
MXC (черный)
+ MXC (Nero)
MX 3GL
@@ -1190,6 +1206,7 @@
MX 3GL
MX 3GL
MX 3GL
+ MX 3GL
MX 3GL (Black)
@@ -1200,6 +1217,7 @@
MX 3GL (Fekete)
MX 3GL (Negro)
MX 3GL (черный)
+ MX 3GL (Nero)
MX LSW
@@ -1210,6 +1228,7 @@
MX LSW
MX LSW
MX LSW
+ MX LSW
MX LSW (Black)
@@ -1220,6 +1239,7 @@
MX LSW (Fekete)
MX LSW (Negro)
MX LSW (черный)
+ MX LSW (Nero)
MXM
@@ -1230,6 +1250,7 @@
MXM
MXM
MXM
+ MXM
MXM (Black)
@@ -1240,6 +1261,7 @@
MXM (Fekete)
MXM (Negro)
MXM (черный)
+ MXM (Nero)
KT2002 Katiba
@@ -1250,6 +1272,7 @@
KT2002 Katiba
KT2002 Katiba
KT2002 Катиба
+ KT2002 Katiba
KT2002C Katiba
@@ -1260,6 +1283,7 @@
KT2002C Katiba
KT2002C Katiba
KT2002C Катиба
+ KT2002C Katiba
KT2002 Katiba KGL
@@ -1270,6 +1294,7 @@
KT2002 Katiba KGL
KT2002 Katiba KGL
KT2002 Катиба KGL
+ KT2002 Katiba KGL
F2000 (Camo)
@@ -1280,6 +1305,7 @@
F2000 (Terepmintás)
F2000 (Camuflaje)
F2000 (камо)
+ F2000 (Camo)
F2000
@@ -1290,6 +1316,7 @@
F2000
F2000
F2000
+ F2000
F2000 Tactical (Camo)
@@ -1300,6 +1327,7 @@
F2000 Tactical (Terepmintás)
F2000 Tactical (Camuflaje)
F2000 Tactical (камо)
+ F2000 Tactical (Camo)
F2000 Tactical
@@ -1310,6 +1338,7 @@
F2000 Tactical
F2000 Tactical
F2000 Tactical
+ F2000 Tactical
F2000 EGLM (Camo)
@@ -1320,6 +1349,7 @@
F2000 EGLM (Terepmintás)
F2000 EGLM (Camuflaje)
F2000 EGLM (камо)
+ F2000 EGLM (Camo)
F2000 EGLM
@@ -1330,6 +1360,7 @@
F2000 EGLM
F2000 EGLM
F2000 EGLM
+ F2000 EGLM
TAR-21
@@ -1340,6 +1371,7 @@
TAR-21
TAR-21
TAR-21
+ TAR-21
CTAR-21
@@ -1350,6 +1382,7 @@
CTAR-21
CTAR-21
CTAR-21
+ CTAR-21
TAR-21 EGLM
@@ -1360,6 +1393,7 @@
TAR-21 EGLM
TAR-21 EGLM
TAR-21 EGLM
+ TAR-21 EGLM
Vector SMG
@@ -1370,6 +1404,7 @@
Vector SMG
Vector SMG
Vector SMG
+ Vector SMG
Scorpion Evo 3 A1
@@ -1380,6 +1415,7 @@
Scorpion Evo 3 A1
Scorpion Evo 3 A1
Scorpion Evo 3 A1
+ Scorpion Evo 3 A1
CPW
@@ -1390,6 +1426,7 @@
CPW
CPW
CPW
+ CPW
RFB SDAR
@@ -1400,6 +1437,7 @@
RFB SDAR
RFB SDAR
RFB SDAR
+ RFB SDAR
Stoner 99 LMG
@@ -1410,6 +1448,7 @@
Stoner 99 Könnyűgéppuska
Stoner 99 LMG
Stoner 99 LMG
+ Stoner 99 LMG
Negev NG7
@@ -1420,6 +1459,7 @@
Negev NG7
Negev NG7
Negev NG7
+ Negev NG7
Mk14 Mod 1 EBR
@@ -1430,6 +1470,7 @@
Mk14 Mod 1 EBR
Mk14 Mod 1 EBR
Mk14 Mod 1 EBR
+ Mk14 Mod 1 EBR
GM6 Lynx
@@ -1440,6 +1481,7 @@
GM6 Gepárd
GM6 Lynx
GM6 Lynx
+ GM6 Lynx
GM6 Lynx (Camo)
@@ -1450,6 +1492,7 @@
GM6 Gepárd (Terepmintás)
GM6 Lynx (Camuflaje)
GM6 Lynx (камо)
+ GM6 Lynx (Camo)
M200 Intervention
@@ -1460,6 +1503,7 @@
M200 Intervention
M200 Intervention
M200 Intervention
+ M200 Intervention
M200 Intervention (Camo)
@@ -1470,6 +1514,7 @@
M200 Intervention (Terepmintás)
M200 Intervention (Camuflaje)
M200 Intervention (камо)
+ M200 Intervention (Camo)
VS-121
@@ -1480,6 +1525,7 @@
VS-121
VS-121
VS-121
+ VS-121
Noreen "Bad News" ULR
@@ -1487,6 +1533,7 @@
Noreen "Bad News" ULR
Noreen "Bad News" ULR
Noreen "Bad News" ULR
+ Noreen "Bad News" ULR
Noreen "Bad News" ULR (Black)
@@ -1494,6 +1541,7 @@
Noreen "Bad News" ULR (Noir)
Noreen "Bad News" ULR (Negro)
Noreen "Bad News" ULR (черный)
+ Noreen "Bad News" ULR (Nero)
Noreen "Bad News" ULR (Camo)
@@ -1501,6 +1549,7 @@
Noreen "Bad News" ULR (Camo)
Noreen "Bad News" ULR (Camuflaje)
Noreen "Bad News" ULR (камо)
+ Noreen "Bad News" ULR (Camo)
Noreen "Bad News" ULR (Sand)
@@ -1508,6 +1557,7 @@
Noreen "Bad News" ULR (Beige)
Noreen "Bad News" ULR (Arena)
Noreen "Bad News" ULR (песочный)
+ Noreen "Bad News" ULR (Sabbia)
SIG 556
@@ -1516,6 +1566,7 @@
SIG 556
SIG 556
SIG 556
+ SIG 556
SIG 556 (Black)
@@ -1524,6 +1575,7 @@
SIG 556 (Negro)
SIG 556 (черный)
SIG 556 (czarny)
+ SIG 556 (Nero)
SIG 556 (Khaki)
@@ -1532,6 +1584,7 @@
SIG 556 (Caqui)
SIG 556 (хаки)
SIG 556 (khaki)
+ SIG 556 (Khaki)
SIG 556 (Sand)
@@ -1540,6 +1593,7 @@
SIG 556 (Arena)
SIG 556 (песочный)
SIG 556 (piaskowy)
+ SIG 556 (Sabbia)
SIG 556 (Camo)
@@ -1548,6 +1602,7 @@
SIG 556 (Camuflaje)
SIG 556 (камо)
SIG 556 (kamuflaż)
+ SIG 556 (Camo)
SIG 556 (Woodland)
@@ -1556,6 +1611,7 @@
SIG 556 (Bosque)
SIG 556 (лесной)
SIG 556 (leśny)
+ SIG 556 (Woodland)
SIG 556 (provisional) spotter
@@ -1564,6 +1620,7 @@
SIG 556 (provisional) observador
SIG 556 (provisional) корректировщик
SIG 556 (prowizoryczny) obserwator
+ SIG 556 (provisional) spotter
ASP-1 Kir
@@ -1571,6 +1628,7 @@
ASP-1 Kir
ASP-1 Kir
ASP-1 Kir
+ ASP-1 Kir
ASP-1 Kir (Black)
@@ -1578,6 +1636,7 @@
ASP-1 Kir (Noir)
ASP-1 Kir (Negro)
ASP-1 Kir (черный)
+ ASP-1 Kir (Nero)
ASP-1 Kir (Tan)
@@ -1585,6 +1644,7 @@
ASP-1 Kir (Tan)
ASP-1 Kir (Tan)
ASP-1 Kir (бронзовый)
+ ASP-1 Kir (Tan)
Cyrus
@@ -1592,6 +1652,7 @@
Cyrus
Cyrus
Cyrus
+ Cyrus
Cyrus (Black)
@@ -1599,6 +1660,7 @@
Cyrus (Noir)
Cyrus (Negro)
Cyrus (черный)
+ Cyrus (Nero)
Cyrus (Hex)
@@ -1606,6 +1668,7 @@
Cyrus (Hex)
Cyrus (Hex)
Cyrus (гекс)
+ Cyrus (Hex)
Cyrus (Tan)
@@ -1613,6 +1676,7 @@
Cyrus (Tan)
Cyrus (Tan)
Cyrus (бронза)
+ Cyrus (Tan)
M14
@@ -1621,6 +1685,7 @@
M14
M14
M14
+ M14
M14 (Camo)
@@ -1629,6 +1694,7 @@
M14 (Camuflaje)
M14 (Камо)
M14 (kamuflaż)
+ M14 (Camo)
M14 (Olive)
@@ -1637,6 +1703,7 @@
M14 (Oliva)
M14 (Олива)
M14 (oliwkowy)
+ M14 (Olive)
HK121
@@ -1644,6 +1711,7 @@
HK121
HK121
HK121
+ HK121
HK121 (Hex)
@@ -1651,6 +1719,7 @@
HK121 (Hex)
HK121 (Hex)
HK121 (гекс)
+ HK121 (Hex)
HK121 (Tan)
@@ -1658,6 +1727,7 @@
HK121 (Tan)
HK121 (Tan)
HK121 (бронза)
+ HK121 (Tan)
LWMMG
@@ -1666,6 +1736,7 @@
LWMMG
LWMMG
LWMMG
+ LWMMG
LWMMG (MTP)
@@ -1674,6 +1745,7 @@
LWMMG (MTP)
LWMMG (MTP)
LWMMG (MTP)
+ LWMMG (MTP)
LWMMG (Black)
@@ -1682,6 +1754,7 @@
LWMMG (Negro)
LWMMG (Черный)
LWMMG (czarny)
+ LWMMG (Nero)
LWMMG (Sand)
@@ -1690,6 +1763,7 @@
LWMMG (Arena)
LWMMG (Песочный)
LWMMG (piaskowy)
+ LWMMG (Sabbia)
-
+
\ No newline at end of file
diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml
index 75f711e20e..95cc7123ed 100644
--- a/addons/respawn/stringtable.xml
+++ b/addons/respawn/stringtable.xml
@@ -52,6 +52,7 @@
Точка сбора Синих (База)
Punkt zbiórki Zachodu (Baza)
Point de ralliement OUEST (Base)
+ Rallypoint West (Base)
Rallypoint East (Base)
@@ -60,6 +61,7 @@
Точка сбора Красных (База)
Punkt zbiórki Wschodu (Baza)
Point de ralliement EST (Base)
+ Rallypoint East (Base)
Rallypoint Independent (Base)
@@ -68,6 +70,7 @@
Точка сбора Независимых (База)
Punkt zbiórki Ruchu oporu (Baza)
Point de ralliement Indépendant (Base)
+ Rallypoint Independent (Base)
Rallypoint West
@@ -76,6 +79,7 @@
Точка сбора Синих
Punkt zbiórki Zachodu
Point de ralliement OUEST
+ Rallypoint West
Rallypoint East
@@ -84,6 +88,7 @@
Точка сбора Красных
Punkt zbiórki Wschodu
Point de ralliement EST
+ Rallypoint East
Rallypoint Independent
@@ -92,6 +97,7 @@
Точка сбора Независимых
Punkt zbiórki Ruchu oporu
Point de ralliement Indépendant
+ Rallypoint Independent
-
+
\ No newline at end of file
diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml
index e62f9fdc5f..5dcab5fe2f 100644
--- a/addons/vehiclelock/stringtable.xml
+++ b/addons/vehiclelock/stringtable.xml
@@ -98,7 +98,7 @@
Egy kulcs, ami a KELET egységeinek legtöbb járművét ki tudja nyitni.
Klíč který by měl otevřít vetšinu Východních vozidel.
Ключ для открытия большинства машин Синих.
- Una chaive che apr ela maggior parte dei veicoli EAST
+ Una chaive che apre la maggior parte dei veicoli EAST
A key that should open most INDEP vehicle.
@@ -123,4 +123,4 @@
Una chaive che apr ela maggior parte dei veicoli CIV
-
+
\ No newline at end of file
From 989332831f582e8dc351960730a6bfdc909e59b0 Mon Sep 17 00:00:00 2001
From: ulteq
Date: Wed, 29 Apr 2015 17:42:37 +0200
Subject: [PATCH 110/478] Added frag configs for 82mm and 155mm shells
---
addons/frag/CfgAmmo.hpp | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp
index 3cfb27dfaf..3db80f0395 100644
--- a/addons/frag/CfgAmmo.hpp
+++ b/addons/frag/CfgAmmo.hpp
@@ -98,7 +98,14 @@ class CfgAmmo {
};
// curator ammo entries
- class Sh_82mm_AMOS;
+ class ShellBase;
+ class Sh_82mm_AMOS : ShellBase {
+ // Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm
+ GVAR(metal) = 3200;
+ GVAR(charge) = 420;
+ GVAR(gurney_c) = 1906;
+ GVAR(gurney_k) = 1/2;
+ };
class ModuleOrdnanceMortar_F_Ammo: Sh_82mm_AMOS {
GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"};
GVAR(metal) = 800;
@@ -107,7 +114,14 @@ class CfgAmmo {
GVAR(gurney_k) = 1/2;
};
- class Sh_155mm_AMOS;
+ class Sh_155mm_AMOS: ShellBase {
+ // Source: http://www.globalsecurity.org/military/systems/munitions/m795.htm
+ GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"};
+ GVAR(metal) = 36000;
+ GVAR(charge) = 9979;
+ GVAR(gurney_c) = 1906;
+ GVAR(gurney_k) = 1/2;
+ };
class ModuleOrdnanceHowitzer_F_ammo: Sh_155mm_AMOS {
GVAR(classes)[] = {"ACE_frag_large", "ACE_frag_large", "ACE_frag_large_HD", "ACE_frag_large", "ACE_frag_huge", "ACE_frag_huge_HD", "ACE_frag_huge"};
GVAR(metal) = 1950;
From 00dc0ef01eedc4e6abc0f87e2f3667cade66cb35 Mon Sep 17 00:00:00 2001
From: ulteq
Date: Wed, 29 Apr 2015 17:48:19 +0200
Subject: [PATCH 111/478] Added frag classes array for 82mm shell
---
addons/frag/CfgAmmo.hpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp
index 3db80f0395..726c7e5b57 100644
--- a/addons/frag/CfgAmmo.hpp
+++ b/addons/frag/CfgAmmo.hpp
@@ -101,6 +101,7 @@ class CfgAmmo {
class ShellBase;
class Sh_82mm_AMOS : ShellBase {
// Source: http://www.arsenal-bg.com/defense_police/mortar_bombs_82mm.htm
+ GVAR(classes)[] = {"ACE_frag_medium", "ACE_frag_medium_HD"};
GVAR(metal) = 3200;
GVAR(charge) = 420;
GVAR(gurney_c) = 1906;
From 5a3b672f10e3e05f6342e4f46c4fa61301efe085 Mon Sep 17 00:00:00 2001
From: Lex Rivera
Date: Wed, 29 Apr 2015 21:15:32 +0300
Subject: [PATCH 112/478] [compat_asdg] fix MRCO PiP compatibility
---
optionals/compat_asdg/config.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/optionals/compat_asdg/config.cpp b/optionals/compat_asdg/config.cpp
index b485685c55..c7e7903ce2 100644
--- a/optionals/compat_asdg/config.cpp
+++ b/optionals/compat_asdg/config.cpp
@@ -28,6 +28,7 @@ class asdg_OpticRail1913: asdg_OpticRail {
ACE_optic_Arco_2D = 1;
ACE_optic_Arco_PIP = 1;
ACE_optic_MRCO_2D = 1;
+ ACE_optic_MRCO_PIP = 1;
ACE_optic_SOS_2D = 1;
ACE_optic_SOS_PIP = 1;
ACE_optic_LRPS_2D = 1;
From 608af39a675b7ef68e859da743954aee3eb12ab2 Mon Sep 17 00:00:00 2001
From: ulteq
Date: Wed, 29 Apr 2015 21:22:07 +0200
Subject: [PATCH 113/478] Added proper dummy object cleanup code
---
addons/explosives/functions/fnc_detonateExplosive.sqf | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/addons/explosives/functions/fnc_detonateExplosive.sqf b/addons/explosives/functions/fnc_detonateExplosive.sqf
index f79f38ae1e..917c874af6 100644
--- a/addons/explosives/functions/fnc_detonateExplosive.sqf
+++ b/addons/explosives/functions/fnc_detonateExplosive.sqf
@@ -19,13 +19,19 @@
* Public: Yes
*/
#include "script_component.hpp"
-private ["_result", "_ignoreRange", "_pos"];
+private ["_result", "_ignoreRange", "_helpers", "_pos"];
EXPLODE_3_PVT(_this,_unit,_range,_item);
_ignoreRange = (_range == -1);
_result = true;
if (!_ignoreRange && {(_unit distance (_item select 0)) > _range}) exitWith {false};
+_helpers = attachedObjects (_item select 0);
+{
+ detach _x;
+ deleteVehicle _x;
+} forEach _helpers;
+
if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhenDestroyed") == 0) then {
private ["_exp", "_previousExp"];
_previousExp = _item select 0;
From 864c3ea03ba0b08a86078f21bd32b839f5c06f0e Mon Sep 17 00:00:00 2001
From: Dimaslg
Date: Wed, 29 Apr 2015 21:23:32 +0200
Subject: [PATCH 114/478] Conflicts resolve again
Conflicts resolve again
---
addons/missileguidance/stringtable.xml | 1 -
addons/optionsmenu/stringtable.xml | 13 ++-----------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index 5516e1e5db..839a4a3937 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -46,7 +46,6 @@
Hydra-70 DAGR Laser Guided Missile
- Missile à guidage Hydra-70 DAGR
Misil guiado por láser Hydra-70 DAGR
Missile à guidage laser Hydra-70 DAGR
Laserowo naprowadzana rakieta Hydra-70 DAGR
diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index df71dceb57..64e95133ba 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -149,13 +149,8 @@
\ No newline at end of file
From 87465b8b102d374f4465cd79520d4e4ad6fae487 Mon Sep 17 00:00:00 2001
From: Glowbal
Date: Wed, 29 Apr 2015 21:49:24 +0200
Subject: [PATCH 115/478] fixes #829
---
addons/medical/functions/fnc_handleDamage.sqf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/medical/functions/fnc_handleDamage.sqf b/addons/medical/functions/fnc_handleDamage.sqf
index a8dddcadc8..a989513580 100644
--- a/addons/medical/functions/fnc_handleDamage.sqf
+++ b/addons/medical/functions/fnc_handleDamage.sqf
@@ -63,7 +63,7 @@ if (GVAR(level) >= 2) then {
};
};
- if ((_minLethalDamage <= _newDamage) && {[_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)}) then {
+ if ((_minLethalDamage <= _newDamage) && {[_unit, [_selection] call FUNC(selectionNameToNumber), _newDamage] call FUNC(determineIfFatal)} || !alive vehicle _unit) then {
if ([_unit] call FUNC(setDead)) then {
_damageReturn = 1;
} else {
From fce91279b575c09251e739a133feae95bb175ea1 Mon Sep 17 00:00:00 2001
From: bux578
Date: Wed, 29 Apr 2015 22:04:17 +0200
Subject: [PATCH 116/478] add ace3 and banana insignia
`[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;`
and
`[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;`
---
addons/common/CfgUnitInsignia.hpp | 14 ++++++++++----
addons/common/data/ace3logo_ca.paa | Bin 22016 -> 0 bytes
addons/common/data/insignia_ace3logo_ca.paa | Bin 0 -> 33382 bytes
addons/common/data/insignia_banana_ca.paa | Bin 0 -> 36279 bytes
4 files changed, 10 insertions(+), 4 deletions(-)
delete mode 100644 addons/common/data/ace3logo_ca.paa
create mode 100644 addons/common/data/insignia_ace3logo_ca.paa
create mode 100644 addons/common/data/insignia_banana_ca.paa
diff --git a/addons/common/CfgUnitInsignia.hpp b/addons/common/CfgUnitInsignia.hpp
index c12c17c0c0..aba82823c9 100644
--- a/addons/common/CfgUnitInsignia.hpp
+++ b/addons/common/CfgUnitInsignia.hpp
@@ -1,9 +1,15 @@
class CfgUnitInsignia {
- class ACE_insignia {
- displayName = "ACE 3";
- author = "kripto202";
- texture = PATHTOF(data\ace3logo_ca.paa);
+ class ACE_insignia_logo {
+ displayName = "ACE3";
+ author = "$STR_ACE_Common_ACETeam";
+ texture = PATHTOF(data\Insignia_ace3logo_ca.paa);
+ textureVehicle = "";
+ };
+ class ACE_insignia_banana {
+ displayName = "ABE3";
+ author = "$STR_ACE_Common_ACETeam";
+ texture = PATHTOF(data\insignia_banana_ca.paa);
textureVehicle = "";
};
};
diff --git a/addons/common/data/ace3logo_ca.paa b/addons/common/data/ace3logo_ca.paa
deleted file mode 100644
index d3e6e20c7b3d08d692565170b06d6824e09d82c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 22016
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
B%1ZzM
diff --git a/addons/common/data/insignia_ace3logo_ca.paa b/addons/common/data/insignia_ace3logo_ca.paa
new file mode 100644
index 0000000000000000000000000000000000000000..04640aa187fdd60644c9daebc8e9547f13ada719
GIT binary patch
literal 33382
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
YK%SXr3*fJL@+Gc0)8PZ6pELJA0B578h5!Hn
literal 0
HcmV?d00001
diff --git a/addons/common/data/insignia_banana_ca.paa b/addons/common/data/insignia_banana_ca.paa
new file mode 100644
index 0000000000000000000000000000000000000000..5302ac07adaa39707d5841de87990bac5d244160
GIT binary patch
literal 36279
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