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

[Sorry] Update screenshots, Software Manual, Setup page #465

Merged
merged 14 commits into from
May 9, 2021
Merged

[Sorry] Update screenshots, Software Manual, Setup page #465

merged 14 commits into from
May 9, 2021

Conversation

gilgongo
Copy link
Member

@gilgongo gilgongo commented May 9, 2021

Does this need translation?

  • Yes
  • No

Changes

Re-arranges Software Manual to cover new features as of 3.8.0 and removing some screenshots to lower maintenance overhead in future. Minor changes to text for style, added TOC.

Angst

I realise of course that I should have done this BEFORE we created the translation branch. Not sure what to do ...

@gilgongo gilgongo added this to the Release 3.8.0 milestone May 9, 2021
@gilgongo gilgongo changed the title Update screenshots, Software Manual, Setup page [Sorry] Update screenshots, Software Manual, Setup page May 9, 2021
@gilgongo gilgongo requested review from ignotus666 and jujudusud May 9, 2021 10:31
Oops Server Manual isn't read yet.
@gilgongo gilgongo mentioned this pull request May 9, 2021
2 tasks
Copy link
Member

@jujudusud jujudusud left a comment

Choose a reason for hiding this comment

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

two letters missing ...

wiki/en/en-Server-Admin-Manual.md Outdated Show resolved Hide resolved
wiki/en/en-Software-Manual.md Outdated Show resolved Hide resolved
@jujudusud
Copy link
Member

jujudusud commented May 9, 2021

Please Merge in changes,
after that we will contact all the translators showing what as been changed. ;-)

@ignotus666
Copy link
Contributor

If you want to push this to the translate branch to get it in before the next release it's ok by me.

@jujudusud
Copy link
Member

If you want to push this to the translate branch to get it in before the next release it's ok by me.

To the "changes" branch ?

@gilgongo gilgongo marked this pull request as ready for review May 9, 2021 19:14
Copy link
Member

@jujudusud jujudusud left a comment

Choose a reason for hiding this comment

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

It's ok for me. Ready to be merged.

@gilgongo gilgongo merged commit a56ec09 into jamulussoftware:changes May 9, 2021
@ignotus666
Copy link
Contributor

ignotus666 commented May 9, 2021

To the "changes" branch ?

No, to 'translate'. If it goes into 'changes' I presume it won't get translated or go live until the release after this one, or at least some time after this release. What I meant was that it's ok by me if it goes into the current 'translate' branch so it can all go live for this release, but it doesn't only depend on me - the other translators would have to weigh in as it kind of "breaks" the translation protocol.

@gilgongo
Copy link
Member Author

gilgongo commented May 9, 2021

We've merged them to changes in the hope that a remedial translation can be merged to translate from there. @jujudusud says he can undertake the work...

@ignotus666
Copy link
Contributor

Ok, so if I want to update the ES translation I have to do it on changes then?

@gilgongo
Copy link
Member Author

gilgongo commented May 9, 2021

To quote @jujudusud: "to translate we just have to go to changes branch, copy past the en file locally (or just read it in raw mode in GH interface) and translate on translate3_8_0 branch." We're talking about 3 files BTW.

@jujudusud
Copy link
Member

jujudusud commented May 9, 2021

Ok, so if I want to update the ES translation I have to do it on changes then?

The modifications in english are made to "changes" branch.
The translations of all languages are made in "translate3_8_0" branch.

So, you have to refer to a file in english using something like this place to have the latest english file : https://github.com/jamulussoftware/jamuluswebsite/blob/changes/wiki/en/en-Software-Manual.md
or the raw file if you want : https://raw.githubusercontent.com/jamulussoftware/jamuluswebsite/changes/wiki/en/en-Software-Manual.md
and translate on your own fork, on your own translate3_8_0 branch, on your own language : https://github.com/ignotus666/jamuluswebsite/blob/translate3_8_0/wiki/es/es-Software-Manual.md

the files to be retranslated are :

  • en-Software-Manual.md
  • en-Setup.md
  • en-Server-Admin-Manual.md
  • en-Installation-for-Linux.md

after translating, open a new PR and merge in translate3_8_0 branch

Is it ok for you @ignotus666 ?

@ignotus666
Copy link
Contributor

Done.

@jujudusud jujudusud mentioned this pull request May 10, 2021
2 tasks
gilgongo pushed a commit that referenced this pull request May 10, 2021
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.

3 participants