From: Richard Russon <rich@flatcap.org>
Date: Sun, 18 Mar 2018 14:06:35 +0000 (+0000)
Subject: too many
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f12a5beebe3c1d2b33dd4dfa356a0f5ac4e21dd;p=neomutt

too many
---

diff --git a/color.c b/color.c
index f545d981c..5f81300e4 100644
--- a/color.c
+++ b/color.c
@@ -842,7 +842,7 @@ static int fgbgattr_to_color(int fg, int bg, int attr)
  *        mono  OBJECT ATTR [ REGEX ]
  */
 static int parse_color(struct Buffer *buf, struct Buffer *s, struct Buffer *err,
-                       parser_callback_t callback, bool dry_run)
+                       parser_callback_t callback, bool dry_run, bool color)
 {
   int object = 0, attr = 0, fg = 0, bg = 0, q_level = 0;
   int r = 0, match = 0;
@@ -862,7 +862,7 @@ static int parse_color(struct Buffer *buf, struct Buffer *s, struct Buffer *err,
   {
     if (!MoreArgs(s))
     {
-      mutt_buffer_printf(err, _("%s: too few arguments"), "color");
+      mutt_buffer_printf(err, _("%s: too few arguments"), color ? "color" : "mono");
       return -1;
     }
 
@@ -871,7 +871,7 @@ static int parse_color(struct Buffer *buf, struct Buffer *s, struct Buffer *err,
 
   if (MoreArgs(s) && (object != MT_COLOR_STATUS))
   {
-    mutt_str_strfcpy(err->data, _("too many arguments"), err->dsize);
+    mutt_buffer_printf(err, _("%s: too many arguments"), color ? "color" : "mono");
     return -1;
   }
 
@@ -928,7 +928,7 @@ static int parse_color(struct Buffer *buf, struct Buffer *s, struct Buffer *err,
 
     if (MoreArgs(s))
     {
-      mutt_str_strfcpy(err->data, _("too many arguments"), err->dsize);
+      mutt_buffer_printf(err, _("%s: too many arguments"), color ? "color" : "mono");
       return -1;
     }
 
@@ -1003,7 +1003,7 @@ int mutt_parse_color(struct Buffer *buf, struct Buffer *s, unsigned long data,
   if (OPT_NO_CURSES || !has_colors())
     dry_run = true;
 
-  return parse_color(buf, s, err, parse_color_pair, dry_run);
+  return parse_color(buf, s, err, parse_color_pair, dry_run, true);
 }
 
 #endif
@@ -1021,5 +1021,5 @@ int mutt_parse_mono(struct Buffer *buf, struct Buffer *s, unsigned long data,
     dry_run = true;
 #endif
 
-  return parse_color(buf, s, err, parse_attr_spec, dry_run);
+  return parse_color(buf, s, err, parse_attr_spec, dry_run, false);
 }
diff --git a/hook.c b/hook.c
index ce43290d7..aa7593688 100644
--- a/hook.c
+++ b/hook.c
@@ -104,7 +104,7 @@ int mutt_parse_hook(struct Buffer *buf, struct Buffer *s, unsigned long data,
 
   if (MoreArgs(s))
   {
-    mutt_str_strfcpy(err->data, _("too many arguments"), err->dsize);
+    mutt_buffer_printf(err, _("%s: too many arguments"), buf->data);
     goto error;
   }
 
diff --git a/init.c b/init.c
index fd16c76dd..61a8039f7 100644
--- a/init.c
+++ b/init.c
@@ -757,7 +757,7 @@ static int finish_source(struct Buffer *tmp, struct Buffer *s,
 {
   if (MoreArgs(s))
   {
-    snprintf(err->data, err->dsize, _("finish: too many arguments"));
+    mutt_buffer_printf(err, _("%s: too many arguments"), "finish");
     return -1;
   }
 
@@ -4170,7 +4170,7 @@ static int parse_subscribe_to(struct Buffer *b, struct Buffer *s,
 
     if (MoreArgs(s))
     {
-      mutt_buffer_addstr(err, _("Too many arguments"));
+      mutt_buffer_printf(err, _("%s: too many arguments"), "subscribe-to");
       return -1;
     }
 
@@ -4224,7 +4224,7 @@ static int parse_unsubscribe_from(struct Buffer *b, struct Buffer *s,
 
     if (MoreArgs(s))
     {
-      mutt_buffer_addstr(err, _("Too many arguments"));
+      mutt_buffer_printf(err, _("%s: too many arguments"), "unsubscribe-from");
       return -1;
     }
 
diff --git a/keymap.c b/keymap.c
index 00b72ed3d..3756c02b5 100644
--- a/keymap.c
+++ b/keymap.c
@@ -964,7 +964,7 @@ int mutt_parse_push(struct Buffer *buf, struct Buffer *s, unsigned long data,
   mutt_extract_token(buf, s, MUTT_TOKEN_CONDENSE);
   if (MoreArgs(s))
   {
-    mutt_str_strfcpy(err->data, _("push: too many arguments"), err->dsize);
+    mutt_buffer_printf(err, _("%s: too many arguments"), "push");
     r = -1;
   }
   else
@@ -1109,7 +1109,7 @@ int mutt_parse_bind(struct Buffer *buf, struct Buffer *s, unsigned long data,
   mutt_extract_token(buf, s, 0);
   if (MoreArgs(s))
   {
-    mutt_str_strfcpy(err->data, _("bind: too many arguments"), err->dsize);
+    mutt_buffer_printf(err, _("%s: too many arguments"), "bind");
     r = -1;
   }
   else if (mutt_str_strcasecmp("noop", buf->data) == 0)
@@ -1178,7 +1178,7 @@ int mutt_parse_macro(struct Buffer *buf, struct Buffer *s, unsigned long data,
 
       if (MoreArgs(s))
       {
-        mutt_str_strfcpy(err->data, _("macro: too many arguments"), err->dsize);
+        mutt_buffer_printf(err, _("%s: too many arguments"), "macro");
       }
       else
       {
diff --git a/mutt_lua.c b/mutt_lua.c
index 6f099079c..a54139b43 100644
--- a/mutt_lua.c
+++ b/mutt_lua.c
@@ -418,7 +418,7 @@ int mutt_lua_source_file(struct Buffer *tmp, struct Buffer *s,
   }
   if (MoreArgs(s))
   {
-    mutt_str_strfcpy(err->data, _("source: too many arguments"), err->dsize);
+    mutt_buffer_printf(err, _("%s: too many arguments"), "source");
     return -1;
   }
   mutt_str_strfcpy(path, tmp->data, sizeof(path));
diff --git a/po/bg.po b/po/bg.po
index f871e5181..91a552e2e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -409,8 +409,8 @@ msgid "%s: no such attribute"
 msgstr "%s: няма такъв атрибут"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "твърде много аргументи"
+msgid "%s: too many arguments"
+msgstr "%s: твърде много аргументи"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2486,11 +2486,6 @@ msgstr "%s: непознат метод за сортиране"
 msgid "%s: Unknown type."
 msgstr "%s: Непознат тип."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: твърде много аргументи"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2698,11 +2693,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "недостатъчно аргументи"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "твърде много аргументи"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2742,10 +2732,6 @@ msgstr "Недефинирана клавишна комбинация."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Недефинирана клавишна комбинация. Използвайте '%s' за помощ."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: твърде много аргументи"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2760,18 +2746,10 @@ msgstr "празна последователност от клавиши"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: твърде много аргументи"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: празна последователност от клавиши"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: твърде много аргументи"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: липсват аргументи"
@@ -3250,10 +3228,6 @@ msgstr "Парола за %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: твърде много аргументи"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6216,10 +6190,6 @@ msgstr "не е намерено mailcap-вписване за типа %s"
 msgid "score: too few arguments"
 msgstr "score: недостатъчно аргументи"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: твърде много аргументи"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 4bd44c640..222eb2cd3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -451,11 +451,9 @@ msgstr "%s: L’atribut no existeix."
 # ivb (2001/12/08)
 # ivb  També apareix com a error aïllat.
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "Sobren arguments."
+msgid "%s: too many arguments"
+msgstr "%s: Sobren arguments."
 
-# ivb (2001/12/08)
-# ivb  També apareix com a error aïllat.
 #: color.c:885
 msgid "default colors not supported"
 msgstr "No es permet l’ús de colors per defecte."
@@ -2539,11 +2537,6 @@ msgstr "%s: El mètode d’ordenació no és conegut."
 msgid "%s: Unknown type."
 msgstr "%s: El tipus no és conegut."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: Sobren arguments."
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "Manquen arguments."
@@ -2756,13 +2749,6 @@ msgstr "-group: No s’ha indicat el nom del grup."
 msgid "out of arguments"
 msgstr "Manquen arguments."
 
-# ivb (2001/12/08)
-# ivb  També apareix com a error aïllat.
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "Sobren arguments."
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2802,10 +2788,6 @@ msgstr "La tecla no està vinculada."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "La tecla no està vinculada.  Premeu «%s» per a obtenir ajuda."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: Sobren arguments."
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2820,18 +2802,10 @@ msgstr "La seqüència de tecles és nul·la."
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: Sobren arguments."
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: La seqüència de tecles és buida."
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: Sobren arguments."
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: Manquen arguments."
@@ -3299,10 +3273,6 @@ msgstr "Contrasenya per a «%s@%s»: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: Sobren arguments."
-
 # Es refereix a l’esquema d’URL.  ivb
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
@@ -6370,10 +6340,6 @@ msgstr "No s’ha trobat cap entrada pel tipus «%s» a «mailcap»"
 msgid "score: too few arguments"
 msgstr "score: Manquen arguments."
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: Sobren arguments."
-
 # És un error com els anteriors.  ivb
 #: score.c:136
 msgid "Error: score: invalid number"
diff --git a/po/cs.po b/po/cs.po
index b2d45c4db..f92b55512 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -399,8 +399,8 @@ msgid "%s: no such attribute"
 msgstr "Atribut %s není definován."
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "příliš mnoho argumentů"
+msgid "%s: too many arguments"
+msgstr "%s: příliš mnoho argumentů"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2407,11 +2407,6 @@ msgstr "metoda %s pro řazení není známa"
 msgid "%s: Unknown type."
 msgstr "neznámý typ %s"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: příliš mnoho argumentů"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "příliš málo argumentů"
@@ -2613,11 +2608,6 @@ msgstr "-group: chybí jméno skupiny"
 msgid "out of arguments"
 msgstr "příliš málo argumentů"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "příliš mnoho argumentů"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2657,10 +2647,6 @@ msgstr "Klávesa není svázána s žádnou funkcí."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Klávesa není svázána. Stiskněte „%s“ pro nápovědu."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: příliš mnoho argumentů"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2675,18 +2661,10 @@ msgstr "prázdný sled kláves"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: příliš mnoho argumentů"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: sled kláves je prázdný"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: příliš mnoho argumentů"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: žádné argumenty"
@@ -3124,10 +3102,6 @@ msgstr "Heslo pro %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: příliš mnoho argumentů"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6033,10 +6007,6 @@ msgstr "pro typ %s nebyla nalezena položka v mailcapu"
 msgid "score: too few arguments"
 msgstr "skóre: příliš málo argumentů"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "skóre: příliš mnoho argumentů"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Chyba: skóre: nesprávné číslo"
diff --git a/po/da.po b/po/da.po
index a9cbdb4a7..780ff525c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -397,8 +397,8 @@ msgid "%s: no such attribute"
 msgstr "%s: ukendt attribut"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "for mange parametre"
+msgid "%s: too many arguments"
+msgstr "%s: for mange parametre"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2399,11 +2399,6 @@ msgstr "%s: ukendt sorteringsmetode"
 msgid "%s: Unknown type."
 msgstr "%s: Ukendt type."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: For mange parametre"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "ikke nok parametre"
@@ -2603,11 +2598,6 @@ msgstr "-group: intet gruppenavn"
 msgid "out of arguments"
 msgstr "parametre slap op"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "for mange parametre"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2647,10 +2637,6 @@ msgstr "Tasten er ikke tillagt en funktion."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tasten er ikke tillagt en funktion. Tast '%s' for hjælp."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: For mange parametre"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2665,18 +2651,10 @@ msgstr "tom tastesekvens"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: for mange parametre"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: tom tastesekvens"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: for mange parametre"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: ingen parametre"
@@ -3112,10 +3090,6 @@ msgstr "Adgangskode for %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: For mange parametre"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6010,10 +5984,6 @@ msgstr "ingen mailcap-angivelse for type %s"
 msgid "score: too few arguments"
 msgstr "score: for få parametre"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: for mange parametre"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Fejl: score: ugyldigt tal"
diff --git a/po/de.po b/po/de.po
index bbcb1dbae..691692261 100644
--- a/po/de.po
+++ b/po/de.po
@@ -401,8 +401,8 @@ msgid "%s: no such attribute"
 msgstr "%s: Attribut unbekannt"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "Zu viele Parameter"
+msgid "%s: too many arguments"
+msgstr "%s: Zu viele Parameter"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2396,11 +2396,6 @@ msgstr "%s: Unbekannte Sortiermethode"
 msgid "%s: Unknown type."
 msgstr "%s: Unbekannter Typ."
 
-#: init.c:762
-#, c-format
-msgid "finish: too many arguments"
-msgstr "finish: Zu viele Argumente"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "Zu wenige Parameter"
@@ -2602,11 +2597,6 @@ msgstr "-group: Kein Gruppen Name"
 msgid "out of arguments"
 msgstr "Zu wenige Parameter"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "Zu viele Parameter"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2648,10 +2638,6 @@ msgstr "Taste ist nicht belegt."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Taste ist nicht belegt. '%s' für Hilfe drücken."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: Zu viele Argumente"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2666,18 +2652,10 @@ msgstr "Leere Tastenfolge"
 msgid "Function '%s' not available for menu '%s'"
 msgstr "Funktion '%s' ist nicht verfügbar für Menü '%s'"
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: Zu viele Argumente"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: Leere Tastenfolge"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: Zu viele Parameter"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: Keine Parameter"
@@ -3117,10 +3095,6 @@ msgstr "Passwort für %s@%s: "
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: Zu viele Argumente"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6003,10 +5977,6 @@ msgstr "Kann keinen Mailcap-Eintrag für %s finden."
 msgid "score: too few arguments"
 msgstr "score: Zu wenige Parameter."
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: Zu viele Parameter."
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Fehler: score: Ungültige Zahl"
diff --git a/po/el.po b/po/el.po
index a2d2e9c10..b297ce0b1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -405,8 +405,8 @@ msgid "%s: no such attribute"
 msgstr "%s: δεν υπάρχει τέτοια ιδιότητα"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "πάρα πολλά ορίσματα"
+msgid "%s: too many arguments"
+msgstr "%s: πάρα πολλά ορίσματα"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2478,11 +2478,6 @@ msgstr "%s: άγνωστη μέθοδος ταξινόμησης"
 msgid "%s: Unknown type."
 msgstr "%s: άγνωστος τύπος."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: πάρα πολλά ορίσματα"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2690,11 +2685,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "πολύ λίγα ορίσματα"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "πάρα πολλά ορίσματα"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2734,10 +2724,6 @@ msgstr "Το πλήκτρο δεν είναι συνδεδεμένο."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Το πλήκτρο δεν είναι συνδεδεμένο. Πατήστε '%s' για βοήθεια."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: πάρα πολλά ορίσματα"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2752,18 +2738,10 @@ msgstr "κενή ακολουθία πλήκτρων"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: πάρα πολλά ορίσματα"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: άδεια ακολουθία πλήκτρων"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: πάρα πολλές παράμετροι"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: καθόλου ορίσματα"
@@ -3244,10 +3222,6 @@ msgstr "Συνθηματικό για το %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: πάρα πολλά ορίσματα"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6212,10 +6186,6 @@ msgstr "Η είσοδος mailcap για το τύπο %s δε βρέθηκε"
 msgid "score: too few arguments"
 msgstr "score: πολύ λίγα ορίσματα"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: πάρα πολλά ορίσματα"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 1a317f559..f382623c7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -393,8 +393,8 @@ msgid "%s: no such attribute"
 msgstr "%s: no such attribute"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "too many arguments"
+msgid "%s: too many arguments"
+msgstr "%s: too many arguments"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2373,11 +2373,6 @@ msgstr "%s: unknown sorting method"
 msgid "%s: Unknown type."
 msgstr "%s: Unknown type."
 
-#: init.c:762
-#, c-format
-msgid "finish: too many arguments"
-msgstr "finish: too many arguments"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "not enough arguments"
@@ -2577,10 +2572,6 @@ msgstr "-group: no group name"
 msgid "out of arguments"
 msgstr "out of arguments"
 
-#: init.c:4309 init.c:4363
-msgid "Too many arguments"
-msgstr "Too many arguments"
-
 #: init.c:4318
 #, c-format
 msgid "Could not subscribe to %s"
@@ -2621,10 +2612,6 @@ msgstr "Key is not bound."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Key is not bound.  Press '%s' for help."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: too many arguments"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2639,18 +2626,10 @@ msgstr "null key sequence"
 msgid "Function '%s' not available for menu '%s'"
 msgstr "Function '%s' not available for menu '%s'"
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: too many arguments"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: empty key sequence"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: too many arguments"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: no arguments"
@@ -3085,10 +3064,6 @@ msgstr "Password for %s@%s: "
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: too many arguments"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -5929,10 +5904,6 @@ msgstr "mailcap entry for type %s not found"
 msgid "score: too few arguments"
 msgstr "score: too few arguments"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: too many arguments"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Error: score: invalid number"
diff --git a/po/eo.po b/po/eo.po
index a7e04ee83..a06a51786 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -398,8 +398,8 @@ msgid "%s: no such attribute"
 msgstr "%s: nekonata trajto"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "tro da argumentoj"
+msgid "%s: too many arguments"
+msgstr "%s: tro da argumentoj"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2397,11 +2397,6 @@ msgstr "%s: nekonata ordigmaniero"
 msgid "%s: Unknown type."
 msgstr "%s: Nekonata speco."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: tro da argumentoj"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "nesufiĉe da argumentoj"
@@ -2601,11 +2596,6 @@ msgstr "-group: mankas gruponomo"
 msgid "out of arguments"
 msgstr "nesufiĉe da argumentoj"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "tro da argumentoj"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2645,10 +2635,6 @@ msgstr "Klavo ne estas difinita."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Klavo ne estas difinita.  Premu '%s' por helpo."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: tro da argumentoj"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2663,18 +2649,10 @@ msgstr "malplena klavoserio"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: tro da argumentoj"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: malplena klavoserio"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: tro da argumentoj"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: mankas argumentoj"
@@ -3110,10 +3088,6 @@ msgstr "Pasvorto por %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: tro da argumentoj"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6016,10 +5990,6 @@ msgstr "mailcap-regulo por speco %s ne trovita"
 msgid "score: too few arguments"
 msgstr "score: nesufiĉe da argumentoj"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: tro da argumentoj"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Eraro: score: nevalida nombro"
diff --git a/po/es.po b/po/es.po
index cdd8d5e7c..923756956 100644
--- a/po/es.po
+++ b/po/es.po
@@ -406,8 +406,8 @@ msgid "%s: no such attribute"
 msgstr "%s: atributo desconocido"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "Demasiados parámetros"
+msgid "%s: too many arguments"
+msgstr "%s: Demasiados parámetros"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2492,11 +2492,6 @@ msgstr "%s: órden desconocido"
 msgid "%s: Unknown type."
 msgstr "%s: tipo desconocido"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: demasiados parámetros"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2704,11 +2699,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "Faltan parámetros"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "Demasiados parámetros"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2748,10 +2738,6 @@ msgstr "La tecla no tiene enlace a una función."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tecla sin enlace. Presione '%s' para obtener ayuda."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: demasiados parámetros"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2766,18 +2752,10 @@ msgstr "sequencia de teclas vacía"
 msgid "Function '%s' not available for menu '%s'"
 msgstr "No existe un motor de descifrado disponible para el mensaje"
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: demasiados parámetros"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: sequencia de teclas vacía"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: demasiados parámetros"
-
 #: keymap.c:1218
 #, fuzzy
 msgid "exec: no arguments"
@@ -3241,10 +3219,6 @@ msgstr "Contraseña para %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: demasiados parámetros"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6256,10 +6230,6 @@ msgstr "Entrada mailcap para tipo %s no encontrada"
 msgid "score: too few arguments"
 msgstr "score: faltan parámetros"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: demasiados parámetros"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/et.po b/po/et.po
index df915eadc..ead83b1f1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -401,8 +401,8 @@ msgid "%s: no such attribute"
 msgstr "%s. sellist atribuuti pole"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "liiga palju argumente"
+msgid "%s: too many arguments"
+msgstr "%s: liiga palju argumente"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2464,11 +2464,6 @@ msgstr "%s: tundmatu järjestamise meetod"
 msgid "%s: Unknown type."
 msgstr "%s: tundmatu tüüp"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: liiga palju argumente"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2676,11 +2671,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "liiga vähe argumente"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "liiga palju argumente"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2720,10 +2710,6 @@ msgstr "Klahv ei ole seotud."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Klahv ei ole seotud. Abiinfo saamiseks vajutage '%s'."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: liiga palju argumente"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2738,18 +2724,10 @@ msgstr "tühi klahvijärjend"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: iiga palju argumente"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "makro: tühi klahvijärjend"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "makro: liiga palju argumente"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: argumente pole"
@@ -3220,10 +3198,6 @@ msgstr "%s@%s parool: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: liiga palju argumente"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6176,10 +6150,6 @@ msgstr "Tüübil %s puudub mailcap kirje"
 msgid "score: too few arguments"
 msgstr "score: liiga vähe argumente"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: liiga palju argumente"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 5ee99e6a9..90ce36a40 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -396,8 +396,8 @@ msgid "%s: no such attribute"
 msgstr "%s: ez da atributua aurkitu"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "argumentu gehiegi"
+msgid "%s: too many arguments"
+msgstr "%s: argumentu gehiegi"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2433,11 +2433,6 @@ msgstr "%s: sailkatze modu ezezaguna"
 msgid "%s: Unknown type."
 msgstr "%s Mota ezezaguna."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: argumentu gutxiegi"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2639,11 +2634,6 @@ msgstr "-group: ez dago talde izenik"
 msgid "out of arguments"
 msgstr "argumentu gehiegi"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "argumentu gehiegi"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2683,10 +2673,6 @@ msgstr "Letra ez dago mugaturik."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Letra ez dago mugaturik.  %s jo laguntzarako."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: argumentu gutxiegi"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2701,18 +2687,10 @@ msgstr "baloigabeko sekuentzi gakoa"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind:argumentu gehiegi"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: sekuentzi gako hutsa"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "makro: argumentu gutxiegi"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: ez da argumenturik"
@@ -3148,10 +3126,6 @@ msgstr "%s@%s-ren pasahitza: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "jatorria : argumentu gutxiegi"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6087,10 +6061,6 @@ msgstr "ez da aurkitu %s motako mailcap sarrerarik"
 msgid "score: too few arguments"
 msgstr "score: argumentu gutxiegi"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: argumentu gehiegi"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 881d7f59c..c43892683 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -428,8 +428,8 @@ msgid "%s: no such attribute"
 msgstr "%s : cet attribut n'existe pas"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "trop d'arguments"
+msgid "%s: too many arguments"
+msgstr "%s: trop d'arguments"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2524,11 +2524,6 @@ msgstr "%s : méthode de tri inconnue"
 msgid "%s: Unknown type."
 msgstr "%s : type inconnu."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push : trop d'arguments"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "pas assez d'arguments"
@@ -2745,11 +2740,6 @@ msgstr "-group: pas de nom de groupe"
 msgid "out of arguments"
 msgstr "pas assez d'arguments"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "trop d'arguments"
-
 # , c-format
 #: init.c:4318
 #, fuzzy, c-format
@@ -2792,10 +2782,6 @@ msgstr "Cette touche n'est pas affectée."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Cette touche n'est pas affectée. Tapez '%s' pour avoir l'aide."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push : trop d'arguments"
-
 # , c-format
 #: keymap.c:1002
 #, c-format
@@ -2811,18 +2797,10 @@ msgstr "séquence de touches nulle"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind : trop d'arguments"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro : séquence de touches vide"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro : trop d'arguments"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec : pas d'arguments"
@@ -3279,10 +3257,6 @@ msgstr "Mot de passe pour %s@%s : "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source : trop d'arguments"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6234,10 +6208,6 @@ msgstr "Entrée mailcap pour le type %s non trouvée"
 msgid "score: too few arguments"
 msgstr "score : pas assez d'arguments"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score : trop d'arguments"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Erreur : score : nombre invalide"
diff --git a/po/ga.po b/po/ga.po
index 9935554ed..35a7747da 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -401,8 +401,8 @@ msgid "%s: no such attribute"
 msgstr "%s: níl a leithéid d'aitreabúid ann"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "an iomarca argóintí"
+msgid "%s: too many arguments"
+msgstr "%s: an iomarca argóintí"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2446,11 +2446,6 @@ msgstr "%s: modh shórtála anaithnid"
 msgid "%s: Unknown type."
 msgstr "%s: Cineál anaithnid."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: an iomarca argóintí"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2652,11 +2647,6 @@ msgstr "-group: gan ainm grúpa"
 msgid "out of arguments"
 msgstr "níl go leor argóintí ann"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "an iomarca argóintí"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2696,10 +2686,6 @@ msgstr "Eochair gan cheangal."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Eochair gan cheangal.  Brúigh '%s' chun cabhrú a fháil."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: an iomarca argóintí"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2714,18 +2700,10 @@ msgstr "seicheamh neamhbhailí"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: an iomarca argóintí"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macra: seicheamh folamh eochrach"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: an iomarca argóintí"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: níl aon argóint"
@@ -3153,10 +3131,6 @@ msgstr "Focal faire do %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: an iomarca argóintí"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6106,10 +6080,6 @@ msgstr "níor aimsíodh iontráil mailcap don chineál %s"
 msgid "score: too few arguments"
 msgstr "score: níl go leor argóintí ann"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: an iomarca argóintí"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 4ca66f64e..b9f044982 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -405,8 +405,8 @@ msgid "%s: no such attribute"
 msgstr "%s: non hai tal atributo"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "demasiados parámetros"
+msgid "%s: too many arguments"
+msgstr "%s: demasiados parámetros"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2491,11 +2491,6 @@ msgstr "%s: método de ordeación descoñecido"
 msgid "%s: Unknown type."
 msgstr "%s: tipo descoñecido"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: demasiados parámetros"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2703,11 +2698,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "parámetros insuficientes"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "demasiados parámetros"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2747,10 +2737,6 @@ msgstr "A tecla non está vinculada."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "A tecla non está vinculada. Pulsa '%s' para axuda."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: demasiados parámetros"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2765,18 +2751,10 @@ msgstr "secuencia de teclas nula"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: demasiados argumentos"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: secuencia de teclas baleira"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: demasiados parámetros"
-
 #: keymap.c:1218
 #, fuzzy
 msgid "exec: no arguments"
@@ -3241,10 +3219,6 @@ msgstr "Contrasinal para %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: demasiados parámetros"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6242,10 +6216,6 @@ msgstr "non se atopou unha entrada mailcap para o tipo %s"
 msgid "score: too few arguments"
 msgstr "score: insuficientes parámetros"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: demasiados parámetros"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 46e3df48b..937e1c92c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -402,8 +402,8 @@ msgid "%s: no such attribute"
 msgstr "%s: nincs ilyen attribútum"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "túl sok paraméter"
+msgid "%s: too many arguments"
+msgstr "%s: túl sok paraméter"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2471,11 +2471,6 @@ msgstr "%s: ismeretlen rendezési mód"
 msgid "%s: Unknown type."
 msgstr "%s: ismeretlen típus"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: túl sok paraméter"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2683,11 +2678,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "túl kevés paraméter"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "túl sok paraméter"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2727,10 +2717,6 @@ msgstr "A billentyűhöz nincs funkció rendelve."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "A billentyűhöz nincs funkció rendelve. A súgóhoz nyomd meg a '%s'-t."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: túl sok paraméter"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2745,18 +2731,10 @@ msgstr "üres billentyűzet-szekvencia"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: túl sok paraméter"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: üres billentyűzet-szekvencia"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: túl sok paraméter"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: nincs paraméter"
@@ -3236,10 +3214,6 @@ msgstr "%s@%s jelszava: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: túl sok paraméter"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6213,10 +6187,6 @@ msgstr "mailcap bejegyzés a(z) %s típushoz nem található"
 msgid "score: too few arguments"
 msgstr "score: túl kevés paraméter"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: túl sok paraméter"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index a22f779c8..b2de08edd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -401,8 +401,8 @@ msgid "%s: no such attribute"
 msgstr "%s: tidak ada atribut begitu"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "parameternya terlalu banyak"
+msgid "%s: too many arguments"
+msgstr "%s: parameternya terlalu banyak"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2441,11 +2441,6 @@ msgstr "%s: metoda pengurutan tidak dikenali"
 msgid "%s: Unknown type."
 msgstr "%s: Jenis tidak dikenali."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: parameter terlalu banyak"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2647,11 +2642,6 @@ msgstr "-group: tidak ada nama group"
 msgid "out of arguments"
 msgstr "parameternya kurang"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "parameternya terlalu banyak"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2691,10 +2681,6 @@ msgstr "Tombol itu tidak ditentukan untuk apa."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tombol itu tidak ditentukan untuk apa. Tekan '%s' utk bantuan."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: parameter terlalu banyak"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2709,18 +2695,10 @@ msgstr "urutan tombol kosong"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: parameter terlalu banyak"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: urutan tombol kosong"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: parameter terlalu banyak"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: tidak ada parameter"
@@ -3145,10 +3123,6 @@ msgstr "Password utk %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: parameter terlalu banyak"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6104,10 +6078,6 @@ msgstr "entry mailcap untuk jenis %s tidak ditemukan"
 msgid "score: too few arguments"
 msgstr "score: parameternya kurang"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: parameternya terlalu banyak"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index e5a003079..be8330fef 100644
--- a/po/it.po
+++ b/po/it.po
@@ -401,8 +401,8 @@ msgid "%s: no such attribute"
 msgstr "%s: attributo inesistente"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "troppi argomenti"
+msgid "%s: too many arguments"
+msgstr "%s: troppi argomenti"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2433,11 +2433,6 @@ msgstr "%s: metodo di ordinamento sconosciuto"
 msgid "%s: Unknown type."
 msgstr "%s: tipo sconosciuto."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: troppi argomenti"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2639,11 +2634,6 @@ msgstr "-group: nessun nome per il gruppo"
 msgid "out of arguments"
 msgstr ""
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "troppi argomenti"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2683,10 +2673,6 @@ msgstr "Il tasto non è assegnato."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Il tasto non è assegnato.  Premere '%s' per l'aiuto."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: troppi argomenti"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2701,18 +2687,10 @@ msgstr "sequenza di tasti nulla"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: troppi argomenti"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: sequenza di tasti nulla"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: troppi argomenti"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: non ci sono argomenti"
@@ -3147,10 +3125,6 @@ msgstr "Password per %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: troppi argomenti"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6075,10 +6049,6 @@ msgstr "La voce di mailcap per il tipo %s non è stata trovata"
 msgid "score: too few arguments"
 msgstr "score: troppo pochi argomenti"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: troppi argomenti"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Errore: score: numero non valido"
diff --git a/po/ja.po b/po/ja.po
index b12a60688..5f2399ac3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -395,8 +395,8 @@ msgid "%s: no such attribute"
 msgstr "%s という属性はない"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "引数が多すぎる"
+msgid "%s: too many arguments"
+msgstr "%s: 引数が多すぎる"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2409,11 +2409,6 @@ msgstr "%s は不明な整列方法"
 msgid "%s: Unknown type."
 msgstr "%s は不明なタイプ"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: 引数が多すぎる"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "引数が足りない"
@@ -2613,11 +2608,6 @@ msgstr "-group: グループ名がない"
 msgid "out of arguments"
 msgstr "引数が少なすぎる"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "引数が多すぎる"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2657,10 +2647,6 @@ msgstr "キーはバインドされていない。"
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "キーはバインドされていない。'%s' を押すとヘルプ"
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: 引数が多すぎる"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2675,18 +2661,10 @@ msgstr "キーシーケンスがない"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: 引数が多すぎる"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: キーシーケンスがない"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: 引数が多すぎる"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: 引数がない"
@@ -3125,10 +3103,6 @@ msgstr "%s@%s のパスワード: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: 引数が多すぎる"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6011,10 +5985,6 @@ msgstr "%s 形式用の mailcap エントリが見つからなかった"
 msgid "score: too few arguments"
 msgstr "score: 引数が少なすぎる"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: 引数が多すぎる"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "エラー: score: 不正な数値"
diff --git a/po/ko.po b/po/ko.po
index 8efb21fb1..df87f2745 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -402,8 +402,8 @@ msgid "%s: no such attribute"
 msgstr "%s: 속성 없음."
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "인수가 너무 많음"
+msgid "%s: too many arguments"
+msgstr "%s: 인수가 너무 많음"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2460,11 +2460,6 @@ msgstr "%s: 알 수 없는 정렬 방법"
 msgid "%s: Unknown type."
 msgstr "%s: 알 수 없는 형식"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: 인수가 너무 많음"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2672,11 +2667,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "인수가 부족함"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "인수가 너무 많음"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2716,10 +2706,6 @@ msgstr "정의되지 않은 글쇠."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "정의되지 않은 글쇠. 도움말 보기는 '%s'"
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: 인수가 너무 많음"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2734,18 +2720,10 @@ msgstr "공백 글쇠 시퀀스"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: 인수가 너무 많음"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: 빈 글쇠 시퀀스"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: 인수가 너무 많음"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: 인수가 없음"
@@ -3211,10 +3189,6 @@ msgstr "%s@%s의 암호: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: 인수가 너무 많음"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6164,10 +6138,6 @@ msgstr "%s 형식을 mailcap 항목에서 찾을 수 없음"
 msgid "score: too few arguments"
 msgstr "score: 너무 적은 인자"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: 너무 많은 인자"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index a065236b8..6b4282209 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -396,8 +396,8 @@ msgid "%s: no such attribute"
 msgstr "%s: tokio atributo nėra"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "per daug argumentų"
+msgid "%s: too many arguments"
+msgstr "%s: per daug argumentų"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2448,11 +2448,6 @@ msgstr "%s: nežinomas rikiavimo metodas"
 msgid "%s: Unknown type."
 msgstr "%s: nežinomas tipas."
 
-#: init.c:762
-#, c-format
-msgid "finish: too many arguments"
-msgstr "finish: per daug argumentų"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "per mažai argumentų"
@@ -2659,11 +2654,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "per mažai argumentų"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "per daug argumentų"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2703,10 +2693,6 @@ msgstr "Klavišas nėra susietas."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Klavišas nėra susietas.  Spausk '%s' dėl pagalbos."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: per daug argumentų"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2721,18 +2707,10 @@ msgstr "nulinė klavišų seka"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: per daug argumentų"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: tuščia klavišų seka"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: per daug argumentų"
-
 #: keymap.c:1218
 #, fuzzy
 msgid "exec: no arguments"
@@ -3191,10 +3169,6 @@ msgstr "%s@%s slaptažodis: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: per daug argumentų"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6194,10 +6168,6 @@ msgstr "mailcap įrašas tipui %s nerastas"
 msgid "score: too few arguments"
 msgstr "score: per mažai argumentų"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: per daug argumentų"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 2d1aab6dd..6afb80357 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -397,8 +397,8 @@ msgid "%s: no such attribute"
 msgstr "%s: onbekend attribuut"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "te veel argumenten"
+msgid "%s: too many arguments"
+msgstr "%s: te veel argumenten"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2408,11 +2408,6 @@ msgstr "%s: onbekende sorteermethode"
 msgid "%s: Unknown type."
 msgstr "%s: Onbekend type."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: te veel argumenten"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "te weinig argumenten"
@@ -2612,11 +2607,6 @@ msgstr "-group: geen groepsnaam"
 msgid "out of arguments"
 msgstr "te weinig argumenten"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "te veel argumenten"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2656,10 +2646,6 @@ msgstr "Toets is niet in gebruik."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Toets is niet in gebruik.  Typ '%s' voor hulp."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: te veel argumenten"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2674,18 +2660,10 @@ msgstr "lege toetsenvolgorde"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: te veel argumenten"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: lege toetsenvolgorde"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: te veel argumenten"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: geen argumenten"
@@ -3122,10 +3100,6 @@ msgstr "Wachtwoord voor %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: te veel argumenten"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6034,10 +6008,6 @@ msgstr "Kan geen mailcap-entry voor %s vinden."
 msgid "score: too few arguments"
 msgstr "score: te weinig argumenten"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: te veel argumenten"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Fout: score: ongeldig getal"
diff --git a/po/pl.po b/po/pl.po
index 02de191c1..a46aa35cd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -399,8 +399,8 @@ msgid "%s: no such attribute"
 msgstr "%s: nie ma takiego atrybutu"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "za dużo argumentów"
+msgid "%s: too many arguments"
+msgstr "%s: za dużo argumentów"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2440,11 +2440,6 @@ msgstr "%s: nieznana metoda sortowania"
 msgid "%s: Unknown type."
 msgstr "%s: nieznany typ"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: zbyt wiele argumentów"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2646,11 +2641,6 @@ msgstr "-group: brak nazwy grupy"
 msgid "out of arguments"
 msgstr "brak argumentów"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "za dużo argumentów"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2690,10 +2680,6 @@ msgstr "Klawisz nie został przypisany."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Klawisz nie został przypisany. Aby uzyskać pomoc przyciśnij '%s'."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: zbyt wiele argumentów"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2708,18 +2694,10 @@ msgstr "pusta sekwencja klawiszy"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: zbyt wiele argumentów"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: pusta sekwencja klawiszy"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: zbyt wiele argumentów"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: brak argumentów"
@@ -3153,10 +3131,6 @@ msgstr "Hasło dla %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: zbyt wiele argumentów"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6091,10 +6065,6 @@ msgstr "brak wpisu w 'mailcap' dla typu %s"
 msgid "score: too few arguments"
 msgstr "score: za mało argumentów"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: zbyt wiele argumentów"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index beb43a637..64ae41c3e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -403,8 +403,8 @@ msgid "%s: no such attribute"
 msgstr "%s: não existe tal atributo"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "muitos argumentos"
+msgid "%s: too many arguments"
+msgstr "%s: muitos argumentos"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2497,11 +2497,6 @@ msgstr "%s: método de ordenação desconhecido"
 msgid "%s: Unknown type."
 msgstr "%s: tipo inválido"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: muitos argumentos"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2709,11 +2704,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "poucos argumentos"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "muitos argumentos"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2753,10 +2743,6 @@ msgstr "Tecla não associada."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tecla não associada. Pressione '%s' para ajuda."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: muitos argumentos"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2771,18 +2757,10 @@ msgstr "seqüência de teclas nula"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: muitos argumentos"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: seqüência de teclas vazia"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: muitos argumentos"
-
 #: keymap.c:1218
 #, fuzzy
 msgid "exec: no arguments"
@@ -3244,10 +3222,6 @@ msgstr "Senha para %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: muitos argumentos"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6280,10 +6254,6 @@ msgstr "entrada no mailcap para o tipo %s não foi encontrada."
 msgid "score: too few arguments"
 msgstr "score: poucos argumentos"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: muitos argumentos"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index ba3d3f8a4..7fa8ae504 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -405,8 +405,8 @@ msgid "%s: no such attribute"
 msgstr "%s: нет такого атрибута"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "слишком много аргументов"
+msgid "%s: too many arguments"
+msgstr "%s: слишком много аргументов"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2417,11 +2417,6 @@ msgstr "%s: неизвестный метод сортировки"
 msgid "%s: Unknown type."
 msgstr "%s: неизвестный тип."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: слишком много аргументов"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "слишком мало аргументов"
@@ -2621,11 +2616,6 @@ msgstr "-group: имя группы отсутствует"
 msgid "out of arguments"
 msgstr "слишком мало аргументов"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "слишком много аргументов"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2665,10 +2655,6 @@ msgstr "Клавише не назначена никакая функция."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Клавише не назначена никакая функция. Для справки используйте \"%s\"."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: слишком много аргументов"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2683,18 +2669,10 @@ msgstr "последовательность клавиш пуста"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: слишком много аргументов"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: пустая последовательность клавиш"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: слишком много аргументов"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: нет аргументов"
@@ -3132,10 +3110,6 @@ msgstr "Пароль для %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: слишком много аргументов"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6043,10 +6017,6 @@ msgstr "для типа %s не найдено записи в файле mailca
 msgid "score: too few arguments"
 msgstr "score: слишком мало аргументов"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: слишком много аргументов"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Ошибка: score: неверное значение"
diff --git a/po/sk.po b/po/sk.po
index 29f33370e..03a397cb7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -397,8 +397,8 @@ msgid "%s: no such attribute"
 msgstr "%s: vlastnosť nenájdená"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "príliš veľa argumentov"
+msgid "%s: too many arguments"
+msgstr "%s: príliš veľa argumentov"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2454,11 +2454,6 @@ msgstr "%s: neznáma metóda triedenia"
 msgid "%s: Unknown type."
 msgstr "%s: neznáma hodnota"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: príliš veľa parametrov"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2666,11 +2661,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "príliš málo argumentov"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "príliš veľa argumentov"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2710,10 +2700,6 @@ msgstr "Klávesa nie je viazaná."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Klávesa nie je viazaná. Stlačte '%s' pre nápovedu."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: príliš veľa parametrov"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2728,18 +2714,10 @@ msgstr "prázdna postupnosť kláves"
 msgid "Function '%s' not available for menu '%s'"
 msgstr "Pre správu nebol nájdený dešifrovací program."
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: príliš veľa parametrov"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: prázdna postupnosť kláves"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "makro: príliš veľa parametrov"
-
 #: keymap.c:1218
 #, fuzzy
 msgid "exec: no arguments"
@@ -3203,10 +3181,6 @@ msgstr "Heslo pre %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "zdroj: príliš veľa argumentov"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6194,10 +6168,6 @@ msgstr "položka mailcap-u pre typ %s nenájdená"
 msgid "score: too few arguments"
 msgstr "score: príliš málo parametrov"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: príliš veľa parametrov"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 9579fcb44..39991ba42 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -396,8 +396,8 @@ msgid "%s: no such attribute"
 msgstr "%s: attributet finns inte"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "för många parametrar"
+msgid "%s: too many arguments"
+msgstr "%s: för många parametrar"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2433,11 +2433,6 @@ msgstr "%s: okänd sorteringsmetod"
 msgid "%s: Unknown type."
 msgstr "%s: Okänd typ."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: för många parametrar"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2639,11 +2634,6 @@ msgstr "-group: inget gruppnamn"
 msgid "out of arguments"
 msgstr "slut på parametrar"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "för många parametrar"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2683,10 +2673,6 @@ msgstr "Tangenten är inte knuten."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tangenten är inte knuten. Tryck \"%s\" för hjälp."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: för många parametrar"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2701,18 +2687,10 @@ msgstr "tom tangentsekvens"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: för många parametrar"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: tom tangentsekvens"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: för många parametrar"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: inga parametrar"
@@ -3148,10 +3126,6 @@ msgstr "Lösenord för %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: för många parametrar"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6092,10 +6066,6 @@ msgstr "\"mailcap\"-post för typ %s hittades inte"
 msgid "score: too few arguments"
 msgstr "score: för få parametrar"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: för många parametrar"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 88ff3b8ab..654c2478f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -399,8 +399,8 @@ msgid "%s: no such attribute"
 msgstr "%s: böyle bir nitelik yok"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "fazla argüman"
+msgid "%s: too many arguments"
+msgstr "%s: fazla argüman"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2440,11 +2440,6 @@ msgstr "%s: bilinmeyen sıralama tipi"
 msgid "%s: Unknown type."
 msgstr "%s: Bilinmeyen tip."
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: fazla argüman"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2648,11 +2643,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "eksik argüman"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "fazla argüman"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2692,10 +2682,6 @@ msgstr "Tuş ayarlanmamış."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Tuş ayarlanmamış.  Lütfen '%s' tuşuyla yardım isteyin."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: fazla argüman"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2710,18 +2696,10 @@ msgstr "boş tuş dizisi"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: fazla argüman"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: boş tuş dizisi"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: fazla argüman"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: argüman verilmemiş"
@@ -3148,10 +3126,6 @@ msgstr "%s@%s için parola: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: fazla argüman"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6106,10 +6080,6 @@ msgstr "%s için mailcap kaydı bulunamadı"
 msgid "score: too few arguments"
 msgstr "puan: eksik argüman"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "puan: fazla argüman"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 7c4008ada..e8a632c78 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -399,8 +399,8 @@ msgid "%s: no such attribute"
 msgstr "%s: такого атрібуту немає"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "забагато аргументів"
+msgid "%s: too many arguments"
+msgstr "%s: забагато аргументів"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2399,11 +2399,6 @@ msgstr "%s: невідомий метод сортування"
 msgid "%s: Unknown type."
 msgstr "%s: Невідомий тип"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push: забагато аргументів"
-
 #: init.c:1021 init.c:1029 init.c:1052
 msgid "not enough arguments"
 msgstr "замало аргументів"
@@ -2603,11 +2598,6 @@ msgstr "-group: не вказано імені групи"
 msgid "out of arguments"
 msgstr "замало аргументів"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "забагато аргументів"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2647,10 +2637,6 @@ msgstr "Клавішу не призначено."
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "Клавішу не призначено. Натисніть \"%s\" для підказки."
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push: забагато аргументів"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2665,18 +2651,10 @@ msgstr "порожня послідовність клавіш"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind: забагато аргументів"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro: порожня послідовність клавіш"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro: забагато аргументів"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec: немає аргументів"
@@ -3111,10 +3089,6 @@ msgstr "Пароль для %s@%s: "
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source: забагато аргументів"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6001,10 +5975,6 @@ msgstr "запису для типу %s в mailcap не знайдено"
 msgid "score: too few arguments"
 msgstr "score: замало аргументів"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "score: забагато аргументів"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "Помилка: score: неправильне число"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b845f38d9..b1291ce8e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -399,8 +399,8 @@ msgid "%s: no such attribute"
 msgstr "%s：没有这个属性"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "参数太多"
+msgid "%s: too many arguments"
+msgstr "%s: 参数太多"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2436,11 +2436,6 @@ msgstr "%s：未知的排序方式"
 msgid "%s: Unknown type."
 msgstr "%s：未知类型。"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push：参数太多"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2644,11 +2639,6 @@ msgstr "-group: 无组名称"
 msgid "out of arguments"
 msgstr "参数不够用"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "参数太多"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2690,10 +2680,6 @@ msgstr "此键还未绑定功能。"
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "此键还未绑定功能。按 '%s' 以获得帮助信息。"
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push：参数太多"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2708,18 +2694,10 @@ msgstr "空的键值序列"
 msgid "Function '%s' not available for menu '%s'"
 msgstr "函数 '%s' 不可用对于菜单 '%s'"
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind：参数太多"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro：空的键值序列"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro：参数太多"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec：无参数"
@@ -3151,10 +3129,6 @@ msgstr "%s@%s 的密码："
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source：参数太多"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, fuzzy, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6068,10 +6042,6 @@ msgstr "没有发现类型 %s 的 mailcap 纪录"
 msgid "score: too few arguments"
 msgstr "分数：参数太少"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "分数：参数太多"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr "错误：分数：无效数字"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1fea37ac8..b8f98c2f3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -403,8 +403,8 @@ msgid "%s: no such attribute"
 msgstr "%s：沒有這個屬性"
 
 #: color.c:860 color.c:917 hook.c:108
-msgid "too many arguments"
-msgstr "太多參數"
+msgid "%s: too many arguments"
+msgstr "%s: 太多參數"
 
 #: color.c:885
 msgid "default colors not supported"
@@ -2483,11 +2483,6 @@ msgstr "%s：不明的排序方式"
 msgid "%s: Unknown type."
 msgstr "%s：不明的種類"
 
-#: init.c:762
-#, fuzzy, c-format
-msgid "finish: too many arguments"
-msgstr "push：太多引數"
-
 #: init.c:1021 init.c:1029 init.c:1052
 #, fuzzy
 msgid "not enough arguments"
@@ -2695,11 +2690,6 @@ msgstr ""
 msgid "out of arguments"
 msgstr "太少參數"
 
-#: init.c:4309 init.c:4363
-#, fuzzy
-msgid "Too many arguments"
-msgstr "太多參數"
-
 #: init.c:4318
 #, fuzzy, c-format
 msgid "Could not subscribe to %s"
@@ -2739,10 +2729,6 @@ msgstr "這個鍵還未被定義功能。"
 msgid "Key is not bound.  Press '%s' for help."
 msgstr "這個鍵還未被定義功能。 按 '%s' 以取得說明。"
 
-#: keymap.c:967
-msgid "push: too many arguments"
-msgstr "push：太多引數"
-
 #: keymap.c:1002
 #, c-format
 msgid "%s: no such menu"
@@ -2757,18 +2743,10 @@ msgstr "空的鍵值序列"
 msgid "Function '%s' not available for menu '%s'"
 msgstr ""
 
-#: keymap.c:1112
-msgid "bind: too many arguments"
-msgstr "bind：太多引數"
-
 #: keymap.c:1170
 msgid "macro: empty key sequence"
 msgstr "macro：空的鍵值序列"
 
-#: keymap.c:1181
-msgid "macro: too many arguments"
-msgstr "macro：引數太多"
-
 #: keymap.c:1218
 msgid "exec: no arguments"
 msgstr "exec：沒有引數"
@@ -3227,10 +3205,6 @@ msgstr "%s@%s 的密碼："
 msgid "%s: %s"
 msgstr ""
 
-#: mutt_lua.c:422
-msgid "source: too many arguments"
-msgstr "source：太多引數"
-
 #: mutt_notmuch.c:204 mutt_notmuch.c:1687 mutt_notmuch.c:1875
 #, c-format
 msgid "failed to parse notmuch uri: %s"
@@ -6228,10 +6202,6 @@ msgstr "沒有發現類型 %s 的 mailcap 紀錄"
 msgid "score: too few arguments"
 msgstr "分數：太少的引數"
 
-#: score.c:96
-msgid "score: too many arguments"
-msgstr "分數：太多的引數"
-
 #: score.c:136
 msgid "Error: score: invalid number"
 msgstr ""
diff --git a/score.c b/score.c
index fe88a221a..9db9be6d0 100644
--- a/score.c
+++ b/score.c
@@ -93,7 +93,7 @@ int mutt_parse_score(struct Buffer *buf, struct Buffer *s, unsigned long data,
   if (MoreArgs(s))
   {
     FREE(&pattern);
-    mutt_str_strfcpy(err->data, _("score: too many arguments"), err->dsize);
+    mutt_buffer_printf(err, _("%s: too many arguments"), "score");
     return -1;
   }