Skip to content

Commit a7f0138

Browse files
committed
builtin function: fix a misleading error message
Issue introduced in 7914c92 (replaced the functions '--rename' option with '--copy'., 2010-09-09).
1 parent ab3c932 commit a7f0138

File tree

8 files changed

+21
-14
lines changed

8 files changed

+21
-14
lines changed

po/de.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,10 @@ msgstr "%ls: Erwartete exakt zwei Namen (momentanen Funktionsnamen und den Neuen
381381
msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
382382
msgstr "%ls: Erwartete generic | variable | signal | exit | job-id für --handlers-type\n"
383383

384+
#
384385
#, c-format
385-
msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
386-
msgstr "%ls: Funktion '%ls' existiert schon. Konnte Kopie '%ls' nicht anlegen\n"
386+
msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
387+
msgstr ""
387388

388389
#, c-format
389390
msgid "%ls: Function '%ls' does not exist\n"

po/en.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,10 @@ msgstr "%ls: Expected exactly two names (current function name, and new function
379379
msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
380380
msgstr ""
381381

382+
#
382383
#, c-format
383-
msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
384-
msgstr "%ls: Function “%ls” already exists. Cannot create copy “%ls”\n"
384+
msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
385+
msgstr ""
385386

386387
#, c-format
387388
msgid "%ls: Function '%ls' does not exist\n"

po/fr.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,10 @@ msgstr "%ls : Exactement deux noms attendus (noms de fonctions actuel et projet
480480
msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
481481
msgstr ""
482482

483+
#
483484
#, c-format
484-
msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
485-
msgstr "%ls : La fonction '%ls' existe déjà. Impossible de créer la copie '%ls'\n"
485+
msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
486+
msgstr ""
486487

487488
#, c-format
488489
msgid "%ls: Function '%ls' does not exist\n"

po/pl.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,10 @@ msgstr "%ls: Oczekiwano dokładnie dwóch nazw (nazwa obecnej funkcji i nazwa no
375375
msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
376376
msgstr ""
377377

378+
#
378379
#, c-format
379-
msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
380-
msgstr "%ls: Funkcja '%ls' już istnieje. Nie można utworzyć kopii '%ls'\n"
380+
msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
381+
msgstr ""
381382

382383
#, c-format
383384
msgid "%ls: Function '%ls' does not exist\n"

po/pt_BR.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,10 @@ msgstr "%ls: Esperava exatamente dois nomes (nome atual da função, e novo nome
380380
msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
381381
msgstr ""
382382

383+
#
383384
#, c-format
384-
msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
385-
msgstr "%ls: Função “%ls” já existe. Não é possivel criar cópia “%ls”\n"
385+
msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
386+
msgstr ""
386387

387388
#, c-format
388389
msgid "%ls: Function '%ls' does not exist\n"

po/sv.po

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,9 @@ msgstr ""
376376
msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
377377
msgstr ""
378378

379+
#
379380
#, c-format
380-
msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
381+
msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
381382
msgstr ""
382383

383384
#, c-format

po/zh_CN.po

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,9 +373,10 @@ msgstr "%ls: 预期有两个确切的名称(当前函数名称, 和新函数名
373373
msgid "%ls: Expected generic | variable | signal | exit | job-id for --handlers-type\n"
374374
msgstr "%ls: 对于 --handlers-type 选项,预期 generic | variable | signal | exit | job-id \n"
375375

376+
#
376377
#, c-format
377-
msgid "%ls: Function '%ls' already exists. Cannot create copy '%ls'\n"
378-
msgstr "%ls: 函数 '%ls' 已经存在 . 无法创建复制 '%ls'\n"
378+
msgid "%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n"
379+
msgstr ""
379380

380381
#, c-format
381382
msgid "%ls: Function '%ls' does not exist\n"

src/builtins/functions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ pub fn functions(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -
351351

352352
if function::exists(new_func, parser) {
353353
streams.err.append(wgettext_fmt!(
354-
"%ls: Function '%ls' already exists. Cannot create copy '%ls'\n",
354+
"%ls: Function '%ls' already exists. Cannot create copy of '%ls'\n",
355355
cmd,
356356
new_func,
357357
current_func

0 commit comments

Comments
 (0)