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

Italian translation #1705

Merged
merged 6 commits into from Jan 7, 2019

Conversation

Projects
None yet
4 participants
@GortiZ6
Copy link
Contributor

GortiZ6 commented Jan 7, 2019

Completed and fixed italian translation started by @Feyn-Man.
I'd like to ask him if it's ok to use this new version or if he prefers to change something else, but I don't know how to contact him, I hope he reads this merge request :)

@justinclift

This comment has been minimized.

Copy link
Member

justinclift commented Jan 7, 2019

but I don't know how to contact him

As a tip, if you clone one of @Feyn-Man's personal repos (for example, this one), then change into it, you'll be able to view the email address associated with the commits using the git log command.

Does that help? 😄

@Feyn-Man

This comment has been minimized.

Copy link
Contributor

Feyn-Man commented Jan 7, 2019

Hi @GortiZ6, it's fine for me, thank you for your help 😄

@justinclift

This comment has been minimized.

Copy link
Member

justinclift commented Jan 7, 2019

Hmmm, this build is failing due to the AppImage stuff (@deepsidhu1313, this might be of interest).

@GortiZ6 @Feyn-Man Should this be merged now, or is it still in progress? 😄

@GortiZ6

This comment has been minimized.

Copy link
Contributor Author

GortiZ6 commented Jan 7, 2019

@justinclift: Yes it helps, I'll remember for next time.
@Feyn-Man: Ok, thanks so I guess if there're no other issue we can merge it. (the failure on travis-ci to me seems unrelated to this merge, but if I can do something to fix it let me know).

@GortiZ6

This comment has been minimized.

Copy link
Contributor Author

GortiZ6 commented Jan 7, 2019

Hmmm, this build is failing due to the AppImage stuff (@deepsidhu1313, this might be of interest).

@GortiZ6 @Feyn-Man Should this be merged now, or is it still in progress? 😄

For me it can be merged, all strings have been translated up to master.

@justinclift justinclift merged commit 460cd88 into sqlitebrowser:master Jan 7, 2019

1 check failed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
@justinclift

This comment has been minimized.

Copy link
Member

justinclift commented Jan 7, 2019

Thanks @GortiZ6, just merged it.

As a thought, are the strings in the v3.11.x branch ok, or do they need some of the pieces from this applied there too? That branch is the one we'll be making the 3.11.0 release from (soon). 😄

@GortiZ6

This comment has been minimized.

Copy link
Contributor Author

GortiZ6 commented Jan 7, 2019

@justinclift I've tried to merge this ts file on v3.11.x and everything but one translation was automatically imported. To fix that missing one I've made a new TS file for v3.11.x that you can find on my branch:
https://github.com/GortiZ6/sqlitebrowser/tree/v3.11.x
Should I do a merge request for it you or can you just pull it from there?

@GortiZ6 GortiZ6 deleted the GortiZ6:italian_translation branch Jan 7, 2019

@deepsidhu1313

This comment has been minimized.

Copy link
Contributor

deepsidhu1313 commented Jan 7, 2019

@GortiZ6

This comment has been minimized.

Copy link
Contributor Author

GortiZ6 commented Jan 7, 2019

Hi , Sorry for late reply. Is it still failing , due to AppImage code ??

I think so -> https://travis-ci.org/sqlitebrowser/sqlitebrowser/builds/476320839?utm_source=github_status&utm_medium=notification

@deepsidhu1313

This comment has been minimized.

Copy link
Contributor

deepsidhu1313 commented Jan 7, 2019

@justinclift

This comment has been minimized.

Copy link
Member

justinclift commented Jan 7, 2019

@GortiZ6 Thanks, I'll have a go at merging your branch now. 😄

@deepsidhu1313 No worries. I've just nuked the AppImage lines from the .travis config. Feel free to add them back / experiment / etc when you have some time and feel up for it. 😄

@justinclift

This comment has been minimized.

Copy link
Member

justinclift commented Jan 7, 2019

@GortiZ6 That turned out to be pretty easy. I just cherry-picked the two commits from your v3.11.x branch across to ours, then push it to our repo. All done. Cool! 😄

@justinclift

This comment has been minimized.

Copy link
Member

justinclift commented Jan 9, 2019

Tracking down a failure in our Windows builds... it turns out to be caused by this. Oops. 😉

Looks like the translation file was renamed to upper case for one part of it's name, with a soft link pointing to the new name.

Do you remember what that was for? We'll need to change the name back to get things working, but it'd be useful to know the problem that the rename was meant to solve, just in case it's important for something else. 😄

justinclift added a commit that referenced this pull request Jan 9, 2019

@GortiZ6

This comment has been minimized.

Copy link
Contributor Author

GortiZ6 commented Jan 9, 2019

Actually it was just to match the "it_IT" language code and leave space for an "it_CH" translation without eliminating the previous generic "it" definition... I forgot the Windows build and issues with the softlink, it was just to avoid to have two equal files for the translations and to maintain them both. For me it's ok also to keep only the generic "it" translation and to push this issue forward in case some one arise the need to have an it_CH translation (which I found quite improbable).

@justinclift

This comment has been minimized.

Copy link
Member

justinclift commented Jan 9, 2019

Ahhh. If we do need to rename the file around (eg to it_IT version), it should be doable. We can rename it, and make sure the various files it's listed in get changed too.

I think (without testing it), that should work. 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment