From f60262aff143c48b99d92e50fcf923fa9088fa25 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sat, 16 Jul 2016 14:48:53 -0400 Subject: [PATCH] Consolidate duplicate Remove Suppressor translations Vanilla development commit: https://github.com/DayZMod/DayZ/commit/66af3465ac4335bfedbb96b46bf551702f040246 --- .../Configs/CfgWeapons/Pistols/G17.hpp | 4 +-- .../Configs/CfgWeapons/Pistols/M9.hpp | 2 +- .../Configs/CfgWeapons/Pistols/Makarov.hpp | 2 +- .../Configs/CfgWeapons/Rifles/AK74.hpp | 12 +++---- .../Configs/CfgWeapons/Rifles/AKS74U.hpp | 4 +-- .../Configs/CfgWeapons/Rifles/Bizon.hpp | 2 +- .../Configs/CfgWeapons/Rifles/G36.hpp | 4 +-- .../Configs/CfgWeapons/Rifles/G36C.hpp | 8 ++--- .../Configs/CfgWeapons/Rifles/M4A1.hpp | 32 +++++++++---------- .../Configs/CfgWeapons/Rifles/MP5.hpp | 2 +- SQF/dayz_code/stringtable.xml | 24 +++----------- 11 files changed, 40 insertions(+), 56 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp index c6375f6b9..488a4b91f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/G17.hpp @@ -80,7 +80,7 @@ class G17_SD_DZ : M9SD { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP9_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup9',_id,'G17_DZ'] call player_removeAttachment"; }; }; @@ -109,7 +109,7 @@ class G17_SD_FL_DZ : G17_SD_DZ { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP9_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup9',_id,'G17_FL_DZ'] call player_removeAttachment"; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/M9.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/M9.hpp index 088476b2d..aaa58f0cf 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/M9.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/M9.hpp @@ -29,7 +29,7 @@ class M9_SD_DZ : M9SD { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP9_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup9',_id,'M9_DZ'] call player_removeAttachment"; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp index f514869bc..bdcc9bc52 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp @@ -26,7 +26,7 @@ class Makarov_SD_DZ : MakarovSD { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP9PM_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_SupMakarov',_id,'Makarov_DZ'] call player_removeAttachment"; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp index b80d4d16a..f59757c4d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp @@ -54,7 +54,7 @@ class AK74_Kobra_SD_DZ : AKS_74_UN_kobra }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP545_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup545',_id,'AK74_Kobra_DZ'] call player_removeAttachment"; }; }; @@ -116,7 +116,7 @@ class AK74_GL_Kobra_SD_DZ : AK74_Kobra_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP545_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup545',_id,'AK74_GL_Kobra_DZ'] call player_removeAttachment"; }; }; @@ -170,7 +170,7 @@ class AK74_SD_DZ : AK74_Kobra_SD_DZ { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP545_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup545',_id,'AK74_DZ'] call player_removeAttachment"; }; }; @@ -232,7 +232,7 @@ class AK74_GL_SD_DZ : AK74_GL_Kobra_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP545_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup545',_id,'AK74_GL_DZ'] call player_removeAttachment"; }; }; @@ -374,7 +374,7 @@ class AK74_PSO1_SD_DZ : AK74_Kobra_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP545_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup545',_id,'AK74_PSO1_DZ'] call player_removeAttachment"; }; }; @@ -520,7 +520,7 @@ class AK74_GL_PSO1_SD_DZ : AK74_GL_Kobra_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP545_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup545',_id,'AK74_GL_PSO1_DZ'] call player_removeAttachment"; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp index 2122915f5..6eb83f55a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp @@ -47,7 +47,7 @@ class AKS74U_Kobra_SD_DZ : AKS_74_UN_kobra class RemoveSuppressor { - text = $STR_DZ_ATT_SUP545_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup545',_id,'AKS74U_Kobra_DZ'] call player_removeAttachment"; }; }; @@ -91,7 +91,7 @@ class AKS74U_SD_DZ : AKS74U_Kobra_SD_DZ { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP545_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup545',_id,'AKS74U_DZ'] call player_removeAttachment"; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp index 2da0e1fbf..8e3c62f13 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp @@ -38,7 +38,7 @@ class Bizon_SD_DZ : bizon_silenced { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP9BIZON_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_SupBizon',_id,'Bizon_DZ'] call player_removeAttachment"; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp index 378100334..993dd6c53 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp @@ -158,7 +158,7 @@ class G36K_Camo_SD_DZ : G36_C_SD_eotech { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'G36K_Camo_DZ'] call player_removeAttachment"; }; }; @@ -200,7 +200,7 @@ class G36A_Camo_DZ : G36K_Camo_DZ { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'G36K_Camo_DZ'] call player_removeAttachment"; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp index 1d69ea28e..8ca077b32 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp @@ -78,7 +78,7 @@ class G36C_SD_DZ : G36_C_SD_eotech { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'G36C_DZ'] call player_removeAttachment"; }; }; @@ -122,7 +122,7 @@ class G36C_CCO_SD_DZ : G36C_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'G36C_CCO_DZ'] call player_removeAttachment"; }; }; @@ -166,7 +166,7 @@ class G36C_Holo_SD_DZ : G36C_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'G36C_Holo_DZ'] call player_removeAttachment"; }; }; @@ -214,7 +214,7 @@ class G36C_ACOG_SD_DZ : G36C_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'G36C_ACOG_DZ'] call player_removeAttachment"; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp index d3a999982..6b7ee411b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp @@ -137,7 +137,7 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_DZ'] call player_removeAttachment"; }; }; @@ -163,7 +163,7 @@ class M4A1_SD_FL_DZ : M4A1_SD_DZ { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_FL_DZ'] call player_removeAttachment"; }; class RemoveFlashlight @@ -259,7 +259,7 @@ class M4A1_GL_SD_DZ : M4A1_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_GL_DZ'] call player_removeAttachment"; }; }; @@ -289,7 +289,7 @@ class M4A1_GL_SD_FL_DZ : M4A1_GL_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_GL_FL_DZ'] call player_removeAttachment"; }; class RemoveFlashlight @@ -375,7 +375,7 @@ class M4A1_CCO_SD_DZ : M4A1_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_CCO_DZ'] call player_removeAttachment"; }; }; @@ -401,7 +401,7 @@ class M4A1_CCO_SD_FL_DZ : M4A1_SD_FL_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_CCO_FL_DZ'] call player_removeAttachment"; }; class RemoveFlashlight @@ -497,7 +497,7 @@ class M4A1_GL_CCO_SD_DZ : M4A1_GL_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_GL_CCO_DZ'] call player_removeAttachment"; }; }; @@ -525,7 +525,7 @@ class M4A1_GL_CCO_SD_FL_DZ : M4A1_GL_SD_FL_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_GL_CCO_FL_DZ'] call player_removeAttachment"; }; class RemoveFlashlight @@ -611,7 +611,7 @@ class M4A1_Holo_SD_DZ : M4A1_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_Holo_DZ'] call player_removeAttachment"; }; }; @@ -637,7 +637,7 @@ class M4A1_Holo_SD_FL_DZ : M4A1_SD_FL_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_Holo_FL_DZ'] call player_removeAttachment"; }; class RemoveFlashlight @@ -733,7 +733,7 @@ class M4A1_GL_Holo_SD_DZ : M4A1_GL_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_GL_Holo_DZ'] call player_removeAttachment"; }; }; @@ -761,7 +761,7 @@ class M4A1_GL_Holo_SD_FL_DZ : M4A1_GL_SD_FL_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_GL_Holo_FL_DZ'] call player_removeAttachment"; }; class RemoveFlashlight @@ -853,7 +853,7 @@ class M4A1_ACOG_SD_DZ : M4A1_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_ACOG_DZ'] call player_removeAttachment"; }; }; @@ -881,7 +881,7 @@ class M4A1_ACOG_SD_FL_DZ : M4A1_SD_FL_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_ACOG_FL_DZ'] call player_removeAttachment"; }; class RemoveFlashlight @@ -983,7 +983,7 @@ class M4A1_GL_ACOG_SD_DZ : M4A1_GL_SD_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_GL_ACOG_DZ'] call player_removeAttachment"; }; }; @@ -1013,7 +1013,7 @@ class M4A1_GL_ACOG_SD_FL_DZ : M4A1_GL_SD_FL_DZ }; class RemoveSuppressor { - text = $STR_DZ_ATT_SUP556_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup556',_id,'M4A1_GL_ACOG_FL_DZ'] call player_removeAttachment"; }; class RemoveFlashlight diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp index c1e386acd..7ad5804d7 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MP5.hpp @@ -32,7 +32,7 @@ class MP5_SD_DZ : MP5SD { class RemoveSuppressor { - text = $STR_DZ_ATT_SUP9_RMVE; + text = $STR_ATTACHMENT_RMVE_Silencer; script = "; ['Attachment_Sup9',_id,'MP5_DZ'] call player_removeAttachment"; }; }; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 60d039d76..a6c82ae99 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -3069,6 +3069,10 @@ Tlumič pro střelné zbraně, používá se pro jejich vylepšení. Ein Schalldämpfer für Schusswaffen. + + Remove Suppressor + Снять глушитель + [A] PSO [М] ПСО @@ -10739,10 +10743,6 @@ 9mm Sound suppressor ПБС для калибра 9мм - - Remove Suppressor - Снять глушитель - [A] 9mm silencer (PM) @@ -10756,10 +10756,6 @@ Tlumič, používá se pro vylepšení pistole Makarov. Ein Schalldämpfer, der an eine Makarov angebracht werden kann. - - Remove Suppressor - Снять глушитель - [A] 9mm silencer (Bizon) @@ -10773,10 +10769,6 @@ Tlumič, používá se pro vylepšení pušky Bizon. Ein Schalldämpfer, der an eine Bizon angebracht werden kann. - - Remove Suppressor - Снять глушитель - @@ -10787,10 +10779,6 @@ 5.56mm Sound suppressor ПБС для калибра 5.56мм - - Remove Suppressor - Снять глушитель - @@ -10801,10 +10789,6 @@ 5.45mm Sound suppressor ПБС для калибра 5.45мм - - Remove Suppressor - Снять глушитель -