widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #07639
[Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands.
Commit message:
Small fixes for various string issues reported on Transifex.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/emp01.wmf/scripting/texts.lua'
--- data/campaigns/emp01.wmf/scripting/texts.lua 2016-02-12 09:15:09 +0000
+++ data/campaigns/emp01.wmf/scripting/texts.lua 2016-05-17 17:19:42 +0000
@@ -183,7 +183,7 @@
_([[I’ve got two important things to talk about… First the good news:]])
.. paragraphdivider() ..
-- TRANSLATORS: Amalea
- _([[I noticed that the construction of the sawmill is complete, so we can begin to refine the logs that the lumberjacks are harvesting into lumber.]])
+ _([[I noticed that the construction of the sawmill is complete, so we can begin to refine the logs that the lumberjacks are harvesting into planks.]])
.. paragraphdivider() ..
-- TRANSLATORS: Amalea
_([[But the bad news is that our lumberjacks harvest at an incredible speed. There are almost no trees left on this island.]])
=== modified file 'data/scripting/win_conditions/territorial_time.lua'
--- data/scripting/win_conditions/territorial_time.lua 2016-05-08 20:51:42 +0000
+++ data/scripting/win_conditions/territorial_time.lua 2016-05-17 17:19:42 +0000
@@ -226,6 +226,7 @@
else
msg = msg .. msg1 .. "\n\n"
end
+ -- TRANSLATORS: Refers to "You own more than half of the map’s area. Keep it for x more minute(s) to win the game."
msg = msg .. p((ngettext("Otherwise the game will end in %i minute.",
"Otherwise the game will end in %i minutes.",
remaining_max_time // 60))
=== modified file 'data/scripting/win_conditions/wood_gnome.lua'
--- data/scripting/win_conditions/wood_gnome.lua 2016-03-15 08:42:41 +0000
+++ data/scripting/win_conditions/wood_gnome.lua 2016-05-17 17:19:42 +0000
@@ -91,6 +91,7 @@
msg = msg .. "\n"
local trees = (ngettext ("%i tree", "%i trees", playerpoints[plr.number]))
:format(playerpoints[plr.number])
+ -- TRANSLATORS: %1$s = player name, %2$s = x tree(s)
msg = msg .. (_"%1$s has %2$s at the moment."):bformat(plr.name,trees)
end
@@ -141,11 +142,13 @@
for idx,plr in ipairs(plrs) do
msg = msg .. "\n"
local trees = (ngettext ("%i tree", "%i trees", playerpoints[plr.number])):format(playerpoints[plr.number])
+ -- TRANSLATORS: %1$s = player name, %2$s = x tree(s)
msg = msg .. (_"%1$s had %2$s."):bformat(plr.name,trees)
end
msg = msg .. "\n\n"
local trees = (ngettext ("%i tree", "%i trees", playerpoints[points[#points][1].number]))
:format(playerpoints[points[#points][1].number])
+ -- TRANSLATORS: %1$s = player name, %2$s = x tree(s)
msg = msg .. (_"The winner is %1$s with %2$s."):bformat(points[#points][1].name, trees)
local privmsg = ""
=== modified file 'data/tribes/scripting/help/controls.lua'
--- data/tribes/scripting/help/controls.lua 2016-05-01 09:57:58 +0000
+++ data/tribes/scripting/help/controls.lua 2016-05-17 17:19:42 +0000
@@ -72,19 +72,19 @@
h3(_"In the message window, the following additional shortcuts are available:") ..
p(
- -- TRANSLATORS: This is an access key combination.
+ -- TRANSLATORS: This is the helptext for an access key combination.
dl(help_format_hotkey("0"), _"Show all messages") ..
- -- TRANSLATORS: This is an access key combination.
+ -- TRANSLATORS: This is the helptext for an access key combination.
dl(help_format_hotkey("1"), _"Show geologists’ messages only") ..
- -- TRANSLATORS: This is an access key combination.
+ -- TRANSLATORS: This is the helptext for an access key combination.
dl(help_format_hotkey("2"), _"Show economy messages only") ..
- -- TRANSLATORS: This is an access key combination.
+ -- TRANSLATORS: This is the helptext for an access key combination.
dl(help_format_hotkey("3"), _"Show seafaring messages only") ..
- -- TRANSLATORS: This is an access key combination.
+ -- TRANSLATORS: This is the helptext for an access key combination.
dl(help_format_hotkey("4"), _"Show warfare messages only") ..
- -- TRANSLATORS: This is an access key combination.
+ -- TRANSLATORS: This is the helptext for an access key combination.
dl(help_format_hotkey("5"), _"Show scenario messages only") ..
- -- TRANSLATORS: This is an access key combination.
+ -- TRANSLATORS: This is the helptext for an access key combination.
dl(help_format_hotkey("G"), _"Jump to the location corresponding to the current message") ..
-- TRANSLATORS: This is an access key combination. Localize, but do not change the key.
dl(help_format_hotkey(pgettext("hotkey", "Delete")), _"Archive/Restore the current message")
=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc 2016-05-04 06:28:27 +0000
+++ src/editor/editorinteractive.cc 2016-05-17 17:19:42 +0000
@@ -661,7 +661,8 @@
0,
/** TRANSLATORS: Default name for new map */
_("No Name"),
- g_options.pull_section("global").get_string("realname", pgettext("map_name", "Unknown")));
+ /** TRANSLATORS: Map author name when it hasn't been set yet */
+ g_options.pull_section("global").get_string("realname", pgettext("author_name", "Unknown")));
load_all_tribes(&egbase, &loader_ui);
=== modified file 'src/editor/ui_menus/main_menu_new_map.cc'
--- src/editor/ui_menus/main_menu_new_map.cc 2016-04-25 07:35:45 +0000
+++ src/editor/ui_menus/main_menu_new_map.cc 2016-05-17 17:19:42 +0000
@@ -129,7 +129,7 @@
height_.get_value() > 0 ? height_.get_value() : Widelands::kMapDimensions[0],
list_.get_selected(),
_("No Name"),
- g_options.pull_section("global").get_string("realname", pgettext("map_name", "Unknown")));
+ g_options.pull_section("global").get_string("realname", pgettext("author_name", "Unknown")));
egbase.postload ();
egbase.load_graphics(loader_ui);
=== modified file 'src/editor/ui_menus/main_menu_random_map.cc'
--- src/editor/ui_menus/main_menu_random_map.cc 2016-05-12 14:15:21 +0000
+++ src/editor/ui_menus/main_menu_random_map.cc 2016-05-17 17:19:42 +0000
@@ -464,7 +464,7 @@
map_info.h,
0,
_("No Name"),
- g_options.pull_section("global").get_string("realname", pgettext("map_name", "Unknown")),
+ g_options.pull_section("global").get_string("realname", pgettext("author_name", "Unknown")),
sstrm.str().c_str());
loader_ui.step(_("Generating random map…"));
=== modified file 'src/wui/game_debug_ui.cc'
--- src/wui/game_debug_ui.cc 2016-04-03 08:01:49 +0000
+++ src/wui/game_debug_ui.cc 2016-05-17 17:19:42 +0000
@@ -232,6 +232,7 @@
FieldDebugWindow::FieldDebugWindow
(InteractiveBase & parent, Widelands::Coords const coords)
:
+ /** TRANSLATORS: Title for a window that shows debug information for a field on the map */
UI::Window(&parent, "field_debug", 0, 60, 300, 400, _("Debug Field")),
map_ (parent.egbase().map()),
coords_ (map_.get_fcoords(coords)),
Follow ups
