Minor fixes in translations

ngosang · nerzhul · commit c7a78037809a · 2015-02-12T16:41:40.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -1074,7 +1074,7 @@ static void show_deathscreen(GUIFormSpecMenu **cur_formspec,`
`1074`	`1074`	`std::string(FORMSPEC_VERSION_STRING) +`
`1075`	`1075`	`SIZE_TAG`
`1076`	`1076`	`"bgcolor[#320000b4;true]"`
`1077`		`- "label[4.85,1.35;You died.]"`
	`1077`	`+ "label[4.85,1.35;" + gettext("You died.") + "]"`
`1078`	`1078`	`"button_exit[4,3;3,0.5;btn_respawn;" + gettext("Respawn") + "]"`
`1079`	`1079`	`;`
`1080`	`1080`
Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,8 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`{`
`159`		`- s32 option_x = offset.X + 10;`
`160`		`- s32 option_y = offset.Y;`
	`159`	`+ s32 option_x = offset.X;`
	`160`	`+ s32 option_y = offset.Y + 5;`
`161`	`161`	`u32 option_w = 180;`
`162`	`162`	`{`
`163`	`163`	`core::rect<s32> rect(0, 0, option_w, 30);`
`@@ -171,9 +171,9 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`{`
`174`		`- s32 option_x = offset.X + 10;`
`175`		`- s32 option_y = offset.Y;`
`176`		`- u32 option_w = 220;`
	`174`	`+ s32 option_x = offset.X;`
	`175`	`+ s32 option_y = offset.Y + 5;`
	`176`	`+ u32 option_w = 280;`
`177`	`177`	`{`
`178`	`178`	`core::rect<s32> rect(0, 0, option_w, 30);`
`179`	`179`	`rect += topleft + v2s32(option_x, option_y);`