Skip to content

Conversation

@tessus
Copy link
Contributor

@tessus tessus commented Jan 29, 2025

This PR has more than 1 commit on purpose and can be squashed during merge. (Or I can squash them as well, even though I like the commits separate in PRs (and not force push in a PR) to make discussion/comments easier to follow. But I will adhere to whatever process this project follows.)

  1. use UNMOUNT in constants
  2. use the term unmount in the GUI
  3. update the documentation
  4. add another command line argument/flag unmount (dismount will still work)

This is a rather extensive change in terms of LOC changed. I split it in several commits to make the review a bit easier.

I haven't changed variable names for now, but can do so upon request. I have noticed that in certain parts of the code the term unmount had already been used.

This change updates the term DISMOUNT in constants to UNMOUNT.
Other occurrences (e.g. variable names) are left alone for now.
This change updates the GUI text and replaces dismount with unmount.
This change adds an argument 'unmount' for command line usage, while
trying to deprecate the old disnount argument.
The current dismount argument/flag will still work to not introduce
a breaking change.
This change fixes the shorthand version of the argument /unmount
It also adds back the info for /dismount and that it is deprecated.
@tessus tessus requested a review from idrassi January 30, 2025 21:04
@idrassi idrassi merged commit 498dff9 into veracrypt:master Jan 31, 2025
1 check passed
@idrassi
Copy link
Member

idrassi commented Jan 31, 2025

@tessus Thank you!

@tessus
Copy link
Contributor Author

tessus commented Jan 31, 2025

You are welcome and thank you for accepting this change.

@Unknown78
Copy link

Replace "Dismount" with "Unmount" across the UI and documentation to align with IT standards (GH #1478)

Hi, just curious.
Which IT standards that enforce the word of unmount instead of dismount?

@idrassi
Copy link
Member

idrassi commented Feb 5, 2025

By "IT standards," I meant what is commonly used as a standard term for disconnecting a disk or volume, not an official standard like ISO or similar.

The term "dismount" originated in the Windows ecosystem where it was chosen in contrast to "unmount" the term used in UNIX and macOS environments.
However, Microsoft has since transitioned to using "unmount" as the official term, aligning with all other operating systems. Some internal APIs and constants still retain "dismount" for backward compatibility but the shift toward "unmount" is now standard practice.

For further clarification, this article explains the distinction between the two terms: https://thecontentauthority.com/blog/unmount-vs-dismount

Additionally, the Cambridge Dictionary definitions reinforce the difference:

It was time for VeraCrypt to move away from "dismount" and I thank @tessus for helping make this change happen.

@apawelec
Copy link

apawelec commented Feb 5, 2025

Maybe I'm missing something, but most obvious un/dis-mount button still has old label:

obraz

In Volumes and tray icon menus I have new word.

Installed from veracrypt-1.26.20-Ubuntu-22.04-amd64.deb.

@tessus
Copy link
Contributor Author

tessus commented Feb 5, 2025

@tessus
Copy link
Contributor Author

tessus commented Feb 5, 2025

I've checked the entire code again (current master). There is no string of Dismount All in the source tree.

But @apawelec is correct. This string also shows in the macOS version.

@idrassi how are the packages built? Is it possible that there was an issue with the build process?

@idrassi
Copy link
Member

idrassi commented Feb 5, 2025

@apawelec Thank you for reporting this. It is amazing how we all missed this button...the brain can sometimes play tricks on you!

@tessus
The issue is caused by the entry IDC_UNMOUNTALL in Language.xml that used & inside it to indicate that ALT+s is accelerator key associated with unmounting all volumes:

    <entry lang="en" key="IDC_UNMOUNTALL">Di&amp;smount All</entry>

Fixing this will require using "Unmount All" and since it doesn't contain an 's', the usual accelerator key cannot be used anymore. The logic approach is to replace it with ALT+u since it is more logical and it is not currently used. Honestly, ALT+s never made sense since s is more associated with saving.

I will push a change to fix this and use ALT+u as a new accelerator key for unmounting all volumes.

@idrassi
Copy link
Member

idrassi commented Feb 5, 2025

Fix pushed: 42b716f

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