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 translations from 10/26 English catalog #22781

Merged

Conversation

jrafanie
Copy link
Member

@jrafanie jrafanie commented Nov 8, 2023

Based on english updated in #22770

Note, the first commit removes all of the commented file: line numbers.

See the second commit for the content changes.

% git diff --cached --numstat
335     12      locale/de/manageiq.po
332     12      locale/es/manageiq.po
342     18      locale/fr/manageiq.po
334     13      locale/it/manageiq.po
330     13      locale/ja/manageiq.po
330     13      locale/ko/manageiq.po
332     12      locale/pt_BR/manageiq.po
329     12      locale/zh_CN/manageiq.po
330     13      locale/zh_TW/manageiq.po

@jrafanie
Copy link
Member Author

jrafanie commented Nov 8, 2023

I'm going to try to see if I can manually delete these commented file/line number lines as a first commit and then apply the downloaded translations on top so the second commit can be reviewed separately.

```
% git diff --cached --numstat
335     12      locale/de/manageiq.po
332     12      locale/es/manageiq.po
342     18      locale/fr/manageiq.po
334     13      locale/it/manageiq.po
330     13      locale/ja/manageiq.po
330     13      locale/ko/manageiq.po
332     12      locale/pt_BR/manageiq.po
329     12      locale/zh_CN/manageiq.po
330     13      locale/zh_TW/manageiq.po
```
@miq-bot
Copy link
Member

miq-bot commented Nov 8, 2023

Checked commits jrafanie/manageiq@cdfb20b~...390451a with ruby 2.6.10, rubocop 1.28.2, haml-lint 0.35.0, and yamllint
0 files checked, 0 offenses detected
Everything looks fine. 🍰

@Fryguy
Copy link
Member

Fryguy commented Nov 8, 2023

The absolute KING of deletions 👑

✂️ ✂️ ✂️ 🔥 🔥 🔥 🗑️ 🗑️ 🗑️

jrafanie added a commit to jrafanie/manageiq-ui-classic that referenced this pull request Nov 8, 2023
English: ManageIQ/manageiq#22770
Translations: ManageIQ/manageiq#22781

Note, I've locally reverted the changes to the english files
as ManageIQ/manageiq#22777 was merged
too early.  We'll get these changes in the next cut.
@Fryguy
Copy link
Member

Fryguy commented Nov 8, 2023

Semi-related to #22217 - I'm still thinking we should just remove the file/line numbers from the .pot file as well.

Regardless, we definitely don't need them in the .po files, so I'm very 👍 on this PR

@Fryguy Fryguy merged commit e2d7b1f into ManageIQ:master Nov 8, 2023
6 checks passed
@jrafanie jrafanie deleted the update_translations_10_26_after_22770 branch November 8, 2023 18:31
@jrafanie
Copy link
Member Author

jrafanie commented Nov 8, 2023

The absolute KING of deletions 👑

✂️ ✂️ ✂️ 🔥 🔥 🔥 🗑️ 🗑️ 🗑️

🤣 If only they were "real" deletions

@Fryguy
Copy link
Member

Fryguy commented Nov 8, 2023

Backported to quinteros in commit ada75bc.

commit ada75bced232dfd67c04e3ff1128cf0bcd39e576
Author: Jason Frey <fryguy9@gmail.com>
Date:   Wed Nov 8 13:11:25 2023 -0500

    Merge pull request #22781 from jrafanie/update_translations_10_26_after_22770
    
    Update translations from 10/26 English catalog
    
    (cherry picked from commit e2d7b1fefa1dcc5984a63f3f11b4f450ebc4182d)

Fryguy added a commit that referenced this pull request Nov 8, 2023
…er_22770

Update translations from 10/26 English catalog

(cherry picked from commit e2d7b1f)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants