New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve German translation #802

Merged
merged 2 commits into from Apr 14, 2018

Conversation

Projects
None yet
2 participants
@kakra
Contributor

kakra commented Apr 14, 2018

This improves the German translation by bringing it more in-line with
the wording of the official Git Book and removes some ambiguous
translations. It also replaces most occurrences of Git technical terms
with their English original as the German Git Book does. It should be
more clear now what each action really does.

Further work will follow while I'm using the software but the current
stage should be suitable for merge.

The po file was edited with poedit2 so it may result in more diff lines
than a hand-crafted edit. But at least the file now follows poedit2
format.

Signed-off-by: Kai Krakow kai@kaishome.de

kakra added some commits Apr 14, 2018

Improve German translation
This improves the German translation by bringing it more in-line with
the wording of the official Git Book and removes some ambiguous
translations. It also replaces most occurrences of Git technical terms
with their English original as the German Git Book does. It should be
more clear now what each action really does.

Further work will follow while I'm using the software but the current
stage should be suitable for merge.

The po file was edited with poedit2 so it may result in more diff lines
than a hand-crafted edit. But at least the file now follows poedit2
format.

Signed-off-by: Kai Krakow <kai@kaishome.de>
Fix the I18n test for German Commit@@verb
Signed-off-by: Kai Krakow <kai@kaishome.de>
@davvid

This comment has been minimized.

Member

davvid commented Apr 14, 2018

Thanks! Just a note -- one thing that might help with merge conflicts later is using make po after making all your edits. That should take care of sorting the output.

I'm going to run make po after the merge to see if it picks up any edits, so if there's a subsequent commit on this file from me please rebase to pick up the latest.

davvid added a commit to davvid/git-cola that referenced this pull request Apr 14, 2018

Merge pull request git-cola#802 from kakra/improve-german-translation
* kakra/improve-german-translation:
  Fix the I18n test for German Commit@@verb
  Improve German translation

Signed-off-by: David Aguilar <davvid@gmail.com>

davvid added a commit to davvid/git-cola that referenced this pull request Apr 14, 2018

po: update German translation using "make po"
Related-to: git-cola#802
Signed-off-by: David Aguilar <davvid@gmail.com>

@davvid davvid merged commit 75d5b23 into git-cola:master Apr 14, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@davvid

This comment has been minimized.

Member

davvid commented Apr 14, 2018

FYI make po did end up editing the file, so please update to pickup these edits before the next batch.

@kakra

This comment has been minimized.

Contributor

kakra commented Apr 15, 2018

Thanks for pointing out how to use make po. I thought I need to run it before doing edits to update it with the latest updates strings from the sources. Good to know, I'll do it according to your suggestion in the future. :-)

@kakra kakra deleted the kakra:improve-german-translation branch Apr 15, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment