Merge branch 'temp' into 'master'

Fix more localization mismatches

See merge request core-developers/forge!2372
This commit is contained in:
swordshine
2020-01-04 05:57:59 +00:00
5 changed files with 6 additions and 6 deletions

View File

@@ -562,7 +562,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
} }
} else { } else {
defender = player.getController().chooseSingleEntityForEffect(e, sa, Localizer.getInstance().getMessage("lblDeclareDefenderForCard", CardTranslation.getTranslatedName(movedCard.getName()))); defender = player.getController().chooseSingleEntityForEffect(e, sa, Localizer.getInstance().getMessage("lblChooseDefenderToAttackWithCard", CardTranslation.getTranslatedName(movedCard.getName())));
} }
if (defender != null) { if (defender != null) {
combat.addAttacker(movedCard, defender); combat.addAttacker(movedCard, defender);
@@ -1052,7 +1052,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
} }
} else { } else {
defender = player.getController().chooseSingleEntityForEffect(e, sa, Localizer.getInstance().getMessage("lblDeclareDefenderForCard", CardTranslation.getTranslatedName(c.getName()))); defender = player.getController().chooseSingleEntityForEffect(e, sa, Localizer.getInstance().getMessage("lblChooseDefenderToAttackWithCard", CardTranslation.getTranslatedName(c.getName())));
} }
if (defender != null) { if (defender != null) {
combat.addAttacker(c, defender); combat.addAttacker(c, defender);

View File

@@ -1617,7 +1617,7 @@ lblTap=Tappen
lblCurrentCard=Aktuelle Karte lblCurrentCard=Aktuelle Karte
lblSelectNSpecifyTypeCardsToAction=Wähle %d {0} Karte(n) zum {1} lblSelectNSpecifyTypeCardsToAction=Wähle %d {0} Karte(n) zum {1}
#AbandonEffect.java #AbandonEffect.java
lblWouldYoulikeAbandonSource=Möchtest du die Verschwörung {0} abbrechen? lblWouldYouLikeAbandonSource=Möchtest du die Verschwörung {0} abbrechen?
#ActivateAbilityEffect.java #ActivateAbilityEffect.java
lblChooseManaAbility=Wähle Mana-Fähigkeit: lblChooseManaAbility=Wähle Mana-Fähigkeit:
#AddTurnEffect.java #AddTurnEffect.java

View File

@@ -1617,7 +1617,7 @@ lblTap=tap
lblCurrentCard=Current Card lblCurrentCard=Current Card
lblSelectNSpecifyTypeCardsToAction=Select %d {0} card(s) to {1} lblSelectNSpecifyTypeCardsToAction=Select %d {0} card(s) to {1}
#AbandonEffect.java #AbandonEffect.java
lblWouldYoulikeAbandonSource=Would you like to abandon the scheme {0}? lblWouldYouLikeAbandonSource=Would you like to abandon the scheme {0}?
#ActivateAbilityEffect.java #ActivateAbilityEffect.java
lblChooseManaAbility=Choose a mana ability: lblChooseManaAbility=Choose a mana ability:
#AddTurnEffect.java #AddTurnEffect.java

View File

@@ -1617,7 +1617,7 @@ lblTap=girar
lblCurrentCard=Carta Actual lblCurrentCard=Carta Actual
lblSelectNSpecifyTypeCardsToAction=Selecciona %d {0} carta(s) a {1} lblSelectNSpecifyTypeCardsToAction=Selecciona %d {0} carta(s) a {1}
#AbandonEffect.java #AbandonEffect.java
lblWouldYoulikeAbandonSource=¿Te gustaría abandonar el scheme {0}? lblWouldYouLikeAbandonSource=¿Te gustaría abandonar el scheme {0}?
#ActivateAbilityEffect.java #ActivateAbilityEffect.java
lblChooseManaAbility=Elige una habilidad de maná: lblChooseManaAbility=Elige una habilidad de maná:
#AddTurnEffect.java #AddTurnEffect.java

View File

@@ -1617,7 +1617,7 @@ lblTap=横置
lblCurrentCard=当前牌 lblCurrentCard=当前牌
lblSelectNSpecifyTypeCardsToAction=选择%d张{0}牌用于{1} lblSelectNSpecifyTypeCardsToAction=选择%d张{0}牌用于{1}
#AbandonEffect.java #AbandonEffect.java
lblWouldYoulikeAbandonSource=你想要终止阴谋{0}吗? lblWouldYouLikeAbandonSource=你想要终止阴谋{0}吗?
#ActivateAbilityEffect.java #ActivateAbilityEffect.java
lblChooseManaAbility=选择一个法术力异能: lblChooseManaAbility=选择一个法术力异能:
#AddTurnEffect.java #AddTurnEffect.java