eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing translation macros.

Browse Source
This commit is contained in:
Milan Broz
2021-11-10 13:28:29 +01:00
parent 7086c414bc
commit a364355c16
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bitlk/bitlk.c
View File

@@ -947,12 +947,12 @@ static int get_startup_key(struct crypt_device *cd,
return -EPERM;
if (bek_header.metadata_version != 1) {
log_err(cd, "Unsupported BEK metadata version %" PRIu32 "", bek_header.metadata_version);
log_err(cd, _("Unsupported BEK metadata version %" PRIu32), bek_header.metadata_version);
return -ENOTSUP;
}
if (bek_header.metadata_size != passwordLen) {
log_err(cd, "Unexpected BEK metadata size %" PRIu32 " does not match BEK file length", bek_header.metadata_size);
log_err(cd, _("Unexpected BEK metadata size %" PRIu32 " does not match BEK file length"), bek_header.metadata_size);
return -EINVAL;
}

2
lib/luks2/luks2_reencrypt.c
View File

@@ -3293,7 +3293,7 @@ static void reencrypt_teardown_fatal(struct crypt_device *cd, struct luks2_reenc
(rh->offset >> SECTOR_SHIFT) + crypt_get_data_offset(cd), rh->length >> SECTOR_SHIFT);
if (rh->online) {
log_err(cd, "Reencryption was run in online mode.");
log_err(cd, _("Online reencryption failed."));
if (dm_status_suspended(cd, rh->hotzone_name) > 0) {
log_dbg(cd, "Hotzone device %s suspended, replacing with dm-error.", rh->hotzone_name);
if (dm_error_device(cd, rh->hotzone_name)) {

4
src/cryptsetup.c
View File

@@ -2972,7 +2972,7 @@ static int action_encrypt_luks2(struct crypt_device **cd)
if (!ARG_SET(OPT_LUKS2_KEYSLOTS_SIZE_ID))
ARG_SET_UINT64(OPT_LUKS2_KEYSLOTS_SIZE_ID, -data_shift - 2 * ARG_UINT64(OPT_LUKS2_METADATA_SIZE_ID));
if (2 * ARG_UINT64(OPT_LUKS2_METADATA_SIZE_ID) + ARG_UINT64(OPT_LUKS2_KEYSLOTS_SIZE_ID) > (uint64_t)-data_shift) {
log_err("LUKS2 metadata size is larger than data shift value.");
log_err(_("LUKS2 metadata size is larger than data shift value."));
return -EINVAL;
}
}
@@ -3004,7 +3004,7 @@ static int action_encrypt_luks2(struct crypt_device **cd)
r = crypt_header_restore(*cd, CRYPT_LUKS2, header_file);
if (r) {
log_err("Failed to place new header at head of device %s.", action_argv[0]);
log_err(_("Failed to place new header at head of device %s."), action_argv[0]);
goto out;
}
}

2
src/cryptsetup_reencrypt.c
View File

@@ -350,7 +350,7 @@ static int parse_log(struct reenc_ctx *rc)
if (end) {
*end++ = '\0';
if (parse_line_log(rc, start)) {
log_err("Wrong log format.");
log_err(_("Wrong log format."));
return -EINVAL;
}
}

4
src/utils_blockdev.c
View File

@@ -291,10 +291,10 @@ int tools_wipe_all_signatures(const char *path)
while ((pr = blk_probe(h)) < PRB_EMPTY) {
if (blk_is_partition(h))
log_verbose("Existing '%s' partition signature on device %s will be wiped.",
log_verbose(_("Existing '%s' partition signature on device %s will be wiped."),
blk_get_partition_type(h), path);
if (blk_is_superblock(h))
log_verbose("Existing '%s' superblock signature on device %s will be wiped.",
log_verbose(_("Existing '%s' superblock signature on device %s will be wiped."),
blk_get_superblock_type(h), path);
if (blk_do_wipe(h)) {
log_err(_("Failed to wipe device signature."));

5
src/utils_tools.c
View File

@@ -116,8 +116,9 @@ static int _dialog(const char *msg, void *usrptr, int default_answer)
set_int_block(0);
if (isatty(STDIN_FILENO)) {
log_std("\nWARNING!\n========\n");
log_std("%s\n\nAre you sure? (Type 'yes' in capital letters): ", msg);
log_std(_("\nWARNING!\n========\n"));
/* TRANSLATORS: User must type "YES" (in capital letters), do not translate this word. */
log_std(_("%s\n\nAre you sure? (Type 'yes' in capital letters): "), msg);
fflush(stdout);
if(getline(&answer, &size, stdin) == -1) {
r = 0;