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

Some Spanish Translation Fixes #6115

Merged
merged 23 commits into from
Jul 16, 2024
Merged

Conversation

tadeu2
Copy link
Contributor

@tadeu2 tadeu2 commented Jul 12, 2024

Some Spanish Translation Fixes

Copy link

@Jaizu Jaizu left a comment

Choose a reason for hiding this comment

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

This seems like a messy PR, idk why you changed some English words to misspelled ones.
I made a review pointing the ones that I found and providing some feedback to the spanish strings as well.
This has plenty of changes, so more reviewers are needed, at least someone that confirms that this doesn't mess with original strings and stugg like that.

localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Outdated Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Outdated Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Outdated Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Outdated Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
@SoftFever
Copy link
Owner

@tadeu2
Thank you.
Could you have a look at @Jaizu's comments?
I can't provide an opinion on the Spanish translation, but the English misspellings seem legitimate.

By the way, we can't leave strings empty if translations are not available.

@tadeu2
Copy link
Contributor Author

tadeu2 commented Jul 14, 2024

This seems like a messy PR, idk why you changed some English words to misspelled ones. I made a review pointing the ones that I found and providing some feedback to the spanish strings as well. This has plenty of changes, so more reviewers are needed, at least someone that confirms that this doesn't mess with original strings and stugg like that.

All the Spanish translation has been done by me from scratch. I have been copying literally, sometimes correcting English mistakes. The first translation I did very quickly and I'm correcting it little by little, seeing spelling mistakes and errors and fixing it.

If you can help me with it, I'd appreciate it.

Copy link
Contributor Author

@tadeu2 tadeu2 left a comment

Choose a reason for hiding this comment

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

I have corrected the issues. @SoftFever have to review english mistakes.

@@ -1676,7 +1676,7 @@ msgstr "Ancho de Extrusión"
msgid "Wipe options"
msgstr "Opciones de limpieza"

msgid "Bed adhesion"
msgid "Bed adhension"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@SoftFever should correct it.

localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Outdated Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Outdated Show resolved Hide resolved
localization/i18n/es/OrcaSlicer_es.po Show resolved Hide resolved
@ElectricalBoy
Copy link
Contributor

ElectricalBoy commented Jul 15, 2024

English misspells are fixed with #5998, i.e., you should rebase this PR to the latest main (and not touch the English part afterwards)

Edit: This PR is in sync with the latest main, okay. Then you should simply not touch the English part.

@SoftFever
Copy link
Owner

@tadeu2 Thank you. Could you have a look at @Jaizu's comments? I can't provide an opinion on the Spanish translation, but the English misspellings seem legitimate.

By the way, we can't leave strings empty if translations are not available.

Just realised there's a typo...
It's supposed to be: "By the way, we can leave strings empty if translations are not available."

Copy link
Owner

@SoftFever SoftFever left a comment

Choose a reason for hiding this comment

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

@tadeu2 @Jaizu Thank you both.

@SoftFever SoftFever merged commit c37a871 into SoftFever:main Jul 16, 2024
1 check passed
@ElectricalBoy
Copy link
Contributor

ElectricalBoy commented Jul 17, 2024

@SoftFever This PR restores the typos fixed by #5998 in the Spanish translation and is out of sync with the translation template.
I believe that this PR should be reverted (or at least be re-fixed) because it breaks the Spanish translation.

@tadeu2
Copy link
Contributor Author

tadeu2 commented Jul 17, 2024 via email

@tadeu2
Copy link
Contributor Author

tadeu2 commented Jul 17, 2024 via email

@ElectricalBoy
Copy link
Contributor

ElectricalBoy commented Jul 17, 2024

You did touch some of the English keys in the Spanish translation file (by reintroducing the typos) and that does break the translation.

Compare the POT timestamp on the Spanish PO file before and after this PR. That moving back implies something is wrong.

ElectricalBoy added a commit to ElectricalBoy/OrcaSlicer that referenced this pull request Jul 17, 2024
tadeu2 pushed a commit to tadeu2/OrcaSlicer that referenced this pull request Jul 19, 2024
SoftFever added a commit that referenced this pull request Jul 25, 2024
* Update OrcaSlicer_es.po

* some changes

* Some fixes

* More fixes

* More fixes and improves

* More fixes

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Traducción español Beta 2.1.0

* Update text.js

* Update OrcaSlicer_es.po

Cambiado punto por coma

* Minor fix PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update Spanish Language

* Updated strings

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Fixed Spanish Strings in English

Fixed a lot of string whose are translations were english to english.

* Some spanish strings improved

* Update Spanish Strings in RC

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes

* More fixes and improves

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

Cambiado punto por coma

* Update Spanish Language

* Some spanish strings improved

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes to PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Traducción español Beta 2.1.0

* Update text.js

* Minor fix PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes to PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes

* More fixes and improves

* Some spanish strings improved

* some changes

* Some fixes

* More fixes

* More fixes and improves

* Update OrcaSlicer_es.po

* Fixed Spanish Strings in English

Fixed a lot of string whose are translations were english to english.

* Some spanish strings improved

* Update Spanish Strings in RC

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Revert "Some Spanish Translation Fixes (#6115)"

This reverts commit c37a871.

* Calibration: retraction test

* Fix a regression: Generic filament profiles conflicts #981

* support full_fan_speed_layer

* Support interface fan speed

* profile cover image reorg

* Traducción español Beta 2.1.0

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes to PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Revert "profile cover image reorg"

This reverts commit 041d41f.

* Revert "Support interface fan speed"

This reverts commit a657d85.

* Revert "support full_fan_speed_layer"

This reverts commit ac6dcad.

* Revert "Fix a regression: Generic filament profiles conflicts #981"

This reverts commit 97118f8.

* Revert "Calibration: retraction test"

This reverts commit b210c29.

* Update OrcaSlicer_es.po

* More fixes

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Final fixes

* Update OrcaSlicer_es.po

* Update Spanish Strings

---------

Co-authored-by: ElectricalBoy <[email protected]>
Co-authored-by: SoftFever <[email protected]>
Co-authored-by: SoftFever <[email protected]>
SoftFever added a commit that referenced this pull request Sep 11, 2024
* Update OrcaSlicer_es.po

* some changes

* Some fixes

* More fixes

* More fixes and improves

* More fixes

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Traducción español Beta 2.1.0

* Update text.js

* Update OrcaSlicer_es.po

Cambiado punto por coma

* Minor fix PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update Spanish Language

* Updated strings

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Fixed Spanish Strings in English

Fixed a lot of string whose are translations were english to english.

* Some spanish strings improved

* Update Spanish Strings in RC

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes

* More fixes and improves

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

Cambiado punto por coma

* Update Spanish Language

* Some spanish strings improved

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes to PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Traducción español Beta 2.1.0

* Update text.js

* Minor fix PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes to PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes

* More fixes and improves

* Some spanish strings improved

* some changes

* Some fixes

* More fixes

* More fixes and improves

* Update OrcaSlicer_es.po

* Fixed Spanish Strings in English

Fixed a lot of string whose are translations were english to english.

* Some spanish strings improved

* Update Spanish Strings in RC

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Revert "Some Spanish Translation Fixes (#6115)"

This reverts commit c37a871.

* Calibration: retraction test

* Fix a regression: Generic filament profiles conflicts #981

* support full_fan_speed_layer

* Support interface fan speed

* profile cover image reorg

* Traducción español Beta 2.1.0

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Some fixes to PR

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Revert "profile cover image reorg"

This reverts commit 041d41f.

* Revert "Support interface fan speed"

This reverts commit a657d85.

* Revert "support full_fan_speed_layer"

This reverts commit ac6dcad.

* Revert "Fix a regression: Generic filament profiles conflicts #981"

This reverts commit 97118f8.

* Revert "Calibration: retraction test"

This reverts commit b210c29.

* Update OrcaSlicer_es.po

* More fixes

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Final fixes

* Update OrcaSlicer_es.po

* Update Spanish Strings

* update

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update text.js

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

* Update OrcaSlicer_es.po

---------

Co-authored-by: ElectricalBoy <[email protected]>
Co-authored-by: SoftFever <[email protected]>
Co-authored-by: SoftFever <[email protected]>
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.

4 participants