GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
Fix pluralization error.
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/362944
Not tested yet.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/scripting/win_conditions/win_condition_functions.lua'
--- data/scripting/win_conditions/win_condition_functions.lua 2019-02-09 15:38:59 +0000
+++ data/scripting/win_conditions/win_condition_functions.lua 2019-02-10 11:37:22 +0000
@@ -258,7 +258,9 @@
if ((h > 0) and (m > 0)) then
-- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
- time = (ngettext("%1% hour and %2% minutes", "%1% hours and %2% minutes", h, m)):bformat(h, m)
+ time = (ngettext("%i minute", "%i minutes", h, m)):bformat(m)
+ -- TRANSLATORS: Context: 'The game will end in 2 hours and 30 minutes.'
+ time = (ngettext("%1% hour and %2%", "%1% hours and %2%", h, m)):bformat(h, time)
elseif m > 0 then
-- TRANSLATORS: Context: 'The game will end in 30 minutes.'
time = (ngettext("%i minute", "%i minutes", m)):format(m)
_______________________________________________
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
