From c7a78037809a2f9c431441f7ef91f84eb8744fff Mon Sep 17 00:00:00 2001
From: ngosang <diegodelasheras@gmail.com>
Date: Wed, 21 Jan 2015 02:50:33 +0100
Subject: [PATCH] Minor fixes in translations
---
builtin/mainmenu/tab_mods.lua | 2 +-
builtin/mainmenu/tab_multiplayer.lua | 6 +++---
builtin/mainmenu/tab_simple_main.lua | 6 +++---
src/game.cpp | 2 +-
src/guiKeyChangeMenu.cpp | 10 +++++-----
src/guiPasswordChange.cpp | 12 ++++++------
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/builtin/mainmenu/tab_mods.lua b/builtin/mainmenu/tab_mods.lua
index e00f580bb..901f14553 100644
--- a/builtin/mainmenu/tab_mods.lua
+++ b/builtin/mainmenu/tab_mods.lua
@@ -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)
diff --git a/builtin/mainmenu/tab_multiplayer.lua b/builtin/mainmenu/tab_multiplayer.lua
index c44fd0144..734cb5d3e 100644
--- a/builtin/mainmenu/tab_multiplayer.lua
+++ b/builtin/mainmenu/tab_multiplayer.lua
@@ -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]"
diff --git a/builtin/mainmenu/tab_simple_main.lua b/builtin/mainmenu/tab_simple_main.lua
index cab1702cf..87bd551c0 100644
--- a/builtin/mainmenu/tab_simple_main.lua
+++ b/builtin/mainmenu/tab_simple_main.lua
@@ -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]"
diff --git a/src/game.cpp b/src/game.cpp
index 186e283ad..0645a7b80 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -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") + "]"
;
diff --git a/src/guiKeyChangeMenu.cpp b/src/guiKeyChangeMenu.cpp
index 9bc8118a1..4cd9f36d9 100644
--- a/src/guiKeyChangeMenu.cpp
+++ b/src/guiKeyChangeMenu.cpp
@@ -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);
diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index d9a5cc48b..0e19f571d 100644
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -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;
--
GitLab