Merge branch 'master' of https://git.cardforge.org/core-developers/forge into mobiletranslation06

 Conflicts:

	forge-gui/res/languages/zh-CN.properties

forge-gui/res/languages/zh-CN.properties

@@ -1042,42 +1042,4 @@ lblDataLocation=数据位置（例如 设置和探索模式）
 lblImageCacheLocation=图片缓存位置
 lblRestartForgeMoveFilesNewLocation=您必须重启Forge才能使此更改生效。执行此操作之前，请确保将所有必要的文件移动到新的位置。
 lblRestartRequired=需要重启
-lblSelect=选择%s
-#AddBasicLandsDialog
-lblLandSet=Land Set
-lblPlains=Plains
-lblIsland=Island
-lblSwamp=Swamp
-lblMountain=Mountain
-lblForest=Forest
-lblAddBasicLandsAutoSuggest=Add Basic Lands to %s\n(double-tap statistics to auto-suggest)
-lblAssortedArt=Assorted Art
-lblCardArt=Card Art %d
-lblNonLandCount=%d non-lands
-lblOldLandCount=%d lands
-lblNewLandCount=%d added lands
-lblNewTotalCount=%d cards
-#FDeckImportDialog
-lblImportLatestVersionCard=Import latest version of card
-lblUseOnlySetsReleasedBefore=Use only sets released before:
-lblUseOnlyCoreAndExpansionSets=Use only core and expansion sets
-lblFollowingCardsCannotBeImported=The following cards cannot be imported due to misspelling, set restrictions, or not being in Forge yet:
-lblImportRemainingCards=Import remaining cards?
-lblNoKnownCardsOnClipboard=No known cards found on clipboard.\n\nCopy the decklist to the clipboard, then reopen this dialog.
-#FDeckViewer
-lblDeckListCopiedClipboard=Deck list for '%s' copied to clipboard.
-#FSideboardDialog
-lblUpdateMainFromSideboard=Update main deck from sideboard%s
-#FVanguardChooser
-lblRandomVanguard=Random Vanguard
-#FOptionPane
-lblYes=Yes
-lblNo=No
-#FSpinner
-lblSelectANumber=Select a number
-#FTextField
-lblCut=Cut
-lblCopy=Copy
-lblPaste=Paste
-#ListChooser
-lblSearch=Search
+lblSelect=选择%s