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

Update all .po files #104

Merged
merged 5 commits into from
Dec 15, 2023
Merged

Update all .po files #104

merged 5 commits into from
Dec 15, 2023

Conversation

milotype
Copy link
Contributor

@milotype milotype commented Dec 3, 2023

  • changed the first section of the header for every language to make them more uniform
  • updated all .po files with the current .pot file, so now all files have 153 strings
  • deleted all old/obsolete strings
  • added string translations in obvious cases without knowing/speeking all languages. For instance: if the string "RGB Format" existed, I added translations for the new strings "Oklab Format", "Oklch Format" according to the translation for "RGB Format". In the case of "Copy Oklab" and "Copy Oklch", I used the same translation for the word "Copy" as in "Copy RGB" used in the specific language.
  • added "translations" for the strings "Oklab" and "Oklch"
  • the spanish translation is based upon the not yet released version of the user "IngrownMink4" (PR Update es.po Update es.po #84)
  • changed the "Eyedropper" app name in the Croatian translation ("Pipeta" is better then "Kapaljka")

Copy link
Owner

@FineFindus FineFindus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the late reply, I have been a bit busy with other things.
The changes look good, but due to the total amount, please separate them into individual commits, following conventional commits, e.g. feat(po/de): remove obsolete strings.
This makes it easier for future contributors to see what and why a change was made.

added "translations" for the strings "Oklab" and "Oklch"

I'm not sure what you mean by this.

Please request a review when you are done.

@milotype
Copy link
Contributor Author

@FineFindus
In future I will make separate commits, I promise :-)

But in this case I've done several changes in all .po files at once per GitHub, because the component Eyedropper at Hosted Weblate is currently locked for all languages.

Maybe you can merge my changes for all files in this commit nevertheless and then apply them in Hosted Weblate?!
I'm not a programmer, so I don't really know about the procedures between GitHub and Hosted Weblate :-(

I'm not sure what you mean by this.

Concearning my message: added "translations" for the strings "Oklab" and "Oklch"

#: src/widgets/preferences/preferences_window.rs:413
msgid "Oklab"
msgstr "Oklab"
#: src/widgets/preferences/preferences_window.rs:414
msgid "Oklch"
msgstr "Oklch"

It means that I've simply copied those two strings unchanged in every .po language file, because the source strings shouldn't be tanslated.

Please also check my isue #105.

@FineFindus
Copy link
Owner

Sorry, but I'm not going to merge this as a single commit. You can use git reset --soft HEAD~1 to reset the entire commit and then commit again, or use git rebase --interactive HEAD~1.

@milotype
Copy link
Contributor Author

Sorry, I'm not a programmer (just a translator) and I don't know how to do what you suggest. :-((
Can you or someone else maybe do what is needed to resolve it?
I think the project would benefit if my changes would be merged.

@FineFindus FineFindus merged commit 8e2d668 into FineFindus:master Dec 15, 2023
4 checks passed
@FineFindus
Copy link
Owner

Thanks.

@FineFindus FineFindus mentioned this pull request Dec 15, 2023
milotype added a commit to milotype/eyedropper that referenced this pull request Dec 19, 2023
For some reason the following six .po files didn't update correctly with the issue FineFindus#104 (neither at Hosted Weblate nor at GitHub). They all still have only 151 strings instead of 153 strings.
ca.po
de.po
fr.po
tr.po
uk.po
zh_CN.po

The current "Eyedropper.pot" file with the Creation-Date in the header ("POT-Creation-Date: 2023-11-14 19:29+0000\n") has 153 strings.

In this commit I've just updated the above six files with the current "Eyedropper.pot" file again, without any other changes concearning the translation of strings.

Once the files are merged on GitHub, please also update those translation files on https://hosted.weblate.org/projects/eyedropper/eyedropper/ and I could add those "obvious translations" at Hosted Weblate.
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