misc: merge in master, update translations, manually fix CH-S and JP

The rest still need work. There appears to be a bug with multi-line values on non-existent keys.

data/ch-s.mse-locale/locale

@@ -1,8 +1,7 @@
-#_DEL mse version: 2.0.0
+mse version: 2.0.2
-#_ADD mse version: 2.0.2
 installer group: translations/chinese/simplified
 full name: 简体中文 (Simplified Chinese)
-version: 2013-08-13
+version: 2022-07-29
 icon: cn.png
 
 ############################################################## Menu items
@@ -30,14 +29,14 @@ menu:
 	undo:			撤销%s	Ctrl+Z
 	redo:			重做%s	Ctrl+Y
 	cut:			剪切	Ctrl+X
-#_ADD	cut card:		Cu&t	Ctrl+X
+	cut card:		剪切	Ctrl+X
-#_ADD	cut keyword:	Cu&t	Ctrl+X
+	cut keyword:	剪切	Ctrl+X
 	copy:			复制	Ctrl+C
-#_ADD	copy card:			&Copy	Ctrl+C
+	copy card:			复制	Ctrl+C
-#_ADD	copy keyword:		&Copy	Ctrl+C
+	copy keyword:		复制	Ctrl+C
 	paste:			粘贴	Ctrl+V
-#_ADD	paste card:		&Paste	Ctrl+V
+	paste card:		粘贴	Ctrl+V
-#_ADD	paste keyword:	&Paste	Ctrl+V
+	paste keyword:	粘贴	Ctrl+V
 #_ADD	select all:				Select &All	Ctrl+A
 	find:			查找	Ctrl+F
 	find next:		查找下一个	F3
@@ -69,10 +68,11 @@ menu:
 	format:			字体格式
 	bold:			粗体	Ctrl+B
 	italic:			斜体	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:		符号	Ctrl+M
 	reminder text:		提示文本	Ctrl+R
 	insert symbol:		插入符号
-#_ADD	# spelling
+# spelling
 #_ADD	no spelling suggestions:	(no suggestions)
 	
 	graph:			图像
@@ -84,15 +84,14 @@ menu:
 	
 #_ADD	console:			Console
 #_ADD	clear console:		&Clear Console	Ctrl+L
-#_ADD 
+
 	window:			窗口
 	new window:		新建窗口
-	cards tab:		卡牌编辑	F5
+	cards tab:		卡牌编辑	Alt+1
-#_DEL	set info tab:		套牌信息	F6
+	style tab:		风格选择	Alt+2
-	style tab:		风格选择	F7
+	set info tab:		套牌信息	Alt+3
-#_ADD	set info tab:		&Set Information	Alt+3
+	keywords tab:		关键词	Alt+4
-	keywords tab:		关键词	F8
+	stats tab:		统计结果	Alt+5
-	stats tab:		统计结果	F9
 #_ADD	random pack tab:	&Random Packs	Alt+6
 #_ADD	console tab:		&Console	Alt+7
 	
@@ -125,9 +124,8 @@ menu:
 ############################################################## Menu help texts
 help:
 	welcome:		欢迎使用 Magic Set Editor
-	
+
-#_DEL	file:
+	#file:
-#_ADD	#file:
 	new set:		创建新套牌
 	open set:		打开已有套牌
 	last opened set:	打开 '%s'
@@ -147,8 +145,7 @@ help:
 #_ADD	show profiler:		Show the profiler window, with timings of (script) functions. Used for optimization.
 	exit:			退出Magic Set Editor程序，请迅速保存你的套牌
 	
-#_DEL	edit:
+	#edit:
-#_ADD	#edit:
 	undo:			撤销上一个动作
 	redo:			重做上一个动作
 	cut:			将选中的文字剪切至剪切板
@@ -166,9 +163,8 @@ help:
 	replace:		替换卡牌文字
 	auto replace:		自动替换什么文字？
 	preferences:		修改Magic Set Editor的设置
-	
+
-#_DEL	cards:
+	#cards:
-#_ADD	#cards:
 	previous card:		选择列表中的上一张卡牌
 	next card:		选择列表中的下一张卡牌
 #_ADD	search cards:		Filter the card list using search terms
@@ -183,36 +179,33 @@ help:
 	rotate 180:		将所显示卡牌上下翻转
 	card list columns:	调整卡牌列表栏显示项目和显示顺序
 	
-#_DEL	keywords:
+	#keywords:
-#_ADD	#keywords:
 	previous keyword:	从列表中选择上一个关键词
 	next keyword:		从列表中选择下一个关键词
 #_ADD	search keywords:		Filter the keyword list using search terms
 	add keyword:		添加一个新关键词到本套牌中
 	remove keyword:		从本套牌中删除选中的关键词
 	
-#_DEL	format:
+	#format:
-#_ADD	#format:
 	bold:			将所选文字设为粗体
 	italic:			将所选文字设为斜体
+#_ADD	underline:          Makes the selected text underlined
 	symbols:		将所选文字改成符号
 	reminder text:		对选择的关键词显示提示文本
 #_ADD	# spelling
 #_ADD	no spelling suggestions:	There are no suggestions for correcting this error
 	
-#_DEL	graph:
+	#graph:
-#_ADD	#graph:
 	pie:			饼状图，每一份的大小取决与卡牌数量
 	bar:			条形图，条形高度取决于卡牌数量
 	stack:			条形图，堆叠条形图
 	scatter:		散点图，每一个散点的大小取决与卡牌数量
 	scatter pie:		散饼图，每一个三点都是一个小型饼状图
 	
-#_DEL	window:
+	#console:
-#_ADD	#console:
 #_ADD	clear console:		Clear the console
-#_ADD 
+
-#_ADD	#window:
+	#window:
 	new window:		创建一个额外窗口用来编辑同一套牌
 	cards tab:		编辑套牌中的卡牌
 	set info tab:		编辑套牌信息，例如创建者，其他
@@ -222,13 +215,12 @@ help:
 #_ADD	random pack tab:	Try how the set works out in practice by generating random booster packs.
 #_ADD	console tab:		Shows error messages and allows executing script commands.
 	
-#_DEL	help:		
+	#help:
-#_ADD	#help:
 	index:			
 	website:			
 	about:				
 	
-#_ADD	# New Set Window
+	# New Set Window
 #_ADD	search game list control: Filter the game list. Use - to exclude games. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
 #_ADD	search stylesheet list control: Filter the stylesheet list. Use - to exclude styles. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
 #_ADD 
@@ -236,7 +228,7 @@ help:
 #_ADD	collapse notes:		Hide the card notes box
 #_ADD	expand notes:		Show the card notes box
 #_ADD	search cards control:	Filter the card list. Use - to exclude cards. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
-#_ADD	# Keywords panel
+	# Keywords panel
 #_ADD	search keywords control: Filter the keyword list. Use - to exclude keywords. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
 	# Random pack panel
 #_ADD	random seed:		Different packs will be generated each time.
@@ -249,8 +241,7 @@ help:
 	app language:
 		注意: 你必须重新启动MSE才能使语言修改生效
 	zoom export:
-		（当关闭该项的时候，卡牌会按照以下规则导出：
+		（当关闭该项的时候，卡牌会按照以下规则导出： 不旋转）
-		 100%大小，不旋转）
 	
 	# apprentice export
 	set code:		套牌代码是一个双字节代码，它能被Apprentice识别成一幅套牌
@@ -270,8 +261,7 @@ help:
 	grid:			显示网格线
 	snap:			吸附形状和控制点到网格线
 	
-#_DEL	tool:
+	#tool:
-#_ADD	#tool:
 	select:			选择并移动形状
 	rotate:			旋转并修剪形状
 	points:			编辑形状控制点
@@ -279,8 +269,7 @@ help:
 	symmetry:		给系列符号添加对称效果
 	paint:			用笔刷在图形上绘制
 	
-#_DEL	select editor:
+	#select editor:
-#_ADD	#select editor:
 	merge:			把这个图形融合到下面
 	subtract:		把这个图形从下面剪掉，仅保留不在这个图形，但是在下面图形的区域
 	intersect:		把这个图形和下面相交，仅保留图像共有区域
@@ -367,12 +356,12 @@ tool:
 	
 	line segment:		直线
 	curve segment:		曲线
-	free point:		自由
+	free point:			自由
 	smooth point:		平滑
 	symmetric point:	对称
 	
 #_ADD	clear console:		Clear Console
-#_ADD	
+	
 ############################################################## Toolbar help text
 tooltip:
 	cards tab:		卡牌编辑	
@@ -381,7 +370,7 @@ tooltip:
 	keywords tab:		关键词
 	stats tab:		统计结果
 #_ADD	random pack tab:	Random packs
-#_ADD	console tab:		
+	console tab:		
 	
 	new set:		新建套牌
 	open set:		打开套牌
@@ -403,6 +392,7 @@ tooltip:
 	
 	bold:			粗体
 	italic:			斜体
+#_ADD	underline:          Underline
 	symbols:		系列符号
 	reminder text:		提示文本
 	
@@ -412,12 +402,6 @@ tooltip:
 	scatter:		散点图
 	scatter pie:		散饼图
 	
-#_DEL	cards tab:		卡牌	
-#_DEL	set info tab:		套牌信息
-#_DEL	style tab:		样式
-#_DEL	keywords tab:		关键词
-#_DEL	stats tab:		统计	
-#_DEL	
 	# symbol editor
 	store symbol:		将系列符号保存到套牌
 	
@@ -455,7 +439,7 @@ tooltip:
 	symmetric point:	点对称效果
 
 #_ADD	clear console:		Clear Console
-#_ADD 
+
 ############################################################## Labels in the GUI
 label:
 	# Cards tab
@@ -478,9 +462,6 @@ label:
 	styling options:	样式选项
 	
 	# Random pack panel
-#_DEL	
-#_DEL	# Open dialogs
-#_DEL	all files		全部文件
 #_ADD	pack selection:		Pack selection
 #_ADD	pack totals:		Totals
 #_ADD	pack name:			Pack name
@@ -516,7 +497,7 @@ label:
 	external programs:	外部程序
 	apprentice:		Apprentice:
 	apprentice exe:		可执行Apprentice
-#_ADD	internal scale desc:
+	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
 		Does not retroactively apply to existing images.
@@ -532,13 +513,11 @@ label:
 	columns:		栏目：
 	
 	# Card select / images export
-#_DEL	select cards print:	选择需要打印的卡牌
+	select cards:			导出卡牌
-#_ADD	select cards:			Cards to export
 #_ADD	selected card count:	%s cards will be exported.
 	filename format:	格式: 
 	filename conflicts:	处理重复文件名:
 	export filenames:	文件名
-#_DEL	cards to export:	导出卡牌
 	filename is ignored: 	（忽略文件名）
 	
 	# apprentice export
@@ -552,15 +531,14 @@ label:
 	# Image slicer
 	original:		原始:
 	result:			结果:
-#_ADD	original with dimensions: Original (%s x %s):
+	original with dimensions: 原始 (%s x %s):
-#_ADD	result with dimensions:	Result (%s x %s):
+	result with dimensions:	结果 (%s x %s):
 	size:			大小
 #_ADD	original size:			&Original Size
 #_ADD	size to fit:			Size to &Fit
 #_ADD	force to fit:			F&orce to Fit
 #_ADD	custom size:			&Custom Size
 	selection:		选取
-#_DEL	zoom:			缩放
 #_ADD	selection left:			&Left
 #_ADD	selection top:			&Top
 #_ADD	selection width:		&Width
@@ -569,12 +547,11 @@ label:
 #_ADD	selection center vertically:	Center Vertically
 #_ADD	selection center horizontally:	Center Horizontally
 #_ADD	selection center both:			Center Both
-#_ADD	#zoom:				Zoom
 #_ADD	fix aspect ratio:		Fix aspect ratio (width/height)
-#_ADD	zoom amount:			Zoom
+	zoom amount:			缩放
-#_ADD	zoom amount x:			Zoom &X
+	zoom amount x:			缩放 &X
-#_ADD	zoom amount y:			Zoom &Y
+	zoom amount y:			缩放 &Y
-#_ADD	zoom %:					%
+	zoom %:					%
 	filter:			过滤
 #_ADD	sharpen filter:			&Sharpen filter
 	
@@ -589,7 +566,7 @@ label:
 	package name:		文件包
 	package status:		状态
 	package action:		动作
-	
+
 	package conflicts:	矛盾修改
 	package modified:	本地修改
 	package updates:	可用升级
@@ -604,8 +581,8 @@ label:
 #_ADD	installable version:	Latest version:
 #_ADD	installer size:			Size:
 #_ADD	installer status:		Status:
-#_ADD	no version:				-
+	no version:				-
-#_ADD 
+
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
 	# Editor
@@ -627,10 +604,9 @@ button:
 #_ADD	add custom pack:	Add &Custom Pack...
 	
 	# Console panel
-		
 #_ADD	evaluate:			&Evaluate
 #_ADD	clear:				&Clear
-#_ADD	
+
 	# Welcome
 	new set:		新建套牌
 	open set:		打开套牌
@@ -694,11 +670,11 @@ button:
 	
 ############################################################## Titles in the GUI
 title:
-	magic set editor:	Magic Set Editor 由 slimeking 漢化制作
+	magic set editor:	Magic Set Editor
-	%s - magic set editor:	%s - Magic Set Editor 由 slimeking 漢化制作
+	%s - magic set editor:	%s - Magic Set Editor
 	untitled:		无标题
-	about:			关于 Magic Set Editor 由slimeking漢化制作
+	about:			关于 Magic Set Editor
-	symbol editor:		系列符号编辑器 由slimeking漢化制作
+	symbol editor:		系列符号编辑器
 	# dialogs
 	new set:		新建套牌
 	open set:		打开套牌
@@ -724,7 +700,7 @@ title:
 #_ADD	select cards print:	Select the cards you want to print
 	# slice
 	slice image:		图片切片
-#_ADD	# pack
+	# pack
 #_ADD	custom pack:		Custom Pack Type
 	# print
 	print preview:		打印预览
@@ -732,7 +708,7 @@ title:
 	export images:		导出为图像
 	export cancelled:	导出取消
 	export html:		导出为HTML
-	save html:		保存为HTML
+	save html:			保存为HTML
 	# auto replace
 	auto replaces:		自动替换
 	
@@ -857,13 +833,11 @@ error:
 	# Stats panel
 	dimension not found:		没有统计数据 '%s'
 	
+	# Random packs
+	pack type duplicate name:
 		There is already a pack type named '%s'.
 		Please choose a different name.
-#_ADD	# Random packs
+	
-#_ADD	pack type duplicate name:
-		There is already a pack type named '%s'.
-		Please choose a different name.
-#_ADD	
 	# Package update window
 #	checking updates:		检查更新
 	can't download installer:

data/ch-t.mse-locale/locale

@@ -1,4 +1,4 @@
-#_DEL mse version: 2.0.0
+#_DEL #_DEL mse version: 2.0.0
 #_ADD mse version: 2.0.2
 installer group: translations/chinese/traditional
 full name: 繁體中文 (Traditional Chinese)
@@ -69,6 +69,7 @@ menu:
 	format:			字體格式
 	bold:			粗體	Ctrl+B
 	italic:			斜體	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:		符號	Ctrl+M
 	reminder text:		提示文本	Ctrl+R
 	insert symbol:		插入符號
@@ -195,6 +196,7 @@ help:
 #_ADD	#format:
 	bold:			將所選文字設為粗體
 	italic:			將所選文字設為斜體
+#_ADD	underline:          Makes the selected text underlined
 	symbols:		將所選文字改成符號
 	reminder text:		對選擇的關鍵詞顯示提示文本
 #_ADD	# spelling
@@ -403,6 +405,7 @@ tooltip:
 	
 	bold:			粗體
 	italic:			斜體
+#_ADD	underline:          Underline
 	symbols:		系列符號
 	reminder text:		提示文本
 	
@@ -516,6 +519,9 @@ label:
 	external programs:	外部程序
 	apprentice:		Apprentice:
 	apprentice exe:		可執行Apprentice
+		Scale to internally store card images at.
+		Changing this may impact how Sharpening looks.
+		Does not retroactively apply to existing images.
 #_ADD	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
@@ -858,6 +864,8 @@ error:
 	
 		There is already a pack type named '%s'.
 		Please choose a different name.
+		There is already a pack type named '%s'.
+		Please choose a different name.
 #_ADD	# Random packs
 #_ADD	pack type duplicate name:
 		There is already a pack type named '%s'.

data/da.mse-locale/locale

@@ -1,4 +1,4 @@
-#_DEL #_DEL mse version: 2.0.0
+#_DEL #_DEL #_DEL mse version: 2.0.0
 #_ADD mse version: 2.0.2
 installer group: translations/dansk
 full name: Dansk
@@ -70,6 +70,7 @@ menu:
 	format:			F&ormater
 	bold:				&Fed	Ctrl+B
 	italic:				&Kursiv	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:			&Symboler	Ctrl+M
 	reminder text:		&Nøgleordspåmindelser	Ctrl+R
 	insert symbol:		I&ndsæt Symbol
@@ -196,6 +197,7 @@ help:
 #_ADD	#format:
 	bold:				Gør den valgte tekst fed
 	italic:				Gør den valgte tekst kursiv
+#_ADD	underline:          Makes the selected text underlined
 	symbols:			Teksten er som Magic-symboler
 	reminder text:		Viser huskeregler i teksten
 	# spelling
@@ -407,6 +409,7 @@ tooltip:
 	
 	bold:				Fed
 	italic:				Kursiv
+#_ADD	underline:          Underline
 	symbols:			Symboler
 	reminder text:		Huskeregler
 	
@@ -523,6 +526,9 @@ label:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
 		Does not retroactively apply to existing images.
+		Scale to internally store card images at.
+		Changing this may impact how Sharpening looks.
+		Does not retroactively apply to existing images.
 #_ADD	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.

data/de.mse-locale/locale

@@ -1,4 +1,4 @@
-#_DEL #_DEL mse version: 2.0.0
+#_DEL #_DEL #_DEL mse version: 2.0.0
 #_ADD mse version: 2.0.2
 installer group: translations/deutsch
 full name: Deutsch
@@ -69,6 +69,7 @@ menu:
 	format:			F&ormat
 	bold:				&Fett	Ctrl+B
 	italic:				&Kursiv	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:			&Symbole	Ctrl+M
 	reminder text:		&Reminder Text	Ctrl+R
 	insert symbol:		Sy&mbol einfügen
@@ -195,6 +196,7 @@ help:
 #_ADD	#format:
 	bold:				Formatiert den Text Fett
 	italic:				Formatiert den Text Kursiv
+#_ADD	underline:          Makes the selected text underlined
 	symbols:			Formatiert den Text als Symbol
 	reminder text:		Zeige den Reminder-Text für die gewählte Fähigkeit an
 #_ADD	# spelling
@@ -403,6 +405,7 @@ tooltip:
 	
 	bold:				Fett
 	italic:				Krusiv
+#_ADD	underline:          Underline
 	symbols:			Symbole
 	reminder text:		Text merken
 	
@@ -519,6 +522,9 @@ label:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
 		Does not retroactively apply to existing images.
+		Scale to internally store card images at.
+		Changing this may impact how Sharpening looks.
+		Does not retroactively apply to existing images.
 #_ADD	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
@@ -862,6 +868,8 @@ error:
 		Please choose a different name.
 		There is already a pack type named '%s'.
 		Please choose a different name.
+		There is already a pack type named '%s'.
+		Please choose a different name.
 #_ADD	# Random packs
 #_ADD	pack type duplicate name:
 		There is already a pack type named '%s'.

data/es.mse-locale/locale

@@ -1,4 +1,4 @@
-#_DEL #_DEL mse version: 2.0.0
+#_DEL #_DEL #_DEL mse version: 2.0.0
 #_ADD mse version: 2.0.2
 installer group: translations/español
 full name: Español
@@ -69,6 +69,7 @@ menu:
 	format:			F&ormato
 	bold:				&Negrita	Ctrl+B
 	italic:				&Cursiva	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:			&Símbolos	Ctrl+M
 	reminder text:		&Texto recordatorio	Ctrl+R
 	insert symbol:		I&nsertar símbolo
@@ -195,6 +196,7 @@ help:
 #_ADD	#format:
 	bold:				Pone el texto seleccionado en negrita
 	italic:				Pone el texto seleccionado en cursiva
+#_ADD	underline:          Makes the selected text underlined
 	symbols:			Dibuja el texto seleccionado con símbolos
 	reminder text:		Muestra el texto recordatorio de la palabra clave seleccionada
 	# spelling
@@ -403,6 +405,7 @@ tooltip:
 	
 	bold:				Negrita
 	italic:				Cursiva
+#_ADD	underline:          Underline
 	symbols:			Símbolos
 	reminder text:		Texto recordatorio
 	
@@ -519,6 +522,9 @@ label:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
 		Does not retroactively apply to existing images.
+		Scale to internally store card images at.
+		Changing this may impact how Sharpening looks.
+		Does not retroactively apply to existing images.
 #_ADD	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.

data/fr.mse-locale/locale

@@ -1,4 +1,4 @@
-#_DEL #_DEL mse version: 2.0.0
+#_DEL #_DEL #_DEL mse version: 2.0.0
 #_ADD mse version: 2.0.2
 installer group: translations/français
 full name: Français
@@ -69,6 +69,7 @@ menu:
 	format:			F&ormat
 	bold:				&Gras	Ctrl+B
 	italic:				&Italique	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:			&Symboles	Ctrl+M
 	reminder text:		&Texte de rappel	Ctrl+R
 	insert symbol:		I&nserer Symbole
@@ -195,6 +196,7 @@ help:
 #_ADD	#format:
 	bold:				Mettre le texte sélectionné en gras
 	italic:				Mettre le texte sélectionné en italique
+#_ADD	underline:          Makes the selected text underlined
 	symbols:			Mettre le texte selectionné en symboles
 	reminder text:		Afficher le texte de rappel pour le Mot-clé sélectionné
 	# spelling
@@ -403,6 +405,7 @@ tooltip:
 	
 	bold:				Gras
 	italic:				Italique
+#_ADD	underline:          Underline
 	symbols:			Symboles
 	reminder text:		Texte de rappel
 	
@@ -519,6 +522,9 @@ label:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
 		Does not retroactively apply to existing images.
+		Scale to internally store card images at.
+		Changing this may impact how Sharpening looks.
+		Does not retroactively apply to existing images.
 #_ADD	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
@@ -865,6 +871,8 @@ error:
 #_DEL	# Package update window
 		There is already a pack type named '%s'.
 		Please choose a different name.
+		There is already a pack type named '%s'.
+		Please choose a different name.
 #_ADD	pack type duplicate name:
 		There is already a pack type named '%s'.
 		Please choose a different name.
@@ -874,8 +882,8 @@ error:
 		Rien n'a été installé.
 #_DEL	
 #_DEL	downloading updates:				Téléchargement de mise à jour(%d de %d)
-	installing updates:					Mise à jour packages (%d de %d)
+#_DEL	installing updates:					Mise à jour packages (%d de %d)
-	
+#_DEL	
 	remove packages:
 		Cela va supprimer %s packages, voulez-vous continuer?
 	remove packages modified:
@@ -905,9 +913,9 @@ type:
 	
 	# Object types
 	package:		package
-#_ADD	date:			date
 	locale:			traduction
 	game:			jeu
+#_ADD	date:			date
 	set:			set
 	stylesheet:		stylesheet
 	export template:exporte modèle
@@ -923,9 +931,9 @@ type:
 	# Symbol editor shapes
 	shape:			forme
 	shapes:			formes
-#_ADD	pack:			pack type
 	circle:			cercle
 	ellipse:		ellipse
+#_ADD	pack:			pack type
 	square:			carré
 	rectangle:		rectangle
 	triangle:		triangle

data/it.mse-locale/locale

@@ -1,4 +1,4 @@
-#_DEL #_DEL mse version: 2.0.0
+#_DEL #_DEL #_DEL mse version: 2.0.0
 #_ADD mse version: 2.0.2
 installer group: translations/italiano
 full name: Italiano
@@ -69,6 +69,7 @@ menu:
 	format:			F&ormato
 	bold:				&Grassetto	Ctrl+B
 	italic:				&Corsivo	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:			&Simboli	Ctrl+M
 	reminder text:		&Promemoria	Ctrl+R
 	insert symbol:		I&nserisci Simbolo
@@ -195,6 +196,7 @@ help:
 #_ADD	#format:
 	bold:				Applica il grassetto al testo selezionato
 	italic:				Applica il corsivo al testo selezionato
+#_ADD	underline:          Makes the selected text underlined
 	symbols:			Trasforma il testo selezionato in simboli
 	reminder text:		Mostra promemoria per la parola-chiave selezionata
 	# spelling
@@ -402,6 +404,7 @@ tooltip:
 	
 	bold:				Grassetto
 	italic:				Corsivo
+#_ADD	underline:          Underline
 	symbols:			Simboli
 	reminder text:			Promemoria
 	
@@ -518,6 +521,9 @@ label:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
 		Does not retroactively apply to existing images.
+		Scale to internally store card images at.
+		Changing this may impact how Sharpening looks.
+		Does not retroactively apply to existing images.
 #_ADD	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.

data/jp.mse-locale/locale

@@ -1,5 +1,4 @@
-#_DEL #_DEL mse version: 2.0.0
+mse version: 2.0.2
-#_ADD mse version: 2.0.2
 installer group: translations/japanese
 full name: 日本語 (Japanese)
 version: 2013-08-13
@@ -30,14 +29,14 @@ menu:
 	undo:				&元に戻す%s	Ctrl+Z
 	redo:				&やり直し%s	Ctrl+Y
 	cut:				切り取り	Ctrl+X
-#_ADD	cut card:		Cu&t	Ctrl+X
+	cut card:			切り取り	Ctrl+X
-#_ADD	cut keyword:	Cu&t	Ctrl+X
+	cut keyword:		切り取り	Ctrl+X
 	copy:				&コピー	Ctrl+C
-#_ADD	copy card:			&Copy	Ctrl+C
+	copy card:			&コピー	Ctrl+C
-#_ADD	copy keyword:		&Copy	Ctrl+C
+	copy keyword:		&コピー	Ctrl+C
 	paste:				&貼り付け	Ctrl+V
-#_ADD	paste card:		&Paste	Ctrl+V
+	paste card:			&貼り付け	Ctrl+V
-#_ADD	paste keyword:	&Paste	Ctrl+V
+	paste keyword:		&貼り付け	Ctrl+V
 #_ADD	select all:				Select &All	Ctrl+A
 	find:				&検索	Ctrl+F
 	find next:			次を検索	F3
@@ -69,10 +68,11 @@ menu:
 	format:			&書式
 	bold:				&太字	Ctrl+B
 	italic:				&斜体	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:			&記号	Ctrl+M
 	reminder text:		&注釈文	Ctrl+R
 	insert symbol:		記号の挿入
-#_ADD	# spelling
+	# spelling
 #_ADD	no spelling suggestions:	(no suggestions)
 
 	graph:			&グラフ
@@ -84,15 +84,14 @@ menu:
 	
 #_ADD	console:			Console
 #_ADD	clear console:		&Clear Console	Ctrl+L
-#_ADD 
+ 
 	window:			&ウィンドウ
 	new window:			&新しいウィンドウ
-	cards tab:			&カード	F5
+	cards tab:			&カード	Alt+1
-#_DEL	set info tab:		&セットの情報	F6
+	style tab:			スタイル	Alt+2
-	style tab:			スタイル	F7
+	set info tab:		&セットの情報	Alt+3
-#_ADD	set info tab:		&Set Information	Alt+3
+	keywords tab:		&キーワード		Alt+4
-	keywords tab:		&キーワード		F8
+	stats tab:			統計	Alt+5
-	stats tab:			統計	F9
 #_ADD	random pack tab:	&Random Packs	Alt+6
 #_ADD	console tab:		&Console	Alt+7
 	
@@ -126,8 +125,7 @@ menu:
 help:
 	welcome:			Magic Set Editor 2 へようこそ
 	
-#_DEL	file:
+	#file:
-#_ADD	#file:
 	new set:			新しいセットを作成します。
 	open set:			既存のセットを開きます。
 	last opened set:	直前に '%s' を開く。 
@@ -147,8 +145,7 @@ help:
 #_ADD	show profiler:		Show the profiler window, with timings of (script) functions. Used for optimization.
 	exit:				Magic Set Editorを終了します。
 	
-#_DEL	edit:
+	#edit:
-#_ADD	#edit:
 	undo:				直前に行った操作を元に戻します。
 	redo:				直前に行った操作をやり直します。
 	cut:				選択したテキストをクリップボードに移動します。
@@ -167,8 +164,7 @@ help:
 	auto replace:		どのテキストが自動的に置き換えられるべきですか？
 	preferences:		Magic Set Editorの設定を変更します。
 	
-#_DEL	cards:
+	#cards:
-#_ADD	#cards:
 	previous card:		リストの前のカードを選択します。
 	next card:			リストの次のカードを選択します。
 #_ADD	search cards:		Filter the card list using search terms
@@ -183,36 +179,33 @@ help:
 	rotate 180:				カードを180°回転させて表示します。
 	card list columns:	表示させる列の設定を行います。
 	
-#_DEL	keywords:
+	#keywords:
-#_ADD	#keywords:
 	previous keyword:	リストの前のキーワード能力を選択します。
 	next keyword:		リストの次のキーワード能力を選択します。
 #_ADD	search keywords:		Filter the keyword list using search terms
 	add keyword:		新しいキーワード能力を現在のセットに加えます。
 	remove keyword:		現在のセットから選ばれたキーワード能力を削除します。
 	
-#_DEL	format:
+	#format:
-#_ADD	#format:
 	bold:				選択したテキストを太字(ボールド体)にします。
 	italic:				選択したテキストを斜体(イタリック体)にします。
+#_ADD	underline:          Makes the selected text underlined
 	symbols:			選択したテキストをマナ・シンボルなどのシンボルにします。
 	reminder text:		選ばれたキーワード能力のための注釈文を表示させます。
-#_ADD	# spelling
+	# spelling
 #_ADD	no spelling suggestions:	There are no suggestions for correcting this error
 
-#_DEL	graph:
+	#graph:
-#_ADD	#graph:
 	pie:				を円グラフ、スライスのサイズのカードの数を示します
 	bar:				バーグラフは、バーの高さをカードの数を示します
 	stack:					バーグラフを積み重ねバー
 	scatter:			散布図は、カードの大きさの数を示します
 	scatter pie:		各アイテムを散布図では、小さなパイグラフ
 	
-#_DEL	window:
+	#console:
-#_ADD	#console:
 #_ADD	clear console:		Clear the console
-#_ADD 
+ 
-#_ADD	#window:
+	#window:
 	new window:			同じセットを編集するために、もう一つのウィンドウを表示します。
 	cards tab:			現在のセットのカードを編集します。
 	set info tab:		現在のセットについての情報を表示します。
@@ -222,21 +215,20 @@ help:
 #_ADD	random pack tab:	Try how the set works out in practice by generating random booster packs.
 #_ADD	console tab:		Shows error messages and allows executing script commands.
 	
-#_DEL	help:
+	#help:
-#_ADD	#help:
 	index:				
 	website:			
 	about:				
 	
-#_ADD	# New Set Window
+	# New Set Window
 #_ADD	search game list control: Filter the game list. Use - to exclude games. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
 #_ADD	search stylesheet list control: Filter the stylesheet list. Use - to exclude styles. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
-#_ADD 
+ 
 	# Cards panel
 #_ADD	collapse notes:		Hide the card notes box
 #_ADD	expand notes:		Show the card notes box
 #_ADD	search cards control:	Filter the card list. Use - to exclude cards. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
-#_ADD	# Keywords panel
+	# Keywords panel
 #_ADD	search keywords control: Filter the keyword list. Use - to exclude keywords. Use field: to search in a specific field. Use quotes for literal search. Separate multiple queries with a space.
 	# Random pack panel
 #_ADD	random seed:		Different packs will be generated each time.
@@ -249,8 +241,7 @@ help:
 	app language:
 		注： 変更を適用するためにはMagic Set Editorを再起動する必要があります。
 	zoom export:
-		(このチェック・ボックスがオフの場合、
+		(このチェック・ボックスがオフの場合、エクスポートされる画像に回転ームは適用されません)
-		エクスポートされる画像に回転やズームは適用されません)
 	
 	# apprentice export
 	set code:			セットされたコードは、Apprenticeによってセットを参照することに使われる2キャラクターのコードです。
@@ -270,8 +261,7 @@ help:
 	grid:				グリッドの表示/非表示を変更します。
 	snap:				図形とポイントをグリッドに合わせるかどうか選択します。
 	
-#_DEL	tool:
+	#tool:
-#_ADD	#tool:
 	select:				図形を選択します。
 	rotate:				図形を回転させます。
 	points:				図形を編集するためのポイントを設置します。
@@ -279,8 +269,7 @@ help:
 	symmetry:			対象線を加えます。
 	paint:				ペイントブラシツールを使って図形をペイントします。
 	
-#_DEL	select editor:
+	#select editor:
-#_ADD	#select editor:
 	merge:				それの下でこの形をそれらと合併させます
 	subtract:			それの下の形からこの形を引いて、すなわちこの形でエリアだけをその形に残します
 	intersect:			それ、両方のエリアだけが形成する葉の下の形でのこの形を横切ります
@@ -372,7 +361,7 @@ tool:
 	symmetric point:	対称的です
 	
 #_ADD	clear console:		Clear Console
-#_ADD	
+	
 ############################################################## Toolbar help text
 tooltip:
 	cards tab:			
@@ -381,7 +370,7 @@ tooltip:
 	keywords tab:		
 	stats tab:			
 #_ADD	random pack tab:	Random packs
-#_ADD	console tab:		
+	console tab:		
 	
 	new set:			新規作成
 	open set:			開く
@@ -403,6 +392,7 @@ tooltip:
 	
 	bold:				太字
 	italic:				斜体
+#_ADD	underline:          Underline
 	symbols:			シンボル
 	reminder text:		注釈文
 
@@ -411,13 +401,7 @@ tooltip:
 	stack:				積み重ね棒グラフ
 	scatter:			散布図
 	scatter pie:		散乱-パイプロット
-	
+
-#_DEL	cards tab:			
-#_DEL	set info tab:		セットの情報
-#_DEL	style tab:			スタイル
-#_DEL	keywords tab:		
-#_DEL	stats tab:			
-#_DEL	
 	# symbol editor
 	store symbol:		使用セットの記号
 	
@@ -455,7 +439,7 @@ tooltip:
 	symmetric point:	ポイントを対称的にしてください
 
 #_ADD	clear console:		Clear Console
-#_ADD 
+ 
 ############################################################## Labels in the GUI
 label:
 	# Cards tab
@@ -478,9 +462,6 @@ label:
 	styling options:	スタイル・オプション
 	
 	# Random pack panel
-#_DEL	
-#_DEL	# Open dialogs
-#_DEL	all files			全てのファイル
 #_ADD	pack selection:		Pack selection
 #_ADD	pack totals:		Totals
 #_ADD	pack name:			Pack name
@@ -516,10 +497,7 @@ label:
 	external programs:	外部のプログラム
 	apprentice:			&Apprentice：
 	apprentice exe:		Apprenticeを起動できます
-		Scale to internally store card images at.
+	internal scale desc:
-		Changing this may impact how Sharpening looks.
-		Does not retroactively apply to existing images.
-#_ADD	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
 		Does not retroactively apply to existing images.
@@ -535,7 +513,6 @@ label:
 	columns:			列：
 	
 	# Card select / images export
-#_DEL	select cards print:	あなたが印刷したいカードを選んでください
 #_ADD	select cards:			Cards to export
 #_ADD	selected card count:	%s cards will be exported.
 	filename format:	&フォーマット： 
@@ -554,15 +531,14 @@ label:
 	# Image slicer
 	original:			オリジナル：
 	result:				結果：
-#_ADD	original with dimensions: Original (%s x %s):
+	original with dimensions: オリジナル (%s x %s)：
-#_ADD	result with dimensions:	Result (%s x %s):
+	result with dimensions:	結果 (%s x %s)：
 	size:				サイズ
 #_ADD	original size:			&Original Size
 #_ADD	size to fit:			Size to &Fit
 #_ADD	force to fit:			F&orce to Fit
 #_ADD	custom size:			&Custom Size
 	selection:			選択
-#_DEL	zoom:				ズーム
 #_ADD	selection left:			&Left
 #_ADD	selection top:			&Top
 #_ADD	selection width:		&Width
@@ -571,12 +547,11 @@ label:
 #_ADD	selection center vertically:	Center Vertically
 #_ADD	selection center horizontally:	Center Horizontally
 #_ADD	selection center both:			Center Both
-#_ADD	#zoom:				Zoom
 #_ADD	fix aspect ratio:		Fix aspect ratio (width/height)
-#_ADD	zoom amount:			Zoom
+	zoom amount:			ズーム
-#_ADD	zoom amount x:			Zoom &X
+	zoom amount x:			ズーム &X
-#_ADD	zoom amount y:			Zoom &Y
+	zoom amount y:			ズーム &Y
-#_ADD	zoom %:					%
+	zoom %:					%
 	filter:				フィルター
 #_ADD	sharpen filter:			&Sharpen filter
 	
@@ -606,8 +581,8 @@ label:
 #_ADD	installable version:	Latest version:
 #_ADD	installer size:			Size:
 #_ADD	installer status:		Status:
-#_ADD	no version:				-
+	no version:				-
-#_ADD 
+
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
 	# Editor
@@ -725,7 +700,7 @@ title:
 #_ADD	select cards print:	Select the cards you want to print
 	# slice
 	slice image:		画像編集
-#_ADD	# pack
+	# pack
 #_ADD	custom pack:		Custom Pack Type
 	# print
 	print preview:		印刷プレビュー
@@ -847,9 +822,10 @@ error:
 		このファイルがMagic Set Editorのより新しいバージョンで作られる　(%s)　あなたがそれを開けて、ファイルのいくつかの局面が紛失しているかもしれない時
 		あなたは最新のバージョンにアップグレードするように勧められます。
 		http::を訪問してください　/　magicseteditor.sourceforge.net　/
+
 	word list type not found:			リストタイプという語　%s　(<word-list>タグから)見つからなかった
 #_ADD	pack type not found:				The pack type "%s" was not found (from a pack type)
-	
+
 	# Update checking
 	checking updates failed:			アップデートが失敗したか調べます。
 	no updates:							利用可能なアップデートはありません。
@@ -857,19 +833,15 @@ error:
 	# Stats panel
 	dimension not found:				ディメンションはありません '%s'
 
+	# Random packs
+	pack type duplicate name:
 		There is already a pack type named '%s'.
 		Please choose a different name.
-		There is already a pack type named '%s'.
+	
-		Please choose a different name.
-#_ADD	# Random packs
-#_ADD	pack type duplicate name:
-		There is already a pack type named '%s'.
-		Please choose a different name.
-#_ADD	
 	# Package update window
 #	checking updates:					アップデートを調べます。
 	can't download installer:
-			インストーラのパッケージをダウンロードできませんでした。 %s 〜から %s.
+		インストーラのパッケージをダウンロードできませんでした。 %s 〜から %s.
 		何もがインストールされています。
 
 	downloading updates:				更新プログラムのダウンロード (%d of %d)

data/pl.mse-locale/locale

@@ -1,4 +1,4 @@
-#_DEL #_DEL mse version: 2.0.0
+#_DEL #_DEL #_DEL mse version: 2.0.0
 #_ADD mse version: 2.0.2
 installer group: translations/polski
 full name: Polski
@@ -70,6 +70,7 @@ menu:
 	format:			&Format
 	bold:				Wy&tłuszczony	Ctrl+B
 	italic:				&Kursywa	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:			&Symbole	Ctrl+M
 	reminder text:		&Tekst przypomnienia	Ctrl+R
 	insert symbol:		&Wstaw symbol
@@ -196,6 +197,7 @@ help:
 #_ADD	#format:
 	bold:				Pogrubia zaznaczony tekst
 	italic:				Pochyla zaznaczony tekst
+#_ADD	underline:          Makes the selected text underlined
 	symbols:			Rysuje zaznaczony tekst z symbolami
 	reminder text:		Pokazuj tekst przypomnienia dla wybranego słowa kluczowego
 #_ADD	# spelling
@@ -404,6 +406,7 @@ tooltip:
 	
 	bold:				Wytłuszczenie
 	italic:				Kursywa
+#_ADD	underline:          Underline
 	symbols:			Symbole
 	reminder text:		Przypomnienie
 	
@@ -520,6 +523,9 @@ label:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.
 		Does not retroactively apply to existing images.
+		Scale to internally store card images at.
+		Changing this may impact how Sharpening looks.
+		Does not retroactively apply to existing images.
 #_ADD	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.

data/pt-br.mse-locale/locale

@@ -1,4 +1,4 @@
-#_DEL mse version: 2.0.0
+#_DEL #_DEL mse version: 2.0.0
 #_ADD mse version: 2.0.2
 installer group: translations/portuguese/brazilian
 full name: Português do Brasil (Brazilian Portuguese)
@@ -70,6 +70,7 @@ menu:
 	format:			F&ormatar
 	bold:				&Negrito	Ctrl+B
 	italic:				&Italico	Ctrl+I
+#_ADD	underline:          &Underline	Ctrl+U
 	symbols:			&Simbolos	Ctrl+M
 	reminder text:			&Texto Explicativo	Ctrl+R
 	insert symbol:			I&nserir Símbolo
@@ -198,6 +199,7 @@ help:
 #_ADD	#format:
 	italic:				Faça o texto selecionado transformar-se em Itálico.
 	symbols:			Transforma uma parte do texto selecionada em simbolos.
+#_ADD	underline:          Makes the selected text underlined
 	reminder text:			Mostra ou oculta o Texto Explicativo de uma Palavra-Chave selecionado.
 	# spelling
 	no spelling suggestions:	Não há sugestões para poder corrigir este erro.
@@ -406,6 +408,7 @@ tooltip:
 	bold:				Negrito
 	italic:				Itálico
 	symbols:			Simbolo
+#_ADD	underline:          Underline
 	reminder text:			Texto Explicativo
 	
 	pie:				Gráfico em Pizza
@@ -519,6 +522,9 @@ label:
 	apprentice:			&Apprentice:
 	apprentice exe:		Executável do Apprentice
 	check at startup:	Proucurar por novo gatilho de inicialização
+		Scale to internally store card images at.
+		Changing this may impact how Sharpening looks.
+		Does not retroactively apply to existing images.
 #_ADD	internal scale desc:
 		Scale to internally store card images at.
 		Changing this may impact how Sharpening looks.