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

Updated italian translation + added some new translations #3525

Merged
merged 9 commits into from
Nov 14, 2024

Conversation

loviuz
Copy link
Contributor

@loviuz loviuz commented Sep 27, 2024

Description

I have updated a lot of italian translations, updating the json file with english one. I also added 2 new placeholder for 2 new translations.

Issues Resolved

None.

@johannesjo
Copy link
Owner

Can you have a look at the conflicts?

@johannesjo
Copy link
Owner

johannesjo commented Oct 11, 2024

Probably it would be the easiest solution to resubmit the changes you have made from the latest master. There are some weird conflicts.

Let me know if you need any help with that.

@loviuz
Copy link
Contributor Author

loviuz commented Oct 14, 2024

The message below says that this branch has no conflicts. Do I have to resubmit the PR or is it all ok?

@johannesjo
Copy link
Owner

johannesjo commented Oct 17, 2024

hm that is weird.

I've tried manually merging, which lead to quite a mess :). There definitely are conflicts unfortunately.

Also:
Screenshot from 2024-10-17 16-02-49

@loviuz
Copy link
Contributor Author

loviuz commented Nov 6, 2024

Hi @johannesjo, do you prefer that I close this PR and I will re-create a new one with an updated fork?

@johannesjo
Copy link
Owner

Hey @loviuz ! Thanks for the offer! That would be great!

@loviuz
Copy link
Contributor Author

loviuz commented Nov 13, 2024

It seems that only syncing the fork it is now updated. Can you check it?

PS: the error on linting it does not seems to be an error related to the contents of the commit 🤔

@johannesjo johannesjo merged commit a9f5a0c into johannesjo:master Nov 14, 2024
4 of 5 checks passed
@johannesjo
Copy link
Owner

Thank you very much!

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