Base

[JustCarmen]

Hi Greg,

I have made a few changes to the Dutch language file (correct some errors). But to be able to review the changes I had to save the file in poedit first without making any changes. Because poedit breaks long lines on a different position then launchpad, it looks like there are a lot of changes between both versions, but they are exactly the same.The second commit I made contains the updates. So it should be possible just to cherry-pick that commit.

I don't know how to just send you that commit, that why I do it this way. I hope this is right. I just started with github because I want to version control my own custom modules and modifications in webtrees. So I hope this is the right way. If you prefer another way to send you an updated language file, please let me know.

[fisharebest]

I hope this is the right way.

Pull-requests are good. Today I have already accepted pull-requests for German and Italian translations.

Other users simply send me new .PO files.

Both are fine. The advantage of a pull-request is that your name appears in the commit logs, so you get credit for your work.

Because poedit breaks long lines on a different position

This is a problem with most (all?) translation applications, as they all use the same library (translate-toolkit) to manipulate .PO data.

FYI, you can re-format a .PO file using this command:

msgcat --no-wrap --sort-output --output=nl.po nl.po

Although both formats (wrap and no-wrap) are equivalent, changing formats creates two problems.

1. it is difficult to see what has changed
2. the repository gets very big, very quickly.

I can't just cherry-pick the second commit, as it relies on a change in the first commit (one of the changes involved a long line).

I think the "git solution" is for you to:

1. reformat the file, as above
2. commit this change to your repository
3. combine your three commits into one (git rebase --interactive).

This will (hopefully!) give one commit which contains just the required changes, and which I will be able to merge into my master branch.

Alternatively, I can simply reformat the file and commit the changes myself...

[fisharebest]

Actually, I can do this for you. I have cloned your repository, created a third commit (to reformat the file), merged the three changes, then cherry-picked the commit.

I can push this now. You'll need to handle the merge-conflicts when you pull.

Or, I can let you do this, and issue another pull request.

Your choice.

[fisharebest]

Your choice.

I forgot this change was already commited to my local repository, so when I just pushed some bug fixes, this was included.

[JustCarmen]

That's ok, I have pulled the latest commits from your branch and indeed I got a merging conflict but solved it. I will try to re-format the PO file next time and use your 'git' solution.