diff --git a/locale/ca/LC_MESSAGES/hammer-cli.mo b/locale/ca/LC_MESSAGES/hammer-cli.mo
index 7e2ad000..708161c6 100644
Binary files a/locale/ca/LC_MESSAGES/hammer-cli.mo and b/locale/ca/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/ca/hammer-cli.po b/locale/ca/hammer-cli.po
index 5a783ed3..fe5e9177 100644
--- a/locale/ca/hammer-cli.po
+++ b/locale/ca/hammer-cli.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the hammer-cli package.
 #
 # Translators:
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
 "PO-Revision-Date: 2020-08-11 19:33+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/"
diff --git a/locale/de/LC_MESSAGES/hammer-cli.mo b/locale/de/LC_MESSAGES/hammer-cli.mo
index 96c45ea1..8587eae8 100644
Binary files a/locale/de/LC_MESSAGES/hammer-cli.mo and b/locale/de/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/de/hammer-cli.po b/locale/de/hammer-cli.po
index 1d514ce6..ee645540 100644
--- a/locale/de/hammer-cli.po
+++ b/locale/de/hammer-cli.po
@@ -10,12 +10,12 @@
 # simon11 <transifex@stieger.co>, 2014
 # simon11 <transifex@stieger.co>, 2014
 # tstrachota <tstrachota@redhat.com>, 2016
-# Ulrich Habel <rhaen@pkgbox.de>, 2014
+# 47388d0d0847859fcc07f8955b27d2a7_d1cb104 <93875580def0fcc1a566b016c3948752_122921>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
 "PO-Revision-Date: 2020-08-11 19:33+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/"
diff --git a/locale/en/LC_MESSAGES/hammer-cli.mo b/locale/en/LC_MESSAGES/hammer-cli.mo
index 46765f2b..55800fa0 100644
Binary files a/locale/en/LC_MESSAGES/hammer-cli.mo and b/locale/en/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/en/hammer-cli.po b/locale/en/hammer-cli.po
index acdc791d..bd33dd18 100644
--- a/locale/en/hammer-cli.po
+++ b/locale/en/hammer-cli.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-03-04 16:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
diff --git a/locale/en_GB/LC_MESSAGES/hammer-cli.mo b/locale/en_GB/LC_MESSAGES/hammer-cli.mo
index dade32db..f6254ee7 100644
Binary files a/locale/en_GB/LC_MESSAGES/hammer-cli.mo and b/locale/en_GB/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/en_GB/hammer-cli.po b/locale/en_GB/hammer-cli.po
index d7ba740b..6fb768e9 100644
--- a/locale/en_GB/hammer-cli.po
+++ b/locale/en_GB/hammer-cli.po
@@ -6,9 +6,9 @@
 # Andi Chandler <andi@gowling.com>, 2015-2017
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
 "PO-Revision-Date: 2020-08-11 19:33+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/"
diff --git a/locale/es/LC_MESSAGES/hammer-cli.mo b/locale/es/LC_MESSAGES/hammer-cli.mo
index cefe39f3..4c292c13 100644
Binary files a/locale/es/LC_MESSAGES/hammer-cli.mo and b/locale/es/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/es/hammer-cli.po b/locale/es/hammer-cli.po
index 0e2281ba..5e8ed457 100644
--- a/locale/es/hammer-cli.po
+++ b/locale/es/hammer-cli.po
@@ -9,9 +9,9 @@
 # Sergio Ocón-Cárdenas <sergio.ocon@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
 "PO-Revision-Date: 2020-09-03 07:45+0000\n"
 "Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/foreman/foreman/language/"
diff --git a/locale/fr/LC_MESSAGES/hammer-cli.mo b/locale/fr/LC_MESSAGES/hammer-cli.mo
index 5a1062c0..1a93307b 100644
Binary files a/locale/fr/LC_MESSAGES/hammer-cli.mo and b/locale/fr/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/fr/hammer-cli.po b/locale/fr/hammer-cli.po
index 64e84340..7c036434 100644
--- a/locale/fr/hammer-cli.po
+++ b/locale/fr/hammer-cli.po
@@ -11,10 +11,10 @@
 # ty breizh <tybreizh29@free.fr>, 2018
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
-"PO-Revision-Date: 2020-12-01 08:26+0000\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
+"PO-Revision-Date: 2021-05-18 14:58+0000\n"
 "Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
 "Language-Team: French (http://www.transifex.com/foreman/foreman/language/"
 "fr/)\n"
@@ -39,7 +39,7 @@ msgid "Predefined field sets"
 msgstr "Ensembles de champs prédéfinis"
 
 msgid "Command extensions should be inherited from %s."
-msgstr "Les extensions de commande doivent être héritées des %."
+msgstr "Les extensions de commande doivent être héritées de %s."
 
 msgid "Unfortunately the server does not support such operation."
 msgstr "Malheureusement le serveur ne supporte pas cette opération"
@@ -56,7 +56,7 @@ msgid "Unable to find hostname in %s."
 msgstr "Impossible de trouver le nom d'hôte dans %s."
 
 msgid "CA certificate for %{uri} was stored to %{file}."
-msgstr "Le certificat CA de %{uri} a été stocké dans %{file}."
+msgstr "Le certificat CA de %%s a été stocké dans %{file}."
 
 msgid ""
 "Now hammer can use the downloaded certificate to verify SSL connection to "
@@ -96,8 +96,7 @@ msgstr "Impossible d'analyser l'URI '%s'."
 msgid ""
 "The CA certificate for %{uri} couldn't be downloaded. No CA cert was found."
 msgstr ""
-"Impossible de télécharger le certificat CA de %{uri}. Certificat CA "
-"introuvable."
+"Impossible de télécharger le certificat CA de %%s. Certificat CA introuvable."
 
 msgid "Make sure your server sends cert chain including the CA."
 msgstr ""
@@ -111,7 +110,7 @@ msgstr ""
 msgid "You can also download the certificate manually and store it as %s."
 msgstr ""
 " Vous pouvez également télécharger le certificat manuellement et le stocker "
-"sous %s."
+"sous %s"
 
 msgid ""
 "If you choose any other location set the ssl_ca_path or ssl_ca_file "
@@ -136,13 +135,13 @@ msgid "Option '%s' is required."
 msgstr "L'option %s est obligatoire."
 
 msgid "Option '%{opt}' (or env %{env}) is required."
-msgstr "L'option '%{opt}' (ou env %{env}) est obligatoire."
+msgstr "L'option '%%s' (ou env %{file}) est obligatoire."
 
 msgid "Option '%{swt}': %{msg}."
-msgstr "Option '' : ."
+msgstr "Option %s' : %{file}."
 
 msgid "Parameter '%{pmt}': %{msg}."
-msgstr "Paramètre"
+msgstr "Paramètre '%{pmt}': %{msg}."
 
 msgid "%{env}: %{msg}."
 msgstr "%{env}: %{msg}."
@@ -157,7 +156,7 @@ msgid "No value provided."
 msgstr "Aucune valeur fournie."
 
 msgid "Illegal quoting in %{buffer}"
-msgstr "Citation illégale dans %{buffer}"
+msgstr "Citation illégale dans %%s"
 
 msgid ""
 "Couldn't create %s. Please create the directory before setting defaults."
@@ -216,18 +215,18 @@ msgid ""
 "Added %{key_val} default-option with value that will be generated from the "
 "server."
 msgstr ""
-"A ajouté l'option par défaut %{key_val} default-option avec la valeur qui "
-"sera générée à partir du serveur."
+"A ajouté l'option par défaut %%s default-option avec la valeur qui sera "
+"générée à partir du serveur."
 
 msgid "Added %{key_val} default-option with value %{val_val}."
-msgstr "Option par défaut avec % de valeur ajoutée."
+msgstr "Ajout de l'option par défaut %%s avec la valeur %{file}."
 
 msgid ""
 "Provider %{name} was not found. See `hammer defaults providers` for "
 "available providers."
 msgstr ""
-"Le fournisseur %{name} n'a pas pu être trouvé. Voir « fournisseurs hammer "
-"par défaut » pour trouver la liste des fournisseurs disponibles."
+"Le fournisseur %%s n'a pas pu être trouvé. Voir « fournisseurs hammer par "
+"défaut » pour trouver la liste des fournisseurs disponibles."
 
 msgid ""
 "The param name is not supported by provider. See `hammer defaults providers` "
@@ -237,7 +236,7 @@ msgstr ""
 "fournisseurs hammer par défaut » pour param pris en charge."
 
 msgid "%{param} was deleted successfully."
-msgstr "%{param} a été détecté."
+msgstr "%%s a été détecté."
 
 msgid "You must specify value or a provider name, can't specify both."
 msgstr ""
@@ -248,13 +247,13 @@ msgid "Couldn't find the requested param in %s."
 msgstr "Vous devez spécifier le paramètre demandé dans %s."
 
 msgid "Error: %s"
-msgstr "Erreur"
+msgstr "Erreur - %%s"
 
 msgid "Error: %{message}"
-msgstr "Erreur"
+msgstr "Erreur - %{message}"
 
 msgid "See: '%{path} --help'."
-msgstr "Voir : ...aide\"."
+msgstr "Voir : '%%s --help'."
 
 msgid "SSL error"
 msgstr "Erreur SSL"
@@ -276,7 +275,7 @@ msgid "Could not load the API description from the server"
 msgstr "Impossible de charger la description de l'API depuis le serveur"
 
 msgid "Missing arguments for %s."
-msgstr "Arguments manquants %s pour %"
+msgstr "Arguments manquants pour %%s"
 
 msgid "Format output in markdown"
 msgstr "Formater la sortie dans markdown"
@@ -291,7 +290,7 @@ msgid "NOTE"
 msgstr "NOTE"
 
 msgid "No permissions to create log dir %s."
-msgstr "Aucune permission pour créer le répertoire de journal %s"
+msgstr "Aucune permission pour créer le répertoire de journalisation %s."
 
 msgid "File %s not writeable, won't log anything to the file!"
 msgstr ""
@@ -444,13 +443,13 @@ msgid "Value must be a combination of '%s'."
 msgstr "La valeur doit être une combinaison de '%s'."
 
 msgid "Warning: Option %{option} is deprecated. %{message}"
-msgstr "Avertisement : Option %{option} est dépréciée. %{message}"
+msgstr "Avertissement : Option %{option} est dépréciée. %{file}"
 
 msgid "Deprecated: %{deprecated_msg}"
-msgstr "Dépréciation : %{deprecated_msg}"
+msgstr "Déprécié : %{deprecated_msg}"
 
 msgid "%{flag} is deprecated: %{deprecated_msg}"
-msgstr "%{flag} est déprécié : %{deprecated_msg}"
+msgstr "%%s est déprécié : %{deprecated_msg}"
 
 msgid "Can be specified multiple times."
 msgstr "Peut être spécifié plusieurs fois."
@@ -466,7 +465,7 @@ msgstr "La variable d'environnement HAMMER_NIL ne peut pas être vide."
 
 msgid "Show specified fields or predefined field sets only. (See below)"
 msgstr ""
-"Afficher uniquement les fichiers spécifiés ou les ensembles de fichiers "
+"Afficher uniquement les champs spécifiés ou les ensembles de champs "
 "prédéfinis. (Voir ci-dessous)"
 
 msgid "There is no such predefined option %s."
@@ -510,7 +509,7 @@ msgstr "Nom"
 
 msgid "Page %{page} of %{total} (use --page and --per-page for navigation)."
 msgstr ""
-"Page %{page} de %{total} (utiliser --page et --per-page pour la navigation)."
+"Page %%s de %{file} (utiliser --page et --per-page pour la navigation)."
 
 msgid "Fields"
 msgstr "Champs"
@@ -519,8 +518,8 @@ msgid ""
 "Method %{tags} for field formatters and output adapters is deprecated. "
 "Please use %{feat} or %{req_feat} instead."
 msgstr ""
-"La méthode %{tags} pour les formateurs de champs et les adaptateurs de "
-"sortie est obsolète. Veuillez utiliser %{feat} ou %{req_feat} à la place."
+"La méthode %%s pour les formateurs de champs et les adaptateurs de sortie "
+"est obsolète. Veuillez utiliser %{file} ou %{req_feat} à la place."
 
 msgid "no"
 msgstr "non"
@@ -530,8 +529,8 @@ msgstr "oui"
 
 msgid "Warning: Couldn't load configuration file %{path}: %{message}."
 msgstr ""
-"Avertissement : impossible de charger le fichier de configuration %{path}: "
-"%{message}."
+"Avertissement : impossible de charger le fichier de configuration %%s: "
+"%{file}."
 
 msgid "Print help for commands"
 msgstr "Afficher l'aide des commandes"
@@ -567,12 +566,14 @@ msgid "Found more than one command."
 msgstr "Plus d'un %s ont été trouvés."
 
 msgid "Did you mean one of these?"
-msgstr "Vous vouliez dire un de ceux-là ?"
+msgstr "Vous voulez dire un de ceux-là ?"
 
 msgid ""
 "Can't replace subcommand %<name>s (%<existing_class>s) with %<name>s "
 "(%<new_class>s)."
-msgstr "On ne peut pas remplacer les % (%s) de sous-commande par des % (%s)."
+msgstr ""
+"Impossible de remplacer la sous-commande %<name>s (%<existing_class>s) avec "
+"%<name>s (%<new_class>s)."
 
 msgid "Cannot use such capitalization. Try one of %s."
 msgstr "Impossible d'utiliser une telle mise en majuscules. Essayez un sur %s."
diff --git a/locale/it/LC_MESSAGES/hammer-cli.mo b/locale/it/LC_MESSAGES/hammer-cli.mo
index b3140870..5a8e5bce 100644
Binary files a/locale/it/LC_MESSAGES/hammer-cli.mo and b/locale/it/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/it/hammer-cli.po b/locale/it/hammer-cli.po
index 9592d4a5..98e58b1d 100644
--- a/locale/it/hammer-cli.po
+++ b/locale/it/hammer-cli.po
@@ -7,9 +7,9 @@
 # Dominic Cleal <dcleal@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
 "PO-Revision-Date: 2020-08-11 19:33+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Italian (http://www.transifex.com/foreman/foreman/language/"
diff --git a/locale/ja/LC_MESSAGES/hammer-cli.mo b/locale/ja/LC_MESSAGES/hammer-cli.mo
index 9811bd74..1a58b4fb 100644
Binary files a/locale/ja/LC_MESSAGES/hammer-cli.mo and b/locale/ja/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/ja/hammer-cli.po b/locale/ja/hammer-cli.po
index 610a7cde..590ddaec 100644
--- a/locale/ja/hammer-cli.po
+++ b/locale/ja/hammer-cli.po
@@ -8,10 +8,10 @@
 # 山田 修司 🍣 Shuji Yamada <uzy.exe@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
-"PO-Revision-Date: 2020-12-01 08:26+0000\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
+"PO-Revision-Date: 2021-05-18 14:58+0000\n"
 "Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/foreman/foreman/language/"
 "ja/)\n"
@@ -32,19 +32,19 @@ msgstr ""
 "須。<> には使用可能なタイプが、[] には使用可能な値が含まれます。):"
 
 msgid "Predefined field sets"
-msgstr "定義済みのフィールドセット"
+msgstr "事前定義済みのフィールドセット"
 
 msgid "Command extensions should be inherited from %s."
 msgstr "コマンド拡張は %s から継承する必要があります。"
 
 msgid "Unfortunately the server does not support such operation."
-msgstr "残念ですがサーバはその操作をサポートしていません。"
+msgstr "残念ですがサーバーはその操作をサポートしていません。"
 
 msgid "The server does not support such operation."
-msgstr "サーバーはこの操作に対応していません。"
+msgstr "サーバーはその操作をサポートしていません。"
 
 msgid "Prepare map of options and subcommands for Bash completion"
-msgstr "bash-completion のオプションおよびサブコマンドのマッピングを準備する"
+msgstr "Bash 補完向けのオプションおよびサブコマンドのマップを準備します"
 
 msgid "Unable to find hostname in %s."
 msgstr "%s でホスト名が見つかりません。"
@@ -133,7 +133,7 @@ msgid "Parameter '%{pmt}': %{msg}."
 msgstr "パラメーター '%{pmt}': %{msg}。"
 
 msgid "%{env}: %{msg}."
-msgstr "%{env}: %{msg}。"
+msgstr "%{env} %{msg}。"
 
 msgid "Unrecognised option '%s'."
 msgstr "認識されないオプション '%s'。"
@@ -150,8 +150,8 @@ msgstr "%{buffer} での不正な引用"
 msgid ""
 "Couldn't create %s. Please create the directory before setting defaults."
 msgstr ""
-"%s を作成できませんでした。デフォルト値を設定する前にディレクトリーを作成して"
-"ください。"
+"%s を作成できませんでした。デフォルトを設定する前にディレクトリーを作成してく"
+"ださい。"
 
 msgid "Defaults management"
 msgstr "デフォルト管理"
@@ -240,7 +240,7 @@ msgid "Error: %{message}"
 msgstr "エラー: %{message}"
 
 msgid "See: '%{path} --help'."
-msgstr "参照: '%{path} --help'."
+msgstr "参照: '%{path} --help'"
 
 msgid "SSL error"
 msgstr "SSL エラー"
@@ -396,7 +396,7 @@ msgstr ""
 "照してください。"
 
 msgid "Numeric value is required."
-msgstr "数値が必要。"
+msgstr "数値が必要です。"
 
 msgid "One of %s."
 msgstr "%s の 1 つ"
@@ -444,7 +444,7 @@ msgid "Default:"
 msgstr "デフォルト:"
 
 msgid "Environment variable HAMMER_NIL can not be empty."
-msgstr "環境変数 HAMMER_NIL は空欄にできません。"
+msgstr "環境変数 HAMMER_NIL を空にすることはできません。"
 
 msgid "Show specified fields or predefined field sets only. (See below)"
 msgstr ""
@@ -501,8 +501,8 @@ msgid ""
 "Method %{tags} for field formatters and output adapters is deprecated. "
 "Please use %{feat} or %{req_feat} instead."
 msgstr ""
-"フィールドフォーマッターおよび出力アダプターのメソッド %{tags} は非推奨になり"
-"ました。代わりに %{feat} または {req_feat} を使用してください。"
+"フィールドフォーマッターおよび出力アダプターのメソッド %{tags} は非推奨となり"
+"ました。代わりに %{feat} または %{req_feat} を使用してください。"
 
 msgid "no"
 msgstr "no"
@@ -514,7 +514,7 @@ msgid "Warning: Couldn't load configuration file %{path}: %{message}."
 msgstr "警告: 設定ファイル %{path} をロードできませんでした: %{message}。"
 
 msgid "Print help for commands"
-msgstr "コマンドについての help を出力"
+msgstr "コマンドの help を出力"
 
 msgid "Exit interactive shell"
 msgstr "インタラクティブシェルの終了"
diff --git a/locale/ko/LC_MESSAGES/hammer-cli.mo b/locale/ko/LC_MESSAGES/hammer-cli.mo
index 401749cf..43fac8f1 100644
Binary files a/locale/ko/LC_MESSAGES/hammer-cli.mo and b/locale/ko/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/ko/hammer-cli.po b/locale/ko/hammer-cli.po
index 2872b63b..ef9a9537 100644
--- a/locale/ko/hammer-cli.po
+++ b/locale/ko/hammer-cli.po
@@ -6,9 +6,9 @@
 # Automatically generated, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
 "PO-Revision-Date: 2020-08-11 19:33+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Korean (http://www.transifex.com/foreman/foreman/language/"
diff --git a/locale/pt_BR/LC_MESSAGES/hammer-cli.mo b/locale/pt_BR/LC_MESSAGES/hammer-cli.mo
index ed3db95a..17660b87 100644
Binary files a/locale/pt_BR/LC_MESSAGES/hammer-cli.mo and b/locale/pt_BR/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/pt_BR/hammer-cli.po b/locale/pt_BR/hammer-cli.po
index 421e09fa..69a0ee34 100644
--- a/locale/pt_BR/hammer-cli.po
+++ b/locale/pt_BR/hammer-cli.po
@@ -11,9 +11,9 @@
 # Valeria S Silva <valeriassilva@live.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
 "PO-Revision-Date: 2020-09-03 07:45+0000\n"
 "Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/foreman/foreman/"
diff --git a/locale/ru/LC_MESSAGES/hammer-cli.mo b/locale/ru/LC_MESSAGES/hammer-cli.mo
index 2ba7fee8..25227d70 100644
Binary files a/locale/ru/LC_MESSAGES/hammer-cli.mo and b/locale/ru/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/ru/hammer-cli.po b/locale/ru/hammer-cli.po
index 7c3a354d..77a9696c 100644
--- a/locale/ru/hammer-cli.po
+++ b/locale/ru/hammer-cli.po
@@ -9,9 +9,9 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
 "PO-Revision-Date: 2020-08-11 19:33+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Russian (http://www.transifex.com/foreman/foreman/language/"
diff --git a/locale/zh_CN/LC_MESSAGES/hammer-cli.mo b/locale/zh_CN/LC_MESSAGES/hammer-cli.mo
index 419c83ab..973d577c 100644
Binary files a/locale/zh_CN/LC_MESSAGES/hammer-cli.mo and b/locale/zh_CN/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/zh_CN/hammer-cli.po b/locale/zh_CN/hammer-cli.po
index 81792156..1b6181dd 100644
--- a/locale/zh_CN/hammer-cli.po
+++ b/locale/zh_CN/hammer-cli.po
@@ -6,10 +6,10 @@
 # Automatically generated, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
-"PO-Revision-Date: 2020-12-01 08:27+0000\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
+"PO-Revision-Date: 2021-05-18 14:58+0000\n"
 "Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/"
 "language/zh_CN/)\n"
@@ -30,7 +30,7 @@ msgstr ""
 "可接受的值）："
 
 msgid "Predefined field sets"
-msgstr "预定义字段集"
+msgstr "预定义的字段集"
 
 msgid "Command extensions should be inherited from %s."
 msgstr "命令扩展名应从%s 继承。"
@@ -39,7 +39,7 @@ msgid "Unfortunately the server does not support such operation."
 msgstr "服务器不支持这样的操作。"
 
 msgid "The server does not support such operation."
-msgstr "伺服器不支援此類型的操作。"
+msgstr "服务器不支持这样的操作。"
 
 msgid "Prepare map of options and subcommands for Bash completion"
 msgstr "准备用于 Bash 完成功能的选项和子命令映射"
@@ -78,7 +78,7 @@ msgstr "无法解析 URI '%s'。"
 
 msgid ""
 "The CA certificate for %{uri} couldn't be downloaded. No CA cert was found."
-msgstr "无法为 %%{uri} 下载 CA 证书。未找到 CA 证书。"
+msgstr "无法为 %{uri} 下载 CA 证书。未找到 CA 证书。"
 
 msgid "Make sure your server sends cert chain including the CA."
 msgstr "确保您的服务器发送了包括 CA 在内的证书链。"
@@ -117,10 +117,10 @@ msgid "Option '%{swt}': %{msg}."
 msgstr "选项 '%{swt} '：%{msg} 。"
 
 msgid "Parameter '%{pmt}': %{msg}."
-msgstr "参数 '%{pmt}': %{msg}."
+msgstr "参数 '%{pmt}': %{msg}。"
 
 msgid "%{env}: %{msg}."
-msgstr "%{env}: %{msg}."
+msgstr "%{env}: %{msg}。"
 
 msgid "Unrecognised option '%s'."
 msgstr "无法识别的选项 '%s'。"
@@ -139,7 +139,7 @@ msgid ""
 msgstr "无法创建 %s。请先创建目录，然后设置默认值。"
 
 msgid "Defaults management"
-msgstr "預設值管理"
+msgstr "默认管理"
 
 msgid "List all the providers"
 msgstr "列出所有供應者"
@@ -202,8 +202,7 @@ msgid ""
 "The param name is not supported by provider. See `hammer defaults providers` "
 "for supported params."
 msgstr ""
-"供應者並不支援此參數名稱。欲知支援的參數名稱，請參閱 `hammer defaults "
-"providers`。"
+"供应商不支持参数名称。有关支持的参数，请参见“ hammer defaults provider”。"
 
 msgid "%{param} was deleted successfully."
 msgstr "已成功刪除 %{param}。"
@@ -230,7 +229,7 @@ msgid "SSL certificate verification failed"
 msgstr "SSL 证书验证失败"
 
 msgid "is the server down?"
-msgstr "伺服器是否沒有在運作？"
+msgstr "服务器是否已下线？"
 
 msgid ""
 "was '%s' run on the server when using apipie cache? (typical production "
@@ -239,13 +238,13 @@ msgstr ""
 "在使用 apipie 缓存时（典型的生产环境设置），'%s' 是否有在服务器上运行？"
 
 msgid "Could not load the API description from the server"
-msgstr "無法從伺服器載入 API 描述"
+msgstr "无法从服务器加载 API 描述"
 
 msgid "Missing arguments for %s."
 msgstr "缺少 %s 参数"
 
 msgid "Format output in markdown"
-msgstr "格式输出下降"
+msgstr "格式输出的 markdown 格式"
 
 msgid "Hammer CLI help"
 msgstr "Hammer CLI 帮助"
@@ -339,7 +338,7 @@ msgid "Character to separate the values"
 msgstr "用來隔開值的字元"
 
 msgid "Get list of possible endings"
-msgstr "取得一列可能的結尾"
+msgstr "取得可能的结尾列表"
 
 msgid "Warning: An error occured while loading module %s."
 msgstr "警告：载入模块 %s 时出错。"
@@ -348,7 +347,7 @@ msgid "Error: Some of the required modules are disabled in configuration: %s."
 msgstr "错误：在配置中禁用了一些要求的模块：%s。"
 
 msgid "Comma-separated list of key=value."
-msgstr "逗號區隔開的一列 key=value。"
+msgstr "逗号分隔的 key=value 列表。"
 
 msgid "JSON is acceptable and preferred way for complex parameters"
 msgstr "JSON 可用，且是复杂参数的首选格式"
@@ -368,7 +367,7 @@ msgid ""
 msgstr "逗号分隔的由 schema 定义的值的列表。请参阅下面的“选项详细信息”部分。"
 
 msgid "Numeric value is required."
-msgstr "需要提供数值。"
+msgstr "需要数字值。"
 
 msgid "One of %s."
 msgstr "%s 之一。"
@@ -386,7 +385,7 @@ msgid "Value must be %s."
 msgstr "值必须是 %s。"
 
 msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
-msgstr "日期與時間，格式為 YYYY-MM-DD HH:MM:SS 或是 ISO 8601 格式"
+msgstr "日期和时间，格式为 YYYY-MM-DD HH:MM:SS 或 ISO 8601"
 
 msgid "'%s' is not a valid date."
 msgstr "'%s' 不是有效日期。"
@@ -398,7 +397,7 @@ msgid "Value must be a combination of '%s'."
 msgstr "值必须是 '%s' 的组合。"
 
 msgid "Warning: Option %{option} is deprecated. %{message}"
-msgstr "警告：选项%{option}已弃用。%{message}"
+msgstr "警告：选项 %{option}已弃用。%{message}"
 
 msgid "Deprecated: %{deprecated_msg}"
 msgstr "弃用：％{deprecated_msg}"
diff --git a/locale/zh_TW/LC_MESSAGES/hammer-cli.mo b/locale/zh_TW/LC_MESSAGES/hammer-cli.mo
index 103e1858..d17a9a30 100644
Binary files a/locale/zh_TW/LC_MESSAGES/hammer-cli.mo and b/locale/zh_TW/LC_MESSAGES/hammer-cli.mo differ
diff --git a/locale/zh_TW/hammer-cli.po b/locale/zh_TW/hammer-cli.po
index 41cd7fc8..3605bdb9 100644
--- a/locale/zh_TW/hammer-cli.po
+++ b/locale/zh_TW/hammer-cli.po
@@ -6,9 +6,9 @@
 # Automatically generated, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 2.5.0\n"
+"Project-Id-Version: hammer-cli 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 17:27+0200\n"
+"POT-Creation-Date: 2021-05-04 13:37+0000\n"
 "PO-Revision-Date: 2020-08-11 19:33+0000\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/"