diff --git a/data/ch-s.mse-locale/locale b/data/ch-s.mse-locale/locale
index e4add5ab..49e276cb 100644
--- a/data/ch-s.mse-locale/locale
+++ b/data/ch-s.mse-locale/locale
@@ -53,6 +53,8 @@ menu:
 	add cards:							批量添加卡牌...
 	remove card:						删除所选卡牌
 	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV...
+	#TODO: Localize
 	link card:							&Link Cards To Selected Card...
 	#TODO: Localize
 	copy card and links:				Copy Selected Cards And Their Linked Cards	Ctrl+Shift+C
@@ -142,6 +144,8 @@ help:
 	export images:						将所有卡牌导出成图片
 	export apprentice:					将套牌导出成为能在 Apprentice 中使用的格式
 	export mws:							将套牌导出成为能在 Magic Workstation 中使用的格式
+	#TODO: Localize
+	add card csv:						Add cards from a Comma Separated Values or Tab Separated Values file
 	check updates:						安装或升级文件包
 	print preview:						显示即将被打印的卡牌
 	print:								从本套牌中打印这张牌
@@ -561,6 +565,13 @@ label:
 	html template:						模板:
 	html export options:				导出选项
 
+	#TODO: Localize entire section
+	# CSV import
+	add card csv sep:					Separator:
+	add card csv tab:					Tab
+	add card csv comma:					Comma
+	add card csv file:					CSV or TSV file path:
+
 	# Image slicer
 	original:							原始:
 	result:								结果:
@@ -751,6 +762,11 @@ title:
 	export cancelled:					导出取消
 	export html:						导出为HTML
 	save html:							保存为HTML
+	# import
+	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV file
+	#TODO: Localize
+	add card csv file:					Open CSV or TSV file
 	# auto replace
 	auto replaces:						自动替换
 
@@ -842,6 +858,8 @@ error:
 	# Card creation
 	no field with name:					Card doesn't have a field named '%s'
 	can't set value:					Can not set card value '%s', it is not of the right type
+	add card csv file not found:		Could not find or load the CSV or TSV file
+	add card csv file malformed:		CSV or TSV file malformed, row '%s' does not have the same number of entries as the first row
 
 	# Script stuff
 	has no member:						%s 没有成员 '%s'
diff --git a/data/ch-t.mse-locale/locale b/data/ch-t.mse-locale/locale
index ae05f519..c5d43388 100644
--- a/data/ch-t.mse-locale/locale
+++ b/data/ch-t.mse-locale/locale
@@ -53,6 +53,8 @@ menu:
 	add cards:							批量添加卡牌...
 	remove card:						刪除所選卡牌
 	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV...
+	#TODO: Localize
 	link card:							&Link Cards To Selected Card...
 	#TODO: Localize
 	copy card and links:				Copy Selected Cards And Their Linked Cards	Ctrl+Shift+C
@@ -143,6 +145,8 @@ help:
 	export images:						將所有卡牌導出成圖片
 	export apprentice:					將套牌導出成為能在 Apprentice 中使用的格式
 	export mws:							將套牌導出成為能在 Magic Workstation 中使用的格式
+	#TODO: Localize
+	add card csv:						Add cards from a Comma Separated Values or Tab Separated Values file
 	check updates:						安裝或昇級文件包
 	print preview:						顯示即將被打印的卡牌
 	print:								從本套牌中打印這張牌
@@ -559,6 +563,13 @@ label:
 	html template:						模板:
 	html export options:				導出選項
 
+	#TODO: Localize entire section
+	# CSV import
+	add card csv sep:					Separator:
+	add card csv tab:					Tab
+	add card csv comma:					Comma
+	add card csv file:					CSV or TSV file path:
+
 	# Image slicer
 	original:							原始:
 	result:								結果:
@@ -749,6 +760,11 @@ title:
 	export cancelled:					導出取消
 	export html:						導出為HTML
 	save html:							保存為HTML
+	# import
+	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV file
+	#TODO: Localize
+	add card csv file:					Open CSV or TSV file
 	# auto replace
 	auto replaces:						自動替換
 
@@ -840,6 +856,8 @@ error:
 	# Card creation
 	no field with name:					Card doesn't have a field named '%s'
 	can't set value:					Can not set card value '%s', it is not of the right type
+	add card csv file not found:		Could not find or load the CSV or TSV file
+	add card csv file malformed:		CSV or TSV file malformed, row '%s' does not have the same number of entries as the first row
 
 	# Script stuff
 	has no member:						%s 沒有成員 '%s'
diff --git a/data/da.mse-locale/locale b/data/da.mse-locale/locale
index 2a484f3e..59f2d852 100644
--- a/data/da.mse-locale/locale
+++ b/data/da.mse-locale/locale
@@ -53,6 +53,8 @@ menu:
 	add cards:							Tilføj &Flere Kort...
 	remove card:						&Slet Valgte Kort
 	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV...
+	#TODO: Localize
 	link card:							&Link Cards To Selected Card...
 	#TODO: Localize
 	copy card and links:				Copy Selected Cards And Their Linked Cards	Ctrl+Shift+C
@@ -143,6 +145,8 @@ help:
 	export images:						Eksportér alle kort som billeder
 	export apprentice:					Eksportér sætter så det kan blive spillet med Apprentice
 	export mws:							Eksportér sættet så det kan blive spillet med Magic Workstation
+	#TODO: Localize
+	add card csv:						Add cards from a Comma Separated Values or Tab Separated Values file
 	check updates:						Installér/opdater pakker.
 	print preview:						Viser kort som de bliver udskrevet
 	print:								Udskriv kort fra dette sæt
@@ -560,6 +564,13 @@ label:
 	html template:						Skabelon:
 	html export options:				Eksportmuligheder
 
+	#TODO: Localize entire section
+	# CSV import
+	add card csv sep:					Separator:
+	add card csv tab:					Tab
+	add card csv comma:					Comma
+	add card csv file:					CSV or TSV file path:
+
 	# Image slicer
 	original:							Original:
 	result:								Resultat:
@@ -752,6 +763,11 @@ title:
 	export cancelled:					Eksport Afbrudt
 	export html:						Eksportér til HTML
 	save html:							Eksportér til HTML
+	# import
+	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV file
+	#TODO: Localize
+	add card csv file:					Open CSV or TSV file
 	# auto replace
 	auto replaces:						Autoerstat
 
@@ -844,6 +860,8 @@ error:
 	# Card creation
 	no field with name:					Card doesn't have a field named '%s'
 	can't set value:					Can not set card value '%s', it is not of the right type
+	add card csv file not found:		Could not find or load the CSV or TSV file
+	add card csv file malformed:		CSV or TSV file malformed, row '%s' does not have the same number of entries as the first row
 
 	# Script stuff
 	has no member:						%s has no member '%s'
diff --git a/data/de.mse-locale/locale b/data/de.mse-locale/locale
index fa5abf09..37d9704a 100644
--- a/data/de.mse-locale/locale
+++ b/data/de.mse-locale/locale
@@ -52,6 +52,7 @@ menu:
 	add card:							Karte Hinzufügen	Ctrl+Enter
 	add cards:							Mehrere hinzufügen...
 	remove card:						Markierte Entfernen 	Del
+	add card csv:						Karten aus CSV oder TSV hinzufügen...
 	link card:							Karten mit ausgewählter Karte verknüpfen ...
 	copy card and links:				Ausgewählte Karten und ihre verknüpften Karten kopieren	Ctrl+Shift+C
 	orientation:						Ansicht
@@ -141,6 +142,7 @@ help:
 	export images:						Exportieren aller Bilder
 	export apprentice:					Exportieren der Edition für Apprentice
 	export mws:							Exportieren der Edition für Magic Workstation
+	add card csv:						Karten aus einer Datei mit kommagetrennten oder tabulatorgetrennten Werten hinzufügen
 	check updates:						Zeigt das Update-Fenster an, indem man neue Packages herunterladen kann.
 	print preview:						Zeigt an, wie die Bilder gedruckt werden
 	print:								Druckt die Bilder der Edition
@@ -551,6 +553,12 @@ label:
 	html template:						html-Template:
 	html export options:				html-Exportoptionen
 
+	# CSV import
+	add card csv sep:					Trennzeichen:
+	add card csv tab:					Tabulator
+	add card csv comma:					Komma
+	add card csv file:					CSV- oder TSV-Dateipfad:
+
 	# Image slicer
 	original:							Original:
 	result:								Ergebnis:
@@ -741,6 +749,9 @@ title:
 	export cancelled:					Export abgebrochen
 	export html:						Exportieren als HTML
 	save html:							Exportieren als HTML
+	# import
+	add card csv:						Karten aus CSV- oder TSV-Datei hinzufügen
+	add card csv file:					CSV- oder TSV-Datei öffnen
 	# auto replace
 	auto replaces:						Automatisches Ersetzen
 
@@ -831,6 +842,8 @@ error:
 	# Card creation
 	no field with name:					Karte enthält kein Feld mit dem Namen '%s'
 	can't set value:					Kartenwert '%s' kann nicht festgelegt werden, da er nicht den richtigen Typ hat
+	add card csv file not found:		Die CSV- oder TSV-Datei konnte nicht gefunden oder geladen werden.
+	add card csv file malformed:		Die CSV- oder TSV-Datei ist fehlerhaft. Die Zeile '%s' enthält nicht die gleiche Anzahl von Einträgen wie die erste Zeile.
 
 	# Script stuff
 	has no member:						%s hat kein Element '%s'
diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale
index 1964ccbb..68ef3aac 100644
--- a/data/en.mse-locale/locale
+++ b/data/en.mse-locale/locale
@@ -53,6 +53,8 @@ menu:
 	add cards:							Add &Multiple Cards...
 	remove card:						&Delete Selected Card
 	add card csv:						Add Cards from CSV or TSV...
+	link card:							&Link Cards To Selected Card...
+	copy card and links:				Copy Selected Cards And Their Linked Cards	Ctrl+Shift+C
 	orientation:						&Orientation
 	rotate 0:							&Normal
 	rotate 270:							Rotated 90° &Clockwise
@@ -140,6 +142,7 @@ help:
 	export images:						Export images for all cards
 	export apprentice:					Export the set so it can be played with in Apprentice
 	export mws:							Export the set so it can be played with in Magic Workstation
+	add card csv:						Add cards from a Comma Separated Values or Tab Separated Values file
 	check updates:						Install/update packages.
 	print preview:						Shows cards as they will be printed
 	print:								Print cards from this set
@@ -173,6 +176,8 @@ help:
 	add card:							Add a new, blank, card to this set
 	add cards:							Add multiple cards to the set
 	remove card:						Delete the selected card from this set
+	link card:							Link one or more cards to the selected card
+	copy card and links:				Copy the selected cards and all their linked cards
 	orientation:						Orientation of the displayed card
 	rotate card:						Rotate the card display 90° clockwise
 	rotate 0:							Display the card with the right side up
@@ -390,6 +395,8 @@ tooltip:
 
 	add card:							Add card
 	remove card:						Remove selected card
+	link card:							Link cards to selected card
+	copy card and links:				Copy selected cards and linked cards
 	rotate card:						Rotate card
 
 	add keyword:						Add keyword
@@ -473,6 +480,16 @@ label:
 	seed:								Seed
 	total cards:						Total
 
+	# Link cards dialog
+	custom link:						Custom...
+	custom link selected:				Generator, Front Face, Meld Component, etc...
+	custom link linked:					Token, Back Face, Meld Result, etc...
+	custom link undefined:				Undefined
+	linked cards relation:				Choose the type of relation between the selected card and the linked cards:
+	selected card:						Selected Card:
+	linked cards:						Linked Cards:
+	select linked cards:				Choose up to 4 cards to link:
+
 	# Open dialogs
 	all files:			All Files
 	
@@ -599,7 +616,7 @@ label:
 	no version:							-
 
 	# Print Window
-	put space between cards:			Put space between cards
+	put space between cards:			Put space between cards?
 
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
@@ -607,6 +624,10 @@ button:
 	edit symbol:						Edit
 	symbol gallery:						Gallery
 
+	# Card panel
+	unlink:								Unlink
+	link select:						Select
+
 	# Style panel
 	use for all cards:					Use for &all cards
 	use custom styling options:			Options &specific to this card
@@ -704,6 +725,7 @@ title:
 	updates available:					Updates Available
 	save changes:						Save Changes?
 	select stylesheet:					Select Stylesheet
+	link cards:							Link Cards To Selected Card
 	#preferences
 	preferences:						Preferences
 	global:								Global
@@ -823,6 +845,8 @@ error:
 	# Card creation
 	no field with name:					Card doesn't have a field named '%s'
 	can't set value:					Can not set card value '%s', it is not of the right type
+	add card csv file not found:		Could not find or load the CSV or TSV file
+	add card csv file malformed:		CSV or TSV file malformed, row '%s' does not have the same number of entries as the first row
 
 	# Script stuff
 	has no member:						%s has no member '%s'
@@ -866,6 +890,11 @@ error:
 	checking updates failed:			Checking updates failed.
 	no updates:							There are no available updates.
 
+	# Card linking
+	not enough free links:				Card does not have enough free links available. Can only link up to 4 cards.
+	not enough free links for copy:		Card does not have enough free links available for copy. Can only link up to 4 cards.
+	could not link:						The following cards could not be linked, as they already have 4 links:
+
 	# Stats panel
 	dimension not found:				There is no statistics dimension '%s'
 
@@ -969,30 +998,38 @@ package:
 	magic-mana-*.mse-symbol-font:
 		# note: reminder/shortcut must start with a space, otherwise it is used as a shortcut
 		#       so typing T *anywhere* would insert a symbol (which would be bad)
-		menu item T:			&Tap symbol	 T
-		menu item Q:			&Untap symbol	 Q
-		menu item W:			&White mana	 W
-		menu item U:			Bl&ue mana	 U
-		menu item B:			&Black mana	 B
-		menu item R:			&Red mana	 R
-		menu item G:			&Green mana	 G
-		menu item S:			&Snow mana	 S
-		menu item X:			Variable mana &X	 X
-		menu item Y:			Variable mana &Y	 Y
-		menu item Z:			Variable mana &Z	 Z
-		menu item I:			&Infinite mana	I
-		menu item colorless:	&Colorless mana...
-		title colorless:		Colorless mana
-		message colorless:		Enter amount of colorless mana:
+		menu item T:				&Tap	 T
+		menu item Q:				&Untap	 Q
+		menu item E:				&Energy	 E
+		menu item J:				Pawprint	 J
+		menu item TK:				Ticket	 TK
+		menu item A:				Chaos	 A
+		menu item W:				&White mana	 W
+		menu item U:				Bl&ue mana	 U
+		menu item B:				&Black mana	 B
+		menu item R:				&Red mana	 R
+		menu item G:				&Green mana	 G
+		menu item C:				&Colorless mana	 C
+		menu item S:				&Snow mana	 S
+		menu item X:				Variable mana &X	 X
+		menu item Y:				Variable mana &Y	 Y
+		menu item Z:				Variable mana &Z	 Z
+		menu item ∞:				&Infinite mana	 ∞
+		menu item colorless:		&Generic mana...
+		title colorless:			Generic mana
+		message colorless:			Enter amount of generic mana:
 		menu item half:				&Half mana
-		menu item |W:				&White	 |W
-		menu item |U:				Bl&ue	 |U
-		menu item |B:				&Black	 |B
-		menu item |R:				&Red	 |R
-		menu item |G:				&Green	 |G
-		menu item |S:				&Snow	 |S
-		menu item 1/2:				&Colorless	1/2
-		menu item hybrid:		H&ybrid mana (two color)
+		menu item half mana:		&Half mana
+		menu item |W:				Half &White mana	 |W
+		menu item |U:				Half Bl&ue mana	 |U
+		menu item |B:				Half &Black mana	 |B
+		menu item |R:				Half &Red mana	 |R
+		menu item |G:				Half &Green mana	 |G
+		menu item |C:				Half &Colorless mana	 |C
+		menu item |S:				Half &Snow mana	 |S
+		menu item 1/2:				Half &Generic mana	 1/2
+		menu item |1:				Half &Generic mana	 |1
+		menu item hybrid:			H&ybrid mana (two colors)
 		menu item W/U:				White/Blue mana	 W/U
 		menu item U/B:				Blue/Black mana	 U/B
 		menu item B/R:				Black/Red mana	 B/R
@@ -1003,7 +1040,13 @@ package:
 		menu item B/G:				Black/Green mana	 B/G
 		menu item R/W:				Red/White mana	 R/W
 		menu item G/U:				Green/Blue mana	 G/U
-		menu item hybrid 3:		H&ybrid mana (three color)
+		menu item C/W:				Colorless/White mana	 C/W
+		menu item C/U:				Colorless/Blue mana	 C/U
+		menu item C/B:				Colorless/Black mana	 C/B
+		menu item C/R:				Colorless/Red mana	 C/R
+		menu item C/G:				Colorless/Green mana	 C/G
+		menu item hybrid 3:			Hybrid mana (three colors)
+		menu item tri-hybrid mana:	Hybrid mana (three colors)
 		menu item W/U/B:			White/Blue/Black mana	 W/U/B
 		menu item U/B/R:			Blue/Black/Red mana	 U/B/R
 		menu item B/R/G:			Black/Red/Green mana	 B/R/G
@@ -1014,3 +1057,80 @@ package:
 		menu item B/G/W:			Black/Green/White mana	 B/G/W
 		menu item R/W/U:			Red/White/Blue mana	 R/W/U
 		menu item G/U/B:			Green/Blue/Black mana	 G/U/B
+		menu item W/U/B/R/G:		Prismatic (five colors)	 W/U/B/R/G
+		menu item H:				Phyrexian Generic mana	 H
+		menu item H/W:				Phyrexian White mana	 H/W
+		menu item H/U:				Phyrexian Blue mana	 H/U
+		menu item H/B:				Phyrexian Black mana	 H/B
+		menu item H/R:				Phyrexian Red mana	 H/R
+		menu item H/G:				Phyrexian Green mana	 H/G
+		menu item H/W/U:			Phyrexian White/Blue mana	 H/W/U
+		menu item H/W/B:			Phyrexian White/Black mana	 H/W/B
+		menu item H/U/B:			Phyrexian Blue/Black mana	 H/U/B
+		menu item H/U/R:			Phyrexian Blue/Red mana	 H/U/R
+		menu item H/B/R:			Phyrexian Black/Red mana	 H/B/R
+		menu item H/B/G:			Phyrexian Black/Green mana	 H/B/G
+		menu item H/R/G:			Phyrexian Red/Green mana	 H/R/G
+		menu item H/R/W:			Phyrexian Red/White mana	 H/R/W
+		menu item H/G/W:			Phyrexian Green/White mana	 H/G/W
+		menu item H/G/U:			Phyrexian Green/Blue mana	 H/G/U
+		menu item number hybrids:	Number Hybrid
+		menu item 2/W:				2 Generic/White mana	 2/W
+		menu item 2/U:				2 Generic/Blue mana	 2/U
+		menu item 2/B:				2 Generic/Black mana	 2/B
+		menu item 2/R:				2 Generic/Red mana	 2/R
+		menu item 2/G:				2 Generic/Green mana	 2/G
+		menu item 2/C:				2 Generic/Colorless mana	 2/C
+		menu item 2/S:				2 Generic/Snow mana	 2/S
+		menu item D0:				0 Defense	 D0
+		menu item D1:				1 Defense	 D1
+		menu item D2:				2 Defense	 D2
+		menu item D3:				3 Defense	 D3
+		menu item D4:				4 Defense	 D4
+		menu item D5:				5 Defense	 D5
+		menu item D6:				6 Defense	 D6
+		menu item D7:				7 Defense	 D7
+		menu item D8:				8 Defense	 D8
+		menu item D9:				9 Defense	 D9
+		menu item DX:				X Defense	 DX
+		menu item r1:				Chapter 1	 r1
+		menu item r2:				Chapter 2	 r2
+		menu item r3:				Chapter 3	 r3
+		menu item r4:				Chapter 4	 r4
+		menu item r5:				Chapter 5	 r5
+		menu item r6:				Chapter 6	 r6
+		menu item +10:				Add 10 Loyalty	 +10
+		menu item +1:				Add 1 Loyalty	 +1
+		menu item +2:				Add 2 Loyalty	 +2
+		menu item +3:				Add 3 Loyalty	 +3
+		menu item +4:				Add 4 Loyalty	 +4
+		menu item +5:				Add 5 Loyalty	 +5
+		menu item +6:				Add 6 Loyalty	 +6
+		menu item +7:				Add 7 Loyalty	 +7
+		menu item +8:				Add 8 Loyalty	 +8
+		menu item +9:				Add 9 Loyalty	 +9
+		menu item +X:				Add X Loyalty	 +X
+		menu item -10:				Remove 10 Loyalty	 -10
+		menu item -1:				Remove 1 Loyalty	 -1
+		menu item -2:				Remove 2 Loyalty	 -2
+		menu item -3:				Remove 3 Loyalty	 -3
+		menu item -4:				Remove 4 Loyalty	 -4
+		menu item -5:				Remove 5 Loyalty	 -5
+		menu item -6:				Remove 6 Loyalty	 -6
+		menu item -7:				Remove 7 Loyalty	 -7
+		menu item -8:				Remove 8 Loyalty	 -8
+		menu item -9:				Remove 9 Loyalty	 -9
+		menu item -X:				Remove X Loyalty	 -X
+		menu item =10:				Set to 10 Loyalty	 =10
+		menu item =0:				Set to 0 Loyalty	 =0
+		menu item =1:				Set to 1 Loyalty	 =1
+		menu item =2:				Set to 2 Loyalty	 =2
+		menu item =3:				Set to 3 Loyalty	 =3
+		menu item =4:				Set to 4 Loyalty	 =4
+		menu item =5:				Set to 5 Loyalty	 =5
+		menu item =6:				Set to 6 Loyalty	 =6
+		menu item =7:				Set to 7 Loyalty	 =7
+		menu item =8:				Set to 8 Loyalty	 =8
+		menu item =9:				Set to 9 Loyalty	 =9
+		menu item =X:				Set to X Loyalty	 =X
+		
\ No newline at end of file
diff --git a/data/es.mse-locale/locale b/data/es.mse-locale/locale
index 3bc2cddb..f8ed01fe 100644
--- a/data/es.mse-locale/locale
+++ b/data/es.mse-locale/locale
@@ -53,6 +53,8 @@ menu:
 	add cards:							Añadir &múltiples cartas...
 	remove card:						&Borrar carta seleccionada
 	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV...
+	#TODO: Localize
 	link card:							&Link Cards To Selected Card...
 	#TODO: Localize
 	copy card and links:				Copy Selected Cards And Their Linked Cards	Ctrl+Shift+C
@@ -143,6 +145,8 @@ help:
 	export images:						Exportar las imágenes de todas las cartas
 	export apprentice:					Exportar el Set para que se pueda jugar en Apprentice
 	export mws:							Exportar el Set para que se pueda jugar en Magic Workstation
+	#TODO: Localize
+	add card csv:						Add cards from a Comma Separated Values or Tab Separated Values file
 	check updates:						Instala y/o actualiza paquetes
 	print preview:						Muestra la carta tal y como va a ser impresa
 	print:								Imprimir cartas de este Set
@@ -560,6 +564,13 @@ label:
 	html template:						Plantilla:
 	html export options:				Opciones de exportación
 
+	#TODO: Localize entire section
+	# CSV import
+	add card csv sep:					Separator:
+	add card csv tab:					Tab
+	add card csv comma:					Comma
+	add card csv file:					CSV or TSV file path:
+
 	# Image slicer
 	original:							Original:
 	result:								Resultado:
@@ -753,6 +764,11 @@ title:
 	export cancelled:					Exportación cancelada
 	export html:						Exportar a HTML
 	save html:							Guardar HTML
+	# import
+	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV file
+	#TODO: Localize
+	add card csv file:					Open CSV or TSV file
 	# auto replace
 	auto replaces:						Auto-reemplazar
 
@@ -845,6 +861,8 @@ error:
 	# Card creation
 	no field with name:					Card doesn't have a field named '%s'
 	can't set value:					Can not set card value '%s', it is not of the right type
+	add card csv file not found:		Could not find or load the CSV or TSV file
+	add card csv file malformed:		CSV or TSV file malformed, row '%s' does not have the same number of entries as the first row
 
 	# Script stuff
 	has no member:						%s no tiene el miembro '%s'
diff --git a/data/fr.mse-locale/locale b/data/fr.mse-locale/locale
index 957df253..90b93bea 100644
--- a/data/fr.mse-locale/locale
+++ b/data/fr.mse-locale/locale
@@ -50,10 +50,11 @@ menu:
 	next card:							Carte &Suivante	PgDn
 	search cards:						Rechercher dans les Cartes	Ctrl+K
 	add card:							&Ajouter une Carte	Ctrl+Enter
-	add cards:							Ajouter &Plusieurs Cartes...
+	add cards:							Ajouter &plusieurs Cartes...
 	remove card:						&Supprimer la carte sélectionnée
-	link card:							&Lier des Cartes à la Carte Sélectionnée...
-	copy card and links:				Copier les Cartes Sélectionnées et leurs Cartes Liées	Ctrl+Shift+C
+	add card csv:						Ajouter plusieurs Cartes depuis un CSV ou TSV...
+	link card:							&Lier des Cartes à la Carte sélectionnée...
+	copy card and links:				Copier les Cartes sélectionnées et leurs Cartes liées	Ctrl+Shift+C
 	orientation:						&Orientation
 	rotate 0:							&Normal
 	rotate 270:							&Rotation 90°
@@ -141,6 +142,7 @@ help:
 	export images:						Exporter toutes les cartes en tant qu'images
 	export apprentice:					Exporter le Set pour être utilisé avec Apprentice
 	export mws:							Exporter le Set pour être utilisé avec Magic Workstation
+	add card csv:						Ajouter des Cartes depuis un fichier à Valeurs Séparées par des Virgules ou Tabulations
 	check updates:						Ouvrir une fenêtre de mise à jour pour télécharger les nouveaux packages (Jeux, Styles, Localisations)
 	print preview:						Voir les cartes telles qu'elles vont être imprimées
 	print:								Imprimer les cartes de ce Set
@@ -553,6 +555,12 @@ label:
 	html template:						Modèle:
 	html export options:				Options d'exportation
 
+	# CSV import
+	add card csv sep:					Séparateur:
+	add card csv tab:					Tabulation
+	add card csv comma:					Virgule
+	add card csv file:					Chemin du fichier CSV ou TSV:
+
 	# Image slicer
 	original:							Original:
 	result:								Résultat:
@@ -743,6 +751,9 @@ title:
 	export cancelled:					Export annulé
 	export html:						Exporter en HTML
 	save html:							Exporter en HTML
+	# import
+	add card csv:						Ajouter des Cartes depuis un fichier CSV ou TSV
+	add card csv file:					Ouvrir un fichier CSV ou TSV
 	# auto replace
 	auto replaces:						Remplacement automatique
 
@@ -833,6 +844,8 @@ error:
 	# Card creation
 	no field with name:					La carte ne contient pas de champ nommé '%s'
 	can't set value:					Impossible de définir la valeur '%s' de la carte, elle n'est pas du bon type
+	add card csv file not found:		Impossible de trouver ou charger le fichier CSV ou TSV spécifié
+	add card csv file malformed:		Fichier CSV ou TSV malformé, la rangée '%s' n'a pas le même nombre d'entrées que la première rangée
 
 	# Script stuff
 	has no member:						%s n'a pas de membre '%s'
diff --git a/data/it.mse-locale/locale b/data/it.mse-locale/locale
index a6c0d6b7..5e5054bb 100644
--- a/data/it.mse-locale/locale
+++ b/data/it.mse-locale/locale
@@ -52,6 +52,7 @@ menu:
 	add card:							&Aggiungi carta	Ctrl+Enter
 	add cards:							Aggiungi &carte Multiple...
 	remove card:						&Rimuovi carta	Del
+	add card csv:						Aggiungi carte da CSV o TSV...
 	link card:							Collega le carte alla carta selezionata...
 	copy card and links:				Copia le carte selezionate e le relative carte collegate	Ctrl+Shift+C
 	orientation:						&Orientamento
@@ -141,6 +142,7 @@ help:
 	export images:						Esporta tutte le carte come immagini
 	export apprentice:					Esporta il set per essere usato in Apprentice
 	export mws:							Esporta il set per essere usato in Magic Workstation
+	add card csv:						Aggiungi carte da un file con Valori Separati da Virgola o da Tabulazione
 	check updates:						Apre la finestra di aggiornamento per scaricare nuovi pacchetti, come giochi, stili e file locale.
 	print preview:						Anteprima di stampa
 	print:								Stampa carte da questo set
@@ -552,6 +554,12 @@ label:
 	html template:						Template:
 	html export options:				Opzioni esportazione
 
+	# CSV import
+	add card csv sep:					Separatore:
+	add card csv tab:					Tabulazione
+	add card csv comma:					Virgola
+	add card csv file:					Percorso del file CSV o TSV:
+
 	# Image slicer
 	original:							Originale:
 	result:								Risultato:
@@ -742,6 +750,9 @@ title:
 	export cancelled:					Esportazione cancellata
 	export html:						Esporta in HTML
 	save html:							Esporta in HTML
+	# import
+	add card csv:						Aggiungi carte da un file CSV o TSV
+	add card csv file:					Aprire un file CSV o TSV
 	# auto replace
 	auto replaces:						Rimpiazza automaticamente
 
@@ -832,6 +843,8 @@ error:
 	# Card creation
 	no field with name:					La carta non ha un campo denominato '%s'
 	can't set value:					Impossibile impostare il valore '%s' della carta, non è del tipo corretto
+	add card csv file not found:		Impossibile trovare o caricare il file CSV o TSV
+	add card csv file malformed:		File CSV o TSV non valido, la riga '%s' non ha lo stesso numero di voci della prima riga
 
 	# Script stuff
 	has no member:						%s non ha membri '%s'
diff --git a/data/jp.mse-locale/locale b/data/jp.mse-locale/locale
index 7bb7a2ff..a688fa0d 100644
--- a/data/jp.mse-locale/locale
+++ b/data/jp.mse-locale/locale
@@ -53,6 +53,8 @@ menu:
 	add cards:							&複数のカードを追加...
 	remove card:						&選択したカードを削除
 	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV...
+	#TODO: Localize
 	link card:							&Link Cards To Selected Card...
 	#TODO: Localize
 	copy card and links:				Copy Selected Cards And Their Linked Cards	Ctrl+Shift+C
@@ -143,6 +145,8 @@ help:
 	export images:						すべてのカードの画像の出力します。
 	export apprentice:					現在のセットをApprentice32形式で出力します。
 	export mws:							現在のセットをMagic Workstation形式で出力します。
+	#TODO: Localize
+	add card csv:						Add cards from a Comma Separated Values or Tab Separated Values file
 	check updates:						新しいスタイルや言語ファイル等をダウンロードするためのウィンドウを開きます。
 	print preview:						印刷のプレビュー画面を表示します。
 	print:								このセットを印刷します。
@@ -558,6 +562,13 @@ label:
 	html template:						テンプレート：
 	html export options:				エクスポート・オプション
 
+	#TODO: Localize entire section
+	# CSV import
+	add card csv sep:					Separator:
+	add card csv tab:					Tab
+	add card csv comma:					Comma
+	add card csv file:					CSV or TSV file path:
+
 	# Image slicer
 	original:							オリジナル：
 	result:								結果：
@@ -749,6 +760,11 @@ title:
 	export cancelled:					エクスポートの取り消し
 	export html:						HTMLへのエクスポート
 	save html:							HTMLへの保存
+	# import
+	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV file
+	#TODO: Localize
+	add card csv file:					Open CSV or TSV file
 	# auto replace
 	auto replaces:						自動置換
 
@@ -840,6 +856,8 @@ error:
 	# Card creation
 	no field with name:					Card doesn't have a field named '%s'
 	can't set value:					Can not set card value '%s', it is not of the right type
+	add card csv file not found:		Could not find or load the CSV or TSV file
+	add card csv file malformed:		CSV or TSV file malformed, row '%s' does not have the same number of entries as the first row
 
 	# Script stuff
 	has no member:						%s メンバーを持っていません '%s'
diff --git a/data/ko.mse-locale/locale b/data/ko.mse-locale/locale
index 55aab23f..a6bfb865 100644
--- a/data/ko.mse-locale/locale
+++ b/data/ko.mse-locale/locale
@@ -54,6 +54,8 @@ menu:
 	add cards:							&여러 카드 추가...
 	remove card:						&카드 삭제
 	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV...
+	#TODO: Localize
 	link card:							&Link Cards To Selected Card...
 	#TODO: Localize
 	copy card and links:				Copy Selected Cards And Their Linked Cards	Ctrl+Shift+C
@@ -143,6 +145,8 @@ help:
 	export images:						모든 카드의 이미지를 저장하세요
 	export apprentice:					Apprentice에서 사용할 수 있도록 세트 내보내기
 	export mws:							Magic Workstation에서 사용할 수 있도록 세트 내보내기
+	#TODO: Localize
+	add card csv:						Add cards from a Comma Separated Values or Tab Separated Values file
 	check updates:						템플릿 업데이트 설치
 	print preview:						인쇄될 카드를 표시합니다.
 	print:								이 세트의 카드를 인쇄하세요
@@ -559,6 +563,13 @@ label:
 	html template:						주형:
 	html export options:				내보내기 옵션
 
+	#TODO: Localize entire section
+	# CSV import
+	add card csv sep:					Separator:
+	add card csv tab:					Tab
+	add card csv comma:					Comma
+	add card csv file:					CSV or TSV file path:
+
 	# Image slicer
 	original:							원래의:
 	result:								결과:
@@ -753,6 +764,11 @@ title:
 	export cancelled:					내보내기가 취소되었습니다.
 	export html:						내보내기 HTML
 	save html:							내보내기 HTML
+	# import
+	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV file
+	#TODO: Localize
+	add card csv file:					Open CSV or TSV file
 	# auto replace
 	auto replaces:						자동 교체
 
@@ -845,6 +861,8 @@ error:
 	# Card creation
 	no field with name:					Card doesn't have a field named '%s'
 	can't set value:					Can not set card value '%s', it is not of the right type
+	add card csv file not found:		Could not find or load the CSV or TSV file
+	add card csv file malformed:		CSV or TSV file malformed, row '%s' does not have the same number of entries as the first row
 
 	# Script stuff
 	has no member:						%s 회원이 없습니다 '%s'
diff --git a/data/pl.mse-locale/locale b/data/pl.mse-locale/locale
index dfebabc3..6a597169 100644
--- a/data/pl.mse-locale/locale
+++ b/data/pl.mse-locale/locale
@@ -63,6 +63,8 @@ menu:
 	add cards:							Dodaj &Wiele Kart...
 	remove card:						&Usuń Wybraną Kartę
 	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV...
+	#TODO: Localize
 	link card:							&Link Cards To Selected Card...
 	#TODO: Localize
 	copy card and links:				Copy Selected Cards And Their Linked Cards	Ctrl+Shift+C
@@ -159,6 +161,8 @@ help:
 	export images:						Eksportuj wszystkie karty jako obrazy
 	export apprentice:					Eksportuj zestaw tak, by dało się grać w programie Apprentice
 	export mws:							Eksportuj zestaw tak, by dało się grać w programie Magic Workstation
+	#TODO: Localize
+	add card csv:						Add cards from a Comma Separated Values or Tab Separated Values file
 	check updates:						Instaluj/uaktualnij dane programu.
 	print preview:						Pokaż karty tak, jak zostaną wydrukowane.
 	print:								Drukuj karty z tego zestawu.
@@ -606,6 +610,13 @@ label:
 	html template:						Szablon:
 	html export options:				Opcje eksportu
 
+	#TODO: Localize entire section
+	# CSV import
+	add card csv sep:					Separator:
+	add card csv tab:					Tab
+	add card csv comma:					Comma
+	add card csv file:					CSV or TSV file path:
+
 	# Image slicer
 	original:							Oryginał:
 	result:								Wynik:
@@ -811,6 +822,11 @@ title:
 	export cancelled:					Anulowano eksportowanie
 	export html:						Eksportuj do strony HTML
 	save html:							Zapisz HTML
+	# import
+	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV file
+	#TODO: Localize
+	add card csv file:					Open CSV or TSV file
 	# auto replace
 	auto replaces:						Auto-zamienianie
 
@@ -902,6 +918,8 @@ error:
 	# Card creation
 	no field with name:					Card doesn't have a field named '%s'
 	can't set value:					Can not set card value '%s', it is not of the right type
+	add card csv file not found:		Could not find or load the CSV or TSV file
+	add card csv file malformed:		CSV or TSV file malformed, row '%s' does not have the same number of entries as the first row
 
 	# Script stuff
 	has no member:						%s nie posiada pola '%s'
diff --git a/data/pt-br.mse-locale/locale b/data/pt-br.mse-locale/locale
index c4f3a9bb..eece4963 100644
--- a/data/pt-br.mse-locale/locale
+++ b/data/pt-br.mse-locale/locale
@@ -52,6 +52,7 @@ menu:
 	add card:							&Adicionar Card	Ctrl+Enter
 	add cards:							Adicionar &Multiplos Cards...
 	remove card:						&Deletar Card Selecionado
+	add card csv:						Adicionar Cards de um arquivo CSV ou TSV...
 	link card:							Vincular cards ao card selecionado...
 	copy card and links:				Copiar cards selecionados e sues cards vinculados	Ctrl+Shift+C
 	orientation:						&Orientação
@@ -141,6 +142,7 @@ help:
 	export images:						Exporta todos os cards como um arquivo de imagem.
 	export apprentice:					Exporta a Edição para que se jogue com ela no Apprentice.
 	export mws:							Exporta a Edição para que se jogue com ela no Magic Workstation.
+	add card csv:						Adicionar Cards de um arquivo de Valores Separados por Vírgula ou Valores Separados por Tabulação
 	check updates:						Instala pacotes de Atualizações.
 	print preview:						Mostra todos os cards como se fossem para serem Impressos.
 	print:								Imprimi os cards dessa Edição.
@@ -552,6 +554,12 @@ label:
 	html template:						Modelo:
 	html export options:				Opções de Exportação
 
+	# CSV import
+	add card csv sep:					Separador:
+	add card csv tab:					Tabulação
+	add card csv comma:					Vírgula
+	add card csv file:					Caminho do arquivo CSV ou TSV:
+
 	# Image slicer
 	original:							Original:
 	result:								Resultado:
@@ -741,6 +749,9 @@ title:
 	export cancelled:					Exportação Cancelada
 	export html:						Exportar para HTML
 	save html:							Exportar para HTML
+	# import
+	add card csv:						Adicionar Cards de um arquivo CSV ou TSV
+	add card csv file:					Abrir arquivo CSV ou TSV
 	# auto replace
 	auto replaces:						Auto Substituição
 
@@ -831,6 +842,8 @@ error:
 	# Card creation
 	no field with name:					O card não possui um campo chamado '%s'
 	can't set value:					Não é possível definir o valor do card '%s', pois ele não é do tipo correto
+	add card csv file not found:		Não foi possível encontrar ou carregar o arquivo CSV ou TSV
+	add card csv file malformed:		Arquivo CSV ou TSV com formato incorreto, a linha '%s' não possui o mesmo número de entradas que a primeira linha
 
 	# Script stuff
 	has no member:						%s como no número '%s'
diff --git a/data/ru.mse-locale/locale b/data/ru.mse-locale/locale
index 7180f9d2..ef4a91f2 100644
--- a/data/ru.mse-locale/locale
+++ b/data/ru.mse-locale/locale
@@ -54,6 +54,8 @@ menu:
 	add cards:							Добавить несколько карт...
 	remove card:						Удалить выделенную карту
 	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV...
+	#TODO: Localize
 	link card:							&Link Cards To Selected Card...
 	#TODO: Localize
 	copy card and links:				Copy Selected Cards And Their Linked Cards	Ctrl+Shift+C
@@ -148,6 +150,8 @@ help:
 	export images:						Export images for all cards
 	export apprentice:					Export the set so it can be played with in Apprentice
 	export mws:							Export the set so it can be played with in Magic Workstation
+	#TODO: Localize
+	add card csv:						Add cards from a Comma Separated Values or Tab Separated Values file
 	check updates:						Установить/обновить дополнительные стили/шрифты
 	print preview:						Показать карты в том виде, в каком они будут напечатаны
 	print:								Печатать карты этого сета
@@ -588,6 +592,13 @@ label:
 	html template:						Шаблон:
 	html export options:				Опции экспорта
 
+	#TODO: Localize entire section
+	# CSV import
+	add card csv sep:					Separator:
+	add card csv tab:					Tab
+	add card csv comma:					Comma
+	add card csv file:					CSV or TSV file path:
+
 	# Image slicer
 	original:							Оригинал:
 	result:								Результат:
@@ -789,6 +800,11 @@ title:
 	export cancelled:					Экспорт отменен
 	export html:						Экспорт в HTML
 	save html:							Сохранить в HTML
+	# import
+	#TODO: Localize
+	add card csv:						Add Cards from CSV or TSV file
+	#TODO: Localize
+	add card csv file:					Open CSV or TSV file
 	# auto replace
 	auto replaces:						Автозамена
 
@@ -881,6 +897,8 @@ error:
 	# Card creation
 	no field with name:					Card doesn't have a field named '%s'
 	can't set value:					Can not set card value '%s', it is not of the right type
+	add card csv file not found:		Could not find or load the CSV or TSV file
+	add card csv file malformed:		CSV or TSV file malformed, row '%s' does not have the same number of entries as the first row
 
 	# Script stuff
 	has no member:						%s has no member '%s'
diff --git a/src/gui/add_csv_window.cpp b/src/gui/add_csv_window.cpp
index 0c08a8b6..bf293e81 100644
--- a/src/gui/add_csv_window.cpp
+++ b/src/gui/add_csv_window.cpp
@@ -124,6 +124,7 @@ void AddCSVWindow::onOk(wxCommandEvent&) {
   auto in = std::ifstream(file_path->GetValue().ToStdString());
   if (in.fail()) {
     queue_message(MESSAGE_ERROR, _ERROR_("add card csv file not found"));
+    EndModal(wxID_ABORT);
     return;
   }
   std::vector<std::vector<std::string>> table;
@@ -141,6 +142,7 @@ void AddCSVWindow::onOk(wxCommandEvent&) {
   for (int y = 1; y < table.size(); ++y) {
     if (table[y].size() != count) {
       queue_message(MESSAGE_ERROR, _ERROR_1_("add card csv file malformed", wxString::Format(wxT("%i"), y+1)));
+      EndModal(wxID_ABORT);
       return;
     }
   }
diff --git a/src/script/functions/construction.cpp b/src/script/functions/construction.cpp
index 6d2b043f..1cf1e4c0 100644
--- a/src/script/functions/construction.cpp
+++ b/src/script/functions/construction.cpp
@@ -64,7 +64,7 @@ static void set_container(Value* container, ScriptValueP& value, String key_name
 static bool set_builtin_container(GameP& game, CardP& card, ScriptValueP& value, String key_name) {
   // check if the given value is for a built-in field, if found set it and return true
   key_name = unified_form(key_name);
-  if (key_name == _("notes")) {
+  if (key_name == _("notes") || key_name == _("note")) {
     card->notes = value->toString();
     return true;
   } else if (key_name == _("style") || key_name == _("stylesheet") || key_name == _("template")) {