Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/korean.txt
#	src/settings.cpp

src/strings.cpp

@@ -580,7 +580,7 @@ static int DeterminePluralForm(int64 count, int plural_form)
 
 		/* Only one form.
 		 * Used in:
-		 *   Hungarian, Japanese, Korean, Turkish */
+		 *   Hungarian, Japanese, Turkish */
 		case 1:
 			return 0;