Merge remote-tracking branch 'upstream/master'

This commit is contained in:
CCTV-1
2020-03-20 11:07:17 +08:00
53 changed files with 550 additions and 241 deletions

View File

@@ -2021,6 +2021,9 @@ lblDamagepreventionHas=Damage prevention: {0}
lblIsExtraTurn=Extra Turn: Yes
lblExtraTurnCountHas=Extra Turn Count: {0}
lblAntedHas=Ante''d: {0}
lblAdditionalVotes=You get {0} additional votes.
lblOptionalAdditionalVotes=You may vote {0} additional times.
lblControlsVote=You choose how each player votes.
#VStack.java
lblAlwaysYes=Always Yes
lblAlwaysNo=Always No