Skip to content
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

Hungarian translation #109

Merged
merged 1 commit into from
Apr 5, 2020
Merged

Hungarian translation #109

merged 1 commit into from
Apr 5, 2020

Conversation

uno20001
Copy link
Contributor

@uno20001 uno20001 commented Apr 2, 2020

This commit introduces Hungarian translation for the software.

@fin-ger
Copy link
Member

fin-ger commented Apr 2, 2020

Thanks for adding this translation! Let's wait for #107 to finish first, it will add some more translation strings.

@fin-ger
Copy link
Member

fin-ger commented Apr 5, 2020

@uno20001 The new changes have landed on master. You can now update the translation, if you like.

@uno20001
Copy link
Contributor Author

uno20001 commented Apr 5, 2020

My git-fu is really lacking, so this is the best I could come up with at the moment. Is it completely useless or can something from it be salvaged?

@fin-ger
Copy link
Member

fin-ger commented Apr 5, 2020

I can do it, give me a sec :)

@fin-ger
Copy link
Member

fin-ger commented Apr 5, 2020

I fixed it. Just checkout and reset translation_hu now and commit as usual:

$ git fetch
$ git checkout translation_hu
$ git reset --hard origin/translation_hu

Note: this assumes your remote (of the fork) is named origin

@fin-ger
Copy link
Member

fin-ger commented Apr 5, 2020

The master branch in your fork is a bit messed :D I can't fix it, because the master branch of your fork is not part of your PR, so I have no access to it. This is how to fix it:

$ git remote add upstream https://github.com/martin31821/cpupower.git
$ git fetch upstream
$ git checkout master
$ git reset --hard upstream/master
$ git push origin master:master --force

Note: your master branch is most likely protected. You have to unprotect it in order to force push to it (you have some duplicated commits on it). Configuring protected branches

@uno20001
Copy link
Contributor Author

uno20001 commented Apr 5, 2020

The master branch in your fork is a bit messed

That is indeed the case. It seems your instructions fixed it, thanks. Hopefully I didn't mess up anything with my commit. I didn't include the .mo file because it was in .gitignore, should I have done it?

@fin-ger
Copy link
Member

fin-ger commented Apr 5, 2020

No, they will be generated by the build process. We will take care of that. Your commit looks good. I think I can merge it now. Thank you for translating!

@uno20001
Copy link
Contributor Author

uno20001 commented Apr 5, 2020

Thanks for the patience and help!

@fin-ger fin-ger merged commit 935f606 into deinstapel:master Apr 5, 2020
@uno20001 uno20001 deleted the translation_hu branch April 5, 2020 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants