Skip to content

Update German and Croatian#69

Closed
milotype wants to merge 3 commits intognome-terminator:masterfrom
milotype:milotype-20200510
Closed

Update German and Croatian#69
milotype wants to merge 3 commits intognome-terminator:masterfrom
milotype:milotype-20200510

Conversation

@milotype
Copy link
Copy Markdown
Contributor

@milotype milotype commented May 10, 2020

  • both translations are complete

@mattrose
Copy link
Copy Markdown
Member

mattrose commented May 11, 2020

Thanks for this. I'll pull this in after the #13 is fixed up.

@lazyfrosch
Copy link
Copy Markdown
Member

lazyfrosch commented May 17, 2020

This now needs rebasing after #91, sorry @milotype can you take a look? Also I think I saw you leaving out some HTML tags in translation.

@milotype
Copy link
Copy Markdown
Contributor Author

milotype commented May 17, 2020

I'm not a programmer, so I don't know how I can help.
In the translation files I sent, I could not find any HTML-tag differences between the .po file and the .pot file. Can you tell me what you found?

@milotype
2nd update German translation
9e9a3dc 
I actually found a problem with "newline" codes in the German. This problem was already in the previous translation:
msgid ""
"Run one of the following Terminator DBus commands:\n"
"\n"
"%s"
msgstr ""
"Einen der folgenden Terminator-DBus-Befehle ausführen:\\n\n"
"\\n\n"
"%s"

- corrected the above problem
- removed "french" quotation marks. They shouldn't be used in German
- removed the formal "Sie" form
@lazyfrosch
Copy link
Copy Markdown
Member

lazyfrosch commented May 17, 2020

No worries, I will take care of it! We are switching to a new translation platform soon, see #90

@mattrose mattrose closed this Nov 10, 2020
@milotype
Copy link
Copy Markdown
Contributor Author

milotype commented Nov 11, 2020

@lazyfrosch @mattrose
I'm just curious ... it seems that my changes for German and Croatian in this PR have not been merged into the master branch. The current de.po and hr.po files are still the ones before my changes, plus some changes you did with the PR update translations #255

Please let me know:

  1. should I wait till you merge my changes, or
  2. should I make a new PR with my changes for de and hr, plus the updated strings in PR update translations update translations #255

@mattrose
Copy link
Copy Markdown
Member

mattrose commented Nov 11, 2020

@milotype If you could make a new PR with your changes that would be amazing and much appreciated. I just couldn't figure out how to merge your changes with some other changes that were made. I'll pull it in as soon as you submit.

@milotype milotype mentioned this pull request Nov 14, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@milotype @mattrose @lazyfrosch