W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix errors from #1689 localization

Browse Source 
@Adaptivity
- STR_EPOCH_WALLWITHDOORLOCKED_DESC string was missing
- I see no reason STR_EPOCH_PLOTDEED_ACTION was renamed to a less
descriptive name, and it was missing the German translation from the old
one, so I changed it back
- These build actions in fn_selfActions are for vanilla building. They
shouldn't be in the Epoch package. I renamed them and submitted them to
vanilla too.
This commit is contained in:
ebaydayz
2016-05-02 14:03:41 -04:00
parent 2a99cf8a63
commit adff6440ed
3 changed files with 97 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
View File

@@ -284,7 +284,7 @@ class ItemPlotDeed: CA_Magazine {
sfx = "document"; sfx = "document";
class ItemActions { class ItemActions {
class Crafting { class Crafting {
text = $STR_EPOCH_PLAYER_317; text = $STR_EPOCH_PLOTDEED_ACTION;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"workshop"}; neednearby[] = {"workshop"};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox"};

16
SQF/dayz_code/compile/fn_selfActions.sqf
View File

@@ -563,7 +563,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// open Gate // open Gate
if (_isGate && _isClosed && _isUnlocked && _canDo) then { if (_isGate && _isClosed && _isUnlocked && _canDo) then {
if (s_player_openGate < 0) then { if (s_player_openGate < 0) then {
s_player_openGate = player addAction [localize "STR_EPOCH_ACTIONS_OPENGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Open"], 1, true, true]; s_player_openGate = player addAction [localize "STR_BLD_ACTIONS_OPENGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Open"], 1, true, true];
}; };
} else { } else {
player removeAction s_player_openGate; player removeAction s_player_openGate;
@@ -572,7 +572,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// Close Gate // Close Gate
if (_isGate && _isOpen && _isUnlocked && _canDo) then { if (_isGate && _isOpen && _isUnlocked && _canDo) then {
if (s_player_CloseGate < 0) then { if (s_player_CloseGate < 0) then {
s_player_CloseGate = player addAction [localize "STR_EPOCH_ACTIONS_CLOSEGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Close"], 1, true, true]; s_player_CloseGate = player addAction [localize "STR_BLD_ACTIONS_CLOSEGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Close"], 1, true, true];
}; };
} else { } else {
player removeAction s_player_CloseGate; player removeAction s_player_CloseGate;
@@ -581,7 +581,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// Set // Set
if ((_isHouse or _isLockableGate) && (_ownerPID == (getPlayerUID player)) && !_isUnlocked && _isClosed && _canDo) then { if ((_isHouse or _isLockableGate) && (_ownerPID == (getPlayerUID player)) && !_isUnlocked && _isClosed && _canDo) then {
if (s_player_setCode < 0) then { if (s_player_setCode < 0) then {
s_player_setCode = player addAction [localize "STR_EPOCH_ACTIONS_SETLOCKCODE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Set"], 1, true, true]; s_player_setCode = player addAction [localize "STR_BLD_ACTIONS_SETLOCKCODE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Set"], 1, true, true];
}; };
} else { } else {
player removeAction s_player_setCode; player removeAction s_player_setCode;
@@ -590,7 +590,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
//Lock Build point //Lock Build point
if ((_isFence or _isGate) && (_ownerPID == (getPlayerUID player)) && !_ownerBuildLock && _canDo) then { if ((_isFence or _isGate) && (_ownerPID == (getPlayerUID player)) && !_ownerBuildLock && _canDo) then {
if (s_player_BuildLock < 0) then { if (s_player_BuildLock < 0) then {
s_player_BuildLock = player addAction [localize "STR_EPOCH_ACTIONS_LOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"BuildLock"], 1, true, true]; s_player_BuildLock = player addAction [localize "STR_BLD_ACTIONS_LOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"BuildLock"], 1, true, true];
}; };
} else { } else {
player removeAction s_player_BuildLock; player removeAction s_player_BuildLock;
@@ -599,7 +599,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
//UnLock Build point //UnLock Build point
if ((_isFence or _isGate) && (_ownerPID == (getPlayerUID player)) && _ownerBuildLock && _canDo) then { if ((_isFence or _isGate) && (_ownerPID == (getPlayerUID player)) && _ownerBuildLock && _canDo) then {
if (s_player_BuildUnLock < 0) then { if (s_player_BuildUnLock < 0) then {
s_player_BuildUnLock = player addAction [localize "STR_EPOCH_ACTIONS_UNLOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"BuildUnLock"], 1, true, true]; s_player_BuildUnLock = player addAction [localize "STR_BLD_ACTIONS_UNLOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"BuildUnLock"], 1, true, true];
}; };
} else { } else {
player removeAction s_player_BuildUnLock; player removeAction s_player_BuildUnLock;
@@ -608,7 +608,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// Unlock Gate/House // Unlock Gate/House
if ((_isHouse or _isLockableGate) && !_isUnlocked && _isClosed && _canDo) then { if ((_isHouse or _isLockableGate) && !_isUnlocked && _isClosed && _canDo) then {
if (s_player_unlockhouse < 0) then { if (s_player_unlockhouse < 0) then {
s_player_unlockhouse = player addAction [localize "STR_EPOCH_ACTIONS_UNLOCKGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Unlock"], 1, true, true]; s_player_unlockhouse = player addAction [localize "STR_BLD_ACTIONS_UNLOCKGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Unlock"], 1, true, true];
}; };
} else { } else {
player removeAction s_player_unlockhouse; player removeAction s_player_unlockhouse;
@@ -617,7 +617,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
// Lock Gate/House // Lock Gate/House
if ((_isHouse or _isLockableGate) && _isUnlocked && _isClosed && _canDo) then { if ((_isHouse or _isLockableGate) && _isUnlocked && _isClosed && _canDo) then {
if (s_player_lockhouse < 0) then { if (s_player_lockhouse < 0) then {
s_player_lockhouse = player addAction [localize "STR_EPOCH_ACTIONS_LOCKGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Lock"], 1, true, true]; s_player_lockhouse = player addAction [localize "STR_BLD_ACTIONS_LOCKGATE", "\z\addons\dayz_code\actions\player_operate.sqf",[cursorTarget,"Lock"], 1, true, true];
}; };
} else { } else {
player removeAction s_player_lockhouse; player removeAction s_player_lockhouse;
@@ -626,7 +626,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
//Break In //Break In
if ((_isHouse or _isLockableGate) && (_ownerPID != (getPlayerUID player)) && !_isUnlocked && _canDo) then { if ((_isHouse or _isLockableGate) && (_ownerPID != (getPlayerUID player)) && !_isUnlocked && _canDo) then {
if (s_player_breakinhouse < 0) then { if (s_player_breakinhouse < 0) then {
s_player_breakinhouse = player addAction [localize "STR_EPOCH_ACTIONS_BREAKIN", "\z\addons\dayz_code\actions\player_breakin.sqf",cursorTarget, 1, true, true]; s_player_breakinhouse = player addAction [localize "STR_BLD_ACTIONS_BREAKIN", "\z\addons\dayz_code\actions\player_breakin.sqf",cursorTarget, 1, true, true];
}; };
} else { } else {
player removeAction s_player_breakinhouse; player removeAction s_player_breakinhouse;

168
SQF/dayz_code/stringtable.xml
View File

@@ -9710,6 +9710,78 @@
<Czech>Kovový plot</Czech> <Czech>Kovový plot</Czech>
<German>Metallzaun</German> <German>Metallzaun</German>
</Key> </Key>
<Key ID="STR_BLD_ACTIONS_OPENGATE">
<English>Open Gate</English>
<German>Open Gate</German>
<Russian>Открыть</Russian>
<Spanish>Open Gate</Spanish>
<Dutch>Open Gate</Dutch>
<French>Open Gate</French>
<Czech>Open Gate</Czech>
</Key>
<Key ID="STR_BLD_ACTIONS_CLOSEGATE">
<English>Close Gate</English>
<German>Close Gate</German>
<Russian>Закрыть</Russian>
<Spanish>Close Gate</Spanish>
<Dutch>Close Gate</Dutch>
<French>Close Gate</French>
<Czech>Close Gate</Czech>
</Key>
<Key ID="STR_BLD_ACTIONS_SETLOCKCODE">
<English>Set Lock Code</English>
<German>Set Lock Code</German>
<Russian>Установить код</Russian>
<Spanish>Set Lock Code</Spanish>
<Dutch>Set Lock Code</Dutch>
<French>Set Lock Code</French>
<Czech>Set Lock Code</Czech>
</Key>
<Key ID="STR_BLD_ACTIONS_LOCKBUILD">
<English>Lock Build</English>
<German>Lock Build</German>
<Russian>Закрыть постройку</Russian>
<Spanish>Lock Build</Spanish>
<Dutch>Lock Build</Dutch>
<French>Lock Build</French>
<Czech>Lock Build</Czech>
</Key>
<Key ID="STR_BLD_ACTIONS_UNLOCKBUILD">
<English>Unlock Build</English>
<German>Unlock Build</German>
<Russian>Открыть постройку</Russian>
<Spanish>Unlock Build</Spanish>
<Dutch>Unlock Build</Dutch>
<French>Unlock Build</French>
<Czech>Unlock Build</Czech>
</Key>
<Key ID="STR_BLD_ACTIONS_UNLOCKGATE">
<English>Unlock Gate</English>
<German>Unlock Gate</German>
<Russian>Разблокировать</Russian>
<Spanish>Unlock Gate</Spanish>
<Dutch>Takel voertuig aan Heli</Dutch>
<French>Unlock Gate</French>
<Czech>Unlock Gate</Czech>
</Key>
<Key ID="STR_BLD_ACTIONS_LOCKGATE">
<English>Lock Gate</English>
<German>Lock Gate</German>
<Russian>Заблокировать</Russian>
<Spanish>Lock Gate</Spanish>
<Dutch>Takel voertuig aan Heli</Dutch>
<French>Lock Gate</French>
<Czech>Lock Gate</Czech>
</Key>
<Key ID="STR_BLD_ACTIONS_BREAKIN">
<English>Break In</English>
<German>Break In</German>
<Russian>Взломать</Russian>
<Spanish>Break In</Spanish>
<Dutch>Break In</Dutch>
<French>Break In</French>
<Czech>Break In</Czech>
</Key>
</Package> </Package>
<Package name="weapons"> <Package name="weapons">
<!-- **** WEAPONS **** --> <!-- **** WEAPONS **** -->
@@ -13090,14 +13162,6 @@
<French>Vous ne pouvez accéder à des engins de vos amis dans ce domaine.</French> <French>Vous ne pouvez accéder à des engins de vos amis dans ce domaine.</French>
<Czech>Můžete mít přístup pouze zařízení uživatele do této oblasti.</Czech> <Czech>Můžete mít přístup pouze zařízení uživatele do této oblasti.</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_317">
<English>Craft Plot Pole</English>
<German>Craft Plot Pole</German>
<Russian>Создать: Plot Pole</Russian>
<Spanish>Craft Plot Pole</Spanish>
<French>Craft Plot Pole</French>
<Czech>Craft Plot Pole</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_318"> <Key ID="STR_EPOCH_PLAYER_318">
<English>You can't perform this action while in a vehicle.</English> <English>You can't perform this action while in a vehicle.</English>
<German>You can't perform this action while in a vehicle.</German> <German>You can't perform this action while in a vehicle.</German>
@@ -13548,78 +13612,6 @@
<French>Attach to Heli</French> <French>Attach to Heli</French>
<Czech>Attach to Heli</Czech> <Czech>Attach to Heli</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_ACTIONS_OPENGATE">
<English>Open Gate</English>
<German>Open Gate</German>
<Russian>Открыть</Russian>
<Spanish>Open Gate</Spanish>
<Dutch>Open Gate</Dutch>
<French>Open Gate</French>
<Czech>Open Gate</Czech>
</Key>
<Key ID="STR_EPOCH_ACTIONS_CLOSEGATE">
<English>Close Gate</English>
<German>Close Gate</German>
<Russian>Закрыть</Russian>
<Spanish>Close Gate</Spanish>
<Dutch>Close Gate</Dutch>
<French>Close Gate</French>
<Czech>Close Gate</Czech>
</Key>
<Key ID="STR_EPOCH_ACTIONS_SETLOCKCODE">
<English>Set Lock Code</English>
<German>Set Lock Code</German>
<Russian>Установить код</Russian>
<Spanish>Set Lock Code</Spanish>
<Dutch>Set Lock Code</Dutch>
<French>Set Lock Code</French>
<Czech>Set Lock Code</Czech>
</Key>
<Key ID="STR_EPOCH_ACTIONS_LOCKBUILD">
<English>Lock Build</English>
<German>Lock Build</German>
<Russian>Закрыть постройку</Russian>
<Spanish>Lock Build</Spanish>
<Dutch>Lock Build</Dutch>
<French>Lock Build</French>
<Czech>Lock Build</Czech>
</Key>
<Key ID="STR_EPOCH_ACTIONS_UNLOCKBUILD">
<English>Unlock Build</English>
<German>Unlock Build</German>
<Russian>Открыть постройку</Russian>
<Spanish>Unlock Build</Spanish>
<Dutch>Unlock Build</Dutch>
<French>Unlock Build</French>
<Czech>Unlock Build</Czech>
</Key>
<Key ID="STR_EPOCH_ACTIONS_UNLOCKGATE">
<English>Unlock Gate</English>
<German>Unlock Gate</German>
<Russian>Разблокировать</Russian>
<Spanish>Unlock Gate</Spanish>
<Dutch>Takel voertuig aan Heli</Dutch>
<French>Unlock Gate</French>
<Czech>Unlock Gate</Czech>
</Key>
<Key ID="STR_EPOCH_ACTIONS_LOCKGATE">
<English>Lock Gate</English>
<German>Lock Gate</German>
<Russian>Заблокировать</Russian>
<Spanish>Lock Gate</Spanish>
<Dutch>Takel voertuig aan Heli</Dutch>
<French>Lock Gate</French>
<Czech>Lock Gate</Czech>
</Key>
<Key ID="STR_EPOCH_ACTIONS_BREAKIN">
<English>Break In</English>
<German>Break In</German>
<Russian>Взломать</Russian>
<Spanish>Break In</Spanish>
<Dutch>Break In</Dutch>
<French>Break In</French>
<Czech>Break In</Czech>
</Key>
<Key ID="STR_EPOCH_ACTIONS_HUMANITY"> <Key ID="STR_EPOCH_ACTIONS_HUMANITY">
<English>Your humanity is too %1, this trader refuses to talk to you</English> <English>Your humanity is too %1, this trader refuses to talk to you</English>
<German>Dein Menschlichkeitswert ist zu %1, dieser Händler will nicht mit dir reden</German> <German>Dein Menschlichkeitswert ist zu %1, dieser Händler will nicht mit dir reden</German>
@@ -14460,6 +14452,14 @@
<French>Plot Deed</French> <French>Plot Deed</French>
<Czech>Plot Deed</Czech> <Czech>Plot Deed</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLOTDEED_ACTION">
<English>Craft Plot Pole</English>
<German>Grundstücks-Markierung herstellen</German>
<Russian>Создать: Plot Pole</Russian>
<Spanish>Craft Plot Pole</Spanish>
<French>Craft Plot Pole</French>
<Czech>Craft Plot Pole</Czech>
</Key>
<Key ID="STR_EPOCH_PLOTDEED_DESC"> <Key ID="STR_EPOCH_PLOTDEED_DESC">
<English>Deed to a plot of land, similar to a plot pole.</English> <English>Deed to a plot of land, similar to a plot pole.</English>
<German>Erlaubt dir, ein Grundstück zu beanspruchen und eine Grundstücks-Markierung zu setzen.</German> <German>Erlaubt dir, ein Grundstück zu beanspruchen und eine Grundstücks-Markierung zu setzen.</German>
@@ -15908,6 +15908,14 @@
<French>Wall w/ Door Locked</French> <French>Wall w/ Door Locked</French>
<Czech>Wall w/ Door Locked</Czech> <Czech>Wall w/ Door Locked</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_WALLWITHDOORLOCKED_DESC">
<English>Wall with locked door constructed out of plywood and lumber.</English>
<German>Wall with locked door constructed out of plywood and lumber.</German>
<Russian>Wall with locked door constructed out of plywood and lumber.</Russian>
<Spanish>Wall with locked door constructed out of plywood and lumber.</Spanish>
<French>Wall with locked door constructed out of plywood and lumber.</French>
<Czech>Wall with locked door constructed out of plywood and lumber.</Czech>
</Key>
<Key ID="STR_EPOCH_WALLWITHDOOR_DESC"> <Key ID="STR_EPOCH_WALLWITHDOOR_DESC">
<English>Wall with door constructed out of plywood and lumber.</English> <English>Wall with door constructed out of plywood and lumber.</English>
<German>Wall with door constructed out of plywood and lumber.</German> <German>Wall with door constructed out of plywood and lumber.</German>