diff --git a/lib/validation.js b/lib/validation.js
index c81be368f..e960379cd 100644
--- a/lib/validation.js
+++ b/lib/validation.js
@@ -26,7 +26,13 @@ module.exports = function validation (yargs, usage, y18n) {
           )
         } else {
           usage.fail(
-            __('Not enough non-option arguments: got %s, need at least %s', _s, demandedCommands._.min)
+            __n(
+              'Not enough non-option arguments: got %s, need at least %s',
+              'Not enough non-option arguments: got %s, need at least %s',
+              _s,
+              _s,
+              demandedCommands._.min
+            )
           )
         }
       } else if (_s > demandedCommands._.max) {
@@ -37,7 +43,13 @@ module.exports = function validation (yargs, usage, y18n) {
           )
         } else {
           usage.fail(
-            __('Too many non-option arguments: got %s, maximum of %s', _s, demandedCommands._.max)
+            __n(
+              'Too many non-option arguments: got %s, maximum of %s',
+              'Too many non-option arguments: got %s, maximum of %s',
+              _s,
+              _s,
+              demandedCommands._.max
+            )
           )
         }
       }
@@ -49,7 +61,13 @@ module.exports = function validation (yargs, usage, y18n) {
   self.positionalCount = function positionalCount (required, observed) {
     if (observed < required) {
       usage.fail(
-        __('Not enough non-option arguments: got %s, need at least %s', observed, required)
+        __n(
+          'Not enough non-option arguments: got %s, need at least %s',
+          'Not enough non-option arguments: got %s, need at least %s',
+          observed,
+          observed,
+          required
+        )
       )
     }
   }
diff --git a/locales/be.json b/locales/be.json
index 141ebe1e1..332ef0a07 100644
--- a/locales/be.json
+++ b/locales/be.json
@@ -12,8 +12,14 @@
   "choices:": "магчымасці:",
   "aliases:": "аліасы:",
   "generated-value": "згенераванае значэнне",
-  "Not enough non-option arguments: got %s, need at least %s": "Недастаткова неапцыйных аргументаў: ёсць %s, трэба як мінімум %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Занадта шмат неапцыйных аргументаў: ёсць %s, максімум дапушчальна %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Недастаткова неапцыйных аргументаў: ёсць %s, трэба як мінімум %s",
+    "other": "Недастаткова неапцыйных аргументаў: ёсць %s, трэба як мінімум %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Занадта шмат неапцыйных аргументаў: ёсць %s, максімум дапушчальна %s",
+    "other": "Занадта шмат неапцыйных аргументаў: ёсць %s, максімум дапушчальна %s"
+  },
   "Missing argument value: %s": {
     "one": "Не хапае значэння аргументу: %s",
     "other": "Не хапае значэнняў аргументаў: %s"
diff --git a/locales/de.json b/locales/de.json
index 05d983737..8551e348d 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -12,8 +12,14 @@
   "choices:": "Möglichkeiten:",
   "aliases:": "Aliase:",
   "generated-value": "Generierter-Wert",
-  "Not enough non-option arguments: got %s, need at least %s": "Nicht genügend Argumente ohne Optionen: %s vorhanden, mindestens %s benötigt",
-  "Too many non-option arguments: got %s, maximum of %s": "Zu viele Argumente ohne Optionen: %s vorhanden, maximal %s erlaubt",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Nicht genügend Argumente ohne Optionen: %s vorhanden, mindestens %s benötigt",
+    "other": "Nicht genügend Argumente ohne Optionen: %s vorhanden, mindestens %s benötigt"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Zu viele Argumente ohne Optionen: %s vorhanden, maximal %s erlaubt",
+    "other": "Zu viele Argumente ohne Optionen: %s vorhanden, maximal %s erlaubt"
+  },
   "Missing argument value: %s": {
     "one": "Fehlender Argumentwert: %s",
     "other": "Fehlende Argumentwerte: %s"
diff --git a/locales/en.json b/locales/en.json
index b32a63f27..a03c1388b 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -12,8 +12,14 @@
   "choices:": "choices:",
   "aliases:": "aliases:",
   "generated-value": "generated-value",
-  "Not enough non-option arguments: got %s, need at least %s": "Not enough non-option arguments: got %s, need at least %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Too many non-option arguments: got %s, maximum of %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Not enough non-option arguments: got %s, need at least %s",
+    "other": "Not enough non-option arguments: got %s, need at least %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Too many non-option arguments: got %s, maximum of %s",
+    "other": "Too many non-option arguments: got %s, maximum of %s"
+  },
   "Missing argument value: %s": {
     "one": "Missing argument value: %s",
     "other": "Missing argument values: %s"
diff --git a/locales/es.json b/locales/es.json
index d7c8af9f8..631a45c67 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -12,8 +12,14 @@
   "choices:": "selección:",
   "aliases:": "alias:",
   "generated-value": "valor-generado",
-  "Not enough non-option arguments: got %s, need at least %s": "Hacen falta argumentos no-opcionales: Número recibido %s, necesita por lo menos %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Demasiados argumentos no-opcionales: Número recibido %s, máximo es %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Hacen falta argumentos no-opcionales: Número recibido %s, necesita por lo menos %s",
+    "other": "Hacen falta argumentos no-opcionales: Número recibido %s, necesita por lo menos %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Demasiados argumentos no-opcionales: Número recibido %s, máximo es %s",
+    "other": "Demasiados argumentos no-opcionales: Número recibido %s, máximo es %s"
+  },
   "Missing argument value: %s": {
     "one": "Falta argumento: %s",
     "other": "Faltan argumentos: %s"
diff --git a/locales/fi.json b/locales/fi.json
index 16acd12dc..e65beee80 100644
--- a/locales/fi.json
+++ b/locales/fi.json
@@ -12,8 +12,14 @@
   "choices:": "vaihtoehdot:",
   "aliases:": "aliakset:",
   "generated-value": "generoitu-arvo",
-  "Not enough non-option arguments: got %s, need at least %s": "Liian vähän argumentteja, jotka eivät ole valintoja: annettu %s, vaaditaan vähintään %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Liikaa argumentteja, jotka eivät ole valintoja: annettu %s, sallitaan enintään %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Liian vähän argumentteja, jotka eivät ole valintoja: annettu %s, vaaditaan vähintään %s",
+    "other": "Liian vähän argumentteja, jotka eivät ole valintoja: annettu %s, vaaditaan vähintään %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Liikaa argumentteja, jotka eivät ole valintoja: annettu %s, sallitaan enintään %s",
+    "other": "Liikaa argumentteja, jotka eivät ole valintoja: annettu %s, sallitaan enintään %s"
+  },
   "Missing argument value: %s": {
     "one": "Argumentin arvo puuttuu: %s",
     "other": "Argumentin arvot puuttuvat: %s"
diff --git a/locales/fr.json b/locales/fr.json
index 3245e4e0a..82b3df401 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -1,38 +1,48 @@
 {
-  "Commands:": "Commandes:",
-  "Options:": "Options:",
-  "Examples:": "Exemples:",
+  "Commands:": "Commandes :",
+  "Options:": "Options :",
+  "Examples:": "Exemples :",
   "boolean": "booléen",
-  "count": "comptage",
-  "string": "chaine de caractère",
+  "count": "compteur",
+  "string": "chaîne de caractères",
   "number": "nombre",
   "array": "tableau",
   "required": "requis",
-  "default:": "défaut:",
-  "choices:": "choix:",
+  "default:": "défaut :",
+  "choices:": "choix :",
+  "aliases:": "alias :",
   "generated-value": "valeur générée",
-  "Not enough non-option arguments: got %s, need at least %s": "Pas assez d'arguments non-option: reçu %s, besoin d'au moins %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Trop d'arguments non-option: reçu %s, maximum %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Pas assez d'arguments (hors options) : reçu %s, besoin d'au moins %s",
+    "other": "Pas assez d'arguments (hors options) : reçus %s, besoin d'au moins %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Trop d'arguments (hors options) : reçu %s, maximum de %s",
+    "other": "Trop d'arguments (hors options) : reçus %s, maximum de %s"
+  },
   "Missing argument value: %s": {
-    "one": "Argument manquant: %s",
-    "other": "Arguments manquants: %s"
+    "one": "Argument manquant : %s",
+    "other": "Arguments manquants : %s"
   },
   "Missing required argument: %s": {
-    "one": "Argument requis manquant: %s",
-    "other": "Arguments requis manquants: %s"
+    "one": "Argument requis manquant : %s",
+    "other": "Arguments requis manquants : %s"
   },
   "Unknown argument: %s": {
-    "one": "Argument inconnu: %s",
-    "other": "Arguments inconnus: %s"
+    "one": "Argument inconnu : %s",
+    "other": "Arguments inconnus : %s"
   },
-  "Invalid values:": "Valeurs invalides:",
-  "Argument: %s, Given: %s, Choices: %s": "Argument: %s, Donné: %s, Choix: %s",
-  "Argument check failed: %s": "Echec de la vérification de l'argument: %s",
-  "Implications failed:": "Arguments dépendants manquants:",
-  "Not enough arguments following: %s": "Pas assez d'arguments suivant: %s",
-  "Invalid JSON config file: %s": "Fichier de configuration JSON invalide: %s",
+  "Invalid values:": "Valeurs invalides :",
+  "Argument: %s, Given: %s, Choices: %s": "Argument : %s, donné : %s, choix : %s",
+  "Argument check failed: %s": "Echec de la vérification de l'argument : %s",
+  "Implications failed:": "Arguments dépendants manquants :",
+  "Not enough arguments following: %s": "Pas assez d'arguments après : %s",
+  "Invalid JSON config file: %s": "Fichier de configuration JSON invalide : %s",
   "Path to JSON config file": "Chemin du fichier de configuration JSON",
-  "Show help": "Affiche de l'aide",
+  "Show help": "Affiche l'aide",
   "Show version number": "Affiche le numéro de version",
-  "Arguments %s and %s are mutually exclusive" : "Les arguments %s et %s sont mutuellement exclusifs"
+  "Did you mean %s?": "Vouliez-vous dire %s ?",
+  "Arguments %s and %s are mutually exclusive" : "Les arguments %s et %s sont mutuellement exclusifs",
+  "Positionals:": "Arguments positionnels :",
+  "command": "commande"
 }
diff --git a/locales/hi.json b/locales/hi.json
index 2cd677acb..021f005f8 100644
--- a/locales/hi.json
+++ b/locales/hi.json
@@ -12,8 +12,14 @@
   "choices:": "विकल्प:",
   "aliases:": "उपनाम:",
   "generated-value": "उत्पन्न-मूल्य",
-  "Not enough non-option arguments: got %s, need at least %s": "पर्याप्त गैर-विकल्प तर्क प्राप्त नहीं: %s प्राप्त, कम से कम %s की आवश्यकता है",
-  "Too many non-option arguments: got %s, maximum of %s": "बहुत सारे गैर-विकल्प तर्क: %s प्राप्त, अधिकतम %s मान्य",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "पर्याप्त गैर-विकल्प तर्क प्राप्त नहीं: %s प्राप्त, कम से कम %s की आवश्यकता है",
+    "other": "पर्याप्त गैर-विकल्प तर्क प्राप्त नहीं: %s प्राप्त, कम से कम %s की आवश्यकता है"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "बहुत सारे गैर-विकल्प तर्क: %s प्राप्त, अधिकतम %s मान्य",
+    "other": "बहुत सारे गैर-विकल्प तर्क: %s प्राप्त, अधिकतम %s मान्य"
+  },
   "Missing argument value: %s": {
     "one": "कुछ तर्को के मूल्य गुम हैं: %s",
     "other": "कुछ तर्को के मूल्य गुम हैं: %s"
diff --git a/locales/hu.json b/locales/hu.json
index 7b7d16606..1ddad5cc9 100644
--- a/locales/hu.json
+++ b/locales/hu.json
@@ -12,8 +12,14 @@
   "choices:": "lehetőségek:",
   "aliases:": "aliaszok:",
   "generated-value": "generált-érték",
-  "Not enough non-option arguments: got %s, need at least %s": "Nincs elég nem opcionális argumentum: %s van, legalább %s kell",
-  "Too many non-option arguments: got %s, maximum of %s": "Túl sok nem opciánlis argumentum van: %s van, maximum %s lehet",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Nincs elég nem opcionális argumentum: %s van, legalább %s kell",
+    "other": "Nincs elég nem opcionális argumentum: %s van, legalább %s kell"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Túl sok nem opciánlis argumentum van: %s van, maximum %s lehet",
+    "other": "Túl sok nem opciánlis argumentum van: %s van, maximum %s lehet"
+  },
   "Missing argument value: %s": {
     "one": "Hiányzó argumentum érték: %s",
     "other": "Hiányzó argumentum értékek: %s"
diff --git a/locales/id.json b/locales/id.json
index 87e441cd8..075857e34 100644
--- a/locales/id.json
+++ b/locales/id.json
@@ -13,8 +13,14 @@
   "aliases:": "istilah lain:",
   "choices:": "pilihan:",
   "generated-value": "nilai-yang-dihasilkan",
-  "Not enough non-option arguments: got %s, need at least %s": "Argumen wajib kurang: hanya %s, minimal %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Terlalu banyak argumen wajib: ada %s, maksimal %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Argumen wajib kurang: hanya %s, minimal %s",
+    "other": "Argumen wajib kurang: hanya %s, minimal %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Terlalu banyak argumen wajib: ada %s, maksimal %s",
+    "other": "Terlalu banyak argumen wajib: ada %s, maksimal %s"
+  },
   "Missing argument value: %s": {
     "one": "Kurang argumen: %s",
     "other": "Kurang argumen: %s"
diff --git a/locales/it.json b/locales/it.json
index 9ee900d34..ae61cc4a7 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -12,8 +12,14 @@
   "choices:": "scelte:",
   "aliases:": "alias:",
   "generated-value": "valore generato",
-  "Not enough non-option arguments: got %s, need at least %s": "Numero insufficiente di argomenti non opzione: inseriti %s, richiesti almeno %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Troppi argomenti non opzione: inseriti %s, massimo possibile %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Numero insufficiente di argomenti non opzione: inseriti %s, richiesti almeno %s",
+    "other": "Numero insufficiente di argomenti non opzione: inseriti %s, richiesti almeno %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Troppi argomenti non opzione: inseriti %s, massimo possibile %s",
+    "other": "Troppi argomenti non opzione: inseriti %s, massimo possibile %s"
+  },
   "Missing argument value: %s": {
     "one": "Argomento mancante: %s",
     "other": "Argomenti mancanti: %s"
diff --git a/locales/ja.json b/locales/ja.json
index 64ee6d3fb..f7c96eedc 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -12,8 +12,14 @@
   "choices:": "選択してください:",
   "aliases:": "エイリアス:",
   "generated-value": "生成された値",
-  "Not enough non-option arguments: got %s, need at least %s": "オプションではない引数が %s 個では不足しています。少なくとも %s 個の引数が必要です:",
-  "Too many non-option arguments: got %s, maximum of %s": "オプションではない引数が %s 個では多すぎます。最大で %s 個までです:",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "オプションではない引数が %s 個では不足しています。少なくとも %s 個の引数が必要です:",
+    "other": "オプションではない引数が %s 個では不足しています。少なくとも %s 個の引数が必要です:"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "オプションではない引数が %s 個では多すぎます。最大で %s 個までです:",
+    "other": "オプションではない引数が %s 個では多すぎます。最大で %s 個までです:"
+  },
   "Missing argument value: %s": {
     "one": "引数が見つかりません: %s",
     "other": "引数が見つかりません: %s"
diff --git a/locales/ko.json b/locales/ko.json
index 0eaeab2f8..a56fde92b 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -12,8 +12,14 @@
   "choices:": "선택:",
   "aliases:": "별칭:",
   "generated-value": "생성된 값",
-  "Not enough non-option arguments: got %s, need at least %s": "옵션이 아닌 인자가 충분치 않습니다: %s개를 받았지만, 적어도 %s개는 필요합니다",
-  "Too many non-option arguments: got %s, maximum of %s": "옵션이 아닌 인자가 너무 많습니다: %s개를 받았지만, %s개 이하여야 합니다",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "옵션이 아닌 인자가 충분치 않습니다: %s개를 받았지만, 적어도 %s개는 필요합니다",
+    "other": "옵션이 아닌 인자가 충분치 않습니다: %s개를 받았지만, 적어도 %s개는 필요합니다"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "옵션이 아닌 인자가 너무 많습니다: %s개를 받았지만, %s개 이하여야 합니다",
+    "other": "옵션이 아닌 인자가 너무 많습니다: %s개를 받았지만, %s개 이하여야 합니다"
+  },
   "Missing argument value: %s": {
     "one": "인자값을 받지 못했습니다: %s",
     "other": "인자값들을 받지 못했습니다: %s"
diff --git a/locales/nb.json b/locales/nb.json
index 55be1fbed..7d5f73e9d 100644
--- a/locales/nb.json
+++ b/locales/nb.json
@@ -11,8 +11,14 @@
   "default:": "standard:",
   "choices:": "valg:",
   "generated-value": "generert-verdi",
-  "Not enough non-option arguments: got %s, need at least %s": "Ikke nok ikke-alternativ argumenter: fikk %s, trenger minst %s",
-  "Too many non-option arguments: got %s, maximum of %s": "For mange ikke-alternativ argumenter: fikk %s, maksimum %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Ikke nok ikke-alternativ argumenter: fikk %s, trenger minst %s",
+    "other": "Ikke nok ikke-alternativ argumenter: fikk %s, trenger minst %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "For mange ikke-alternativ argumenter: fikk %s, maksimum %s",
+    "other": "For mange ikke-alternativ argumenter: fikk %s, maksimum %s"
+  },
   "Missing argument value: %s": {
     "one": "Mangler argument verdi: %s",
     "other": "Mangler argument verdier: %s"
diff --git a/locales/nl.json b/locales/nl.json
index 5d62e0fc3..b42a323a9 100644
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -12,8 +12,14 @@
   "choices:": "keuzes:",
   "aliases:": "aliassen:",
   "generated-value": "gegenereerde waarde",
-  "Not enough non-option arguments: got %s, need at least %s": "Niet genoeg niet-optie-argumenten: %s gekregen, minstens %s nodig",
-  "Too many non-option arguments: got %s, maximum of %s": "Te veel niet-optie-argumenten: %s gekregen, maximum is %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Niet genoeg niet-optie-argumenten: %s gekregen, minstens %s nodig",
+    "other": "Niet genoeg niet-optie-argumenten: %s gekregen, minstens %s nodig"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Te veel niet-optie-argumenten: %s gekregen, maximum is %s",
+    "other": "Te veel niet-optie-argumenten: %s gekregen, maximum is %s"
+  },
   "Missing argument value: %s": {
     "one": "Missende argumentwaarde: %s",
     "other": "Missende argumentwaarden: %s"
diff --git a/locales/nn.json b/locales/nn.json
index 5a3c9514d..545c0641d 100644
--- a/locales/nn.json
+++ b/locales/nn.json
@@ -11,10 +11,14 @@
   "default:": "standard:",
   "choices:": "val:",
   "generated-value": "generert-verdi",
-  "Not enough non-option arguments: got %s, need at least %s":
-    "Ikkje nok ikkje-alternativ argument: fekk %s, treng minst %s",
-  "Too many non-option arguments: got %s, maximum of %s":
-    "For mange ikkje-alternativ argument: fekk %s, maksimum %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Ikkje nok ikkje-alternativ argument: fekk %s, treng minst %s",
+    "other": "Ikkje nok ikkje-alternativ argument: fekk %s, treng minst %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "For mange ikkje-alternativ argument: fekk %s, maksimum %s",
+    "other": "For mange ikkje-alternativ argument: fekk %s, maksimum %s"
+  },
   "Missing argument value: %s": {
     "one": "Manglar argumentverdi: %s",
     "other": "Manglar argumentverdiar: %s"
diff --git a/locales/pl.json b/locales/pl.json
index 6926a4548..5f6c578e0 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -12,8 +12,14 @@
   "choices:": "dostępne:",
   "aliases:": "aliasy:",
   "generated-value": "wygenerowana-wartość",
-  "Not enough non-option arguments: got %s, need at least %s": "Niewystarczająca ilość argumentów: otrzymano %s, wymagane co najmniej %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Zbyt duża ilość argumentów: otrzymano %s, wymagane co najwyżej %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Niewystarczająca ilość argumentów: otrzymano %s, wymagane co najmniej %s",
+    "other": "Niewystarczająca ilość argumentów: otrzymano %s, wymagane co najmniej %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Zbyt duża ilość argumentów: otrzymano %s, wymagane co najwyżej %s",
+    "other": "Zbyt duża ilość argumentów: otrzymano %s, wymagane co najwyżej %s"
+  },
   "Missing argument value: %s": {
     "one": "Brak wartości dla argumentu: %s",
     "other": "Brak wartości dla argumentów: %s"
diff --git a/locales/pt.json b/locales/pt.json
index 75c3921c8..78da747b1 100644
--- a/locales/pt.json
+++ b/locales/pt.json
@@ -11,8 +11,14 @@
   "default:": "padrão:",
   "choices:": "escolhas:",
   "generated-value": "valor-gerado",
-  "Not enough non-option arguments: got %s, need at least %s": "Argumentos insuficientes não opcionais: Argumento %s, necessário pelo menos %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Excesso de argumentos não opcionais: recebido %s, máximo de %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Argumentos insuficientes não opcionais: Argumento %s, necessário pelo menos %s",
+    "other": "Argumentos insuficientes não opcionais: Argumento %s, necessário pelo menos %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Excesso de argumentos não opcionais: recebido %s, máximo de %s",
+    "other": "Excesso de argumentos não opcionais: recebido %s, máximo de %s"
+  },
   "Missing argument value: %s": {
     "one": "Falta valor de argumento: %s",
     "other": "Falta valores de argumento: %s"
diff --git a/locales/pt_BR.json b/locales/pt_BR.json
index 904cb66eb..eae1ec60d 100644
--- a/locales/pt_BR.json
+++ b/locales/pt_BR.json
@@ -12,8 +12,14 @@
   "choices:": "opções:",
   "aliases:": "sinônimos:",
   "generated-value": "valor-gerado",
-  "Not enough non-option arguments: got %s, need at least %s": "Argumentos insuficientes: Argumento %s, necessário pelo menos %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Excesso de argumentos: recebido %s, máximo de %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Argumentos insuficientes: Argumento %s, necessário pelo menos %s",
+    "other": "Argumentos insuficientes: Argumento %s, necessário pelo menos %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Excesso de argumentos: recebido %s, máximo de %s",
+    "other": "Excesso de argumentos: recebido %s, máximo de %s"
+  },
   "Missing argument value: %s": {
     "one": "Falta valor de argumento: %s",
     "other": "Falta valores de argumento: %s"
diff --git a/locales/ru.json b/locales/ru.json
index cb7b88b49..c9001d1e9 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -12,8 +12,14 @@
   "choices:": "возможности:",
   "aliases:": "алиасы:",
   "generated-value": "генерированное значение",
-  "Not enough non-option arguments: got %s, need at least %s": "Недостаточно неопционных аргументов: есть %s, нужно как минимум %s",
-  "Too many non-option arguments: got %s, maximum of %s": "Слишком много неопционных аргументов: есть %s, максимум допустимо %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Недостаточно неопционных аргументов: есть %s, нужно как минимум %s",
+    "other": "Недостаточно неопционных аргументов: есть %s, нужно как минимум %s"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Слишком много неопционных аргументов: есть %s, максимум допустимо %s",
+    "other": "Слишком много неопционных аргументов: есть %s, максимум допустимо %s"
+  },
   "Missing argument value: %s": {
     "one": "Не хватает значения аргумента: %s",
     "other": "Не хватает значений аргументов: %s"
diff --git a/locales/th.json b/locales/th.json
index 3f08dcd23..250298beb 100644
--- a/locales/th.json
+++ b/locales/th.json
@@ -12,8 +12,14 @@
   "choices:": "ตัวเลือก",
   "aliases:": "เอเลียส",
   "generated-value": "ค่าที่ถูกสร้างขึ้น",
-  "Not enough non-option arguments: got %s, need at least %s": "ใส่อาร์กิวเมนต์ไม่ครบตามจำนวนที่กำหนด: ใส่ค่ามาจำนวน %s ค่า, แต่ต้องการอย่างน้อย %s ค่า",
-  "Too many non-option arguments: got %s, maximum of %s": "ใส่อาร์กิวเมนต์เกินจำนวนที่กำหนด: ใส่ค่ามาจำนวน %s ค่า, แต่ต้องการมากที่สุด %s ค่า",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "ใส่อาร์กิวเมนต์ไม่ครบตามจำนวนที่กำหนด: ใส่ค่ามาจำนวน %s ค่า, แต่ต้องการอย่างน้อย %s ค่า",
+    "other": "ใส่อาร์กิวเมนต์ไม่ครบตามจำนวนที่กำหนด: ใส่ค่ามาจำนวน %s ค่า, แต่ต้องการอย่างน้อย %s ค่า"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "ใส่อาร์กิวเมนต์เกินจำนวนที่กำหนด: ใส่ค่ามาจำนวน %s ค่า, แต่ต้องการมากที่สุด %s ค่า",
+    "other": "ใส่อาร์กิวเมนต์เกินจำนวนที่กำหนด: ใส่ค่ามาจำนวน %s ค่า, แต่ต้องการมากที่สุด %s ค่า"
+  },
   "Missing argument value: %s": {
     "one": "ค่าอาร์กิวเมนต์ที่ขาดไป: %s",
     "other": "ค่าอาร์กิวเมนต์ที่ขาดไป: %s"
diff --git a/locales/tr.json b/locales/tr.json
index 9b06c52a8..b9ad65f0e 100644
--- a/locales/tr.json
+++ b/locales/tr.json
@@ -12,8 +12,14 @@
   "choices:": "seçimler:",
   "aliases:": "takma adlar:",
   "generated-value": "oluşturulan-değer",
-  "Not enough non-option arguments: got %s, need at least %s": "Seçenek dışı argümanlar yetersiz: %s bulundu, %s gerekli",
-  "Too many non-option arguments: got %s, maximum of %s": "Seçenek dışı argümanlar gereğinden fazla: %s bulundu, azami %s",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "Seçenek dışı argümanlar yetersiz: %s bulundu, %s gerekli",
+    "other": "Seçenek dışı argümanlar yetersiz: %s bulundu, %s gerekli"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "Seçenek dışı argümanlar gereğinden fazla: %s bulundu, azami %s",
+    "other": "Seçenek dışı argümanlar gereğinden fazla: %s bulundu, azami %s"
+  },
   "Missing argument value: %s": {
     "one": "Eksik argüman değeri: %s",
     "other": "Eksik argüman değerleri: %s"
diff --git a/locales/zh_CN.json b/locales/zh_CN.json
index 03a3d94f0..4872a0954 100644
--- a/locales/zh_CN.json
+++ b/locales/zh_CN.json
@@ -11,8 +11,14 @@
   "default:": "默认值:",
   "choices:": "可选值:",
   "generated-value": "生成的值",
-  "Not enough non-option arguments: got %s, need at least %s": "缺少 non-option 参数：传入了 %s 个, 至少需要 %s 个",
-  "Too many non-option arguments: got %s, maximum of %s": "non-option 参数过多：传入了 %s 个, 最大允许 %s 个",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "缺少 non-option 参数：传入了 %s 个, 至少需要 %s 个",
+    "other": "缺少 non-option 参数：传入了 %s 个, 至少需要 %s 个"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "non-option 参数过多：传入了 %s 个, 最大允许 %s 个",
+    "other": "non-option 参数过多：传入了 %s 个, 最大允许 %s 个"
+  },
   "Missing argument value: %s": {
     "one": "没有给此选项指定值：%s",
     "other": "没有给这些选项指定值：%s"
diff --git a/locales/zh_TW.json b/locales/zh_TW.json
index 12498888a..c41a517d9 100644
--- a/locales/zh_TW.json
+++ b/locales/zh_TW.json
@@ -12,8 +12,14 @@
   "choices:": "可選值:",
   "aliases:": "別名:",
   "generated-value": "生成的值",
-  "Not enough non-option arguments: got %s, need at least %s": "non-option 引數不足：只傳入了 %s 個, 至少要 %s 個",
-  "Too many non-option arguments: got %s, maximum of %s": "non-option 引數過多：傳入了 %s 個, 但最多 %s 個",
+  "Not enough non-option arguments: got %s, need at least %s": {
+    "one": "non-option 引數不足：只傳入了 %s 個, 至少要 %s 個",
+    "other": "non-option 引數不足：只傳入了 %s 個, 至少要 %s 個"
+  },
+  "Too many non-option arguments: got %s, maximum of %s": {
+    "one": "non-option 引數過多：傳入了 %s 個, 但最多 %s 個",
+    "other": "non-option 引數過多：傳入了 %s 個, 但最多 %s 個"
+  },
   "Missing argument value: %s": {
     "one": "此引數無指定值：%s",
     "other": "這些引數無指定值：%s"