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

Server UI Changes #677

Closed
wants to merge 41 commits into from
Closed

Server UI Changes #677

wants to merge 41 commits into from

Conversation

gilgongo
Copy link
Member

@gilgongo gilgongo commented Jan 9, 2022

Does this need translation?

  • Yes
  • No

Changes

A number of changes across the docs are implied by changes to the server UI (notably, but not exclusively, the abolition of the concept of "private servers") in jamulussoftware/jamulus#2199

See also the discussion on vocabulary here: jamulussoftware/jamulus#2228

@gilgongo gilgongo marked this pull request as draft January 9, 2022 09:44
wiki/en/FAQ.md Outdated Show resolved Hide resolved
wiki/en/FAQ.md Outdated Show resolved Hide resolved
wiki/en/FAQ.md Outdated Show resolved Hide resolved
wiki/en/FAQ.md Show resolved Hide resolved
wiki/en/Running-a-Server.md Outdated Show resolved Hide resolved
wiki/en/Running-a-Server.md Outdated Show resolved Hide resolved
@gilgongo
Copy link
Member Author

gilgongo commented Jan 9, 2022

I'll wait a bit for the main PR to mature before updating the screenshots.

wiki/en/Running-a-Server.md Outdated Show resolved Hide resolved
wiki/en/Running-a-Server.md Outdated Show resolved Hide resolved
@gilgongo
Copy link
Member Author

OK so pending the outcome of jamulussoftware/jamulus#2228 vocabulary we go for, I've done all the changes save for the screenshots now.

@gilgongo gilgongo mentioned this pull request Jan 17, 2022
3 tasks
@gilgongo gilgongo added this to the 3.9.0 milestone Jan 22, 2022
@ann0see
Copy link
Member

ann0see commented Feb 23, 2022

Not sure what to do with this PR.

@gilgongo
Copy link
Member Author

I can try fixing the conflicts. Otherwise, I think it's OK. I think we agree that we can't prevent people from using the term "private", but if we try to be clear with our terms in the docs then that's all we can do.

@gilgongo
Copy link
Member Author

BTW I'm going to do another PR to turn the structure of the server docs inside out so that they lead (after suitable intro) with running a headless Linux server. So I'd like to get this merged :-)

@gilgongo
Copy link
Member Author

I can try fixing the conflicts. Otherwise, I think it's OK. I think we agree that we can't prevent people from using the term "private", but if we try to be clear with our terms in the docs then that's all we can do.

Actually, no I can't as I don't know what all those _translator-files and non-en things are doing.

@ann0see
Copy link
Member

ann0see commented Feb 23, 2022

Hmm. I think fixing the conflicts is a tricky one... @ignotus666 I think it makes sense to do it the "dirty" way i.e. just copy the changed files manually to a new branch

@ignotus666
Copy link
Contributor

Yeah, it seems that lots of the changes in files are stuff that has nothing to do with "server UI changes" (image links edited to use includes, etc.). There might still be conflicts in some files because small things may have got edited since this PR was created, but they'll be much easier to fix than what's here now. The .po and .inc file conflicts should go away anyway.

@gilgongo
Copy link
Member Author

gilgongo commented Feb 23, 2022

OK so if I close this. What's the best way of working out what I changed? Maybe I can just remember what those files were. I think it was only a few.

@gilgongo gilgongo closed this Feb 23, 2022
@ignotus666
Copy link
Contributor

The list of changed files in this PR should tell you (just ignore all the. po and .inc files).

@pljones pljones removed this from the Release 3.9.0 milestone May 22, 2022
@gilgongo gilgongo mentioned this pull request Jul 31, 2022
3 tasks
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.

4 participants