diff --git a/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp b/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp index 196212212..049c093be 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp @@ -213,8 +213,8 @@ class Skin_TK_Soldier_Sniper_EP1_DZ: SkinBase { }; class Skin_TK_Commander_EP1_DZ: SkinBase { scope = public; - displayName = $STR_EPOCH_SKINS_GENERAL; - descriptionShort = $STR_EPOCH_SKINS_GENERAL; + displayName = $STR_GENERAL; + descriptionShort = $STR_GENERAL; }; class Skin_RU_Soldier_Crew_DZ: SkinBase { scope = public; diff --git a/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp b/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp index ad5b58c11..a02e2cc16 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp @@ -189,7 +189,7 @@ class DZ_GroupDialog { }; class Kick: DZ_GroupButton { idc = 4; - text = $STR_EPOCH_KICK; + text = $STR_DISP_MP_DS_KICK; onButtonClick = "(_this select 0) ctrlShow false; call dayz_kickFromGroup;"; y = .239; }; diff --git a/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp b/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp index 6fecb30a6..041fb4be8 100644 --- a/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp @@ -119,7 +119,7 @@ class AdvancedTrading class ZSC_RscButtonMenu_BACK: AT_Zupa_BlueButton { idc = 7449; - text = $STR_EPOCH_BACK; + text = $STR_DISP_BACK; x = 0.21 * safezoneW + safezoneX; y = 0.33 * safezoneH + safezoneY; w = 0.08 * safezoneW; diff --git a/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorAccess.hpp b/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorAccess.hpp index dd990e3ba..adfdb9354 100644 --- a/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorAccess.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorAccess.hpp @@ -64,7 +64,7 @@ class DoorAccess class ZupaButton_2: ZSC_RscButtonMenuBlue { idc = -1; - text = $STR_EPOCH_CANCEL; + text = $STR_DISP_CANCEL; x = 0.40 * safezoneW + safezoneX; y = 0.70 * safezoneH + safezoneY; w = 0.20; diff --git a/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorManagement.hpp b/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorManagement.hpp index ae8886d81..7a04f457d 100644 --- a/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorManagement.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/doorManagement/doorManagement.hpp @@ -48,7 +48,7 @@ class DoorManagement class RscShortcutButton_7105: ZSC_RscButtonMenuBlue { idc = 7105; - text = $STR_EPOCH_DELETE; + text = $STR_DISP_DELETE; x = 0.47 * safezoneW + safezoneX; y = 0.72 * safezoneH + safezoneY; w = 0.08 * safezoneW; diff --git a/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp b/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp index 6a4781d26..c1a59ad71 100644 --- a/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/plotManagement.hpp @@ -147,7 +147,7 @@ class PlotManagement class RscShortcutButton_7005: ZSC_RscButtonMenuBlue { idc = -1; - text = $STR_EPOCH_DELETE; + text = $STR_DISP_DELETE; x = 0.47 * safezoneW + safezoneX; y = 0.72 * safezoneH + safezoneY; w = 0.08 * safezoneW; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf index d4f5a4ebe..4dad317d7 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf @@ -33,7 +33,7 @@ if (isClass _config) then { }; }; -if (count _attachments < 1) then {_attachments = [localize "STR_EPOCH_NONE"];}; +if (count _attachments < 1) then {_attachments = [localize "STR_SPECIAL_NONE"];}; _attachText = ""; { diff --git a/SQF/dayz_code/actions/modular_build.sqf b/SQF/dayz_code/actions/modular_build.sqf index 7f89e0f07..365750ee6 100644 --- a/SQF/dayz_code/actions/modular_build.sqf +++ b/SQF/dayz_code/actions/modular_build.sqf @@ -491,13 +491,13 @@ if (_canBuild select 0) then { _combination = format["%1%2%3",_combination_1,_combination_2,_combination_3]; dayz_combination = _combination; if (_combination_1 == 100) then { - _combination_1_Display = localize "STR_EPOCH_RED"; + _combination_1_Display = localize "STR_TEAM_RED"; }; if (_combination_1 == 101) then { - _combination_1_Display = localize "STR_EPOCH_GREEN"; + _combination_1_Display = localize "STR_TEAM_GREEN"; }; if (_combination_1 == 102) then { - _combination_1_Display = localize "STR_EPOCH_BLUE"; + _combination_1_Display = localize "STR_TEAM_BLUE"; }; _combinationDisplay = format["%1%2%3",_combination_1_Display,_combination_2,_combination_3]; }; diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index ce727f72d..59bef7c9e 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -400,13 +400,13 @@ if (_canBuild select 0) then { _combination = format["%1%2%3",_combination_1,_combination_2,_combination_3]; dayz_combination = _combination; if (_combination_1 == 100) then { - _combination_1_Display = localize "STR_EPOCH_RED"; + _combination_1_Display = localize "STR_TEAM_RED"; }; if (_combination_1 == 101) then { - _combination_1_Display = localize "STR_EPOCH_GREEN"; + _combination_1_Display = localize "STR_TEAM_GREEN"; }; if (_combination_1 == 102) then { - _combination_1_Display = localize "STR_EPOCH_BLUE"; + _combination_1_Display = localize "STR_TEAM_BLUE"; }; _combinationDisplay = format["%1%2%3",_combination_1_Display,_combination_2,_combination_3]; }; diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index 1a130d8ca..eac8dac26 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -48,7 +48,7 @@ if (count _this > 0) then { if (_sourceWeapon == "Throw") then {_sourceWeapon = (weaponState _source) select 3;}; if (_ammo in ["PipeBomb","Mine","MineE"]) then {_sourceWeapon = _ammo;}; if (alive _source) then { - _sourceName = if (isPlayer _source) then {name _source} else {localize "STR_EPOCH_AI"}; + _sourceName = if (isPlayer _source) then {name _source} else {localize "STR_PLAYER_AI"}; }; }; }; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 4caf7b3d6..6ec706cfc 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -16051,15 +16051,6 @@ Desert Sniper Wüsten Scharfschütze - - General - Генерал - Général - Generale - Tábornok - Generał - Generál - Crewman Член команды @@ -16283,17 +16274,6 @@ Uzbrojenie Fegyverek - - None - Keine - Nessuna - Ninguna - Néant - Není - Нет - Brak - Nincs - Compatible Kompatibel @@ -16310,18 +16290,6 @@ Beschreibung Popis - - Player - Joueur - Jugador - Giocatore - Játékos - Gracz - Игрок - Spieler - Hráč - プレイヤー - Groups (F5) групп @@ -16416,28 +16384,6 @@ Ablehnen Odmítnout - - Kick - Ejecter - Expulsa - Espelli - Kirúgás - Wyrzuć - Выгнать - Kicken - Vyhostit - 排除 - - - AI - IA - IA - IA - MI - SI - ИИ - KI - View Voir @@ -16449,41 +16395,6 @@ Ansicht Pohled - - Back - Retour - Atrás - Indietro - Vissza - Powrót - Назад - Zurück - Zpět - 戻る - - - Refresh - Actualiser - Actualizar - Aggiorna - Frissítés - Odśwież - Обновить - Aktualis. - Aktualizovat - - - Delete - Supprimer - Suprimir - Cancella - Törlés - Usuń - Удалить - Löschen - Smazat - 削除 - Add Ajouter @@ -16518,42 +16429,6 @@ Feuer (angezündet) Ohniště (hořící) - - Red - Rouge - Rojo - Rosso - Piros - Czerwony - Красный - Rot - Červená - 赤色 - - - Green - Vert - Verde - Verde - Zöld - Zielony - Зеленый - Grün - Zelená - 緑色 - - - Blue - Bleu - Azul - Blu - Kék - Niebieski - Синий - Blau - Modrá - 青色 - Humans Nearby Spieler in der Nähe @@ -16654,17 +16529,6 @@ Lock Door Tür abschließen - - Cancel - Annuler - Cancelar - Annulla - Mégse - Anuluj - Отмена - Abbrechen - Zrušit - You need more people to help you push. Du brauchst mehr Leute zum Schieben.