From: Kahrl Date: Tue, 14 Jul 2015 16:20:50 +0000 (+0200) Subject: Make serialization error message translatable X-Git-Tag: 0.4.13~124 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b30e8d8ec689fbb65b1cee6fb6ff79322b204d0d;p=oweals%2Fminetest.git Make serialization error message translatable Also don't show "probably running a different version" message in simple singleplayer mode --- diff --git a/src/game.cpp b/src/game.cpp index 41bfa5e60..d5819f78a 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -4352,9 +4352,13 @@ void the_game(bool *kill, } } catch (SerializationError &e) { - error_message = std::string("A serialization error occurred:\n") - + e.what() + "\n\nThe server is probably " - " running a different version of " PROJECT_NAME_C "."; + error_message = strgettext("A serialization error occurred:") + + "\n" + e.what(); + if (!simple_singleplayer_mode) { + error_message += "\n\n" + + strgettext("The server is probably running a different version of") + + " " PROJECT_NAME_C "."; + } errorstream << error_message << std::endl; } catch (ServerError &e) { error_message = e.what();