Translated using Weblate (Japanese)

[oweals/minetest.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 7223522cc44c61828c025a0b72be2176f7e7bb36..dece274280cd29d8bb46a10a017b374e1d641ad1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,7 +40,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "game.h"
 #include "defaultsettings.h"
 #include "gettext.h"
-#include "profiler.h"
 #include "log.h"
 #include "quicktune.h"
 #include "httpfetch.h"
@@ -154,7 +153,7 @@ int main(int argc, char *argv[])
        log_add_output_maxlev(&main_stderr_log_out, LMT_ACTION);
        log_add_output_all_levs(&main_dstream_no_stderr_log_out);
 
-       log_register_thread("main");
+       log_register_thread("Main");
 
        Settings cmd_args;
        bool cmd_args_ok = get_cmdline_opts(argc, argv, &cmd_args);
@@ -347,7 +346,7 @@ static void print_allowed_options(const OptionList &allowed_options)
 
 static void print_version()
 {
-       dstream << PROJECT_NAME " " << g_version_hash << std::endl;
+       dstream << PROJECT_NAME_C " " << g_version_hash << std::endl;
 #ifndef SERVER
        dstream << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl;
 #endif
@@ -358,7 +357,7 @@ static void list_game_ids()
 {
        std::set<std::string> gameids = getAvailableGameIds();
        for (std::set<std::string>::const_iterator i = gameids.begin();
-                       i != gameids.end(); i++)
+                       i != gameids.end(); ++i)
                dstream << (*i) <<std::endl;
 }
 
@@ -473,10 +472,10 @@ static bool init_common(int *log_level, const Settings &cmd_args, int argc, char
        httpfetch_init(g_settings->getS32("curl_parallel_limit"));
 
 #ifdef _MSC_VER
-       init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),
+       init_gettext(porting::path_locale.c_str(),
                g_settings->get("language"), argc, argv);
 #else
-       init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),
+       init_gettext(porting::path_locale.c_str(),
                g_settings->get("language"));
 #endif