[Widelands-dev] [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: Fixed various string issues reported on Transifex and added some translators' comments. 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/312126 -- 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/atl01.wmf/scripting/texts.lua' --- data/campaigns/atl01.wmf/scripting/texts.lua 2016-03-03 17:07:13 + +++ data/campaigns/atl01.wmf/scripting/texts.lua 2016-11-30 08:11:15 + @@ -228,7 +228,7 @@ _([[Ahh, but I think this is impossible to change. The preparing and eating of food is something deeply ingrained in us Atlanteans – it is a ceremony that we just need for our well-being. So I guess we cannot take this away from the individuals completely.]]) .. paragraphdivider() .. -- TRANSLATORS: Colionder - _([[But we might find a compromise in between: for me, making bread is a troublesome task. Grinding the blackroot and corn to flour and then baking the bread is tedious and boring; I feel a more industrial approach would be helpful here. I for one would love to just have fresh bread delivered to my house every day.]]) + _([[But we might find a compromise in between: for me, making bread is a troublesome task. Grinding the blackroots and corn to flour and then baking the bread is tedious and boring; I feel a more industrial approach would be helpful here. I for one would love to just have fresh bread delivered to my house every day.]]) .. paragraphdivider() .. -- TRANSLATORS: Colionder _([[Oooh and even more important: the smoking of fish and meat to cleanse them and improve their taste is terrible. My house is full of smoke and stinks for weeks afterwards. Don’t you think that this could be done in a special building where the side effects do not matter? I think those two things would be accepted by the people and would reduce the cooking time without taking away the ritual.]])) === modified file 'data/campaigns/bar01.wmf/scripting/texts.lua' --- data/campaigns/bar01.wmf/scripting/texts.lua 2016-01-28 05:24:34 + +++ data/campaigns/bar01.wmf/scripting/texts.lua 2016-11-30 08:11:15 + @@ -63,7 +63,7 @@ name = "basic food began", title = _"Provide your miners with food", number = 3, - body = objective_text(_"Build a hunter, a gamekeeper and a tavern", + body = objective_text(_"Build a hunter’s hut, a gamekeeper’s hut and a tavern", listitem_bullet(_"In order to work, your miners need food.") .. listitem_arrow(_"A hunter can hunt down animals, while a gamekeeper prevents them from becoming extinct. The meat is then processed in a tavern into lunches for your miners.") .. " " .. _([[This is only the first example of a ware which has to be refined before being used in a secondary building – others will follow.]])) === modified file 'data/campaigns/bar02.wmf/scripting/texts.lua' --- data/campaigns/bar02.wmf/scripting/texts.lua 2016-05-02 15:33:14 + +++ data/campaigns/bar02.wmf/scripting/texts.lua 2016-11-30 08:11:15 + @@ -261,7 +261,7 @@ title = _"Tracks", body = boldreth(_"Boldreth says:", -- TRANSLATORS: Boldreth - _([[Thron told me that he discovered tracks in the snow to the northeast of our settlement. He has instructed us to build a tower, to have a greater visual range over the area around our hall to protect our people from sudden attacks.]])) + _([[Thron told me that he discovered tracks in the snow to the northeast of our settlement. He has instructed us to build a tower, to have a greater visual range over the area around our hall to protect our people from sudden attacks.]])) .. new_objectives(obj_build_a_tower) } === modified file 'data/campaigns/emp02.wmf/scripting/texts.lua' --- data/campaigns/emp02.wmf/scripting/texts.lua 2016-01-28 05:24:34 + +++ data/campaigns/emp02.wmf/scripting/texts.lua 2016-11-30 08:11:15 + @@ -64,7 +64,7 @@ title =_"Build a stonemason’s house and mining infrastructure", number = 7, body = objective_text(_"Stonemason’s
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 1135. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/130899893. Appveyor build 972. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-972. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/wlimages_rework into lp:widelands-website
Above is better - you did nothing wrong, it was just a case of my being a bit screen-blind on this one. -- https://code.launchpad.net/~widelands-dev/widelands-website/wlimages_rework/+merge/311985 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/wlimages_rework into lp:widelands-website. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_201611 into lp:widelands
Continuous integration builds have changed state: Travis build 1665. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/180021645. Appveyor build 1505. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_compiler_warnings_201611-1505. -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_201611/+merge/311329 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warnings_201611. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mac_os_x_build_fixes into lp:widelands
Review: Approve Self approve!! https://media.giphy.com/media/OcZp0maz6ALok/giphy.gif @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/mac_os_x_build_fixes/+merge/312105 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mac_os_x_build_fixes. ___ 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
Re: [Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website
Review: Approve Prima :-) -- https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/mac_os_x_build_fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/mac_os_x_build_fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/mac_os_x_build_fixes/+merge/312105 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mac_os_x_build_fixes. ___ 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
Re: [Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website
Review: Approve -- https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-collectors into lp:widelands
Merging trunk is fine by me but I am not sure about your comments.
I tried it with only one call of set_textdomain("win_conditions") at the
beginning of the function. However, this does not translate the "Game over"
string. When it should include the widelands-domain it does not seem to be
working. None of the other win conditions seem to use the widelands-strings,
though.
I am not completely sure what you mean with moving a part down. Assuming that
you want to move the "if m > 0 then" clause further down, it won't work since
the result (value of $time) of this clause is used inside the "if h > 0" clause.
Another, minor, thing: Should there be a period after "Game over"?
--
https://code.launchpad.net/~widelands-dev/widelands/bug-collectors/+merge/312092
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-collectors.
___
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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_201611 into lp:widelands
Continuous integration builds have changed state: Travis build 1671. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/180198181. Appveyor build 1511. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_compiler_warnings_201611-1511. -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_201611/+merge/311329 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warnings_201611. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1426465-scenario-timings into lp:widelands
Continuous integration builds have changed state: Travis build 1672. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/180199443. Appveyor build 1512. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1426465_scenario_timings-1512. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1426465-scenario-timings/+merge/39 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1426465-scenario-timings into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-collectors into lp:widelands
Continuous integration builds have changed state: Travis build 1674. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/180231631. Appveyor build 1514. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_collectors-1514. -- https://code.launchpad.net/~widelands-dev/widelands/bug-collectors/+merge/312092 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-collectors. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-collectors into lp:widelands
The reason "Game Over" won't translate is that it hasn't been translated yet - if you hack a win condition PO file to add a translation and recompile, the translation should appear then. I have looked at this again in Meld and you're correct with the if-else as it is. Just fix the textdomain and we're good to go. -- https://code.launchpad.net/~widelands-dev/widelands/bug-collectors/+merge/312092 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-collectors. ___ 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
[Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website
The proposal to merge lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 -- Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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
Re: [Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website
Merged and deployed. Die Änderung ist online. Danke :-) -- https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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
