Merge branch 'master' into jgrpp

# Conflicts:
#	src/error.h
#	src/error_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/misc_gui.cpp
#	src/newgrf_gui.cpp
#	src/news_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/gamelog_sl.cpp
#	src/script/api/script_text.cpp
#	src/script/script_instance.cpp
#	src/statusbar_gui.cpp
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
#	src/table/settings/gui_settings.ini
#	src/table/settings/linkgraph_settings.ini
#	src/textbuf_gui.h

src/newgrf.cpp

@@ -2646,12 +2646,9 @@ static ChangeInfoResult LoadTranslationTable(uint gvid, int numinfo, ByteReader
  */
 static std::string ReadDWordAsString(ByteReader *reader)
 {
-	char output[5];
-	for (int i = 0; i < 4; i++) output[i] = reader->ReadByte();
-	output[4] = '\0';
-	StrMakeValidInPlace(output, lastof(output));
-
-	return std::string(output);
+	std::string output;
+	for (int i = 0; i < 4; i++) output.push_back(reader->ReadByte());
+	return StrMakeValid(output);
 }
 
 /**