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