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

Fixes #2709: reword status to say "directory" #2710

Merged

Conversation

pljones
Copy link
Collaborator

@pljones pljones commented Jul 4, 2022

Short description of changes

Fixes three of the remaining references to "directory server" rather than "directory" in the code -- these are in messages, two of them requiring translation.

There is one I didn't change: --directoryserver. I could change that, too.

There's a whole load of others in the code that don't get seen - those need changing, too, really, but not as part of this fix.

CHANGELOG: Fix (hopefully) all remaining references to "directory server" in displayed messages to say "directory"

Context: Fixes an issue?

Fixes: #2709

Does this change need documentation?

Hopefully all documentation already refers to "directory" correctly.

Status of this Pull Request

Need to confirm scope.

What is missing until this pull request can be merged?

Decide when to merge it.

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

src/util.h Show resolved Hide resolved
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.

As it requires translation we need to tell the translators...

@pljones
Copy link
Collaborator Author

pljones commented Jul 5, 2022

That's what triggered this -- seeing it in translation strings.

@ann0see
Copy link
Member

ann0see commented Jul 5, 2022

I'd merge it as soon as possible and notify translators

@jujudusud jujudusud self-requested a review July 5, 2022 13:56
@ann0see ann0see requested a review from hoffie July 5, 2022 15:54
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.

  • Should this PR also include updated files as produced by lupdate? Or did you avoid adding them intentionally?
  • Merging this PR now will add additional work:
    • PRs where the translation was already updated despite the source string only changing here will likely show up for translation again.
    • PRs which are based on a commit which did not have this change are likely to have a conflict. The conflict can only be solved by the translator and not by maintainers.

I already saw that you (@pljones) have been mentoring some (all?) already submitted translation PRs, so I guess it'll be taken care of. Therefore, approving.

@hoffie hoffie added this to the Release 3.9.0 milestone Jul 5, 2022
@pljones
Copy link
Collaborator Author

pljones commented Jul 5, 2022

I left out the lrelease stuff to do separately with a new push to the translators. Once I've done that to master, I'll update all the translator issues, re-opening where necessary.

@ghost ghost mentioned this pull request Jul 6, 2022
5 tasks
melcon added a commit to melcon/jamulus that referenced this pull request Jul 21, 2022
Fixed the translation for jamulussoftware#2710 that got messed up during the branching/fetch/merge. This is the last one for pt_BR
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.

Remaining instance of "directory server"
4 participants