diff --git a/po/de.po b/po/de.po index 4e14eb26c..d78a66390 100644 --- a/po/de.po +++ b/po/de.po @@ -349,10 +349,6 @@ msgstr "%ls: Konnte Heimordner nicht finden\n" msgid "%ls: Could not find job '%d'\n" msgstr "%ls: Konnte Job '%d' nicht finden\n" -#, c-format -msgid "%ls: Could not get executable path: '%s'\n" -msgstr "%ls: Konnte Ausführungsdatei-Pfad nicht finden: '%s'\n" - #, c-format msgid "%ls: Did you mean `set %ls %ls`?" msgstr "%ls: Meintest du `set %ls %ls`?" @@ -426,10 +422,6 @@ msgstr "%ls: Ungültiger 'count'-Wert '%ls'\n" msgid "%ls: Invalid end value '%ls'\n" msgstr "%ls: Ungültiger 'end'-Wert '%ls'\n" -#, c-format -msgid "%ls: Invalid escape sequence in pattern \"%ls\"\n" -msgstr "%ls: Ungültige Escapesequenz in Muster \"%ls\"\n" - #, c-format msgid "%ls: Invalid escape style '%ls'\n" msgstr "%ls: Ungültiger Escapestil '%ls'\n" @@ -1193,10 +1185,6 @@ msgstr "Verlaufs-ID '%ls' ist kein gültiger Variablenname. Nutze `%ls`." msgid "Home for %ls" msgstr "Heimordner für %ls" -#, c-format -msgid "I appear to be an orphaned process, so I am quitting politely. My pid is %d." -msgstr "Ich scheine ein verwaister Prozess zu sein, also beende ich mich höflich. Meine PID ist %d." - msgid "I/O on asynchronous file descriptor is possible" msgstr "E/A auf asynchronem Dateideskriptor ist möglich" diff --git a/po/en.po b/po/en.po index 3fdbc5220..a0f4f6f47 100644 --- a/po/en.po +++ b/po/en.po @@ -347,10 +347,6 @@ msgstr "%ls: Could not find home directory\n" msgid "%ls: Could not find job '%d'\n" msgstr "" -#, c-format -msgid "%ls: Could not get executable path: '%s'\n" -msgstr "" - #, c-format msgid "%ls: Did you mean `set %ls %ls`?" msgstr "" @@ -424,10 +420,6 @@ msgstr "" msgid "%ls: Invalid end value '%ls'\n" msgstr "" -#, c-format -msgid "%ls: Invalid escape sequence in pattern \"%ls\"\n" -msgstr "" - #, c-format msgid "%ls: Invalid escape style '%ls'\n" msgstr "" @@ -1192,10 +1184,6 @@ msgstr "" msgid "Home for %ls" msgstr "Home for %ls" -#, c-format -msgid "I appear to be an orphaned process, so I am quitting politely. My pid is %d." -msgstr "I appear to be an orphaned process, so I am quitting politely. My pid is %d." - msgid "I/O on asynchronous file descriptor is possible" msgstr "I/O on asynchronous file descriptor is possible" diff --git a/po/fr.po b/po/fr.po index 92ed3e061..7f0312ffc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -448,10 +448,6 @@ msgstr "%ls : Dossier personnel introuvable\n" msgid "%ls: Could not find job '%d'\n" msgstr "%ls : Impossible de trouver la tâche '%d'\n" -#, c-format -msgid "%ls: Could not get executable path: '%s'\n" -msgstr "" - #, c-format msgid "%ls: Did you mean `set %ls %ls`?" msgstr "" @@ -525,10 +521,6 @@ msgstr "%ls : compte '%ls' invalide\n" msgid "%ls: Invalid end value '%ls'\n" msgstr "" -#, c-format -msgid "%ls: Invalid escape sequence in pattern \"%ls\"\n" -msgstr "" - #, c-format msgid "%ls: Invalid escape style '%ls'\n" msgstr "%ls : Style d’échappement '%ls' invalide\n" @@ -1293,10 +1285,6 @@ msgstr "L’ID de session d’historique '%ls' n’est pas un nom de variable va msgid "Home for %ls" msgstr "" -#, c-format -msgid "I appear to be an orphaned process, so I am quitting politely. My pid is %d." -msgstr "Il semblerait que je sois un processus orphelin, je m'arrête donc. Mon pid est %d." - msgid "I/O on asynchronous file descriptor is possible" msgstr "E/S sur un descripteur de fichier asynchrone possible" diff --git a/po/pl.po b/po/pl.po index 73daf5e69..4b9a0703e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -343,10 +343,6 @@ msgstr "%ls: Nie można odnaleźć katalogu domowego\n" msgid "%ls: Could not find job '%d'\n" msgstr "" -#, c-format -msgid "%ls: Could not get executable path: '%s'\n" -msgstr "" - #, c-format msgid "%ls: Did you mean `set %ls %ls`?" msgstr "" @@ -420,10 +416,6 @@ msgstr "" msgid "%ls: Invalid end value '%ls'\n" msgstr "" -#, c-format -msgid "%ls: Invalid escape sequence in pattern \"%ls\"\n" -msgstr "" - #, c-format msgid "%ls: Invalid escape style '%ls'\n" msgstr "" @@ -1188,10 +1180,6 @@ msgstr "" msgid "Home for %ls" msgstr "Katalog domowy dla %ls" -#, c-format -msgid "I appear to be an orphaned process, so I am quitting politely. My pid is %d." -msgstr "" - msgid "I/O on asynchronous file descriptor is possible" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index a2a6d61e9..ea56297d1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -348,10 +348,6 @@ msgstr "%ls: Não foi possível encontrar o diretório home\n" msgid "%ls: Could not find job '%d'\n" msgstr "%ls: Não foi possível encontrar a tarefa '%d'\n" -#, c-format -msgid "%ls: Could not get executable path: '%s'\n" -msgstr "" - #, c-format msgid "%ls: Did you mean `set %ls %ls`?" msgstr "" @@ -425,10 +421,6 @@ msgstr "" msgid "%ls: Invalid end value '%ls'\n" msgstr "" -#, c-format -msgid "%ls: Invalid escape sequence in pattern \"%ls\"\n" -msgstr "" - #, c-format msgid "%ls: Invalid escape style '%ls'\n" msgstr "" @@ -1193,10 +1185,6 @@ msgstr "" msgid "Home for %ls" msgstr "Diretório de usuário para %ls" -#, c-format -msgid "I appear to be an orphaned process, so I am quitting politely. My pid is %d." -msgstr "Pareço um processo órfão, então estou saindo educadamente. Meu pid é %d." - msgid "I/O on asynchronous file descriptor is possible" msgstr "E/S em descritor de arquivo assíncrono possível" diff --git a/po/sv.po b/po/sv.po index 63a97f03c..1b05720e9 100644 --- a/po/sv.po +++ b/po/sv.po @@ -344,10 +344,6 @@ msgstr "%ls: Kunde inte hitta hemkatalogen\n" msgid "%ls: Could not find job '%d'\n" msgstr "" -#, c-format -msgid "%ls: Could not get executable path: '%s'\n" -msgstr "" - #, c-format msgid "%ls: Did you mean `set %ls %ls`?" msgstr "" @@ -421,10 +417,6 @@ msgstr "" msgid "%ls: Invalid end value '%ls'\n" msgstr "" -#, c-format -msgid "%ls: Invalid escape sequence in pattern \"%ls\"\n" -msgstr "" - #, c-format msgid "%ls: Invalid escape style '%ls'\n" msgstr "" @@ -1189,10 +1181,6 @@ msgstr "" msgid "Home for %ls" msgstr "" -#, c-format -msgid "I appear to be an orphaned process, so I am quitting politely. My pid is %d." -msgstr "" - msgid "I/O on asynchronous file descriptor is possible" msgstr "Läsning/skrivning på asynkron filidentifierare möjligt" diff --git a/po/zh_CN.po b/po/zh_CN.po index 17a6c2f79..8f5517d95 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -341,10 +341,6 @@ msgstr "%ls:找不到home目录\n" msgid "%ls: Could not find job '%d'\n" msgstr "%ls: 找不到作业 '%d'\n" -#, c-format -msgid "%ls: Could not get executable path: '%s'\n" -msgstr "%ls: 无法获取可执行路径: '%s'\n" - #, c-format msgid "%ls: Did you mean `set %ls %ls`?" msgstr "%ls: 您是否指`set %ls %ls`?" @@ -418,10 +414,6 @@ msgstr "%s: 无效的计数值 '%s'\n" msgid "%ls: Invalid end value '%ls'\n" msgstr "%ls: 无效的end值 '%ls'\n" -#, c-format -msgid "%ls: Invalid escape sequence in pattern \"%ls\"\n" -msgstr "%ls: 模式字符串中包含不合法的转义字符 \"%ls\"\n" - #, c-format msgid "%ls: Invalid escape style '%ls'\n" msgstr "%ls: 无效的转义格式 '%ls'\n" @@ -1186,10 +1178,6 @@ msgstr "历史会话 ID '%ls' 不是有效的可变名称 . 切换回`%ls`." msgid "Home for %ls" msgstr "%ls 的 Home" -#, c-format -msgid "I appear to be an orphaned process, so I am quitting politely. My pid is %d." -msgstr "检测到自身为孤立进程,优雅退出。进程 pid 为 %d." - msgid "I/O on asynchronous file descriptor is possible" msgstr "" diff --git a/src/builtins/status.rs b/src/builtins/status.rs index 71bf5b52c..5184c1203 100644 --- a/src/builtins/status.rs +++ b/src/builtins/status.rs @@ -726,7 +726,7 @@ pub fn status(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> B STATUS_FISH_PATH => { let path = get_executable_path("fish"); if path.is_empty() { - streams.err.append(wgettext_fmt!( + streams.err.append(sprintf!( "%ls: Could not get executable path: '%s'\n", cmd, Errno::last().to_string() diff --git a/src/builtins/string.rs b/src/builtins/string.rs index 609c29d4b..e52df2884 100644 --- a/src/builtins/string.rs +++ b/src/builtins/string.rs @@ -195,9 +195,12 @@ fn print_error(&self, args: &[&wstr], streams: &mut IoStreams) { InvalidEscape(pattern) => { string_error!( streams, - "%ls: Invalid escape sequence in pattern \"%ls\"\n", - cmd, - pattern + "%ls", + sprintf!( + "%ls: Invalid escape sequence in pattern \"%ls\"\n", + cmd, + pattern + ) ); } } diff --git a/src/reader.rs b/src/reader.rs index 4e0c39f8d..93d927835 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -4551,7 +4551,7 @@ fn acquire_tty_or_exit(shell_pgid: libc::pid_t) { if check_for_orphaned_process(loop_count, shell_pgid) { // We're orphaned, so we just die. Another sad statistic. let pid = getpid(); - FLOG!(warning, wgettext_fmt!("I appear to be an orphaned process, so I am quitting politely. My pid is %d.", pid)); + FLOG!(warning, sprintf!("I appear to be an orphaned process, so I am quitting politely. My pid is %d.", pid)); exit_without_destructors(1); }