Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
:-( Sorry GunChleoc. I'm going to relink them later. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 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
The bugs are related to the branch because this is a permanent branch that I keep recycling. Just like the bugs that are linked to trunk, they should have remained linked. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 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
Review: Approve Fix is okay, but as Klaus said. The related bugs don't fit. :-) I'm going to remove them from the merge request. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 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
Uhm, I dont find any changes for #1421942, #1487887, #1530240, #1547909 , #1530398 Bu only soem pluar in the wincondition. Can we get the relations correct? The actual fix is ok :-) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944 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
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 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
Review: Approve diff, testing Changes sound good to me and output looks as expected. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 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
Problem with the new sphinx version, unrelated to this branch. @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 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
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 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
Review: Approve changes look good for me: -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 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/345135 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
Review: Approve Approved, changes sound good to me. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 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
Review: Resubmit Fixed accidental changes -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 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
2. Doesn't matter - you'll only need to remove the extra # where they are not wanted to activate the comments for translators. It should be -- TRANSLATORS: Thanks for the review! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000 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
1. You can't see it locally. They are concatenated later in data/tribes/scripting/help. Just look at the shovel in-game, and you'll see it. 2. It needs to be there if there is no translatable string below it (no _, ngettext or pgettext). -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000 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
1. I have answered inline
2. Agreed, but not in this merge request. I have created a new bug for it:
https://bugs.launchpad.net/widelands/+bug/1768859
Diff comments:
>
> === modified file 'data/tribes/wares/shovel/helptexts.lua'
> --- data/tribes/wares/shovel/helptexts.lua2017-07-07 16:51:39 +
> +++ data/tribes/wares/shovel/helptexts.lua2018-05-03 05:43:13 +
> @@ -9,7 +9,7 @@
>-- TRANSLATORS: Helptext for a ware: Shovel
>empire = pgettext("empire_ware", "Therefore the forester and the vine
> farmer use them. They are produced by the toolsmith."),
>-- TRANSLATORS: Helptext for a ware: Shovel
> - frisians = pgettext("frisians_ware", "They are used by berry and reed
> farmers as well as foresters. Diggers also need them to dig mud out of hard
> soil.")
> + frisians = pgettext("frisians_ware", "They are used by berry and reed
> farmers as well as foresters. Brickmakers also need them to dig mud out of
> hard soil.")
> }
The full helptext will read:
"Shovels are needed for the proper handling of plants. They are used by berry
and reed farmers as well as foresters. Brickmakers also need them to dig mud
out of hard soil."
> local result = ""
> if tribe then
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000
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
Review: Needs Fixing
1. see inline comment
2. I did a spotcheck of the helptexts and found multiple issues with the # sign
in TRANSLATORS remarks not correctly implemented. Just checked a couple of
frisian buildings where the ' is used in defined performance helptexts and not
used in other buildings where undefined messages are in place. Found issues in
the barbarians helptexts as well
Diff comments:
>
> === modified file 'data/tribes/wares/shovel/helptexts.lua'
> --- data/tribes/wares/shovel/helptexts.lua2017-07-07 16:51:39 +
> +++ data/tribes/wares/shovel/helptexts.lua2018-05-03 05:43:13 +
> @@ -9,7 +9,7 @@
>-- TRANSLATORS: Helptext for a ware: Shovel
>empire = pgettext("empire_ware", "Therefore the forester and the vine
> farmer use them. They are produced by the toolsmith."),
>-- TRANSLATORS: Helptext for a ware: Shovel
> - frisians = pgettext("frisians_ware", "They are used by berry and reed
> farmers as well as foresters. Diggers also need them to dig mud out of hard
> soil.")
> + frisians = pgettext("frisians_ware", "They are used by berry and reed
> farmers as well as foresters. Brickmakers also need them to dig mud out of
> hard soil.")
> }
They should be replaced with shovel to be consistent with other helptexts
> local result = ""
> if tribe then
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000
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 a lot for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/342037 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 for the review :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 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
Review: Approve LGTM Thanks for doing the empire 4 string. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849 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
Review: Approve @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/326266 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
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 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
Since we don't have a consensus, I reverted it to the way it was. I don't have strong feelings about this string. Ans even as master of strings I appreciate any feedback and improvement from others ;) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 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
For me "Jundlina Writes a Letter" is the heading of this chapter. The header gives a hint on whats going on in the following text, but isn't a concrete part of the text. Since i am not registered on transifex and you are the master of translation, feel free to change it as you like. I am not good in explaining such things :D -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 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
Regarding your comment, I changed it due to the following feedback on Transifex: Wait, so Jundlina writes a letter in which she writes that she will write a letter to Sidolus? Perhaps we should just go with one of the older titles? It would fit perfectly well if she received a letter instead of writing one, for example. Change it to "Jundlina Received a Message"? -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985 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
Review: Approve
One nit, otherwise looks good to me.
Diff comments:
> === modified file 'data/campaigns/atl01.wmf/scripting/texts.lua'
> --- data/campaigns/atl01.wmf/scripting/texts.lua 2017-02-15 19:32:31
> +
> +++ data/campaigns/atl01.wmf/scripting/texts.lua 2017-03-04 13:46:04
> +
> @@ -314,7 +314,7 @@
>
> barracks_story = {
> {
> - title = _"Jundlina Writes a Letter",
> + title = _"Jundlina Received a Letter",
As i understand the text Jundlina writes a letter to Sidolus and she received
word.
>body = jundlina(_"Jundlina",
> -- TRANSLATORS: Jundlina
> _([[I have received word that our mining industry started working.
> Now that we are forging weapons, I will send a letter to Sidolus informing
> him that it’s time to build a barracks and start recruiting soldiers.]]))
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985
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 for reviewing again :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 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
Review: Approve Thanks for the campaign fixes, the diff looks good to me now. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 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
1. I don't have a better idea either. In Firefox, it's "Ctrl++" and "Ctrl+-", so it's the same solution without the blank spaces. 2. Good idea, I have split this. I don't think that we need to mention the zoom though, the user will notice that anyway. The important information here is which hotkeys to use to jump around. -- 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. ___ 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
Most of the diff looks good to me. Two nits: - "Ctrl + +" and "Ctrl + -" just look strange. But I haven't any better idea. - I would split up the "Ctrl + 1-9" help text into a "Ctrl + 1-9"-line for storing and a "1-9"-line for restoring the positions. Maybe also add a comment that the zoom level is stored, too? -- 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. ___ 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/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
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939 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
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939 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
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291335 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
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154 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
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154 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
T have retested this myself now, and since I don't expect any new bugs (famous last words...), I'm gonna merge. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 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
Review: Approve Code looks good to me, not tested -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399 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
Review: Approve LGTM, I have not tested it but if travis says it is OK, you can merge this I think -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/288491 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
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 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
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547 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
Review: Approve
You should probably use another branch name in the future. This one has all
those fixed bugs attached.
One tiny nit, otherwise lgtm.
Diff comments:
>
> === modified file 'src/ui_basic/progresswindow.cc'
> --- src/ui_basic/progresswindow.cc2016-01-31 21:03:15 +
> +++ src/ui_basic/progresswindow.cc2016-02-04 16:17:22 +
> @@ -92,6 +92,7 @@
> }
>
> void ProgressWindow::step(const std::string & description) {
> +
remove empty line?
> RenderTarget & rt = *g_gr->get_render_target();
>
> const uint32_t xres = g_gr->get_xres();
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088
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
This is sort of my catch-all branch for string issues - I just fix whatever gets reported on Transifex here. It would be hard to come up with a good branch name each time. Is reusing the branch a problem for the commit history? -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088 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
Review: Approve lgtm. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712 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
Only SirVer and I have the necessary privileges on Transifex to push translations. So, the new translation templates will have to wait until I get back home. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 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. Could someone please merge my approved branches, unless they contain difficult merge conflicts? It will take some time until I can do this myself again. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 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
Merged and pushed. :) (Haven't generated new translation templates though) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 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
Review: Approve OK, I tested it -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 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
Code looks good, please test -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 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: Needs Fixing
Diff comments:
>
> === modified file 'utils/buildcat.py'
> --- utils/buildcat.py 2015-11-06 18:57:00 +
> +++ utils/buildcat.py 2015-11-27 17:43:13 +
> @@ -58,8 +58,9 @@
> "../../world/*/*/*/*/*/*.lua",
> ]),
> ("tribes/tribes", [
> -"../../tribes/scripting/starting_conditions/*/*.lua"
> +"../../tribes/scripting/starting_conditions/*/*.lua" #
> TODO(GunChleoc): the starting conditions aren't being picked up.
there is a comma missing after this line. this will combine this and the next
string into one runaway one.
> "../../tribes/*.lua",
> +"../../tribes/preload.lua", # TODO(GunChleoc): Why do I have to load
> both *.lua and preload.lua for this to work?
adding the comma above should solve that.
> "../../tribes/*/init.lua",
> "../../tribes/*/*/init.lua",
> "../../tribes/*/*/*/init.lua",
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857
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
see inline comments -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857 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
Yes, that fixed it :) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857 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 :) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857 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
Review: Approve lgtm. gonna merge. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857 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
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/277693 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
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/271730 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
The change you commented is straight quote -> curly quote. So, no addicental whitespace added - may editor will strip any trailing whitespaces anyway. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/270856 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
Review: Approve
one thing to look into, otherwise lgtm.
Diff comments:
>
> === modified file 'tribes/atlanteans/woodcutters_house/help.lua'
> --- tribes/atlanteans/woodcutters_house/help.lua 2015-07-26 10:59:28
> +
> +++ tribes/atlanteans/woodcutters_house/help.lua 2015-09-13 06:21:44
> +
> @@ -14,7 +14,7 @@
> --General Section
> building_help_general_string("atlanteans", building_description,
> _"Fell trees in the surrounding area and process them into
> logs.",
> - _"The woodcutter's house needs trees to fell within the work
> area.") ..
> + _"The woodcutter’s house needs trees to fell within the work
> area.") ..
I do not nee what changed in this line. Could you doublecheck that you didn't
add whitespace?
>
> --Dependencies
> building_help_dependencies_production("atlanteans",
> building_description, true) ..
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/270856
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
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/270159 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
Review: Approve I reviewed offline and merged right after. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/266520 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
In revision 7492,the change Working radius - Work area in the file tribes/scripting/format_help.lua should be revised. The string prints the work area radius, so the original text Working radius seems more appropriate. On 27 July 2015 at 11:10, nore...@launchpad.net wrote: 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/265906 -- You are subscribed to branch lp:widelands. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/265906 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
+1 -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/216424 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
