From 9ae21dd4f58ad141443ad0dde79a32b0139b2bc8 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Thu, 21 Jul 2016 11:12:55 -0400 Subject: [PATCH] Rifle flashlight fix, translations Vanilla development commit: https://github.com/DayZMod/DayZ/commit/a850f25e14a4745ddef22ebb6a6bd1d9a3f1e839 - Attachment_FL_Rfl -> Attachment_FL - Sherbet desc - Take blood translation - weapons/mods translation fixes for better strings fitting --- .../Configs/CfgMagazines/Consumables/Soda.hpp | 2 +- .../CfgMagazines/Medical/BloodBags.hpp | 2 +- .../Configs/CfgWeapons/Rifles/M16A4.hpp | 8 +- .../Configs/CfgWeapons/Rifles/M4A1.hpp | 16 +-- .../Configs/CfgWeapons/Rifles/SA58.hpp | 16 +-- SQF/dayz_code/stringtable.xml | 134 +++++++++++------- 6 files changed, 107 insertions(+), 71 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp index 7484acf85..30bff301e 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp @@ -251,7 +251,7 @@ class ItemSherbet : ItemSoda model = "z\addons\dayz_communityassets\models\soda_sherbet_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_sherbet_clean_full_ca.paa"; displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15; - descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15; + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_15; Nutrition[] = {90,0,500,0}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp index d777f7a5b..f1000e0d2 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp @@ -201,7 +201,7 @@ class emptyBloodBag : CA_Magazine { class Use { - text = "Take Blood"; + text = $STR_BLD_take; script = "spawn player_useMeds;"; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp index 1e8812f8f..03d271df5 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp @@ -378,7 +378,7 @@ class M16A4_ACOG_DZ : M16A4_DZ class Attachments { Attachment_M203 = M16A4_GL_ACOG_DZ; - Attachment_FL_Rfl = M16A4_ACOG_FL_DZ; + Attachment_FL = M16A4_ACOG_FL_DZ; }; class ItemActions @@ -414,7 +414,7 @@ class M16A4_ACOG_FL_DZ : M16A4_FL_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'M16A4_ACOG_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'M16A4_ACOG_DZ'] call player_removeAttachment"; }; }; }; @@ -429,7 +429,7 @@ class M16A4_GL_ACOG_DZ : M16A4_GL_DZ class Attachments { - Attachment_FL_Rfl = M16A4_GL_ACOG_FL_DZ; + Attachment_FL = M16A4_GL_ACOG_FL_DZ; }; class ItemActions @@ -472,7 +472,7 @@ class M16A4_GL_ACOG_FL_DZ : M16A4_GL_FL_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'M16A4_GL_ACOG_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'M16A4_GL_ACOG_DZ'] call player_removeAttachment"; }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp index 6b7ee411b..bbfcbf2c9 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp @@ -788,7 +788,7 @@ class M4A1_ACOG_DZ : M4A1_DZ { Attachment_M203 = M4A1_GL_ACOG_DZ; Attachment_Sup556 = M4A1_ACOG_SD_DZ; - Attachment_FL_Rfl = M4A1_ACOG_FL_DZ; + Attachment_FL = M4A1_ACOG_FL_DZ; }; class ItemActions @@ -825,7 +825,7 @@ class M4A1_ACOG_FL_DZ : M4A1_FL_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'M4A1_ACOG_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'M4A1_ACOG_DZ'] call player_removeAttachment"; }; }; }; @@ -841,7 +841,7 @@ class M4A1_ACOG_SD_DZ : M4A1_SD_DZ class Attachments { Attachment_M203 = M4A1_GL_ACOG_SD_DZ; - Attachment_FL_Rfl = M4A1_ACOG_SD_FL_DZ; + Attachment_FL = M4A1_ACOG_SD_FL_DZ; }; class ItemActions @@ -887,7 +887,7 @@ class M4A1_ACOG_SD_FL_DZ : M4A1_SD_FL_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'M4A1_ACOG_SD_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'M4A1_ACOG_SD_DZ'] call player_removeAttachment"; }; }; }; @@ -905,7 +905,7 @@ class M4A1_GL_ACOG_DZ : M4A1_GL_DZ class Attachments { Attachment_Sup556 = M4A1_GL_ACOG_SD_DZ; - Attachment_FL_Rfl = M4A1_GL_ACOG_FL_DZ; + Attachment_FL = M4A1_GL_ACOG_FL_DZ; }; class ItemActions @@ -951,7 +951,7 @@ class M4A1_GL_ACOG_FL_DZ : M4A1_GL_FL_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'M4A1_GL_ACOG_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'M4A1_GL_ACOG_DZ'] call player_removeAttachment"; }; }; }; @@ -966,7 +966,7 @@ class M4A1_GL_ACOG_SD_DZ : M4A1_GL_SD_DZ class Attachments { - Attachment_FL_Rfl = M4A1_GL_ACOG_SD_FL_DZ; + Attachment_FL = M4A1_GL_ACOG_SD_FL_DZ; }; class ItemActions @@ -1019,7 +1019,7 @@ class M4A1_GL_ACOG_SD_FL_DZ : M4A1_GL_SD_FL_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'M4A1_GL_ACOG_SD_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'M4A1_GL_ACOG_SD_DZ'] call player_removeAttachment"; }; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp index 6bddea330..409aa29f4 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SA58.hpp @@ -39,7 +39,7 @@ class SA58_RIS_DZ : SA58_DZ Attachment_CCO = SA58_CCO_DZ; Attachment_Holo = SA58_Holo_DZ; Attachment_ACOG = SA58_ACOG_DZ; - Attachment_FL_Rfl = SA58_RIS_FL_DZ; + Attachment_FL = SA58_RIS_FL_DZ; }; }; @@ -63,7 +63,7 @@ class SA58_RIS_FL_DZ : SA58_RIS_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'SA58_RIS_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'SA58_RIS_DZ'] call player_removeAttachment"; }; }; }; @@ -82,7 +82,7 @@ class SA58_CCO_DZ : SA58_RIS_DZ class Attachments { - Attachment_FL_Rfl = SA58_CCO_FL_DZ; + Attachment_FL = SA58_CCO_FL_DZ; }; class ItemActions @@ -115,7 +115,7 @@ class SA58_CCO_FL_DZ : SA58_CCO_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'SA58_CCO_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'SA58_CCO_DZ'] call player_removeAttachment"; }; }; }; @@ -128,7 +128,7 @@ class SA58_Holo_DZ : SA58_CCO_DZ class Attachments { - Attachment_FL_Rfl = SA58_Holo_FL_DZ; + Attachment_FL = SA58_Holo_FL_DZ; }; class ItemActions @@ -161,7 +161,7 @@ class SA58_Holo_FL_DZ : SA58_Holo_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'SA58_Holo_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'SA58_Holo_DZ'] call player_removeAttachment"; }; }; }; @@ -213,7 +213,7 @@ class SA58_ACOG_DZ : SA58_CCO_DZ class Attachments { - Attachment_FL_Rfl = SA58_ACOG_FL_DZ; + Attachment_FL = SA58_ACOG_FL_DZ; }; class ItemActions @@ -246,7 +246,7 @@ class SA58_ACOG_FL_DZ : SA58_ACOG_DZ class RemoveFlashlight { text = $STR_DZ_ATT_FL_RFL_RMVE; - script = "; ['Attachment_FL_Rfl',_id,'SA58_ACOG_DZ'] call player_removeAttachment"; + script = "; ['Attachment_FL',_id,'SA58_ACOG_DZ'] call player_removeAttachment"; }; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 4d8603276..919e60151 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -287,15 +287,19 @@ You seem to have misplaced your antibiotics. + Похоже, вы потеряли антибиотики. You have taken antibiotics. + Вы приняли антибиотики. You gave antibiotics. + Вы поделились антибиотиками. You have been knocked out. + Вы оглушены. @@ -444,6 +448,10 @@ Utiliser la poche de sang Použít krevní vak + + Take blood + Взять кровь + Whole Blood: A+ Цельная кровь: A(II)Rh+ @@ -689,6 +697,7 @@ Unable to exit vehicle, too close to buildables objects + Невозможно выйти из транспорта, слишком близко от постройки Add ammo to %1 @@ -1430,6 +1439,7 @@ Cannot remove attachment. + Не удалось снять модификацию. You seem to be missing a primary weapon! @@ -1514,9 +1524,11 @@ You need a water bottle to sharpen objects. + Нужна вода, чтобы заточить объект. %1 has been sharpened. + Заточено (%1) Disassemble done. @@ -1541,6 +1553,7 @@ You cannot do this while on a ladder or on water. + Невозможно делать это, находясь на лестнице или в воде. @@ -1813,7 +1826,7 @@ Missing tool: %1 to dissassemble building. - Для разборки нужно иметь %1 + Для разборки нужно иметь: %1 Outil manquant pour le démontage: %1 Pro demontáž budovy schází %1. %1 fehlt, um das Objekt abzubauen. @@ -1827,7 +1840,7 @@ Missing tool: %1 for maintenance. - Для обслуживания нужно иметь %1 + Для обслуживания нужно иметь: %1 Outil manquant pour l'entretien: %1 Pro údržbu budovy schází %1. %1 fehlt, um das Objekt zu warten. @@ -3686,7 +3699,7 @@ Empty - Пустая + Опустошить Ausleeren @@ -5619,13 +5632,17 @@ Čistá a ještě neotevřená plechovka sodovky Olsha Sparkling Grape od Papa. Vyrobeno v Černarusi. - Sherbet - Шербет + Sherbet (Cold drink) + Шербет (Напиток) + + + Sharbet, a traditional Middle Eastern cold drink prepared with rose hips, cornelian cherries, rose or licorice and a variety of spices. + Традиционный напиток в странах Востока, приготавливаемый из шиповника, кизила, розы или лакрицы и различных специй. MRE EPa - Сухой паёк MRE + Паёк MRE MRE Repas instantané Vojenská dávka @@ -7202,6 +7219,7 @@ You seem to have misplaced the container. + Кажется вы потеряли контейнер. You have finished collecting stone. @@ -7229,6 +7247,7 @@ Mining already in progress! + Добыча в процессе! Cannot add %1 to back. @@ -9659,18 +9678,23 @@ You have set the combination to %1 + Вы установили комбинацию: %1 Gates locked. + Ворота заперты. Gates unlocked. + Ворота отомкнуты. Gates opened. + Ворота открыты. Gates closed. + Ворота закрыты. Open Gate @@ -9744,39 +9768,51 @@ You need a Sledgehammer to break into this compound. + Вам нужна кувалда, чтобы проломить эту преграду. You need a Crowbar to break into this compound. + Вам нужен ломик, чтобы проломить эту преграду. Your Sledgehammer handle has snapped. + Ваша кувалда сломалась. Your crowbar has bent. + Ваш ломик согнулся. Breaking into compound, attempt (%1 of %2). + Проламываем преграду, попытка (%1 из %2). Break in cancelled. + Взлом прекращен. Break in attempt completed with limited success. + Попытка взлома завершилась с сомнительным успехом. Break in attempt successful. + Удачная попытка вломиться за преграду. You are missing the tool %1 to dismantle + Для демонтажа не хватает: %1 Your tool has been damaged. + Ваш инструмент поврежден. Dismantle attempt (%1 of %2). + Попытка демонтажа (%1 из %2). You have dismantled (%1). + Вы демонтировали (%1). @@ -9845,7 +9881,7 @@ M4A1 FL - M4A1 фон. + M4A1 Ф M4A1 SD @@ -9853,14 +9889,14 @@ M4A1 SD FL - M4A1 ПБС фон. + M4A1 ПБС Ф M4A1 M203 M4A1 M203 FL - M4A1 M203 фон. + M4A1 M203 Ф M4A1 M203 SD @@ -9868,7 +9904,7 @@ M4A1 M203 SD FL - M4A1 M203 ПБС фон. + M4A1 M203 ПБС Ф @@ -9876,7 +9912,7 @@ M4A1 CCO FL - M4A1 CCO фон. + M4A1 CCO Ф M4A1 CCO SD @@ -9884,14 +9920,14 @@ M4A1 CCO SD FL - M4A1 CCO ПБС фон. + M4A1 CCO ПБС Ф M4A1 M203 CCO M4A1 M203 CCO FL - M4A1 M203 CCO фон. + M4A1 M203 CCO Ф M4A1 M203 CCO SD @@ -9899,7 +9935,7 @@ M4A1 M203 CCO SD FL - M4A1 M203 CCO ПБС фон. + M4A1 M203 CCO ПБС Ф @@ -9907,7 +9943,7 @@ M4A1 Holo FL - M4A1 Holo фон. + M4A1 Holo Ф M4A1 Holo SD @@ -9915,14 +9951,14 @@ M4A1 Holo SD FL - M4A1 Holo ПБС фон. + M4A1 Holo ПБС Ф M4A1 M203 Holo M4A1 M203 Holo FL - M4A1 M203 Holo фон. + M4A1 M203 Holo Ф M4A1 M203 Holo SD @@ -9930,7 +9966,7 @@ M4A1 M203 Holo SD FL - M4A1 M203 Holo ПБС фон. + M4A1 M203 Holo ПБС Ф @@ -9938,7 +9974,7 @@ M4A1 ACOG FL - M4A1 ACOG фон. + M4A1 ACOG Ф M4A1 ACOG SD @@ -9946,14 +9982,14 @@ M4A1 ACOG SD FL - M4A1 ACOG ПБС фон. + M4A1 ACOG ПБС Ф M4A1 M203 ACOG M4A1 M203 ACOG FL - M4A1 M203 ACOG фон. + M4A1 M203 ACOG Ф M4A1 M203 ACOG SD @@ -9961,7 +9997,7 @@ M4A1 M203 ACOG SD FL - M4A1 M203 ACOG ПБС фон. + M4A1 M203 ACOG ПБС Ф @@ -9972,28 +10008,28 @@ M16A4 FL - M16A4 фон. + M16A4 Ф M16A4 CCO M16A4 CCO FL - M16A4 CCO фон. + M16A4 CCO Ф M16A4 Holo M16A4 Holo FL - M16A4 Holo фон. + M16A4 Holo Ф M16A4 ACOG M16A4 ACOG FL - M16A4 ACOG фон. + M16A4 ACOG Ф @@ -10001,28 +10037,28 @@ M16A4 M203 FL - M16A4 M203 фон. + M16A4 M203 Ф M16A4 M203 CCO M16A4 M203 CCO FL - M16A4 M203 CCO фон. + M16A4 M203 CCO Ф M16A4 M203 Holo M16A4 M203 Holo FL - M16A4 M203 Holo фон. + M16A4 M203 Holo Ф M16A4 M203 ACOG M16A4 M203 ACOG FL - M16A4 M203 ACOG фон. + M16A4 M203 ACOG Ф @@ -10179,28 +10215,28 @@ SA-58 RIS FL - SA-58 РСИ фон. + SA-58 РСИ Ф SA-58 CCO SA-58 CCO FL - SA-58 CCO фон. + SA-58 CCO Ф SA-58 Holo SA-58 Holo FL - SA-58 Holo фон. + SA-58 Holo Ф SA-58 ACOG SA-58 ACOG FL - SA-58 ACOG фон. + SA-58 ACOG Ф @@ -10295,7 +10331,7 @@ G17 FL - G17 фон. + G17 Ф G17 SD @@ -10303,7 +10339,7 @@ G17 SD FL - G17 ПБС фон. + G17 ПБС Ф @@ -10375,7 +10411,7 @@ Remington 870 FL - Ремингтон 870 фон. + Ремингтон 870 Ф Remington 870 mit Taschenlampe Remington 870 (Linterna) Remington 870 (+Torche) @@ -10489,15 +10525,15 @@ Mosin Nagant FL - Мосинка фон. + Мосинка Ф Mosin Nagant Belt - Мосинка патр. + Мосинка П Mosin Nagant Belt FL - Мосинка патр. фон. + Мосинка П Ф Mosin Nagant PU @@ -10505,15 +10541,15 @@ Mosin Nagant PU FL - Мосинка ПУ фон. + Мосинка ПР Ф Mosin Nagant PU Belt - Мосинка ПУ патр. + Мосинка ПР П Mosin Nagant PU Belt FL - Мосинка ПУ патр. фон. + Мосинка ПР П Ф Bolt-action military rifle developed by the Imperial Russian Army in 1891.<br/>Caliber: 7.62x54mmR @@ -10529,7 +10565,7 @@ Crossbow FL - Арбалет фон. + Арбалет Ф Crossbow CCO @@ -10537,15 +10573,15 @@ Crossbow CCO FL - Арбалет CCO фон. + Арбалет CCO Ф Crossbow Scoped - Арбалет приц. + Арбалет ПР Crossbow Scoped FL - Арбалет приц. фон. + Арбалет ПР Ф @@ -11060,8 +11096,8 @@ - [A] SA-58 RIS upgrade kit - [М] SA-58 РСИ + [A] SA-58 RIS + [М] SA-58 РСИ A Rail Integration System kit designed for the SA-58 assault rifle.