Skip to content

Fix: Resolve the warning for redundant Czech desktop entry fields#15720

Merged
ronso0 merged 1 commit into
mixxxdj:2.6from
Rishabhsaini21:fix-desktop-cz-comment
Dec 10, 2025
Merged

Fix: Resolve the warning for redundant Czech desktop entry fields#15720
ronso0 merged 1 commit into
mixxxdj:2.6from
Rishabhsaini21:fix-desktop-cz-comment

Conversation

@Rishabhsaini21
Copy link
Copy Markdown
Contributor

@Rishabhsaini21 Rishabhsaini21 commented Dec 7, 2025

Fixes #15699
This Pull Request resolves a warning in the org.mixxx.Mixxx.desktop file.

In the Czech ([cz]), both keys were translated to "Digitální DJ systém." So,
The fix:
Updates Comment[cz] to another same meaning—"Digitální DJ rozhraní"—resolving the redundancy issue.

@daschuer
Copy link
Copy Markdown
Member

daschuer commented Dec 7, 2025

Thank you for taking care. The bug report was probably too short. Sorry.
We need something like this for all languages:"

Looking at Gedit it has:

Name=Text Editor
Comment=Edit text files

And Gimp:

GenericName=Image Editor
Comment=Create images and edit photographs

Definition:

  • GenericName: General description of the programme, e.g. web browser.
  • Comment: A short descriptive sentence, which should not be identical to the information provided for Name and GenericName.

I think our description for Mixxx is not very good in general.
Can you try to find a good one and than translate it into all languages using an translation tool.

First proposal, you may can do better:

"Digital DJ interface"
“Play music files and create mixes with tempo sync and effects.”

@Rishabhsaini21
Copy link
Copy Markdown
Contributor Author

Hi I've pushed the updates to this branch with the full translations, using the English description "Play music files and perform live DJ mixes with tempo sync, looping and effects. " This PR is now complete and ready for final review and merge. Thanks.

Copy link
Copy Markdown
Member

@ronso0 ronso0 left a comment

Choose a reason for hiding this comment

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

Thank you!
I noticed the formal tone in the de translation (which doesn't suit well and is not consistent with other apps' launcher translations) so I ran this through perplexity.ai and asked it to adjust to use the informal imperative tone.

Please review where possible

Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
Comment thread res/linux/org.mixxx.Mixxx.desktop Outdated
@Rishabhsaini21
Copy link
Copy Markdown
Contributor Author

Hi, I pushed the new commit that updates all Comment translations to the informal imperative tone in required languages.

@daschuer
Copy link
Copy Markdown
Member

daschuer commented Dec 8, 2025

Nice. Can you rebase and probably squash everything onto the 2.6. branch. Than it will be part of the next release not the one after 2.7.

@ronso0 ronso0 added this to the 2.6.0 milestone Dec 8, 2025
@Rishabhsaini21
Copy link
Copy Markdown
Contributor Author

I've successfully rebased this branch onto the upstream/2.6

@github-actions github-actions Bot added the build label Dec 8, 2025
@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Dec 8, 2025

Not quite, you also have the new commits of main since 2.6 and main were last syncronized.
Since the message of the now squashed commit doesn't fit anymore, I suggest you simply do
git rebase -i --onto=upstream/2.6 -> -i is for interactive
in the rebase editor

  • remove all unrelated commits
  • for the squashed commit, replace pick with r (reword)
  • when you get the reword editor, try to summarize the essence of this PR (and it's not required to mention each small change since this is a rather compact commit affecting only one file set)

@Rishabhsaini21
Copy link
Copy Markdown
Contributor Author

Rishabhsaini21 commented Dec 9, 2025

Not quite, you also have the new commits of main since 2.6 and main were last syncronized. Since the message of the now squashed commit doesn't fit anymore, I suggest you simply do git rebase -i --onto=upstream/2.6 -> -i is for interactive in the rebase editor

  • remove all unrelated commits
  • for the squashed commit, replace pick with r (reword)
  • when you get the reword editor, try to summarize the essence of this PR (and it's not required to mention each small change since this is a rather compact commit affecting only one file set)
Screenshot 2025-12-09 203910 $ git rebase -i --onto=upstream/2.6 Successfully rebased and updated refs/heads/fix-desktop-cz-comment.

Hi, I executed the above command and it shows no unrelated commits .

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Dec 9, 2025

Well, you need to push we can see : )
Here there are still 5 unrelated commits from main.

FWIW one of those git commands I find very helpful is this (with an alias of course):
git log --reverse --oneline "$(git rev-parse --symbolic-full-name --abbrev-ref @{u})".."$(git branch --show-current)"
it returns a compact (one-line), reversed (latest at the bottom) gitlog showing only commits of the current branch (relative to its base):
requires gb --set-upstream-to=[upstream], if not already done with git checkout -b [branch-name] [upstream]

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Dec 9, 2025

When you're done, change the target to 2.6 here as well.

@Rishabhsaini21 Rishabhsaini21 changed the base branch from main to 2.6 December 9, 2025 18:45
@Rishabhsaini21
Copy link
Copy Markdown
Contributor Author

It now shows 1 clean commit after changing to 2.6 . Thanks

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Dec 9, 2025

Great, thanks for not giving up on git : )

@ronso0 ronso0 force-pushed the fix-desktop-cz-comment branch from bb7f40c to 2435d63 Compare December 9, 2025 21:39
@ronso0 ronso0 enabled auto-merge December 9, 2025 21:40
Copy link
Copy Markdown
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

LGTM, Thank you.

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Dec 9, 2025

The macOS 15 runner fails with

-- Verify SHA256 of downloaded file /Users/runner/buildenv/mixxx-deps-2.6-arm64-osx-cross-rel-da4c207.zip ...
CMake Error at CMakeLists.txt:117 (message):
  SHA256 checksum mismatch:

  expected: 4a6e7a2d83ae2056a89298a0fd6d110d44a4344e3968219dd0c3d34648599233

       got: 7ea56cc7cce076fa818527f7df32cbb462d15e9e29079a92fed2c18220e2ea1e

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Dec 9, 2025

vcpkg issue, so merge nonetheless?

@daschuer
Copy link
Copy Markdown
Member

Yes. go ahead.

@ronso0 ronso0 disabled auto-merge December 10, 2025 09:16
@ronso0 ronso0 enabled auto-merge December 10, 2025 09:17
@ronso0 ronso0 merged commit 1ce48a1 into mixxxdj:2.6 Dec 10, 2025
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Warning for org.mixxx.Mixxx.desktop during Flatpak builds

3 participants