GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Various string fixes for 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/337849
--
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/emp02.wmf/scripting/texts.lua'
--- data/campaigns/emp02.wmf/scripting/texts.lua 2018-01-30 14:32:39 +0000
+++ data/campaigns/emp02.wmf/scripting/texts.lua 2018-02-16 08:14:40 +0000
@@ -252,7 +252,7 @@
posy=1,
body= lutius(_"Diary of Lutius",
-- TRANSLATORS: Lutius - Diary
- _([[That’s good. The first large military building is complete and the mining infrastructure is getting better and better. Now we should think about preparing ourselves for battle.]]))
+ _([[That’s good. The first big military building is complete and the mining infrastructure is getting better and better. Now we should think about preparing ourselves for battle.]]))
.. new_objectives(obj_remove_the_barbarians)
}
=== modified file 'data/campaigns/emp04.wmf/scripting/texts.lua'
--- data/campaigns/emp04.wmf/scripting/texts.lua 2018-01-17 06:10:39 +0000
+++ data/campaigns/emp04.wmf/scripting/texts.lua 2018-02-16 08:14:40 +0000
@@ -109,7 +109,7 @@
title=_"Deal with Julia to get the technology",
number = 1,
body = objective_text(_"Diplomacy: Trade or War",
- li(_[[Decide: Either collect 35 sheaves of wheat and 15 bottles of wine for the goddess in your headquarters or conquer the monastery.]])
+ li(_[[Decide: Either collect 35 sheaves of wheat and 15 amphoras of wine for the goddess in your headquarters or conquer the monastery.]])
),
}
@@ -697,7 +697,7 @@
title=_"Worship to be Gifted",
body= julia(_"Julia is demanding a sacrifice for Vesta…",
-- TRANSLATORS: Julia - priestess of the goddess Vesta
- _([[Ave, Lutius! If you want us to help you, you first have to worship our goddess Vesta. Therefore deliver 35 sheaves of wheat and 15 bottles of wine to prepare a worthy sacrifice for her.]])),
+ _([[Ave, Lutius! If you want us to help you, you first have to worship our goddess Vesta. Therefore deliver 35 sheaves of wheat and 15 amphoras of wine to prepare a worthy sacrifice for her.]])),
posy=1,
}
=== modified file 'data/txts/LICENSE.lua'
--- data/txts/LICENSE.lua 2017-12-19 08:28:46 +0000
+++ data/txts/LICENSE.lua 2018-02-16 08:14:40 +0000
@@ -6,7 +6,7 @@
title = _"License",
text = rt(
p_font("align=center", "size=28 color=2F9131", _"Licensing information for Widelands") ..
- p_font("align=center", "size=14 italic=1 color=D1D1D1", _"Copyright 2002 - 2016 by the Widelands Development Team.") ..
+ p_font("align=center", "size=14 italic=1 color=D1D1D1", _"Copyright 2002 - 2018 by the Widelands Development Team.") ..
p(vspace(12) .. b(_"This game is Free and Open Source (FOSS), licensed under the GNU General Public License (GPL) V2.0.")) ..
=== modified file 'data/txts/tips/editor.lua'
--- data/txts/tips/editor.lua 2017-03-04 13:44:18 +0000
+++ data/txts/tips/editor.lua 2018-02-16 08:14:40 +0000
@@ -1,7 +1,10 @@
+include "scripting/richtext.lua"
+
set_textdomain("texts")
tips = {
{
- text = _"You can find general help for the editor as well as a short tutorial on our wiki at www.widelands.org",
+ -- TRANSLATORS: %s = URL to the Widelands website
+ text = (_"You can find general help for the editor as well as a short tutorial on our wiki at %s."):bformat(u("widelands.org")),
seconds = 6
},
{
@@ -41,7 +44,7 @@
seconds = 7
},
{
- text = _"You can place a large building on any node where you could place a medium building if there is no obstacle or non-arable terrain towards the west, northwest and northeast.",
+ text = _"You can place a big building on any node where you could place a medium building if there is no obstacle or non-arable terrain towards the west, northwest and northeast.",
seconds = 7
},
}
=== modified file 'data/txts/tips/general_game.lua'
--- data/txts/tips/general_game.lua 2017-12-17 09:42:42 +0000
+++ data/txts/tips/general_game.lua 2018-02-16 08:14:40 +0000
@@ -1,3 +1,5 @@
+include "scripting/richtext.lua"
+
set_textdomain("texts")
tips = {
{
@@ -21,7 +23,8 @@
seconds = 6
},
{
- text = _"Any further questions? Our FAQ, the wiki and of course our community forums can be found at www.widelands.org.",
+ -- TRANSLATORS: %s = URL to the Widelands website
+ text = (_"Any further questions? Our FAQ, the wiki and of course our community forums can be found online at %s."):bformat(u("widelands.org")),
seconds = 6
},
{
=== modified file 'data/txts/tips/singleplayer.lua'
--- data/txts/tips/singleplayer.lua 2016-10-19 08:50:16 +0000
+++ data/txts/tips/singleplayer.lua 2018-02-16 08:14:40 +0000
@@ -1,7 +1,10 @@
+include "scripting/richtext.lua"
+
set_textdomain("texts")
tips = {
{
- text = _"Our computer players are too boring? Visit our website at www.widelands.org and meet other players to play online.",
+ -- TRANSLATORS: %s = URL to the Widelands website
+ text = (_"Our computer players are too boring? Visit our website at %s and meet other players to play online."):bformat(u("widelands.org")),
seconds = 6
},
}
=== modified file 'src/wui/fieldaction.cc'
--- src/wui/fieldaction.cc 2017-12-11 17:09:48 +0000
+++ src/wui/fieldaction.cc 2018-02-16 08:14:40 +0000
@@ -214,7 +214,7 @@
"images/wui/fieldaction/menu_tab_buildbig.png",
"images/wui/fieldaction/menu_tab_buildport.png"};
static const std::string tooltip_tab_build[] = {
- _("Build small building"), _("Build medium building"), _("Build large building"),
+ _("Build small building"), _("Build medium building"), _("Build big building"),
_("Build port building")};
static const std::string name_tab_build[] = {"small", "medium", "big", "port"};
=== modified file 'src/wui/game_message_menu.cc'
--- src/wui/game_message_menu.cc 2017-11-24 21:34:17 +0000
+++ src/wui/game_message_menu.cc 2018-02-16 08:14:40 +0000
@@ -621,8 +621,9 @@
case Archive:
if (no_selections > 1) {
button_tooltip =
- /** TRANSLATORS: Tooltip in the messages window. There is a separate string for 1
- message. */
+ /** TRANSLATORS: Tooltip in the messages window. There is a separate string for 1 message.
+ * DO NOT omit the placeholder in your translation.
+ */
(boost::format(ngettext("Restore the selected %d message",
"Restore the selected %d messages", no_selections)) %
no_selections)
@@ -635,8 +636,9 @@
case Inbox:
if (no_selections > 1) {
button_tooltip =
- /** TRANSLATORS: Tooltip in the messages window. There is a separate string for 1
- message. */
+ /** TRANSLATORS: Tooltip in the messages window. There is a separate string for 1 message.
+ * DO NOT omit the placeholder in your translation.
+ */
(boost::format(ngettext("Archive the selected %d message",
"Archive the selected %d messages", no_selections)) %
no_selections)
=== modified file 'src/wui/load_or_save_game.cc'
--- src/wui/load_or_save_game.cc 2017-12-19 07:17:15 +0000
+++ src/wui/load_or_save_game.cc 2018-02-16 08:14:40 +0000
@@ -246,7 +246,8 @@
if (filetype_ == FileType::kReplay) {
header = no_selections == 1 ?
_("Do you really want to delete this replay?") :
- /** TRANSLATORS: Used with multiple replays, 1 replay has a separate string. */
+ /** TRANSLATORS: Used with multiple replays, 1 replay has a separate string.
+ DO NOT omit the placeholder in your translation. */
(boost::format(ngettext("Do you really want to delete this %d replay?",
"Do you really want to delete these %d replays?",
no_selections)) %
@@ -255,7 +256,8 @@
} else {
header = no_selections == 1 ?
_("Do you really want to delete this game?") :
- /** TRANSLATORS: Used with multiple games, 1 game has a separate string. */
+ /** TRANSLATORS: Used with multiple games, 1 game has a separate string.
+ DO NOT omit the placeholder in your translation. */
(boost::format(ngettext("Do you really want to delete this %d game?",
"Do you really want to delete these %d games?",
no_selections)) %
@@ -416,9 +418,9 @@
.str();
gamedata.savedonstring =
/** TRANSLATORS: Display date for choosing a savegame/replay. Placeholders are:
- month day, year. This is part of a list. */
- (boost::format(_("saved on %1% %2%, %3%")) % localize_month(savedate->tm_mon) %
- savedate->tm_mday % (1900 + savedate->tm_year))
+ month (short name) day (number), year (number). This is part of a list. */
+ (boost::format(_("saved on %2% %1%, %3%")) % savedate->tm_mday %
+ localize_month(savedate->tm_mon) % (1900 + savedate->tm_year))
.str();
}
}
=== modified file 'utils/validate_translations.sh'
--- utils/validate_translations.sh 2016-09-17 15:00:20 +0000
+++ utils/validate_translations.sh 2018-02-16 08:14:40 +0000
@@ -63,6 +63,7 @@
# These checks are nice to have
run_pofilter "doublespacing"
+run_pofilter "doublewords"
run_pofilter "startwhitespace"
run_pofilter "endwhitespace"
run_pofilter "startpunc"
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
