Merge pull request #689 from acemod/group

Reword the group action names
This commit is contained in:
Felix Wiegand 2015-05-01 23:30:10 +02:00
commit a211bcfacf
2 changed files with 44 additions and 60 deletions

View File

@ -42,8 +42,8 @@ class CfgVehicles {
icon = PATHTOF(UI\team\team_management_ca.paa);
hotkey = "M";
class ACE_JoinTeamRed {
displayName = "$STR_ACE_Interaction_JoinTeamRed";
class ACE_AssignTeamRed {
displayName = "$STR_ACE_Interaction_AssignTeamRed";
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'RED')] call DFUNC(joinTeam));
showDisabled = 1;
@ -51,8 +51,8 @@ class CfgVehicles {
priority = 2.4;
hotkey = "R";
};
class ACE_JoinTeamGreen {
displayName = "$STR_ACE_Interaction_JoinTeamGreen";
class ACE_AssignTeamGreen {
displayName = "$STR_ACE_Interaction_AssignTeamGreen";
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'GREEN')] call DFUNC(joinTeam));
showDisabled = 1;
@ -60,8 +60,8 @@ class CfgVehicles {
priority = 2.3;
hotkey = "G";
};
class ACE_JoinTeamBlue {
displayName = "$STR_ACE_Interaction_JoinTeamBlue";
class ACE_AssignTeamBlue {
displayName = "$STR_ACE_Interaction_AssignTeamBlue";
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'BLUE')] call DFUNC(joinTeam));
showDisabled = 1;
@ -69,8 +69,8 @@ class CfgVehicles {
priority = 2.2;
hotkey = "B";
};
class ACE_JoinTeamYellow {
displayName = "$STR_ACE_Interaction_JoinTeamYellow";
class ACE_AssignTeamYellow {
displayName = "$STR_ACE_Interaction_AssignTeamYellow";
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam));
statement = QUOTE([ARR_2(_target,'YELLOW')] call DFUNC(joinTeam));
showDisabled = 1;
@ -79,9 +79,9 @@ class CfgVehicles {
hotkey = "Y";
};
class ACE_LeaveTeam {
class ACE_UnassignTeam {
displayName = "$STR_ACE_Interaction_LeaveTeam";
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam) && {assignedTeam _player != 'MAIN'});
condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canJoinTeam) && {assignedTeam _target != 'MAIN'});
statement = QUOTE([ARR_2(_target,'MAIN')] call DFUNC(joinTeam));
showDisabled = 1;
icon = PATHTOF(UI\team\team_white_ca.paa);

View File

@ -506,16 +506,16 @@
<Italian>A Terra!</Italian>
</Key>
<Key ID="STR_ACE_Interaction_TeamManagement">
<English>Team&lt;br/&gt;Management</English>
<German>Team&lt;br/&gt;Management</German>
<Spanish>Gestión&lt;br/&gt;de equipo</Spanish>
<French>Gestion&lt;br/&gt;d'équipe</French>
<Polish>Zarządzanie&lt;br/&gt;oddziałem</Polish>
<Czech>Správa&lt;br/&gt;týmu</Czech>
<Russian>Управление&lt;br/&gt;группой</Russian>
<Portuguese>Gerenciamento&lt;br/&gt;de Equipe</Portuguese>
<Italian>Organizzazione&lt;br/&gt;Squadra</Italian>
<Hungarian>Csapat&lt;br/&gt;kezelése</Hungarian>
<English>Team Management</English>
<German>Team Management</German>
<Spanish>Gestión de equipo</Spanish>
<French>Gestion d'équipe</French>
<Polish>Zarządzanie oddziałem</Polish>
<Czech>Správa týmu</Czech>
<Russian>Управление группой</Russian>
<Portuguese>Gerenciamento de Equipe</Portuguese>
<Italian>Organizzazione Squadra</Italian>
<Hungarian>Csapat kezelése</Hungarian>
</Key>
<Key ID="STR_ACE_Interaction_TeamRED">
<English>Red</English>
@ -565,53 +565,37 @@
<Italian>Giallo</Italian>
<Hungarian>Sárga</Hungarian>
</Key>
<Key ID="STR_ACE_Interaction_AssignTeamRed">
<English>Assign Red</English>
<Spanish>Asignar a rojo</Spanish>
</Key>
<Key ID="STR_ACE_Interaction_AssignTeamGreen">
<English>Assign Green</English>
<Spanish>Asignar a verde</Spanish>
</Key>
<Key ID="STR_ACE_Interaction_AssignTeamBlue">
<English>Assign Blue</English>
<Spanish>Asignar a azul</Spanish>
</Key>
<Key ID="STR_ACE_Interaction_AssignTeamYellow">
<English>Assign Yellow</English>
<Spanish>Asignar a amarillo</Spanish>
</Key>
<Key ID="STR_ACE_Interaction_JoinTeamRed">
<English>Join Team&lt;br/&gt;Red</English>
<German>Team Rot&lt;br/&gt;beitreten</German>
<Spanish>Unirse al&lt;br/&gt;equipo rojo</Spanish>
<French>Rejoindre&lt;br/&gt;Rouge</French>
<Polish>Dołącz do drużyny&lt;br/&gt;czerwonej</Polish>
<Czech>Připojit do&lt;br/&gt;Červeného týmu</Czech>
<Russian>Присоединиться&lt;br/&gt;к Красной группе</Russian>
<Portuguese>Unir-se à&lt;br/&gt;Equipe Vermelha</Portuguese>
<Italian>Entra nella&lt;br/&gt;Squadra Rossa</Italian>
<Hungarian>Csatlakozás a&lt;br/&gt;piros csapathoz</Hungarian>
<English>Join Red</English>
<Spanish>Unirse a rojo</Spanish>
</Key>
<Key ID="STR_ACE_Interaction_JoinTeamGreen">
<English>Join Team&lt;br/&gt;Green</English>
<German>Team Grün&lt;br/&gt;beitreten</German>
<Spanish>Unirse al&lt;br/&gt;equipo verde</Spanish>
<French>Rejoindre&lt;br/&gt;Vert</French>
<Polish>Dołącz do&lt;br/&gt;drużyny zielonej</Polish>
<Czech>Připojit do&lt;br/&gt;Zeleného týmu</Czech>
<Russian>Присоединиться&lt;br/&gt;к Зеленой группе</Russian>
<Portuguese>Unir-se à&lt;br/&gt;Equipe Verde</Portuguese>
<Italian>Entra nella&lt;br/&gt;Squadra Verde</Italian>
<Hungarian>Csatlakozás a&lt;br/&gt;zöld csapathoz</Hungarian>
<English>Join Green</English>
<Spanish>Unirse a verde</Spanish>
</Key>
<Key ID="STR_ACE_Interaction_JoinTeamBlue">
<English>Join Team&lt;br/&gt;Blue</English>
<German>Team Blau&lt;br/&gt;beitreten</German>
<Spanish>Unirse al&lt;br/&gt;equipo azul</Spanish>
<French>Rejoindre&lt;br/&gt;Bleu</French>
<Polish>Dołącz do&lt;br/&gt;drużyny niebieskiej</Polish>
<Czech>Připojit do&lt;br/&gt;Modrého týmu</Czech>
<Russian>Присоединиться&lt;br/&gt;к Синей группе</Russian>
<Portuguese>Unir-se à&lt;br/&gt;Equipe Azul</Portuguese>
<Italian>Entra nella&lt;br/&gt;Squadra Blu</Italian>
<Hungarian>Csatlakozás a&lt;br/&gt;kék csapathoz</Hungarian>
<English>Join Blue</English>
<Spanish>Unirse a azul</Spanish>
</Key>
<Key ID="STR_ACE_Interaction_JoinTeamYellow">
<English>Join Team&lt;br/&gt;Yellow</English>
<German>Team Gelb&lt;br/&gt;beitreten</German>
<Spanish>Unirse al&lt;br/&gt;equipo amarillo</Spanish>
<French>Rejoindre&lt;br/&gt;Jaune</French>
<Polish>Dołącz do&lt;br/&gt;drużyny żółtej</Polish>
<Czech>Připojit do&lt;br/&gt;Žlutého týmu</Czech>
<Russian>Присоединиться&lt;br/&gt;к Жёлтой группе</Russian>
<Portuguese>Unir-se à&lt;br/&gt;Equipe Amarela</Portuguese>
<Italian>Entra nella&lt;br/&gt;Squadra Gialla</Italian>
<Hungarian>Csatlakozás a&lt;br/&gt;sárga csapathoz</Hungarian>
<English>Join Yellow</English>
<Spanish>Unirse a amarillo</Spanish>
</Key>
<Key ID="STR_ACE_Interaction_JoinedTeam">
<English>You joined Team %1</English>