Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2062 from jonpas/removeDuplicatedStrings

Browse Source 
Removed duplicated strings
This commit is contained in:
Glowbal 2015-08-08 18:04:44 +02:00
commit 054ac3443d
12 changed files with 19 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/interaction/CfgVehicles.hpp
View File

@ -351,7 +351,7 @@ class CfgVehicles {
hotkey = "7"; hotkey = "7";
}; };
class ACE_Gesture_Yes { class ACE_Gesture_Yes {
displayName = CSTRING(Gestures_Yes); displayName = ECSTRING(common,Yes);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow ([ARR_2('gestureYes','gestureNod')] select floor random 2);); statement = QUOTE(_target playActionNow ([ARR_2('gestureYes','gestureNod')] select floor random 2););
showDisabled = 1; showDisabled = 1;
@ -359,7 +359,7 @@ class CfgVehicles {
hotkey = "8"; hotkey = "8";
}; };
class ACE_Gesture_No { class ACE_Gesture_No {
displayName = CSTRING(Gestures_No); displayName = ECSTRING(common,No);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureNo';); statement = QUOTE(_target playActionNow 'gestureNo';);
showDisabled = 1; showDisabled = 1;

24
addons/interaction/stringtable.xml
View File

@ -385,30 +385,6 @@
<Portuguese>Olá</Portuguese> <Portuguese>Olá</Portuguese>
<Italian>Ciao</Italian> <Italian>Ciao</Italian>
</Key> </Key>
<Key ID="STR_ACE_Interaction_Gestures_Yes">
<English>Yes</English>
<German>Ja</German>
<Spanish>Si</Spanish>
<Polish>Tak</Polish>
<Czech>Ano</Czech>
<French>Oui</French>
<Russian>Да</Russian>
<Hungarian>Igen</Hungarian>
<Portuguese>Sim</Portuguese>
<Italian>Si</Italian>
</Key>
<Key ID="STR_ACE_Interaction_Gestures_No">
<English>No</English>
<German>Nein</German>
<Spanish>No</Spanish>
<Polish>Nie</Polish>
<Czech>Ne</Czech>
<French>Non</French>
<Russian>Нет</Russian>
<Hungarian>Nem</Hungarian>
<Portuguese>Não</Portuguese>
<Italian>No</Italian>
</Key>
<Key ID="STR_ACE_Interaction_WeaponOnBack"> <Key ID="STR_ACE_Interaction_WeaponOnBack">
<English>Put weapon on back</English> <English>Put weapon on back</English>
<German>Waffe wegstecken</German> <German>Waffe wegstecken</German>

12
addons/medical/CfgVehicles.hpp
View File

@ -92,7 +92,7 @@ class CfgVehicles {
typeName = "NUMBER"; typeName = "NUMBER";
class values { class values {
class disable { class disable {
name = CSTRING(disabled); name = ECSTRING(common,Disabled);
value = 0; value = 0;
}; };
class normal { class normal {
@ -101,7 +101,7 @@ class CfgVehicles {
default = 1; default = 1;
}; };
class full { class full {
name = CSTRING(enabled); name = ECSTRING(common,Enabled);
value = 2; value = 2;
}; };
}; };
@ -198,8 +198,8 @@ class CfgVehicles {
description = CSTRING(AdvancedMedicalSettings_consumeItem_PAK_Description); description = CSTRING(AdvancedMedicalSettings_consumeItem_PAK_Description);
typeName = "NUMBER"; typeName = "NUMBER";
class values { class values {
class keep { name = CSTRING(No); value = 0; }; class keep { name = ECSTRING(common,No); value = 0; };
class remove { name = CSTRING(Yes); value = 1; default = 1; }; class remove { name = ECSTRING(common,Yes); value = 1; default = 1; };
}; };
}; };
class useCondition_PAK { class useCondition_PAK {
@ -220,7 +220,7 @@ class CfgVehicles {
class vehicle { name = CSTRING(AdvancedMedicalSettings_vehicle); value = 1; }; class vehicle { name = CSTRING(AdvancedMedicalSettings_vehicle); value = 1; };
class facility { name = CSTRING(AdvancedMedicalSettings_facility); value = 2; }; class facility { name = CSTRING(AdvancedMedicalSettings_facility); value = 2; };
class vehicleAndFacility { name = CSTRING(AdvancedMedicalSettings_vehicleAndFacility); value = 3; default = 1; }; class vehicleAndFacility { name = CSTRING(AdvancedMedicalSettings_vehicleAndFacility); value = 3; default = 1; };
class disabled { name = CSTRING(AdvancedMedicalSettings_disabled); value = 4;}; class disabled { name = ECSTRING(common,Disabled); value = 4;};
}; };
}; };
class medicSetting_SurgicalKit: medicSetting_PAK { class medicSetting_SurgicalKit: medicSetting_PAK {
@ -280,7 +280,7 @@ class CfgVehicles {
typeName = "NUMBER"; typeName = "NUMBER";
defaultValue = 0; defaultValue = 0;
class values { class values {
class disable { name = CSTRING(disabled); value = 0; default = 1;}; class disable { name = ECSTRING(common,Disabled); value = 0; default = 1;};
class playerOnly { name = CSTRING(playeronly); value = 1; }; class playerOnly { name = CSTRING(playeronly); value = 1; };
class playerAndAI { name = CSTRING(playersandai); value = 2; }; class playerAndAI { name = CSTRING(playersandai); value = 2; };
}; };

51
addons/medical/stringtable.xml
View File

@ -2928,24 +2928,6 @@
<Polish>Traktuj jednostki zdalnie sterowane (przez Zeusa) jako AI, nie jako graczy?</Polish> <Polish>Traktuj jednostki zdalnie sterowane (przez Zeusa) jako AI, nie jako graczy?</Polish>
<Czech>Ošetřit vzdáleně ovládané jednotky jako AI, ne jako hráče?</Czech> <Czech>Ošetřit vzdáleně ovládané jednotky jako AI, ne jako hráče?</Czech>
</Key> </Key>
<Key ID="STR_ACE_Medical_disabled">
<English>Disabled</English>
<Russian>Отключено</Russian>
<Polish>Wyłączone</Polish>
<Spanish>Desactivado</Spanish>
<German>Deaktiviert</German>
<Czech>Zakázáno</Czech>
<Portuguese>Desativado</Portuguese>
</Key>
<Key ID="STR_ACE_Medical_enabled">
<English>Enabled</English>
<Russian>Включено</Russian>
<Polish>Włączone</Polish>
<Spanish>Activado</Spanish>
<German>Aktiviert</German>
<Czech>Povoleno</Czech>
<Portuguese>Ativado</Portuguese>
</Key>
<Key ID="STR_ACE_Medical_MedicalSettings_preventInstaDeath_DisplayName"> <Key ID="STR_ACE_Medical_MedicalSettings_preventInstaDeath_DisplayName">
<English>Prevent instant death</English> <English>Prevent instant death</English>
<Russian>Отключить мгновенную смерть</Russian> <Russian>Отключить мгновенную смерть</Russian>
@ -3237,15 +3219,6 @@
<Czech>Vozidla a zařízení</Czech> <Czech>Vozidla a zařízení</Czech>
<Portuguese>Veículos e instalações</Portuguese> <Portuguese>Veículos e instalações</Portuguese>
</Key> </Key>
<Key ID="STR_ACE_Medical_AdvancedMedicalSettings_disabled">
<English>Disabled</English>
<Russian>Отключено</Russian>
<Polish>Wyłączone</Polish>
<Spanish>Desactivado</Spanish>
<German>Deaktiviert</German>
<Czech>Zakázáno</Czech>
<Portuguese>Desativado</Portuguese>
</Key>
<Key ID="STR_ACE_Medical_AdvancedMedicalSettings_medicSetting_SurgicalKit_DisplayName"> <Key ID="STR_ACE_Medical_AdvancedMedicalSettings_medicSetting_SurgicalKit_DisplayName">
<English>Allow Surgical kit (Adv)</English> <English>Allow Surgical kit (Adv)</English>
<Russian>Разрешить хирургический набор (усл.)</Russian> <Russian>Разрешить хирургический набор (усл.)</Russian>
@ -3612,30 +3585,6 @@
<Czech>[ACE] Zdravotnické zásoby (pokročilé)</Czech> <Czech>[ACE] Zdravotnické zásoby (pokročilé)</Czech>
<Portuguese>[ACE] Caixa com suprimentos médicos (Avançados)</Portuguese> <Portuguese>[ACE] Caixa com suprimentos médicos (Avançados)</Portuguese>
</Key> </Key>
<Key ID="STR_ACE_Medical_Yes">
<English>Yes</English>
<German>Ja</German>
<Spanish>Si</Spanish>
<Polish>Tak</Polish>
<Czech>Ano</Czech>
<French>Oui</French>
<Russian>Да</Russian>
<Hungarian>Igen</Hungarian>
<Portuguese>Sim</Portuguese>
<Italian>Si</Italian>
</Key>
<Key ID="STR_ACE_Medical_No">
<English>No</English>
<German>Nein</German>
<Spanish>No</Spanish>
<Polish>Nie</Polish>
<Czech>Ne</Czech>
<French>Non</French>
<Russian>Нет</Russian>
<Hungarian>Nem</Hungarian>
<Portuguese>Não</Portuguese>
<Italian>No</Italian>
</Key>
<Key ID="STR_ACE_Medical_AnyTime"> <Key ID="STR_ACE_Medical_AnyTime">
<English>Anytime</English> <English>Anytime</English>
<Czech>Kdykoli</Czech> <Czech>Kdykoli</Czech>

4
addons/nametags/ACE_Settings.hpp
View File

@ -11,7 +11,7 @@ class ACE_Settings {
isClientSettable = 1; isClientSettable = 1;
displayName = CSTRING(ShowPlayerNames); displayName = CSTRING(ShowPlayerNames);
description = CSTRING(ShowPlayerNames_Desc); description = CSTRING(ShowPlayerNames_Desc);
values[] = {CSTRING(Disabled), CSTRING(Enabled), CSTRING(OnlyCursor), CSTRING(OnlyKeypress), CSTRING(OnlyCursorAndKeypress)}; values[] = {ECSTRING(common,Disabled), CSTRING(Enabled), CSTRING(OnlyCursor), CSTRING(OnlyKeypress), CSTRING(OnlyCursorAndKeypress)};
}; };
class GVAR(showPlayerRanks) { class GVAR(showPlayerRanks) {
value = 1; value = 1;
@ -42,7 +42,7 @@ class ACE_Settings {
isClientSettable = 1; isClientSettable = 1;
displayName = CSTRING(ShowSoundWaves); displayName = CSTRING(ShowSoundWaves);
description = CSTRING(ShowSoundWaves_Desc); description = CSTRING(ShowSoundWaves_Desc);
values[] = {CSTRING(Disabled), CSTRING(NameTagSettings), CSTRING(AlwaysShowAll)}; values[] = {ECSTRING(common,Disabled), CSTRING(NameTagSettings), CSTRING(AlwaysShowAll)};
}; };
class GVAR(playerNamesViewDistance) { class GVAR(playerNamesViewDistance) {
value = 5; value = 5;

6
addons/nametags/CfgVehicles.hpp
View File

@ -16,7 +16,7 @@ class CfgVehicles {
class values { class values {
class DoNotForce { class DoNotForce {
default = 1; default = 1;
name = CSTRING(DoNotForce); name = ECSTRING(common,DoNotForce);
value = -1; value = -1;
}; };
class ForceHide { class ForceHide {
@ -54,7 +54,7 @@ class CfgVehicles {
class values { class values {
class DoNotForce { class DoNotForce {
default = 1; default = 1;
name = CSTRING(DoNotForce); name = ECSTRING(common,DoNotForce);
value = -1; value = -1;
}; };
class ForceHide { class ForceHide {
@ -74,7 +74,7 @@ class CfgVehicles {
class values { class values {
class DoNotForce { class DoNotForce {
default = 1; default = 1;
name = CSTRING(DoNotForce); name = ECSTRING(common,DoNotForce);
value = -1; value = -1;
}; };
class ForceHide { class ForceHide {

24
addons/nametags/stringtable.xml
View File

@ -149,14 +149,6 @@
<Czech>Zobrazit jména a hodnosti pro spřátelené AI jednotky? Výchozí: Nevynucovat</Czech> <Czech>Zobrazit jména a hodnosti pro spřátelené AI jednotky? Výchozí: Nevynucovat</Czech>
<Portuguese>Mostra o nome e patente para unidades IA aliadas? Padrão: Não forçar</Portuguese> <Portuguese>Mostra o nome e patente para unidades IA aliadas? Padrão: Não forçar</Portuguese>
</Key> </Key>
<Key ID="STR_ACE_NameTags_DoNotForce">
<English>Do Not Force</English>
<Polish>Nie wymuszaj</Polish>
<Spanish>No forzar</Spanish>
<German>Nicht erzwingen</German>
<Czech>Nevynucovat</Czech>
<Portuguese>Não forçar</Portuguese>
</Key>
<Key ID="STR_ACE_NameTags_ForceHide"> <Key ID="STR_ACE_NameTags_ForceHide">
<English>Force Hide</English> <English>Force Hide</English>
<Polish>Wymuś ukrycie</Polish> <Polish>Wymuś ukrycie</Polish>
@ -213,22 +205,6 @@
<Czech>Tento modul umožňuje si přizpůsobit nastavení a vzdálenost jmenovky.</Czech> <Czech>Tento modul umožňuje si přizpůsobit nastavení a vzdálenost jmenovky.</Czech>
<Portuguese>Este módulo permite que você personalize as configurações e distâncias de etiquetas de nome.</Portuguese> <Portuguese>Este módulo permite que você personalize as configurações e distâncias de etiquetas de nome.</Portuguese>
</Key> </Key>
<Key ID="STR_ACE_NameTags_Disabled">
<English>Disabled</English>
<Polish>Wyłączone</Polish>
<Spanish>Desactivado</Spanish>
<German>Deaktiviert</German>
<Czech>Zakázáno</Czech>
<Portuguese>Desativado</Portuguese>
</Key>
<Key ID="STR_ACE_NameTags_Enabled">
<English>Enabled</English>
<Polish>Włączone</Polish>
<Spanish>Activado</Spanish>
<German>Aktiviert</German>
<Czech>Povoleno</Czech>
<Portuguese>Ativado</Portuguese>
</Key>
<Key ID="STR_ACE_NameTags_OnlyCursor"> <Key ID="STR_ACE_NameTags_OnlyCursor">
<English>Only on Cursor</English> <English>Only on Cursor</English>
<Polish>Tylko pod kursorem</Polish> <Polish>Tylko pod kursorem</Polish>

4
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf
View File

@ -56,8 +56,8 @@ if (count _collection > 0) then {
// Created disable/enable options for bools // Created disable/enable options for bools
if ((_setting select 1) == "BOOL") then { if ((_setting select 1) == "BOOL") then {
lbClear 400; lbClear 400;
lbAdd [400, (localize LSTRING(Disabled))]; lbAdd [400, (localize ELSTRING(common,No))];
lbAdd [400, (localize LSTRING(Enabled))]; lbAdd [400, (localize ELSTRING(common,Yes))];
_settingsValue = [0, 1] select _settingsValue; _settingsValue = [0, 1] select _settingsValue;
} else { } else {
lbClear 400; lbClear 400;

2
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
View File

@ -37,7 +37,7 @@ switch (GVAR(optionMenu_openTab)) do {
// Created disable/enable options for bools // Created disable/enable options for bools
_settingsText = if ((_x select 1) == "BOOL") then { _settingsText = if ((_x select 1) == "BOOL") then {
[(localize LSTRING(Disabled)), (localize LSTRING(Enabled))] select _settingsValue; [(localize ELSTRING(common,No)), (localize ELSTRING(common,Yes))] select _settingsValue;
} else { } else {
(_x select 5) select _settingsValue; (_x select 5) select _settingsValue;
}; };

4
addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf
View File

@ -56,8 +56,8 @@ if (count _collection > 0) then {
// Created disable/enable options for bools // Created disable/enable options for bools
if ((_setting select 1) == "BOOL") then { if ((_setting select 1) == "BOOL") then {
lbClear 400; lbClear 400;
lbAdd [400, (localize LSTRING(Disabled))]; lbAdd [400, (localize ELSTRING(common,No))];
lbAdd [400, (localize LSTRING(Enabled))]; lbAdd [400, (localize ELSTRING(common,Yes))];
_settingsValue = [0, 1] select _settingsValue; _settingsValue = [0, 1] select _settingsValue;
} else { } else {
lbClear 400; lbClear 400;

2
addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
View File

@ -34,7 +34,7 @@ switch (GVAR(optionMenu_openTab)) do {
// Created disable/enable options for bools // Created disable/enable options for bools
_settingsText = if ((_x select 1) == "BOOL") then { _settingsText = if ((_x select 1) == "BOOL") then {
[(localize LSTRING(Disabled)), (localize LSTRING(Enabled))] select _settingsValue; [(localize ELSTRING(common,No)), (localize ELSTRING(common,Yes))] select _settingsValue;
} else { } else {
(_x select 5) select _settingsValue; (_x select 5) select _settingsValue;
}; };

24
addons/optionsmenu/stringtable.xml
View File

@ -73,30 +73,6 @@
<Italian>Valori</Italian> <Italian>Valori</Italian>
<Portuguese>Valores</Portuguese> <Portuguese>Valores</Portuguese>
</Key> </Key>
<Key ID="STR_ACE_OptionsMenu_Enabled">
<English>Yes</English>
<German>Ja</German>
<Spanish>Si</Spanish>
<Polish>Tak</Polish>
<Czech>Ano</Czech>
<French>Oui</French>
<Russian>Да</Russian>
<Hungarian>Igen</Hungarian>
<Portuguese>Sim</Portuguese>
<Italian>Si</Italian>
</Key>
<Key ID="STR_ACE_OptionsMenu_Disabled">
<English>No</English>
<German>Nein</German>
<Spanish>No</Spanish>
<Polish>Nie</Polish>
<Czech>Ne</Czech>
<French>Non</French>
<Russian>Нет</Russian>
<Hungarian>Nem</Hungarian>
<Portuguese>Não</Portuguese>
<Italian>No</Italian>
</Key>
<Key ID="STR_ACE_OptionsMenu_Setting"> <Key ID="STR_ACE_OptionsMenu_Setting">
<English>Setting:</English> <English>Setting:</English>
<Czech>Nastavení:</Czech> <Czech>Nastavení:</Czech>