root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xz: Unify a few strings with liblzma 

Avoid having both "%s: foo" and "foo" as translatable strings
so that translators don't need to handle it twice.
This commit is contained in:
Lasse Collin 2025-01-20 16:31:49 +02:00
parent 713fdaa8b0
commit 6f5cdd4534
No known key found for this signature in database
GPG Key ID: 38EE757D69184620
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/xz/options.c
View File

@ -82,9 +82,9 @@ parse_options(const char *str, const option_map *opts,
*value++ = '\0';
if (value == NULL || value[0] == '\0')
message_fatal(_("%s: Options must be 'name=value' "
"pairs separated with commas"),
tuklib_mask_nonprint(str));
message_fatal(_("%s: %s"), tuklib_mask_nonprint(str),
_("Options must be 'name=value' "
"pairs separated with commas"));
// Look for the option name from the option map.
unsigned i = 0;
@ -110,8 +110,9 @@ parse_options(const char *str, const option_map *opts,
}
if (opts[i].map[j].name == NULL)
message_fatal(_("%s: Invalid option value"),
tuklib_mask_nonprint(value));
message_fatal(_("%s: %s"),
tuklib_mask_nonprint(value),
_("Invalid option value"));
set(filter_options, i, opts[i].map[j].id, value);

4
src/xz/util.c
View File

@ -103,8 +103,8 @@ str_to_uint64(const char *name, const char *value, uint64_t min, uint64_t max)
return max;
if (*value < '0' || *value > '9')
message_fatal(_("%s: Value is not a non-negative "
"decimal integer"), value);
message_fatal(_("%s: %s"), value,
_("Value is not a non-negative decimal integer"));
do {
// Don't overflow.