From a3239ef1235f7080aa8ea85367e247ee3a9ded1c Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Tue, 9 Jun 2026 22:18:18 +0900 Subject: [PATCH] Run "gettext update" and "format" xtasks --- localization/po/de.po | 14 +++++++------- localization/po/es.po | 14 +++++++------- localization/po/fr.po | 16 ++++++++-------- localization/po/ja_JP.po | 14 +++++++------- localization/po/pl.po | 14 +++++++------- localization/po/pt_BR.po | 14 +++++++------- localization/po/sv.po | 14 +++++++------- localization/po/zh_CN.po | 14 +++++++------- localization/po/zh_TW.po | 14 +++++++------- share/completions/zpool.fish | 1 - src/locale.rs | 4 +++- 11 files changed, 67 insertions(+), 66 deletions(-) diff --git a/localization/po/de.po b/localization/po/de.po index 061e1bf5a..1fb0b0132 100644 --- a/localization/po/de.po +++ b/localization/po/de.po @@ -15740,9 +15740,6 @@ msgstr "" msgid "Device to disconnect" msgstr "Zu trennendes Gerät" -msgid "Device to use for replacement" -msgstr "" - msgid "DevicesMojo lists all attached devices and emulators found with the android debug bridge" msgstr "" @@ -25766,6 +25763,9 @@ msgstr "" msgid "Existing pool device to attach to" msgstr "" +msgid "Existing pool device to replace" +msgstr "" + msgid "Existing revision/tag." msgstr "" @@ -43280,9 +43280,6 @@ msgstr "" msgid "Polling interval" msgstr "" -msgid "Pool device to be replaced" -msgstr "" - msgid "Pool information in XML" msgstr "" @@ -43343,7 +43340,7 @@ msgstr "" msgid "Pool to remove device from" msgstr "" -msgid "Pool to replace device" +msgid "Pool to replace device of" msgstr "" msgid "Pool to retrieve I/O stats from" @@ -50501,6 +50498,9 @@ msgstr "" msgid "Replace the default HTML title and H1 header with string" msgstr "" +msgid "Replacement device" +msgstr "" + msgid "Replacement for dot in _templates etc" msgstr "" diff --git a/localization/po/es.po b/localization/po/es.po index c558e9b23..b4954d779 100644 --- a/localization/po/es.po +++ b/localization/po/es.po @@ -15740,9 +15740,6 @@ msgstr "" msgid "Device to disconnect" msgstr "" -msgid "Device to use for replacement" -msgstr "" - msgid "DevicesMojo lists all attached devices and emulators found with the android debug bridge" msgstr "" @@ -25766,6 +25763,9 @@ msgstr "" msgid "Existing pool device to attach to" msgstr "" +msgid "Existing pool device to replace" +msgstr "" + msgid "Existing revision/tag." msgstr "" @@ -43280,9 +43280,6 @@ msgstr "" msgid "Polling interval" msgstr "" -msgid "Pool device to be replaced" -msgstr "" - msgid "Pool information in XML" msgstr "" @@ -43343,7 +43340,7 @@ msgstr "" msgid "Pool to remove device from" msgstr "" -msgid "Pool to replace device" +msgid "Pool to replace device of" msgstr "" msgid "Pool to retrieve I/O stats from" @@ -50501,6 +50498,9 @@ msgstr "" msgid "Replace the default HTML title and H1 header with string" msgstr "" +msgid "Replacement device" +msgstr "" + msgid "Replacement for dot in _templates etc" msgstr "" diff --git a/localization/po/fr.po b/localization/po/fr.po index ff9a9bb48..dec3153d9 100644 --- a/localization/po/fr.po +++ b/localization/po/fr.po @@ -15869,9 +15869,6 @@ msgstr "Périphérique duquel effacer l’étiquette des informations ZFS" msgid "Device to disconnect" msgstr "Périphérique à déconnecter" -msgid "Device to use for replacement" -msgstr "Périphérique à utiliser en remplacement" - msgid "DevicesMojo lists all attached devices and emulators found with the android debug bridge" msgstr "" @@ -25895,6 +25892,9 @@ msgstr "Date existante" msgid "Existing pool device to attach to" msgstr "" +msgid "Existing pool device to replace" +msgstr "" + msgid "Existing revision/tag." msgstr "Révision/étiquette existante" @@ -43409,9 +43409,6 @@ msgstr "" msgid "Polling interval" msgstr "" -msgid "Pool device to be replaced" -msgstr "Périphérique du pool à remplacer" - msgid "Pool information in XML" msgstr "" @@ -43472,8 +43469,8 @@ msgstr "Pool duquel lire les événements" msgid "Pool to remove device from" msgstr "Pool duquel supprimer un périphérique" -msgid "Pool to replace device" -msgstr "Pool duquel remplacer un périphérique" +msgid "Pool to replace device of" +msgstr "" msgid "Pool to retrieve I/O stats from" msgstr "Pool duquel récupérer les statistiques d’E/S" @@ -50630,6 +50627,9 @@ msgstr "Remplacer le message de la révision" msgid "Replace the default HTML title and H1 header with string" msgstr "" +msgid "Replacement device" +msgstr "" + msgid "Replacement for dot in _templates etc" msgstr "" diff --git a/localization/po/ja_JP.po b/localization/po/ja_JP.po index 76268cbdc..83fd44f15 100644 --- a/localization/po/ja_JP.po +++ b/localization/po/ja_JP.po @@ -15743,9 +15743,6 @@ msgstr "" msgid "Device to disconnect" msgstr "" -msgid "Device to use for replacement" -msgstr "" - msgid "DevicesMojo lists all attached devices and emulators found with the android debug bridge" msgstr "" @@ -25769,6 +25766,9 @@ msgstr "" msgid "Existing pool device to attach to" msgstr "" +msgid "Existing pool device to replace" +msgstr "" + msgid "Existing revision/tag." msgstr "" @@ -43283,9 +43283,6 @@ msgstr "" msgid "Polling interval" msgstr "" -msgid "Pool device to be replaced" -msgstr "" - msgid "Pool information in XML" msgstr "" @@ -43346,7 +43343,7 @@ msgstr "" msgid "Pool to remove device from" msgstr "" -msgid "Pool to replace device" +msgid "Pool to replace device of" msgstr "" msgid "Pool to retrieve I/O stats from" @@ -50504,6 +50501,9 @@ msgstr "" msgid "Replace the default HTML title and H1 header with string" msgstr "" +msgid "Replacement device" +msgstr "" + msgid "Replacement for dot in _templates etc" msgstr "" diff --git a/localization/po/pl.po b/localization/po/pl.po index 5903ddcbb..1e8b105be 100644 --- a/localization/po/pl.po +++ b/localization/po/pl.po @@ -15736,9 +15736,6 @@ msgstr "" msgid "Device to disconnect" msgstr "" -msgid "Device to use for replacement" -msgstr "" - msgid "DevicesMojo lists all attached devices and emulators found with the android debug bridge" msgstr "" @@ -25762,6 +25759,9 @@ msgstr "" msgid "Existing pool device to attach to" msgstr "" +msgid "Existing pool device to replace" +msgstr "" + msgid "Existing revision/tag." msgstr "" @@ -43276,9 +43276,6 @@ msgstr "" msgid "Polling interval" msgstr "" -msgid "Pool device to be replaced" -msgstr "" - msgid "Pool information in XML" msgstr "" @@ -43339,7 +43336,7 @@ msgstr "" msgid "Pool to remove device from" msgstr "" -msgid "Pool to replace device" +msgid "Pool to replace device of" msgstr "" msgid "Pool to retrieve I/O stats from" @@ -50497,6 +50494,9 @@ msgstr "" msgid "Replace the default HTML title and H1 header with string" msgstr "" +msgid "Replacement device" +msgstr "" + msgid "Replacement for dot in _templates etc" msgstr "" diff --git a/localization/po/pt_BR.po b/localization/po/pt_BR.po index 7d30ec363..36d8f9df3 100644 --- a/localization/po/pt_BR.po +++ b/localization/po/pt_BR.po @@ -15741,9 +15741,6 @@ msgstr "" msgid "Device to disconnect" msgstr "" -msgid "Device to use for replacement" -msgstr "" - msgid "DevicesMojo lists all attached devices and emulators found with the android debug bridge" msgstr "" @@ -25767,6 +25764,9 @@ msgstr "" msgid "Existing pool device to attach to" msgstr "" +msgid "Existing pool device to replace" +msgstr "" + msgid "Existing revision/tag." msgstr "" @@ -43281,9 +43281,6 @@ msgstr "" msgid "Polling interval" msgstr "" -msgid "Pool device to be replaced" -msgstr "" - msgid "Pool information in XML" msgstr "" @@ -43344,7 +43341,7 @@ msgstr "" msgid "Pool to remove device from" msgstr "" -msgid "Pool to replace device" +msgid "Pool to replace device of" msgstr "" msgid "Pool to retrieve I/O stats from" @@ -50502,6 +50499,9 @@ msgstr "" msgid "Replace the default HTML title and H1 header with string" msgstr "" +msgid "Replacement device" +msgstr "" + msgid "Replacement for dot in _templates etc" msgstr "" diff --git a/localization/po/sv.po b/localization/po/sv.po index 1a6bc1c6f..38898c7c0 100644 --- a/localization/po/sv.po +++ b/localization/po/sv.po @@ -15737,9 +15737,6 @@ msgstr "" msgid "Device to disconnect" msgstr "" -msgid "Device to use for replacement" -msgstr "" - msgid "DevicesMojo lists all attached devices and emulators found with the android debug bridge" msgstr "" @@ -25763,6 +25760,9 @@ msgstr "" msgid "Existing pool device to attach to" msgstr "" +msgid "Existing pool device to replace" +msgstr "" + msgid "Existing revision/tag." msgstr "" @@ -43277,9 +43277,6 @@ msgstr "" msgid "Polling interval" msgstr "" -msgid "Pool device to be replaced" -msgstr "" - msgid "Pool information in XML" msgstr "" @@ -43340,7 +43337,7 @@ msgstr "" msgid "Pool to remove device from" msgstr "" -msgid "Pool to replace device" +msgid "Pool to replace device of" msgstr "" msgid "Pool to retrieve I/O stats from" @@ -50498,6 +50495,9 @@ msgstr "" msgid "Replace the default HTML title and H1 header with string" msgstr "" +msgid "Replacement device" +msgstr "" + msgid "Replacement for dot in _templates etc" msgstr "" diff --git a/localization/po/zh_CN.po b/localization/po/zh_CN.po index 035d0d3f2..1cf5ecac5 100644 --- a/localization/po/zh_CN.po +++ b/localization/po/zh_CN.po @@ -15761,9 +15761,6 @@ msgstr "" msgid "Device to disconnect" msgstr "" -msgid "Device to use for replacement" -msgstr "" - msgid "DevicesMojo lists all attached devices and emulators found with the android debug bridge" msgstr "" @@ -25787,6 +25784,9 @@ msgstr "" msgid "Existing pool device to attach to" msgstr "" +msgid "Existing pool device to replace" +msgstr "" + msgid "Existing revision/tag." msgstr "" @@ -43301,9 +43301,6 @@ msgstr "" msgid "Polling interval" msgstr "" -msgid "Pool device to be replaced" -msgstr "" - msgid "Pool information in XML" msgstr "" @@ -43364,7 +43361,7 @@ msgstr "" msgid "Pool to remove device from" msgstr "" -msgid "Pool to replace device" +msgid "Pool to replace device of" msgstr "" msgid "Pool to retrieve I/O stats from" @@ -50522,6 +50519,9 @@ msgstr "" msgid "Replace the default HTML title and H1 header with string" msgstr "" +msgid "Replacement device" +msgstr "" + msgid "Replacement for dot in _templates etc" msgstr "" diff --git a/localization/po/zh_TW.po b/localization/po/zh_TW.po index 0633f885c..2f4c7d9ca 100644 --- a/localization/po/zh_TW.po +++ b/localization/po/zh_TW.po @@ -15738,9 +15738,6 @@ msgstr "" msgid "Device to disconnect" msgstr "" -msgid "Device to use for replacement" -msgstr "" - msgid "DevicesMojo lists all attached devices and emulators found with the android debug bridge" msgstr "" @@ -25764,6 +25761,9 @@ msgstr "" msgid "Existing pool device to attach to" msgstr "" +msgid "Existing pool device to replace" +msgstr "" + msgid "Existing revision/tag." msgstr "" @@ -43278,9 +43278,6 @@ msgstr "" msgid "Polling interval" msgstr "" -msgid "Pool device to be replaced" -msgstr "" - msgid "Pool information in XML" msgstr "" @@ -43341,7 +43338,7 @@ msgstr "" msgid "Pool to remove device from" msgstr "" -msgid "Pool to replace device" +msgid "Pool to replace device of" msgstr "" msgid "Pool to retrieve I/O stats from" @@ -50499,6 +50496,9 @@ msgstr "" msgid "Replace the default HTML title and H1 header with string" msgstr "" +msgid "Replacement device" +msgstr "" + msgid "Replacement for dot in _templates etc" msgstr "" diff --git a/share/completions/zpool.fish b/share/completions/zpool.fish index 04159e5a6..c2385a912 100644 --- a/share/completions/zpool.fish +++ b/share/completions/zpool.fish @@ -139,7 +139,6 @@ function __fish_zpool_list_free_vdevs -a except_pool string match -vr $exclude_regex end - function __fish_zpool_list_get_fields echo -e "name\tPool full name" echo -e "property\tProperty" diff --git a/src/locale.rs b/src/locale.rs index 7856e14bb..4e2719273 100644 --- a/src/locale.rs +++ b/src/locale.rs @@ -48,7 +48,9 @@ fn setlocale(category: libc::c_int, locale: Option<&CStr>) -> Option<&'static CS let loc_ptr = { let locale = locale.map_or(std::ptr::null(), |loc| loc.as_ptr()); #[allow(clippy::disallowed_methods)] - unsafe { libc::setlocale(category, locale) } + unsafe { + libc::setlocale(category, locale) + } }; (!loc_ptr.is_null()).then(|| // Safety: setlocale did not return a null-pointer, so it is a valid pointer