Minor fixes in translations
authorngosang <diegodelasheras@gmail.com>
Wed, 21 Jan 2015 01:50:33 +0000 (02:50 +0100)
committerBlockMen <nmuelll@web.de>
Sat, 14 Feb 2015 12:11:33 +0000 (13:11 +0100)
builtin/mainmenu/tab_mods.lua
builtin/mainmenu/tab_multiplayer.lua
builtin/mainmenu/tab_simple_main.lua
src/game.cpp
src/guiKeyChangeMenu.cpp
src/guiPasswordChange.cpp

index e00f580bb241cb2e89bde26e8e66e3407ce595ec..901f1455306c15523599bdc915a8cdec05dbd15d 100644 (file)
@@ -96,7 +96,7 @@ local function get_formspec(tabview, name, tabdata)
                else
                        --show dependencies
 
-                       retval = retval .. ",Depends:,"
+                       retval = retval .. "," .. fgettext("Depends:") .. ","
 
                        local toadd = modmgr.get_dependencies(selected_mod.path)
 
index c44fd0144c64924799fe658045cf8cee411ec537..734cb5d3efd7cf1046b053adb68b5c130b0a564c 100644 (file)
@@ -59,9 +59,9 @@ local function get_formspec(tabview, name, tabdata)
                        "text,align=right;" ..                -- clients
                        "text,align=center,padding=0.25;" ..  -- "/"
                        "text,align=right,padding=0.25;" ..   -- clients_max
-                       image_column("Creative mode", "creative") .. ",padding=1;" ..
-                       image_column("Damage enabled", "damage") .. ",padding=0.25;" ..
-                       image_column("PvP enabled", "pvp") .. ",padding=0.25;" ..
+                       image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
+                       image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
+                       image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
                        "text,padding=1]"                               -- name
        else
                retval = retval .. "tablecolumns[text]"
index cab1702cf2a8f161292094a054f7ac8ba3856c22..87bd551c05c30fa884ba841a3c690eab355a8d84 100644 (file)
@@ -42,9 +42,9 @@ local function get_formspec(tabview, name, tabdata)
                        "text,align=right;" ..                -- clients
                        "text,align=center,padding=0.25;" ..  -- "/"
                        "text,align=right,padding=0.25;" ..   -- clients_max
-                       image_column("Creative mode", "creative") .. ",padding=1;" ..
-                       image_column("Damage enabled", "damage") .. ",padding=0.25;" ..
-                       image_column("PvP enabled", "pvp") .. ",padding=0.25;" ..
+                       image_column(fgettext("Creative mode"), "creative") .. ",padding=1;" ..
+                       image_column(fgettext("Damage enabled"), "damage") .. ",padding=0.25;" ..
+                       image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
                        "text,padding=1]"                               -- name
        else
                retval = retval .. "tablecolumns[text]"
index a1e2b807a28ce86aecfa1956d0f727491f7864ee..8969735155a91735c8048df2959ffe53d62b9a47 100644 (file)
@@ -1074,7 +1074,7 @@ static void show_deathscreen(GUIFormSpecMenu **cur_formspec,
                std::string(FORMSPEC_VERSION_STRING) +
                SIZE_TAG
                "bgcolor[#320000b4;true]"
-               "label[4.85,1.35;You died.]"
+               "label[4.85,1.35;" + gettext("You died.") + "]"
                "button_exit[4,3;3,0.5;btn_respawn;" + gettext("Respawn") + "]"
                ;
 
index 9bc8118a103d391d2f24d668e0ef392811b6aa6e..4cd9f36d998ec793c21e0af88a4e5c8629b7d75f 100644 (file)
@@ -156,8 +156,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        }
        
        {
-               s32 option_x = offset.X + 10;
-               s32 option_y = offset.Y;
+               s32 option_x = offset.X;
+               s32 option_y = offset.Y + 5;
                u32 option_w = 180;
                {
                        core::rect<s32> rect(0, 0, option_w, 30);
@@ -171,9 +171,9 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
        }
 
        {
-               s32 option_x = offset.X + 10;
-               s32 option_y = offset.Y;
-               u32 option_w = 220;
+               s32 option_x = offset.X;
+               s32 option_y = offset.Y + 5;
+               u32 option_w = 280;
                {
                        core::rect<s32> rect(0, 0, option_w, 30);
                        rect += topleft + v2s32(option_x, option_y);
index d9a5cc48b9b20ea09f3c88cb07a487919b292080..0e19f571d9881d9dd6e142b765032ec4b564fb57 100644 (file)
@@ -103,8 +103,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        */
        s32 ypos = 50;
        {
-               core::rect<s32> rect(0, 0, 110, 20);
-               rect += topleft_client + v2s32(35, ypos+6);
+               core::rect<s32> rect(0, 0, 150, 20);
+               rect += topleft_client + v2s32(25, ypos+6);
                text = wgettext("Old Password");
                Environment->addStaticText(text, rect, false, true, this, -1);
                delete[] text;
@@ -119,8 +119,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        }
        ypos += 50;
        {
-               core::rect<s32> rect(0, 0, 110, 20);
-               rect += topleft_client + v2s32(35, ypos+6);
+               core::rect<s32> rect(0, 0, 150, 20);
+               rect += topleft_client + v2s32(25, ypos+6);
                text = wgettext("New Password");
                Environment->addStaticText(text, rect, false, true, this, -1);
                delete[] text;
@@ -134,8 +134,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
        }
        ypos += 50;
        {
-               core::rect<s32> rect(0, 0, 110, 20);
-               rect += topleft_client + v2s32(35, ypos+6);
+               core::rect<s32> rect(0, 0, 150, 20);
+               rect += topleft_client + v2s32(25, ypos+6);
                text = wgettext("Confirm Password");
                Environment->addStaticText(text, rect, false, true, this, -1);
                delete[] text;