GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands.
Commit message: Various string fixes for helptexts. 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/316931 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/helptexts.lua' --- data/tribes/buildings/productionsites/barbarians/ax_workshop/helptexts.lua 2015-10-31 12:11:44 +0000 +++ data/tribes/buildings/productionsites/barbarians/ax_workshop/helptexts.lua 2017-02-10 09:24:20 +0000 @@ -15,7 +15,7 @@ function building_helptext_note() -- TRANSLATORS: Note helptext for a building - return pgettext("barbarians_building", "The Barbarian ax workshop is the intermediate production site in a series of three buildings. It is an upgrade from the metal workshop but doesn’t require additional qualification for the worker.") + return pgettext("barbarians_building", "The Barbarian ax workshop is the intermediate production site in a series of three buildings. It is enhanced from the metal workshop but doesn’t require additional qualification for the worker.") end function building_helptext_performance() === modified file 'data/tribes/scripting/help/controls.lua' --- data/tribes/scripting/help/controls.lua 2017-01-03 20:41:24 +0000 +++ data/tribes/scripting/help/controls.lua 2017-02-10 09:24:20 +0000 @@ -56,13 +56,13 @@ -- TRANSLATORS: This is an access key combination. Localize, but do not change the key. dl(help_format_hotkey(pgettext("hotkey", "Home")), _"Center main mapview on starting location") .. -- TRANSLATORS: This is an access key combination. Localize, but do not change the key. - dl(help_format_hotkey(pgettext("hotkey", "(Ctrl +) 1-9")), _"Remember and go to previously remembered locations") .. - -- TRANSLATORS: This is an access key combination. Localize, but do not change the key. - dl(help_format_hotkey(pgettext("hotkey", "(Ctrl +) +")), _"Increase zoom") .. - -- TRANSLATORS: This is an access key combination. Localize, but do not change the key. - dl(help_format_hotkey(pgettext("hotkey", "(Ctrl +) -")), _"Decrease zoom") .. - -- TRANSLATORS: This is an access key combination. Localize, but do not change the key. - dl(help_format_hotkey(pgettext("hotkey", "(Ctrl +) 0")), _"Reset zoom") .. + dl(help_format_hotkey(pgettext("hotkey", "Ctrl + 1-9")), _"Remember and go to previously remembered locations") .. + -- TRANSLATORS: This is an access key combination. Localize, but do not change the key. + dl(help_format_hotkey(pgettext("hotkey", "Ctrl + +")), _"Increase zoom") .. + -- TRANSLATORS: This is an access key combination. Localize, but do not change the key. + dl(help_format_hotkey(pgettext("hotkey", "Ctrl + -")), _"Decrease zoom") .. + -- TRANSLATORS: This is an access key combination. Localize, but do not change the key. + dl(help_format_hotkey(pgettext("hotkey", "Ctrl + 0")), _"Reset zoom") .. -- TRANSLATORS: This is an access key combination. Localize, but do not change the key. dl(help_format_hotkey(pgettext("hotkey", "Ctrl + F11")), _"Take a screenshot") .. toggle_fullscreen_hotkey .. === modified file 'data/tribes/workers/atlanteans/recruit/helptexts.lua' --- data/tribes/workers/atlanteans/recruit/helptexts.lua 2016-11-12 06:50:18 +0000 +++ data/tribes/workers/atlanteans/recruit/helptexts.lua 2017-02-10 09:24:20 +0000 @@ -1,4 +1,4 @@ function worker_helptext() -- TRANSLATORS: Helptext for a worker: Recruit - return pgettext("atlanteans_worker", "Eager to become a soldier and defend your tribe!") + return pgettext("atlanteans_worker", "Eager to become a soldier and defend his tribe!") end === modified file 'data/tribes/workers/atlanteans/weaver/helptexts.lua' --- data/tribes/workers/atlanteans/weaver/helptexts.lua 2015-10-31 12:11:44 +0000 +++ data/tribes/workers/atlanteans/weaver/helptexts.lua 2017-02-10 09:24:20 +0000 @@ -1,4 +1,4 @@ function worker_helptext() -- TRANSLATORS: Helptext for a worker: Weaver - return pgettext("atlanteans_worker", "Produces cloth for buildings, ships and soldiers.") + return pgettext("atlanteans_worker", "Produces spidercloth for buildings, ships and soldiers.") end === modified file 'data/tribes/workers/barbarians/recruit/helptexts.lua' --- data/tribes/workers/barbarians/recruit/helptexts.lua 2016-11-12 06:50:18 +0000 +++ data/tribes/workers/barbarians/recruit/helptexts.lua 2017-02-10 09:24:20 +0000 @@ -1,4 +1,4 @@ function worker_helptext() -- TRANSLATORS: Helptext for a worker: Recruit - return pgettext("barbarians_worker", "Eager to become a soldier and defend your tribe!") + return pgettext("barbarians_worker", "Eager to become a soldier and defend his tribe!") end === modified file 'data/tribes/workers/empire/recruit/helptexts.lua' --- data/tribes/workers/empire/recruit/helptexts.lua 2016-11-12 06:50:18 +0000 +++ data/tribes/workers/empire/recruit/helptexts.lua 2017-02-10 09:24:20 +0000 @@ -1,4 +1,4 @@ function worker_helptext() -- TRANSLATORS: Helptext for a worker: Recruit - return pgettext("empire_worker", "Eager to become a soldier and defend your tribe!") + return pgettext("empire_worker", "Eager to become a soldier and defend his tribe!") end === modified file 'data/txts/tips/barbarians.lua' --- data/txts/tips/barbarians.lua 2016-10-19 08:50:16 +0000 +++ data/txts/tips/barbarians.lua 2017-02-10 09:24:20 +0000 @@ -5,7 +5,7 @@ seconds = 4 }, { - text = _"Always build a ranger’s and a gamekeeper’s hut, so you will not run out of logs.", + text = _"Always build a ranger’s and a gamekeeper’s hut, so you will not run out of logs or game.", seconds = 5 }, }
_______________________________________________ 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