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.

Sign up for GitHub

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

Jump to bottom

chore: standardize on "drive" for USB export devices #2251

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: standardize on "drive" for USB export devices #2251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions client/securedrop_client/gui/conversation/export/export_wizard_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@ class Pages(IntEnum):

# Human-readable status info
STATUS_MESSAGES = {
ExportStatus.NO_DEVICE_DETECTED: _("No device detected"),
ExportStatus.NO_DEVICE_DETECTED: _("No USB drives detected"),
ExportStatus.MULTI_DEVICE_DETECTED: _(
"Too many USB devices detected; please insert one supported device."
"Too many USB drives detected; please insert one supported drive."
),
ExportStatus.INVALID_DEVICE_DETECTED: _(
"Either the drive is not encrypted or there is something else wrong with it."
"<br />"
"If this is a VeraCrypt drive, please unlock it from within "
"the sd-devices VM, then try again."
),
ExportStatus.DEVICE_WRITABLE: _("The device is ready for export."),
ExportStatus.DEVICE_LOCKED: _("The device is locked."),
ExportStatus.DEVICE_WRITABLE: _("The drive is ready for export."),
ExportStatus.DEVICE_LOCKED: _("The drive is locked."),
ExportStatus.ERROR_UNLOCK_LUKS: _("The passphrase provided did not work. Please try again."),
ExportStatus.ERROR_MOUNT: _("Error mounting drive"),
ExportStatus.ERROR_EXPORT: _("Error during export"),
ExportStatus.ERROR_UNMOUNT_VOLUME_BUSY: _(
"Files were exported successfully, but the USB device could not be unmounted."
"Files were exported successfully, but the USB drive could not be unmounted."
),
ExportStatus.ERROR_EXPORT_CLEANUP: _(
"Files were exported successfully, but some temporary files remain on disk. "
"Reboot to remove them."
),
ExportStatus.SUCCESS_EXPORT: _("Export successful"),
ExportStatus.DEVICE_ERROR: _(
"Error encountered with this device. See your administrator for help."
"Error encountered with this drive. See your administrator for help."
),
ExportStatus.ERROR_MISSING_FILES: _("Files were moved or missing and could not be exported."),
ExportStatus.CALLED_PROCESS_ERROR: _("Error encountered. Please contact support."),
Expand Down
12 changes: 6 additions & 6 deletions client/securedrop_client/locale/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,19 +276,19 @@ msgstr ""
msgid "BACK"
msgstr ""

msgid "No device detected"
msgid "No USB drives detected"
msgstr ""

msgid "Too many USB devices detected; please insert one supported device."
msgid "Too many USB drives detected; please insert one supported drive."
msgstr ""

msgid "Either the drive is not encrypted or there is something else wrong with it.<br />If this is a VeraCrypt drive, please unlock it from within the sd-devices VM, then try again."
msgstr ""

msgid "The device is ready for export."
msgid "The drive is ready for export."
msgstr ""

msgid "The device is locked."
msgid "The drive is locked."
msgstr ""

msgid "The passphrase provided did not work. Please try again."
Expand All @@ -300,7 +300,7 @@ msgstr ""
msgid "Error during export"
msgstr ""

msgid "Files were exported successfully, but the USB device could not be unmounted."
msgid "Files were exported successfully, but the USB drive could not be unmounted."
msgstr ""

msgid "Files were exported successfully, but some temporary files remain on disk. Reboot to remove them."
Expand All @@ -309,7 +309,7 @@ msgstr ""
msgid "Export successful"
msgstr ""

msgid "Error encountered with this device. See your administrator for help."
msgid "Error encountered with this drive. See your administrator for help."
msgstr ""

msgid "Files were moved or missing and could not be exported."
Expand Down