From 678edbd22353c68117c2ad83394e21d19f920457 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Tue, 30 Sep 2025 08:30:50 +0200 Subject: [PATCH] Fix short description for builtin wait (cherry picked from commit e3974989d86a1d2e3e5183d473076603db0adb18) --- po/de.po | 9 +++++---- po/en.po | 10 ++++++---- po/fr.po | 10 ++++++---- po/pl.po | 10 ++++++---- po/pt_BR.po | 10 ++++++---- po/sv.po | 10 ++++++---- po/zh_CN.po | 10 ++++++---- src/builtins/shared.rs | 2 +- src/signal.rs | 2 +- 9 files changed, 43 insertions(+), 30 deletions(-) diff --git a/po/de.po b/po/de.po index 064e5e71f..4e14eb26c 100644 --- a/po/de.po +++ b/po/de.po @@ -925,6 +925,9 @@ msgstr "Fehler beim Einrichten der Pipe aufgetreten" msgid "Argument is not a number: '%ls'" msgstr "Argument ist keine Zahl: '%ls'" +msgid "Await background process completion" +msgstr "Auf den Abschluss von Hintergrundprozessen warten" + msgid "Background IO thread events" msgstr "" @@ -1751,12 +1754,10 @@ msgstr "" msgid "Variables cannot be bracketed. In fish, please use {$%ls}." msgstr "" -msgid "Virtual timefr expired" +# +msgid "Virtual timer expired" msgstr "" -msgid "Wait for background processes completed" -msgstr "Auf den Abschluss von Hintergrundprozessen warten" - msgid "Warning about using test's zero- or one-argument modes (`test -d $foo`), which will be changed in future." msgstr "" diff --git a/po/en.po b/po/en.po index f966582c7..3fdbc5220 100644 --- a/po/en.po +++ b/po/en.po @@ -923,6 +923,10 @@ msgstr "An error occurred while setting up pipe" msgid "Argument is not a number: '%ls'" msgstr "" +# +msgid "Await background process completion" +msgstr "" + msgid "Background IO thread events" msgstr "" @@ -1747,10 +1751,8 @@ msgstr "" msgid "Variables cannot be bracketed. In fish, please use {$%ls}." msgstr "" -msgid "Virtual timefr expired" -msgstr "" - -msgid "Wait for background processes completed" +# +msgid "Virtual timer expired" msgstr "" msgid "Warning about using test's zero- or one-argument modes (`test -d $foo`), which will be changed in future." diff --git a/po/fr.po b/po/fr.po index a0fa0d1ce..92ed3e061 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1024,6 +1024,10 @@ msgstr "Une erreur est survenue lors du paramétrage du tube" msgid "Argument is not a number: '%ls'" msgstr "" +# +msgid "Await background process completion" +msgstr "" + msgid "Background IO thread events" msgstr "" @@ -1848,12 +1852,10 @@ msgstr "Les variables ne peuvent être placées entre crochets. Dans fish, veuil msgid "Variables cannot be bracketed. In fish, please use {$%ls}." msgstr "Les variables ne peuvent être placées entre crochets. Dans fish, veuillez utiliser {$%ls}." -msgid "Virtual timefr expired" +# +msgid "Virtual timer expired" msgstr "" -msgid "Wait for background processes completed" -msgstr "Attendre la mort des processus en arrière-plan" - msgid "Warning about using test's zero- or one-argument modes (`test -d $foo`), which will be changed in future." msgstr "" diff --git a/po/pl.po b/po/pl.po index 99e44b4d3..73daf5e69 100644 --- a/po/pl.po +++ b/po/pl.po @@ -919,6 +919,10 @@ msgstr "" msgid "Argument is not a number: '%ls'" msgstr "" +# +msgid "Await background process completion" +msgstr "" + msgid "Background IO thread events" msgstr "" @@ -1743,10 +1747,8 @@ msgstr "Zmienne nie mogą znajdować się w nawiasach. W fish używane jest \"$% msgid "Variables cannot be bracketed. In fish, please use {$%ls}." msgstr "Zmienne nie mogą znajdować się w nawiasach. W fish używane jest {$%ls}." -msgid "Virtual timefr expired" -msgstr "" - -msgid "Wait for background processes completed" +# +msgid "Virtual timer expired" msgstr "" msgid "Warning about using test's zero- or one-argument modes (`test -d $foo`), which will be changed in future." diff --git a/po/pt_BR.po b/po/pt_BR.po index 081116df0..a2a6d61e9 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -924,6 +924,10 @@ msgstr "Ocorreu um erro ao preparar pipe" msgid "Argument is not a number: '%ls'" msgstr "" +# +msgid "Await background process completion" +msgstr "" + msgid "Background IO thread events" msgstr "" @@ -1748,12 +1752,10 @@ msgstr "" msgid "Variables cannot be bracketed. In fish, please use {$%ls}." msgstr "" -msgid "Virtual timefr expired" +# +msgid "Virtual timer expired" msgstr "" -msgid "Wait for background processes completed" -msgstr "Espera até os processos no background completarem" - msgid "Warning about using test's zero- or one-argument modes (`test -d $foo`), which will be changed in future." msgstr "" diff --git a/po/sv.po b/po/sv.po index 5fe72978d..63a97f03c 100644 --- a/po/sv.po +++ b/po/sv.po @@ -920,6 +920,10 @@ msgstr "Ett fel inträffade under skapandet av ett rör" msgid "Argument is not a number: '%ls'" msgstr "" +# +msgid "Await background process completion" +msgstr "" + msgid "Background IO thread events" msgstr "" @@ -1744,10 +1748,8 @@ msgstr "" msgid "Variables cannot be bracketed. In fish, please use {$%ls}." msgstr "" -msgid "Virtual timefr expired" -msgstr "" - -msgid "Wait for background processes completed" +# +msgid "Virtual timer expired" msgstr "" msgid "Warning about using test's zero- or one-argument modes (`test -d $foo`), which will be changed in future." diff --git a/po/zh_CN.po b/po/zh_CN.po index 33c3e8e87..17a6c2f79 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -917,6 +917,10 @@ msgstr "设置管道时出错" msgid "Argument is not a number: '%ls'" msgstr "参数不是数字: '%ls'" +# +msgid "Await background process completion" +msgstr "" + msgid "Background IO thread events" msgstr "" @@ -1743,12 +1747,10 @@ msgstr "" msgid "Variables cannot be bracketed. In fish, please use {$%ls}." msgstr "" -msgid "Virtual timefr expired" +# +msgid "Virtual timer expired" msgstr "" -msgid "Wait for background processes completed" -msgstr "等待背景进程完成" - msgid "Warning about using test's zero- or one-argument modes (`test -d $foo`), which will be changed in future." msgstr "" diff --git a/src/builtins/shared.rs b/src/builtins/shared.rs index 682597149..31729299f 100644 --- a/src/builtins/shared.rs +++ b/src/builtins/shared.rs @@ -612,7 +612,7 @@ pub fn builtin_get_desc(name: &wstr) -> Option<&'static wstr> { _ if name == "true" => wgettext!("Return a successful result"), _ if name == "type" => wgettext!("Check if a thing is a thing"), _ if name == "ulimit" => wgettext!("Get/set resource usage limits"), - _ if name == "wait" => wgettext!("Wait for background processes completed"), + _ if name == "wait" => wgettext!("Await background process completion"), _ if name == "while" => wgettext!("Perform a command multiple times"), _ => return None, }; diff --git a/src/signal.rs b/src/signal.rs index 3c4e2dd5a..2ee410998 100644 --- a/src/signal.rs +++ b/src/signal.rs @@ -404,7 +404,7 @@ macro_rules! signal_entry { signal_entry!(SIGURG, "Urgent socket condition"), signal_entry!(SIGXCPU, "CPU time limit exceeded"), signal_entry!(SIGXFSZ, "File size limit exceeded"), - signal_entry!(SIGVTALRM, "Virtual timefr expired"), + signal_entry!(SIGVTALRM, "Virtual timer expired"), signal_entry!(SIGPROF, "Profiling timer expired"), signal_entry!(SIGWINCH, "Window size change"), signal_entry!(SIGIO, "I/O on asynchronous file descriptor is possible"),