Skip to content

Comments

Polish translation of Windows installer NSIS script#1124

Merged
ann0see merged 4 commits intojamulussoftware:masterfrom
SeeLook:fix-for-installerlng
Feb 28, 2021
Merged

Polish translation of Windows installer NSIS script#1124
ann0see merged 4 commits intojamulussoftware:masterfrom
SeeLook:fix-for-installerlng

Conversation

@SeeLook
Copy link
Contributor

@SeeLook SeeLook commented Feb 26, 2021

I dared to translate that.
Probably it is not enough to make it work with all NSIS structure and the installer
but from translation angle it should be sufficient.
Let me know if I can do more.

@ann0see ann0see self-assigned this Feb 26, 2021
Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

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

To make it work, you'll need to edit the installerlng.nsi file too.

@ann0see
Copy link
Member

ann0see commented Feb 26, 2021

Thanks for this BTW!

Copy link
Member

@ann0see ann0see left a comment

Choose a reason for hiding this comment

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

Can you check the artifact from the checks page on this PR to verify everything works as expected?

@ann0see
Copy link
Member

ann0see commented Feb 26, 2021

The installer seems to work fine (I had another problem, but I think it's not related and just a windows bug.)

@SeeLook
Copy link
Contributor Author

SeeLook commented Feb 27, 2021

I tested Polish texts in working Windows installer and there is a small glitch in the layout - a button overlaps the text.
Jamulus-installer

But this is not a translation problem.
The rest looks just fine.

@ann0see
Copy link
Member

ann0see commented Feb 27, 2021

Ok. Probably we need to make the label a bit bigger. It should be possible to do this here:

${NSD_CreateLabel} 0 0 100% 12u "$(ASIO_DRIVER_EXPLAIN)"

@ann0see ann0see added this to the Release 3.7.0 milestone Feb 27, 2021
@ann0see
Copy link
Member

ann0see commented Feb 27, 2021

Can you edit this line and check if e.g. 13u instead of 12u in this line works better?

@SeeLook
Copy link
Contributor Author

SeeLook commented Feb 27, 2021

Can I check that through this pull request? Or through another one? - This one is about translation I guess.
I have not build environment for Jamulus under Windows, so artifact is only way I can get installer executable.

@ann0see
Copy link
Member

ann0see commented Feb 27, 2021

Or through another one?

Yes, another PR (with your changes) would be better

@SeeLook
Copy link
Contributor Author

SeeLook commented Feb 27, 2021

But until this pull request is not merged and I send a change to my fork it will automatically land exactly here I suppose.
Or there is some other way. This github quirks I don't know well.

@ann0see
Copy link
Member

ann0see commented Feb 27, 2021

If you change it on master, yes it will add the commit here. If you select to create a new branch via the GitHub web UI, you should be able to create a new PR.

Copy link
Member

@hoffie hoffie left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

  • Translator listed in the src/util.cpp
  • Looks consistent
  • Passes tools/check-wininstaller-translations.sh

Not merging yet as I'm not sure if @ann0see wants to wait for the UI fix?

@hoffie hoffie mentioned this pull request Feb 27, 2021
39 tasks
@hoffie
Copy link
Member

hoffie commented Feb 27, 2021

@SeeLook Could you please rebase? I guess one of the other translations added a conflict in src/res/translation/wininstaller/installerlng.nsi.

@SeeLook
Copy link
Contributor Author

SeeLook commented Feb 28, 2021

Please give me a hint how can I do that rebase.
For the record, my fork is at state of this PR exactly.
And I will send installer UI patch with another PR.

@hoffie
Copy link
Member

hoffie commented Feb 28, 2021

Please give me a hint how can I do that rebase.
For the record, my fork is at state of this PR exactly.

I think it can be done in the Github UI. Do you see a Resolve conflicts button? This should lead to the right place. It will open an editor where you would have to edit the conflicting file (installerlng.nsi) to contain both your changes (Polish) and the changes from master (French). I think in this case this could simply be done by removing the lines with conflict markers (<<<<<<< master, =======, >>>>>>> master) and making sure that the number of empty lines looks right.

You can also do the same using the git command line, but it'd be some more steps.

Can you try?

And I will send installer UI patch with another PR.

Sounds good, thanks!

@ann0see ann0see merged commit 7157912 into jamulussoftware:master Feb 28, 2021
@SeeLook SeeLook deleted the fix-for-installerlng branch February 28, 2021 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Triage

Development

Successfully merging this pull request may close these issues.

3 participants