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/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'.