Merge pull request #25036 from keszybz/plurals

Remove usage of "noun(s)" in messages and docs
This commit is contained in:
Luca Boccassi
2022-10-17 17:12:16 +02:00
committed by GitHub
32 changed files with 57 additions and 59 deletions
+1 -1
View File
@@ -449,7 +449,7 @@ int ethtool_set_wol(
_cleanup_free_ char *str = NULL;
(void) wol_options_to_string_alloc(wolopts & ~ecmd.supported, &str);
log_debug("Network interface %s does not support requested Wake on LAN option(s) \"%s\", ignoring.",
log_debug("Network interface %s does not support requested Wake on LAN options \"%s\", ignoring.",
ifname, strna(str));
wolopts &= ecmd.supported;
+1 -1
View File
@@ -142,7 +142,7 @@ int table_print_with_pager(Table *t, JsonFormatFlags json_format_flags, PagerFla
int table_set_json_field_name(Table *t, size_t column, const char *name);
#define table_log_add_error(r) \
log_error_errno(r, "Failed to add cell(s) to table: %m")
log_error_errno(r, "Failed to add cells to table: %m")
#define table_log_print_error(r) \
log_error_errno(r, "Failed to print table: %m")
+2 -2
View File
@@ -60,10 +60,10 @@ int wifi_get_interface(sd_netlink *genl, int ifindex, enum nl80211_iftype *ret_i
return log_debug_errno(r, "Failed to get NL80211_ATTR_SSID attribute: %m");
if (r >= 0) {
if (len == 0) {
log_debug("SSID has zero length, ignoring the received SSID.");
log_debug("SSID has zero length, ignoring it.");
ssid = mfree(ssid);
} else if (strlen_ptr(ssid) != len) {
log_debug("SSID contains NUL character(s), ignoring the received SSID.");
log_debug("SSID contains NUL characters, ignoring it.");
ssid = mfree(ssid);
}
}