From 2dc0be993b6e00b1e149e8afcc57a185ca581142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ba=C4=8Dovsk=C3=BD?= <martin.bacovsky@gmail.com>
Date: Tue, 14 Jun 2016 23:26:29 +0200
Subject: [PATCH] i18n - extracting new, pulling from tx

---
 locale/ca/LC_MESSAGES/hammer-cli.mo    | Bin 5589 -> 5393 bytes
 locale/ca/hammer-cli.po                | 365 +++++++++++++++----------
 locale/de/LC_MESSAGES/hammer-cli.mo    | Bin 6760 -> 6574 bytes
 locale/de/hammer-cli.po                |  30 +-
 locale/en/LC_MESSAGES/hammer-cli.mo    | Bin 389 -> 389 bytes
 locale/en/hammer-cli.po                |  23 +-
 locale/en_GB/LC_MESSAGES/hammer-cli.mo | Bin 6228 -> 6090 bytes
 locale/en_GB/hammer-cli.po             |  30 +-
 locale/es/LC_MESSAGES/hammer-cli.mo    | Bin 6815 -> 6626 bytes
 locale/es/hammer-cli.po                |  30 +-
 locale/fr/LC_MESSAGES/hammer-cli.mo    | Bin 6817 -> 6623 bytes
 locale/fr/hammer-cli.po                |  30 +-
 locale/hammer-cli.pot                  |  78 ++++--
 locale/it/LC_MESSAGES/hammer-cli.mo    | Bin 6795 -> 6619 bytes
 locale/it/hammer-cli.po                |  30 +-
 locale/ja/LC_MESSAGES/hammer-cli.mo    | Bin 7476 -> 7274 bytes
 locale/ja/hammer-cli.po                |  30 +-
 locale/ko/LC_MESSAGES/hammer-cli.mo    | Bin 7056 -> 6873 bytes
 locale/ko/hammer-cli.po                |  30 +-
 locale/pt_BR/LC_MESSAGES/hammer-cli.mo | Bin 6756 -> 6570 bytes
 locale/pt_BR/hammer-cli.po             |  30 +-
 locale/ru/LC_MESSAGES/hammer-cli.mo    | Bin 8229 -> 8006 bytes
 locale/ru/hammer-cli.po                |  30 +-
 locale/zh_CN/LC_MESSAGES/hammer-cli.mo | Bin 6176 -> 6007 bytes
 locale/zh_CN/hammer-cli.po             |  32 ++-
 locale/zh_TW/LC_MESSAGES/hammer-cli.mo | Bin 6333 -> 6167 bytes
 locale/zh_TW/hammer-cli.po             |  30 +-
 27 files changed, 557 insertions(+), 241 deletions(-)

diff --git a/locale/ca/LC_MESSAGES/hammer-cli.mo b/locale/ca/LC_MESSAGES/hammer-cli.mo
index 0dc153b54d7942e0cfba3f3d2f6b5c97e90cc19d..3837fffecef1dd583d9b3f0a393162633db0a501 100644
GIT binary patch
delta 979
zcmXZaO-K}B9LMqhwwq?_ORcL;Dz;g^uj^Lku5=Kj_9l9Wf@Os$@f3B55E1nhc94*v
zLl9J02uYNA=+Gevk{~)Li3yv6c`i&ZMn>Nsvja1q=b3pPp8w0Nv`jURt%m{+j4R1q
z&7Jj`_2MHx53X+kvoNlqgFi8b`3KGFu>((FKSpp2kK+@p#RW{@4=li{JkL5TXSua8
zXy8K%JMbndkmq;+Kj2aPn0vp9Y393_kG(vI$*$l@%wP?UqXK!175E-c;c9OF7i&1*
z!iT)b&!RH9gq3&)mGM;W`wKkH{4-v|eQdz1q}7NMr~~KlFfO4I$f6S1z&LKB*445o
z!ui(CK&85litsKffLScVMWj@g#X{V{5L(b%Uy8~+iBZg;x_1vR)6Pj$3%A&;%I;w&
zmKRa~HU@nR>Tw(+IFp-yLS^;~+tDfZ0_Z`KurwaS0aRwA*p08S4u7L6;FOph!79{w
zQ5?cd3H7Inw!#ZVypD=&6V=0NcFFUogVGqo+o+07V>2$I64=I8bg1_^OrbI!LACZF
zUc`4ejJ^={R}V+1r#3!A&6iOd|DZCcDD?uV#52r0Q32e*2;N7v;5DjZUr~YXqXLgo
zfAu_toNa?hjyBZDpozf*Dw8)D$M2|vi}?X)p(Wip|E$m4{=h9?V*X3uWuE&sc)_2D
S#od2FXTGa2T;M(}YyS^ciezg5

delta 1103
zcmXZaT}V@57{KvoZCW;UW`0xombIBSJ(HOqNI_;uAx27sUBt;P6{ZunKIo#|byb!f
zif;8TDomuCv<nHMyF}0ni=YUskP3?~rT^nLcFynpIEVN7I1@F?wW&{qo`=G(g=-Jj
zSC>dPK67*9_st_xgx|3YH?a;&vqb!O3isnM8oY;<_yP~$A~xY4%)#31w2fFIl9J;L
z0&JYeqj(E7ke9d(mv9#@XV%xSkGW^N2!FZ6jhJKrt1yQ9@IGoF(^!h{@gS~c=D9oc
zxfF{G3>)pJnMAMxZ=+^Bnc07ZA?6?OGUky^07tPJAEO?)fIIOsY69!13H(9}U2N)e
z4QM!D&N0wZB~T-Lgc`sc7UK$1Dp|)|bbCb#u>ke?D%8w7u?=H*1fQUGaRpN@kyX@I
z_T{B39LJRQ{SJeAe2aekhX(iNr{~8|GmK&w$58`$gCr%3SdOcx8UDo+c*w_vgQ%4l
z#{!(ddYtl6{~HXJSfHwMhFy)g7d5a8sJ(oUaR&9EMXbXgsFf?HzBSl}n!o@CaU2_Q
z9`&2rKy9&)@^xUSkow<baGeG1<p%1D6}!{(PSh7iQ8T!UTOSuTFrP*Z;0qeeqQ2S+
zKWfEJqXwEl4SWi<_wz_B^0Ao#$;(eXjGL&LRMYq_>_H1BQ3F^)S}85gr2DC>$?5XM
zUCpzvJ<qfABhf2EBhiSl6UH|E&O(-PE_!?1p}LSW<1MQ`+ua*%AB)<_q4-Gfq@9em
zng%Nr4qDAYD{MmH)^H;O%bI=XEzSva#LP8279TT%wuuCyiKIPdwhkCdn*R7OCtMw|
RP0ab7=XYj`N}P?N%Ku4wiAewe

diff --git a/locale/ca/hammer-cli.po b/locale/ca/hammer-cli.po
index 447b4278..db917f6a 100644
--- a/locale/ca/hammer-cli.po
+++ b/locale/ca/hammer-cli.po
@@ -1,9 +1,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.1.1\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-04 14:45-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -14,264 +13,326 @@ msgstr ""
 "X-Generator: Poedit 1.8.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: lib/hammer_cli/validator.rb:41
-msgid "Unknown option name '%s'"
-msgstr "Nom desconegut d'opció '%s'"
+msgid "too many arguments"
+msgstr "massa arguments"
 
-#: lib/hammer_cli/validator.rb:62
-msgid "You can't set all options %s at one time"
-msgstr "No podeu establir totes les opcions %s alhora"
+msgid "option '%<option>s' is required"
+msgstr "es requereix l'opció '%<option>s'"
 
-#: lib/hammer_cli/validator.rb:63
-msgid "Options %s are required"
-msgstr "Es requereixen %s opcions"
+msgid "option '%<option>s' (or env %<env>s) is required"
+msgstr "es requereix l'opció '%<option>s' (o env %<env>s)"
 
-#: lib/hammer_cli/validator.rb:79
-msgid "You can't set any of options %s"
-msgstr "No podeu establir cap de les opcions %s"
+msgid "option '%<switch>s': %<message>s"
+msgstr "opció '%<switch>s': %<message>s"
 
-#: lib/hammer_cli/validator.rb:80
-msgid "At least one of options %s is required"
-msgstr "Com a mínim es requereix una de les opcions %s"
+msgid "parameter '%<param>s': %<message>s"
+msgstr "paràmetre '%<param>s': %<message>s"
 
-#: lib/hammer_cli/modules.rb:10
-msgid ""
-"Legacy configuration of modules detected. Check section about configuration "
-"in user manual"
+msgid "%<env>s: %<message>s"
+msgstr "%<env>s: %<message>s"
+
+msgid "Unrecognised option '%<switch>s'"
+msgstr "Opció no reconeguda '%<switch>s'"
+
+msgid "No such sub-command '%<name>s'"
+msgstr "No hi ha la suborde '%<name>s'"
+
+msgid "no value provided"
+msgstr "no s'ha proporcionat cap valor"
+
+msgid "Couldn't create %s please create the path before defaults are enabled."
 msgstr ""
-"S'ha detectat la configuració del llegat dels mòduls. Consulteu la secció "
-"quant a la configuració al manual d'usuari"
 
-#: lib/hammer_cli/modules.rb:42
-msgid "Warning: An error occured while loading module %s"
-msgstr "Advertència: S'ha produït un error mentre es carregava el mòdul %s"
+msgid "Defaults management"
+msgstr ""
 
-#: lib/hammer_cli/logger.rb:28
-msgid "No permissions to create log dir %s"
-msgstr "Sense els permisos per crear el directori del registre %s"
+msgid "List all the providers"
+msgstr ""
 
-#: lib/hammer_cli/logger.rb:43
-msgid "File %s not writeable, won't log anything to the file!"
-msgstr "No es pot escriure al fitxer %s, no s'enregistrarà res al fitxer!"
+msgid "Provider"
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:26
-msgid "Comma-separated list of key=value."
-msgstr "Llista separada per comes de clau=valor."
+msgid "Supported defaults"
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:35
-msgid "value must be defined as a comma-separated list of key=value"
+msgid "Description"
 msgstr ""
-"El valor ha d'estar definit com a una llista separada per comes de "
-"clau=valor"
 
-#: lib/hammer_cli/options/normalizers.rb:46
-msgid "Comma separated list of values."
-msgstr "Llista separada per comes dels valors."
+msgid "List all the default parameters"
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:58
-msgid "One of true/false, yes/no, 1/0."
-msgstr "Un de true/false, yes/no, 1/0."
+msgid "Parameter"
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:68
-msgid "value must be one of true/false, yes/no, 1/0"
-msgstr "el valor ha de ser un de true/false, yes/no, 1/0"
+msgid "Value"
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:107
-msgid "Unable to parse JSON input"
-msgstr "No es pot analitzar sintàcticament l'entrada de JSON"
+msgid "Delete a default param"
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:120
-msgid "One of %s"
+msgid "The name of the default option"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:127
-msgid "value must be one of '%s'"
+msgid "Add a default parameter to config"
 msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:146
-msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
-msgstr "Data i hora en format YYYY-MM-DD HH:MM:SS o ISO 8601"
+msgid "The name of the default option (e.g. organization_id)."
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:153
-msgid "'%s' is not a valid date"
-msgstr "'%s' no és una data vàlida"
+msgid "The value for the default option"
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:164
-msgid "Any combination (comma separated list) of '%s'"
-msgstr "Qualsevol combinació (llista separada per comes) de '%s'"
+msgid ""
+"The name of the provider providing the value. For list available providers see"
+" `hammer defaults providers`."
+msgstr ""
 
-#: lib/hammer_cli/options/normalizers.rb:184
-msgid "value must be a combination of '%s'"
-msgstr "el valor ha de ser una combinació de '%s'"
+msgid ""
+"Added %{key_val} default-option with value that will be generated from the ser"
+"ver."
+msgstr ""
 
-#: lib/hammer_cli/options/option_definition.rb:68
-msgid "Can be specified multiple times. "
-msgstr "Es pot especificar múltiples vegades."
+msgid "Added %{key_val} default-option with value %{val_val}."
+msgstr ""
 
-#: lib/hammer_cli/options/option_definition.rb:69
-msgid "Default: "
-msgstr "Per defecte:"
+msgid ""
+"\"Provider #{namespace} was not found. See `hammer defaults providers` for avai"
+"lable providers.\""
+msgstr ""
 
-#: lib/hammer_cli/options/option_definition.rb:69
-msgid ", or "
+msgid ""
+"The param name is not supported by provider. See `hammer defaults providers` f"
+"or supported params."
+msgstr ""
+
+msgid "%{param} was deleted successfully."
+msgstr ""
+
+msgid "You must specify value or a provider name, cant specify both."
+msgstr ""
+
+msgid "Couldn't find the requested param in %s."
 msgstr ""
 
-#: lib/hammer_cli/exception_handler.rb:60
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: lib/hammer_cli/exception_handler.rb:66
-msgid "Error: %{message}\\n\\nSee: '%{path} --help'"
+#, fuzzy
+msgid "Error: %{message}"
+msgstr "Error: %s"
+
+msgid "See: '%{path} --help'"
 msgstr ""
 
-#: lib/hammer_cli/exception_handler.rb:83
 msgid "Invalid username or password"
 msgstr "nom d'usuari no vàlid o contrasenya no vàlida"
 
-#: lib/hammer_cli/exception_handler.rb:90
-msgid ""
-"Could not load API description from the server\\n  - is your server down?\\n"
-"\\\\n          \"  - was \\\"#{rake_command}\\\" run on the server when "
-"using apipie cache? (typical production settings))\\n\""
+msgid "Could not load the API description from the server"
+msgstr ""
+
+msgid "is the server down?"
 msgstr ""
 
-#: lib/hammer_cli/settings.rb:28
 msgid ""
-"Warning: location hammer.modules.d is deprecated, move your module "
-"configurations to cli.modules.d"
+"was '%s' run on the server when using apipie cache? (typical production settin"
+"gs)"
+msgstr ""
+
+msgid "Missing arguments for %s"
 msgstr ""
-"Advertència: la ubicació hammer.modules.d està en desús, moveu les "
-"configuracions dels vostres mòduls a cli.modules.d"
 
-#: lib/hammer_cli/main.rb:7
+msgid "No permissions to create log dir %s"
+msgstr "Sense els permisos per crear el directori del registre %s"
+
+msgid "File %s not writeable, won't log anything to the file!"
+msgstr "No es pot escriure al fitxer %s, no s'enregistrarà res al fitxer!"
+
 msgid "be verbose"
 msgstr "mostra informació detallada"
 
-#: lib/hammer_cli/main.rb:8
 msgid "show debugging output "
 msgstr "mostra la sortida de depuració"
 
-#: lib/hammer_cli/main.rb:9
+msgid "force reload of Apipie cache"
+msgstr ""
+
 msgid "path to custom config file"
 msgstr "camí al fitxer de configuració personalitzat"
 
-#: lib/hammer_cli/main.rb:11
 msgid "username to access the remote system"
 msgstr "nom d'usuari per accedir al sistema remot"
 
-#: lib/hammer_cli/main.rb:13
 msgid "password to access the remote system"
 msgstr "contrasenya per accedir al sistema remot"
 
-#: lib/hammer_cli/main.rb:15
 msgid "remote system address"
 msgstr "adreça del sistema remot"
 
-#: lib/hammer_cli/main.rb:18
 msgid "show version"
 msgstr "mostra la versió"
 
-#: lib/hammer_cli/main.rb:27
+#, fuzzy
+msgid "unknown version"
+msgstr "mostra la versió"
+
 msgid "Show ids of associated resources"
 msgstr "Mostra els id. dels recursos associats"
 
-#: lib/hammer_cli/main.rb:29
 msgid "Explicitly turn interactive mode on/off"
 msgstr "Explícitament encén o apaga el mode interactiu"
 
-#: lib/hammer_cli/main.rb:33
 msgid "Output as CSV (same as --output=csv)"
 msgstr "Sortida com a CSV (el mateix que --output=csv)"
 
-#: lib/hammer_cli/main.rb:34
 msgid "Set output format. One of [%s]"
 msgstr "Estableix el format de sortida. Un de [%s]"
 
-#: lib/hammer_cli/main.rb:37
 msgid "Character to separate the values"
 msgstr "Caràcter per separar els valors"
 
-#: lib/hammer_cli/main.rb:41
 msgid "Get list of possible endings"
 msgstr "Obté la llista dels finals possibles"
 
-#: lib/hammer_cli/shell.rb:10
-msgid "Print help for commands"
-msgstr "Imprimeix l'ajuda per a les ordres"
+msgid ""
+"Legacy configuration of modules detected. Check section about configuration in"
+" user manual"
+msgstr ""
+"S'ha detectat la configuració del llegat dels mòduls. Consulteu la secció quan"
+"t a la configuració al manual d'usuari"
 
-#: lib/hammer_cli/shell.rb:22
-msgid "Exit interactive shell"
-msgstr "Surt del shell interactiu"
+msgid "Warning: An error occured while loading module %s"
+msgstr "Advertència: S'ha produït un error mentre es carregava el mòdul %s"
 
-#: lib/hammer_cli/shell.rb:120
-msgid "Welcome to the hammer interactive shell"
-msgstr "Benvingut al shell interactiu de hammer"
+msgid "Error: Some of the required modules are disabled in configuration: %s "
+msgstr ""
 
-#: lib/hammer_cli/shell.rb:121
-msgid "Type 'help' for usage information"
-msgstr "Teclegeu 'help' per a la informació de l'ús"
+msgid "Comma-separated list of key=value."
+msgstr "Llista separada per comes de clau=valor."
 
-#: lib/hammer_cli/shell.rb:122
-msgid ""
-"Command completion is disabled on ruby < 1.9 due to compatibility problems."
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
 msgstr ""
 
-#: lib/hammer_cli/shell.rb:138
-msgid "Interactive shell"
-msgstr "Shell interactiu"
+msgid "Comma separated list of values."
+msgstr "Llista separada per comes dels valors."
 
-#: lib/hammer_cli/clamp.rb:5
-msgid "too many arguments"
-msgstr "massa arguments"
+msgid "numeric value is required"
+msgstr ""
 
-#: lib/hammer_cli/clamp.rb:6
-msgid "option '%<option>s' is required"
-msgstr "es requereix l'opció '%<option>s'"
+msgid "One of true/false, yes/no, 1/0."
+msgstr "Un de true/false, yes/no, 1/0."
 
-#: lib/hammer_cli/clamp.rb:7
-msgid "option '%<option>s' (or env %<env>s) is required"
-msgstr "es requereix l'opció '%<option>s' (o env %<env>s)"
+msgid "value must be one of true/false, yes/no, 1/0"
+msgstr "el valor ha de ser un de true/false, yes/no, 1/0"
 
-#: lib/hammer_cli/clamp.rb:8
-msgid "option '%<switch>s': %<message>s"
-msgstr "opció '%<switch>s': %<message>s"
+msgid "Unable to parse JSON input"
+msgstr "No es pot analitzar sintàcticament l'entrada de JSON"
 
-#: lib/hammer_cli/clamp.rb:9
-msgid "parameter '%<param>s': %<message>s"
-msgstr "paràmetre '%<param>s': %<message>s"
+msgid "Possible value(s): %s"
+msgstr ""
 
-#: lib/hammer_cli/clamp.rb:10
-msgid "%<env>s: %<message>s"
-msgstr "%<env>s: %<message>s"
+msgid "value must be %s"
+msgstr ""
 
-#: lib/hammer_cli/clamp.rb:11
-msgid "Unrecognised option '%<switch>s'"
-msgstr "Opció no reconeguda '%<switch>s'"
+msgid "value must be one of %s"
+msgstr ""
 
-#: lib/hammer_cli/clamp.rb:12
-msgid "No such sub-command '%<name>s'"
-msgstr "No hi ha la suborde '%<name>s'"
+msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
+msgstr "Data i hora en format YYYY-MM-DD HH:MM:SS o ISO 8601"
 
-#: lib/hammer_cli/clamp.rb:13
-msgid "no value provided"
-msgstr "no s'ha proporcionat cap valor"
+msgid "'%s' is not a valid date"
+msgstr "'%s' no és una data vàlida"
+
+msgid "Any combination (comma separated list) of '%s'"
+msgstr "Qualsevol combinació (llista separada per comes) de '%s'"
+
+msgid "value must be a combination of '%s'"
+msgstr "el valor ha de ser una combinació de '%s'"
+
+msgid "Warning: Option %{option} is deprecated. %{message}"
+msgstr ""
+
+msgid "Can be specified multiple times. "
+msgstr "Es pot especificar múltiples vegades."
+
+msgid "Default: "
+msgstr "Per defecte:"
+
+msgid ", or "
+msgstr ""
 
-#: lib/hammer_cli/output/adapter/csv.rb:171
 msgid "Message"
 msgstr "Missatge"
 
-#: lib/hammer_cli/output/adapter/csv.rb:175
 msgid "Id"
 msgstr "ID"
 
-#: lib/hammer_cli/output/adapter/csv.rb:180
 msgid "Name"
 msgstr "Nom"
 
-#: lib/hammer_cli/output/formatters.rb:154
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
+
 msgid "no"
 msgstr "no"
 
-#: lib/hammer_cli/output/formatters.rb:154
 msgid "yes"
 msgstr "si"
+
+msgid ""
+"Warning: location hammer.modules.d is deprecated, move your module configurati"
+"ons to cli.modules.d"
+msgstr ""
+"Advertència: la ubicació hammer.modules.d està en desús, moveu les configuraci"
+"ons dels vostres mòduls a cli.modules.d"
+
+msgid "Print help for commands"
+msgstr "Imprimeix l'ajuda per a les ordres"
+
+msgid "Exit interactive shell"
+msgstr "Surt del shell interactiu"
+
+msgid "Welcome to the hammer interactive shell"
+msgstr "Benvingut al shell interactiu de hammer"
+
+msgid "Type 'help' for usage information"
+msgstr "Teclegeu 'help' per a la informació de l'ús"
+
+msgid "Interactive shell"
+msgstr "Shell interactiu"
+
+msgid ""
+"can't replace subcommand %<name>s (%<existing_class>s) with %<name>s (%<new_cl"
+"ass>s)"
+msgstr ""
+
+msgid "Unknown option name '%s'"
+msgstr "Nom desconegut d'opció '%s'"
+
+msgid "You can't set all options %s at one time"
+msgstr "No podeu establir totes les opcions %s alhora"
+
+msgid "Options %s are required"
+msgstr "Es requereixen %s opcions"
+
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "No podeu establir cap de les opcions %s"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "Es requereixen %s opcions"
+
+msgid "You can't set any of options %s"
+msgstr "No podeu establir cap de les opcions %s"
+
+msgid "At least one of options %s is required"
+msgstr "Com a mínim es requereix una de les opcions %s"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "Com a mínim es requereix una de les opcions %s"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/de/LC_MESSAGES/hammer-cli.mo b/locale/de/LC_MESSAGES/hammer-cli.mo
index d067a59bdf9d8f23c4a9e08fdb68f1bb1beb5fcc..d46f4b57686034e8f332b74848bf46253246d604 100644
GIT binary patch
delta 1489
zcmX}sT}abW7{~EvI$t(xTWT-%;^rzVTg~Zmm8;zBjS3_SNqdhX3c8BuB5>ek76#I)
zi@fV93Wr@N;)M`hNOuvGVBREkQFKuhB1GTcf3w4$ea`>C{db=8oOAXy{<1mqsnY$>
zXzj#WB3@+HjmO-)(S}RRsxgPF@D1{^S>Cqe9M)rXsaYMiVhGP-5PLC<L)e6qn807?
zG0Rw_%;{JQF5`nXJcymR0-xX}9L5&>fJ)R~Zbq&aK|L2m-A`c;o<qKBW2nR@QFEHc
z^*D>QjBmxHp-jWL64ST=dkWVXT+a0)ti=}?!nddyf5+A6_vQy`Kz-hhF}#eIFpHYV
zJZ{Fi3dUu8J3@zhb{$XRE!0e=unNDRX1aiy>0fNbz><98DGYIa5mo9w)C8WP5}QIz
zU=CH$1>|LwOR0Y)ogf`QHlZF&qe^rYBiN6}aTJTu>oXg0nfXvZJjBDQ%qwJB?Hww?
z>4Fu3e4<Izz-KUo*8<dEU%bnWRvgFu_y<*yB-53LP>FWp3A}=9a15LAJ$9gnFV$f;
zs$zGLkE|Cpkq3AaCy-UMSQYhGiCU?%8@q5fp2m927M#F!Tz|$bSj3S~0uj`nIgDHJ
z0;+=dFoikP-uj7J(kjZON;RS;+>xPkgHAtcQ_N#ChFK{6U>9=B`cRwbF=}ZRFoZ!y
zSK@6*Zgv2Z*o{ggi>k;t>bV)*hAxhT#>+(MD5F!Tfo>z!xBEzyY^Y!kV_d&RJ@^}y
zV6evQJRU`r{5iTXL~JCKgl4M7*!h!&Y#p_XlU2T--!$rL%~}X$uGU6qP$d{8l%NLF
zACQ_7+exUzYTATa#(jjAi38&-vnI6Iw7edj|Gjjy$+WX|KFf(FLS<TPET1tkr=@vk
z@=m!`YHchn0f)mH2<>n-{{PlaPyd*#m{aLps6Qs{CnsyErgh&##EBimV$+6GOAskS
aWw();l5b^$rM|2yG4j;+!#nt~X5b%sn0BWC

delta 1587
zcmX}sOGp(_9LMp$`AqYXW~TWVOU*}_rrFEV>{1YcSV16y`9v`-y}hW#jh1Ffm_*TI
zCFDW_tyMt_$#PMPprA!z(84GXH)T@L_cwFx;F-^vnLD2U`JeyHc-dTe;B#Wwu+e<<
zbb93qvnFf^<3O7YH(P^Wa2@_c{wzMitQeCq4}F-8UFhI-%))WpfNyadF5nK#i8Nbj
z7O)0yVC}e?8)xt!Ud6RIgPU*`D=;d`3$zM})f!OGH3qNuVm;?KkVotrD)0r=nxdI?
zBgSJU^II7MMS2udun%*vKY0EalR1BdnfM7E{DWF?MzmQPR-q=UM+f~_inp*Cr%?+j
zh%w8@I?Q5zyTpKdb{CK12x=>qFbPvuc`GeKt+W_Ruo@M3FFJS=mFfx90^XwnTS6@$
zIo8W)5pv0DFp$WgmO(r=qaN%-rRX+R;xpWgi&%%bab}@-0S80OE~6%hN$@h1jcl`3
zqXIn?^dc(YQB(jk3FO~l@FDnvU$}?!e3t3MR#aw2gFZn8`~r{RJ6w->Tr9&Hti|(~
zjnk+anL~bR-%$(si+(IjBL8foJs{6Y)guhUDcp^(F%Ls|1!N&+U>z3VX;c7rP_^?E
zi|`F9lfQ94W|AJQ{3L2?ub^t_et>~i{2aS+5mg-RlztfwqW<9&a?9pX#T3qL+M*70
zZ~ztf7!tEhptf!r6-X$Rsf^^Ko;!?NFwnz56W&8b^b$4ES7bMA3CWhlq<UszDd(lA
z=UVUx4xj@4h>aLdI+gl13_%5_El{Ie+;0K@H{ed@Uge+^DP234FW^49R-(#QEvPx}
z(JL-xk2$S|zKgz<u8Fl;Z6OJBKR8;<0Xi?$|F&1}|8mp*>dU64>eMQIbk&C%TWMA9
z$Xlt>suY$7uPvjjs41Ij#U5_GXjm9LSKXv{1WzhZ9|!GC6g`)&LQ@O%a9>f?gkCK*
z?X$jcY_Z$6b5wO#yJy~kH`e_qrA>~7|A>rhZENrBX=`<w{7#e8GW0OQ8S0N638|PY
kiJOm(Khf5A*6BXy=jJKD(=~K0p*Y%cAL-=IP-^P%Kbe<|IRF3v

diff --git a/locale/de/hammer-cli.po b/locale/de/hammer-cli.po
index cc68a96f..2be2f0db 100644
--- a/locale/de/hammer-cli.po
+++ b/locale/de/hammer-cli.po
@@ -12,7 +12,7 @@
 # hpeters <hpeters@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-27 11:50+0000\n"
 "Last-Translator: hpeters <hpeters@redhat.com>\n"
@@ -223,8 +223,8 @@ msgstr ""
 msgid "Comma-separated list of key=value."
 msgstr "Kommagetrennte Liste mit Schlüssel-Wert-Paaren."
 
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "Wert muss als kommagetrennte Liste mit Schlüssel-Wert-Paaren definiert sein"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
 msgid "Comma separated list of values."
 msgstr "Kommagetrennte Liste von Werten."
@@ -285,12 +285,17 @@ msgstr "ID"
 msgid "Name"
 msgstr "Name"
 
-msgid "yes"
-msgstr "ja"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "nein"
 
+msgid "yes"
+msgstr "ja"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -329,8 +334,23 @@ msgstr "Nicht alle Optionen %s sind gleichzeitig verwendbar"
 msgid "Options %s are required"
 msgstr "Optionen %s sind erforderlich"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "Sie können keine der Optionen %s festlegen"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "Optionen %s sind erforderlich"
+
 msgid "You can't set any of options %s"
 msgstr "Sie können keine der Optionen %s festlegen"
 
 msgid "At least one of options %s is required"
 msgstr "Mindestens eine der Optionen %s ist erforderlich"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "Mindestens eine der Optionen %s ist erforderlich"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/en/LC_MESSAGES/hammer-cli.mo b/locale/en/LC_MESSAGES/hammer-cli.mo
index 06853145f83d462b67947dafdcc627342dead73d..47b60726b0d3f3b1dac0544e8a1dc42cdc9bdcbb 100644
GIT binary patch
delta 12
TcmZo=Ze^Yj#b~}UT8j|?7w-dV

delta 12
TcmZo=Ze^Yj#b~xMT8j|?7wQ9P

diff --git a/locale/en/hammer-cli.po b/locale/en/hammer-cli.po
index 11d95420..9d60cf3e 100644
--- a/locale/en/hammer-cli.po
+++ b/locale/en/hammer-cli.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-03-04 16:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -208,7 +208,7 @@ msgstr ""
 msgid "Comma-separated list of key=value."
 msgstr ""
 
-msgid "value must be defined as a comma-separated list of key=value"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
 msgstr ""
 
 msgid "Comma separated list of values."
@@ -268,12 +268,17 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-msgid "yes"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
 msgstr ""
 
 msgid "no"
 msgstr ""
 
+msgid "yes"
+msgstr ""
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -308,8 +313,20 @@ msgstr ""
 msgid "Options %s are required"
 msgstr ""
 
+msgid "You can't set option %s"
+msgstr ""
+
+msgid "Option %s is required"
+msgstr ""
+
 msgid "You can't set any of options %s"
 msgstr ""
 
 msgid "At least one of options %s is required"
 msgstr ""
+
+msgid "One of options %s is required"
+msgstr ""
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/hammer-cli.mo b/locale/en_GB/LC_MESSAGES/hammer-cli.mo
index 5f0c9bfb4efa9c52959de070b3f59aba91691508..62f2169889039aa13c11f3ccf5a3b29e684dcc13 100644
GIT binary patch
delta 1143
zcmXZaKWI}?6vy%NVxF<uByH42N=Va2606lF6<SaS8_+_;LLf^EE|D$@ilT#H$)w`Y
z4nA7C2o+S2P9Y#z99*=LC5y$O8XdZ5Xcs{Wg7y0|2`}$+?|pynIp>{Enc8r<5%Dh=
zza0M<{~@2*6rS^Q;<xOY9l~dL1YaYE)j6HQbxfguuUS8yzyw~#KD>bgIFBP(!7<##
z4zsew0{;h=!fq~P@FM202Onb^mvIz7q5|DTVzt=5)^mNR^(;=~Byx+rLIqwy<y6BY
z)-lfh_KSfcjSx;0NAM`-+w+@vnE4}&<5NuFTU5qhu@`qy8};sQT|bRk=0z;wLrmij
zJciu|*q8n73<K6|8jCoC%48J};%8K*O;m-pF@x6G3OtJmrUg`~Z=(`eKn1pnN?;vT
z(I#@3FG&3(48jcbzyPW=6F7v|v4Bgs2Y=$cLjb6rm<_iweuC<W6;w}DFooYy6$*5<
z0vtqDI*$tUS{L<KQ_QiTrg(=`(RSMUNLLwma#BykQ5npjN_ijE6VFi<+dx%n2RZCd
zdp$^&>WSm1o_K)zRC5vPucmm(f-+x0ed9VR(rr{vg!m4sPzp7_gevJ()cyA`flH{2
z-=Iprf!gSI`+AtNWtnHNgrzbAW%3@?6kDi`dw9EgVib!wj>>Qmd6!jDnXaKStzibg
zpq>v>rUafum3k7Dz%5i@i^#2(t1#fOHBM@Z29mTjQ4jn@RVGQ=>WK*~;2l&?e298^
rf5RE~2HjyN=S{gu$GllL?VPW^a5n?qx9DB(Y^dKEt6m9R=+N{ZcfNAL

delta 1193
zcmZwFPe_w-9LMqR(#@>)r?t{T^qGdPT5U?q&<@UFlm(>>!u1EHGsq|csi3Gqb+*GY
zi=dmwXyu{01YU$jm!d;>(1VRm9ik3~FnWKS$Hueg^?QELp8bB`&+{$CzQ*%Q!P;r#
zlj7UN_wXjO5j<7PiBHjO7Q)xqhzrPJ%bX5j8QU@BF$-faI(PwF@E*3}3+%#q?8ZM>
zZ<e=c-TJ^1xSbn)cnpVe7e2!dEMfw`p*HH@Y{p(Kih3@FnonW|FCss+_o$7}qiR~j
zHeAML*0&nAp`Es31NP%y%xqleaVOU^*o-gH!B41)f8rkWZ>cV{A9X*4otVQ>e1a<E
zFGeuDm33L)1{pAC6PU&us7gw>1Am|@T|-q`!8iuCRX3hQhwCgV>iehyW>Fg}p$aIY
z5?w<M3wp^v$e@LR9_T_va~6-{9gN~T9KtfzV7Jd~%Eh}z^+w5Gt$Z2P8>^_^s9-xD
z3{;a!qr>%0RN^xM^4E^vGNI;JL^X$(GD+12Hav|SHo{50aRpV$8&sqpQN8gCm0X0X
zl-K|=WyewT8B}lFLiNU%Ao;5~7MW0U{6;0Pih9>g<gcCfqI%;TDyhkh>!+w_i>Ti(
zpo3)$qlb9(3L>a=Qt04$?8Liy2BQpKp(+XTZ)%Pn)WTz^-gtm%oI+Kyf~>I~gDMRX
zhbnErIPOC|pFsz2qmq7(D&PZZW5X*9_%Ev<hlMCp&2az;!H%FFIEhN;I;uAwqk7{r
z4q*k=8)q5|J+(`&{=#l|%#|vfaJRYo3Rm47uH@Xb`+J=)H-72zweg&jopiF!SmBY!
TDNJ~0U5UAXZ=nAFcOU)(m@Iue

diff --git a/locale/en_GB/hammer-cli.po b/locale/en_GB/hammer-cli.po
index a2008864..b57e0845 100644
--- a/locale/en_GB/hammer-cli.po
+++ b/locale/en_GB/hammer-cli.po
@@ -6,7 +6,7 @@
 # Andi Chandler <andi@gowling.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-08-30 02:01+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
@@ -215,8 +215,8 @@ msgstr "Error: Some of the required modules are disabled in configuration: %s "
 msgid "Comma-separated list of key=value."
 msgstr "Comma-separated list of key=value."
 
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "value must be defined as a comma-separated list of key=value"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
 msgid "Comma separated list of values."
 msgstr "Comma separated list of values."
@@ -277,12 +277,17 @@ msgstr "Id"
 msgid "Name"
 msgstr "Name"
 
-msgid "yes"
-msgstr "yes"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "no"
 
+msgid "yes"
+msgstr "yes"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -321,8 +326,23 @@ msgstr "You can't set all options %s at one time"
 msgid "Options %s are required"
 msgstr "Options %s are required"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "You can't set any of options %s"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "Options %s are required"
+
 msgid "You can't set any of options %s"
 msgstr "You can't set any of options %s"
 
 msgid "At least one of options %s is required"
 msgstr "At least one of options %s is required"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "At least one of options %s is required"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/es/LC_MESSAGES/hammer-cli.mo b/locale/es/LC_MESSAGES/hammer-cli.mo
index 522880719533fc07df65279b66925cc67746f0fb..ced78f6973dd6a419805e9a4503b35e062e7fd48 100644
GIT binary patch
delta 1489
zcmX}sOGs2v9LMp$`N~J5j+&*VGm}|OW4=etGG_#d5PJs+l}1qMsvx2VU8qeEL?qga
ziWU(G6NVtQ3O6mRa1nt8DFh<)Ac8g_MBm??nGSRA=iIq>=KlZxbIyI(^rgX>^`;FQ
zt&_fr-nhi<Aa<v5ppB)Q72$JSfv=H|&2iX-^H_yN8D@TLLmwW(3cQ2?e1P>hiOu*M
zv&<X|Wx4|kV*wXBunYI#a=e4<a16sZg9<cnsTr|a2=%)f)b|nW#ly(0_7WBNBr2y*
zxCZC2oab9AVJOl7mS7Ysu{Uw<U@_;nupDFP!?&o6e_$!*Wyc>BL|yO1Iy{C)aRimf
zA6$?A9G=VbZ3hFsvjN<PXHc0;VIeM{GF?Pv`WI_4KQ|tD1bv+Mqe^`lmB3?EU{k0B
z=1~=0L_X$SM*Y1EDj4KpJ?e*1REdsb2(RI8e1WN$?J>KVV&*}ujYs@g0Z*Vx{2p6z
z1~;NNKVGSJRDgZB7O&(}{~88Q`C==6M9pytX)?4Pq`Gzl`PfMgd+`F6;WX<0Z+HL$
zWTPoMhpO0Z<dWS(O>qp*<2%&a*j`BeS2EZ|omr4JfGv0meK?A$#2ZwGKT#RwlD5uU
zP^I0E8*mVPIE=M8fy#IxVKz7GdNry-Jr0Aj46dU7Kog`&1hEcJAi>&Q?86xP(Zfnr
z1!_^5b|=nvVjJg!sKxdKb^kOfkzc4OEoMuo@=lb&Y6hnh-awW984{DdLV~vssEod1
z5X&fA6Lw)gUPP^pSxiA6U30AUq=3|Tc6_HHOGnLdql%B?571b17N#q5wGO(ri~>^B
z3Q$?=1*E1*wa_&sYMRQ;^lfxii4EiK1XVKGsu*Nx|F<*H_EYpK8Se%6O;wG_rV5al
z+oBvPg1a@hpvtLL&*pF|qpiil|KB<p@sf16o)%{-U5iguccYeS4Rp<YBVDCUHg{cc
f(oB!gwE%7WbNctpp$yMRO7r-APi4+fLFx5>f9Q4Z

delta 1581
zcmX}sOGs2v9LMp$rD>Kk<}=6FEgwC6q?x8RrkT2pN-AQg#urIxrG%7=0cjCJMNJ_T
z;mS=>Lee6vO^YI^c9omVT0}vMS`;A#eSi0k9p>E6x#!NzJ^%mt-}|X%vNkfG7JtKN
zZS*{PaG6;cL-8DF3khZ!_z~CQFXUtX6=s!~iKW<v>+l3RcnJ&fKCZ{txD|ikb}UXb
zTWJ=tkT<YCT*HOa*nwl1g)eXeE?^xdC3y>NM%HQ})bEbQ=Fi|^&MzZBv9G9w|3Jl*
z%w3Dnj|JS{Y8Ysx`!E}auo%Z<=hK+U`ExA5_vqjsRK)qoW&vzQ-RLknIE>YJ9lP)u
zDv(X9%r@d)Ead)no&neFCU)W!YAY5o9kW+^k(Qw%t;8y9K`s0YI(QY8>IbL*-k=t?
zhzcMx#mi_JGG(n8Nn@~wfgih2KO91(Xaa*ci{<zm_hO09Y&nkLwK%g;RE_vjy@eN{
zQr&_L*p6iwL1pYNYN4-E$$trh?@VmLEW&HT4%A*>KrY!Vl5Km5eC#cU{rClQF-R2p
z{vkYoS5RB^8C4?*q*1?1LS-y~=dm%J{HsVFGLeH%kOH-LSda7QU^d|?BlW1Q385l7
z7dxLqrT8gs!Z~zs8Ix65go?N`<_PNg%?JafXckBCC+ZIdvb;=8U^VA&kYFs43O$Aa
zR4PYN8Muv#^ik~mG49}e4pnp+RHnWkL<MpLwWX0U21@-j=HrK$e^IH=B`vJU%8{U~
z6&2Az+>94-56)mME~nzc*np~$TNsC`2W^2G<>I~z2q@zIxjV~2d$WsPzchh6=_*2{
zPfv-O;~u?*C`#^at@H-Ef>9>c(HrR`&VAu1nB8<9s{gG?&;L>@WuP~knjR0Oy^XHI
zQ&aTK?#SDFJt-CRZLzr}^lYoC0M#lz+-=oRSyR)t<sEm2UiE69v^Tt{+^0g@p{6vd
z`RO%u6{s4u=@u_r>^7xed)nfjc?X_Y_oWn=xtH)Q(bv=4*FV_X<AjHuu+tr#T;W8=
nQ>NnTW~zL}t1{fH{X@gOPWP#SQ_k7JuyZncC$%Elo^$&j|Kf)A

diff --git a/locale/es/hammer-cli.po b/locale/es/hammer-cli.po
index ca539fd2..d6db839d 100644
--- a/locale/es/hammer-cli.po
+++ b/locale/es/hammer-cli.po
@@ -8,7 +8,7 @@
 # gguerrer <gguerrer@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-27 06:26+0000\n"
 "Last-Translator: gguerrer <gguerrer@redhat.com>\n"
@@ -221,10 +221,8 @@ msgstr ""
 msgid "Comma-separated list of key=value."
 msgstr "Lista de pares llave=valor separados por comas."
 
-msgid "value must be defined as a comma-separated list of key=value"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
 msgstr ""
-"el valor debe definirse como una lista de pares llave=valor separados por coma"
-"s"
 
 msgid "Comma separated list of values."
 msgstr "Lista de valores separadas por comas."
@@ -285,12 +283,17 @@ msgstr "ID"
 msgid "Name"
 msgstr "Nombre"
 
-msgid "yes"
-msgstr "sí"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "no"
 
+msgid "yes"
+msgstr "sí"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -329,8 +332,23 @@ msgstr "No se pueden establecer todas las opciones %s al mismo tiempo"
 msgid "Options %s are required"
 msgstr "Se necesitan las opciones %s"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "No se puede establecer ninguna de las opciones %s"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "Se necesitan las opciones %s"
+
 msgid "You can't set any of options %s"
 msgstr "No se puede establecer ninguna de las opciones %s"
 
 msgid "At least one of options %s is required"
 msgstr "Se necesita al menos una de las opciones %s"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "Se necesita al menos una de las opciones %s"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/fr/LC_MESSAGES/hammer-cli.mo b/locale/fr/LC_MESSAGES/hammer-cli.mo
index 2c08389752641bc89caa440e1c29e0fe7c61c2a1..cd5e5889944f67faf76ace203dff492dfca46792 100644
GIT binary patch
delta 1489
zcmX}sTS(Jk7{~F))68Yt@>EvpHcL}i<~&ulbXyciM1~Lv327t<L0xnc)WC~Q-c**-
zMMXr^MS-PYU3wEFQ5Riwq6WdJpe{PxlpuY7|IJ?Z?DPIN|NB4B^S-aQT9eI*k43px
zjS(l-5G~ne2XJ>TZ;Z)2vl4uWEAc7vvLtUCF@-f);xY?h2m0|KR^e$3;tdSrEVkos
zEHF!0DBqb_8!qRIF5HRxunezZEly$^zCk7GU1CPA7DC<Ei26K=eb|rusXaj@K8vd9
z9adu!D|x=<kcKi1;tGu6TI|bQC$N<339Q5i=*Q=%iofG3^t#gzsz-ev$0j_C12~Q<
z<PWaLz*3&e^R1f+pV=_>;t5nGb6AX@QI*c4DqX-$=qpSo9z{Rbhfu8^K^1TZmDn7r
zfE22u^T^AJmeKzrCRI$l7)IR~L$zoKLpX{(_!x80?J>KUW#&Qcjho!8&P=2B#w*;0
zZ?Oi;d}iw~l5r3>aDCoK|J9-yKIp`+s2l4jQyn>i6l=#(oj8Si@e;1aPpAYJa1S<6
zO*x)Kb?gfAlQw}$;2s{s7pT3_Sxo=+L%aBORW^u9WC*pkcTsEh40+iP-c(T@WmjMb
zwP(6fYdV1XeiXy_2-VRPYDwL!gRI3E?np2hW^xwm@h5g+1q)S&{YcmC91h|*>H&XI
zi3fPP5|1FaS`_u*{ip&ip!URltj3q9WBV&(BFNd$5A`5P+EHZLYy{Q1%NcKDGuP9o
zmVd$RSW3UoU@t0>_sG^TKcSYZ`VK;aXQodYvUM~PPFCr8dRJ@Cayn;S6=-x3YOgA6
zB$QY-p-MEGh|PprtKlNH5?V?Xr#+;Tz_R}z>SBS;zpBt?Q}$YG{x3K!)DB%7>Wns)
zMvS0%XFq7OsvEh4mPt!kNT`F0BhEypf)#U4$rjY+)BbU?mKthrglHjJiN&FPpwUi5
ci3VLveaQQkKj!j`XSGjV_oUoougmBD0U2O<5dZ)H

delta 1598
zcmYk+TS!z<6vpx8-K=yf&9u^Esa-71EW24wB|dh;dJxGbXDZXu#x76~0|h+@-I(qW
z(L)bO8D&rq^kNhdlu!`_l|4ihK?vQ5sQ%wMM`+=m-#%N;oVC|pXWmv_njd>JHu;nh
zb&N@jnnbe@HYM{x45pZ6<2#&y-;qDdN;NCT94y5;EW$Q)@CX)SFHXTHI2VU-0T!p3
zjWCN@lQ*#~IEH_8Vm%(j@%RX*;UHFHdb*crEt0D>q3&z;*LPtf*GG|C>?11iA=I8S
zc<NNl!UCReRZNuWI?Tl=7Gt-6eI0YSeuxG58Xf$N+VSKJvwW;YJ*W{K?7~VsiJS2O
zY9lj7noY;GSjh8jKNJ3E=dl4VqmJSij>Fth-cHL<J1xgK7(^w$3mrUxD)mj&240{N
z`-R#-&S<ZqWyq4Pz}Q$OtC?isX4H*QREf@D4c^6B_!HM+Nv2s6?!)5=W(QC`GAiIz
zs0h^~LDc>ASc-?R1bci30@Qyt3*T8#sfyWNEp9;Fcp6oiXGk&Z4XPraa1H*!iMX0w
zD8V*dg=aAjKcIRfftz@QC8H9^!A@K<j{2)fuCkynx`o==04kB^s58!Hdpf&nWXU$7
zb`-_Qcn;M&w^3*N)c^laoXd3~^;c!rp^kQ+@5vaG6)fDq?f4aEVl%BD#BQ8{kCE!z
zH*CQqo~8u0q7pxfO1ua83hPBZ_&#a_KTy4qM~6<u8Z5`yCVz4a^+orPr0o@|C%&Lc
z_t!T-U8}e*LX~_yHsC>AhA;6jj;HgK&;_JL+*gm&a)WkpljC$^Znplq+s(_lSU9|Z
z`cn0RvR5xC9QV_E3zjhFnQj#qVFe?Rp<OR#P%!rgN1Is5P#+D)QoaAfp>nEg6?#1?
z8FdU^b2n5K^@O5~q4QMp&SU%^I)8<JD-<fTLdU4k@hVj9N!#41_sgaR)7hjm)TL@H
zh03VVaj5jEx**huYF>`kjrn})NP_N__o1HQ<Sf7MTFU3N%y48&>&{5n33WLkrzL(d
z)rohHzMN3qHz)IbMoD|f*&Aw)?1?(zj@I2yf6wk{#0mFb;hxrr)6%hHN5pB5-w9O2
Iv-2MR1I#y)dH?_b

diff --git a/locale/fr/hammer-cli.po b/locale/fr/hammer-cli.po
index 265cc8d4..203d770c 100644
--- a/locale/fr/hammer-cli.po
+++ b/locale/fr/hammer-cli.po
@@ -9,7 +9,7 @@
 # jcarbone <jcarbone@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-28 08:20+0000\n"
 "Last-Translator: jcarbone <jcarbone@redhat.com>\n"
@@ -218,10 +218,8 @@ msgstr "Erreur : certains modules requis sont désactivés dans la configuratio
 msgid "Comma-separated list of key=value."
 msgstr "Liste de clef=valeur séparées par des virgules."
 
-msgid "value must be defined as a comma-separated list of key=value"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
 msgstr ""
-"la valeur doit être définie comme liste de clef=valeur séparées par des virgul"
-"es"
 
 msgid "Comma separated list of values."
 msgstr "Liste de valeurs séparées par des virgules."
@@ -282,12 +280,17 @@ msgstr "Id"
 msgid "Name"
 msgstr "Nom"
 
-msgid "yes"
-msgstr "oui"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "non"
 
+msgid "yes"
+msgstr "oui"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -326,8 +329,23 @@ msgstr "Vous ne pouvez pas définir toutes les options %s en même temps"
 msgid "Options %s are required"
 msgstr "Options %s requises"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "Vous ne pouvez définir les options de %s"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "Options %s requises"
+
 msgid "You can't set any of options %s"
 msgstr "Vous ne pouvez définir les options de %s"
 
 msgid "At least one of options %s is required"
 msgstr "Au moins une options de %s est requise"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "Au moins une options de %s est requise"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/hammer-cli.pot b/locale/hammer-cli.pot
index f6c69fd6..ee1260bf 100644
--- a/locale/hammer-cli.pot
+++ b/locale/hammer-cli.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.4.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-08 08:56+0000\n"
-"PO-Revision-Date: 2015-12-08 08:56+0000\n"
+"POT-Creation-Date: 2016-06-14 23:26+0200\n"
+"PO-Revision-Date: 2016-06-14 23:26+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -54,11 +54,11 @@ msgstr ""
 msgid "no value provided"
 msgstr ""
 
-#: ../lib/hammer_cli/defaults.rb:72
+#: ../lib/hammer_cli/defaults.rb:77
 msgid "Couldn't create %s please create the path before defaults are enabled."
 msgstr ""
 
-#: ../lib/hammer_cli/defaults.rb:82
+#: ../lib/hammer_cli/defaults.rb:101
 msgid "Defaults management"
 msgstr ""
 
@@ -266,59 +266,59 @@ msgstr ""
 msgid "Error: Some of the required modules are disabled in configuration: %s "
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:26
+#: ../lib/hammer_cli/options/normalizers.rb:29
 msgid "Comma-separated list of key=value."
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:39
-msgid "value must be defined as a comma-separated list of key=value"
+#: ../lib/hammer_cli/options/normalizers.rb:43
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:73
+#: ../lib/hammer_cli/options/normalizers.rb:85
 msgid "Comma separated list of values."
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:88
+#: ../lib/hammer_cli/options/normalizers.rb:100
 msgid "numeric value is required"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:102
+#: ../lib/hammer_cli/options/normalizers.rb:114
 msgid "One of true/false, yes/no, 1/0."
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:112
+#: ../lib/hammer_cli/options/normalizers.rb:124
 msgid "value must be one of true/false, yes/no, 1/0"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:151
+#: ../lib/hammer_cli/options/normalizers.rb:163
 msgid "Unable to parse JSON input"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:165
+#: ../lib/hammer_cli/options/normalizers.rb:177
 msgid "Possible value(s): %s"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:173
+#: ../lib/hammer_cli/options/normalizers.rb:185
 msgid "value must be %s"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:175
+#: ../lib/hammer_cli/options/normalizers.rb:187
 msgid "value must be one of %s"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:196
+#: ../lib/hammer_cli/options/normalizers.rb:208
 msgid "Date and time in YYYY-MM-DD HH:MM:SS or ISO 8601 format"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:203
+#: ../lib/hammer_cli/options/normalizers.rb:215
 msgid "'%s' is not a valid date"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:214
+#: ../lib/hammer_cli/options/normalizers.rb:226
 msgid "Any combination (comma separated list) of '%s'"
 msgstr ""
 
-#: ../lib/hammer_cli/options/normalizers.rb:234
+#: ../lib/hammer_cli/options/normalizers.rb:246
 msgid "value must be a combination of '%s'"
 msgstr ""
 
@@ -338,26 +338,32 @@ msgstr ""
 msgid ", or "
 msgstr ""
 
-#: ../lib/hammer_cli/output/adapter/csv.rb:174
+#: ../lib/hammer_cli/output/adapter/csv.rb:179
 msgid "Message"
 msgstr ""
 
-#: ../lib/hammer_cli/output/adapter/csv.rb:178
+#: ../lib/hammer_cli/output/adapter/csv.rb:183
 msgid "Id"
 msgstr ""
 
-#: ../lib/hammer_cli/output/adapter/csv.rb:183
+#: ../lib/hammer_cli/output/adapter/csv.rb:188
 msgid "Name"
 msgstr ""
 
-#: ../lib/hammer_cli/output/formatters.rb:154
-msgid "yes"
+#: ../lib/hammer_cli/output/adapter/table.rb:63
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
 msgstr ""
 
-#: ../lib/hammer_cli/output/formatters.rb:154
+#: ../lib/hammer_cli/output/formatters.rb:160
 msgid "no"
 msgstr ""
 
+#: ../lib/hammer_cli/output/formatters.rb:160
+msgid "yes"
+msgstr ""
+
 #: ../lib/hammer_cli/settings.rb:27
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
@@ -402,10 +408,26 @@ msgstr ""
 msgid "Options %s are required"
 msgstr ""
 
-#: ../lib/hammer_cli/validator.rb:79
+#: ../lib/hammer_cli/validator.rb:77
+msgid "You can't set option %s"
+msgstr ""
+
+#: ../lib/hammer_cli/validator.rb:78
+msgid "Option %s is required"
+msgstr ""
+
+#: ../lib/hammer_cli/validator.rb:90
 msgid "You can't set any of options %s"
 msgstr ""
 
-#: ../lib/hammer_cli/validator.rb:80
+#: ../lib/hammer_cli/validator.rb:91
 msgid "At least one of options %s is required"
 msgstr ""
+
+#: ../lib/hammer_cli/validator.rb:116
+msgid "One of options %s is required"
+msgstr ""
+
+#: ../lib/hammer_cli/validator.rb:120
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/it/LC_MESSAGES/hammer-cli.mo b/locale/it/LC_MESSAGES/hammer-cli.mo
index fc2475efc47c89c6856baf84ad89c8f0b0de8060..b9159b260b1efc22abb4eb83a8c4d780ffa4952d 100644
GIT binary patch
delta 1489
zcmX}sOGwmF6vy#nj*l5@#&jy}q2nVfH6P<Ud(1cykwFv@C1w;-FpwZ*o1g&+3M5-d
zMucr5Xi=a|3tdFG$Vj41EvA=ll3dgxs6`0T_xGQfE}r?^ng9If-gEBxJJRy0DYj7H
zx^0XIv6*OIWp)Y=yLe$tW|{eM3X5<K`Ljh{>Tn6G(4TEqhMgF|(^!gEu^jJX5NELs
zf1%qfX0<ua#9DDJ7eaUdkKuZ}i`#G#TQPy!s4v%yy;?2mzIxQ>VeG*^<f}G=+W0Ig
zr;k{Hi&(<?mdQ4>({kK^U08`dsrNBl$NM{2f=@7jZ%`Tkz>VnhBp0eiU5{WR_TxDm
zM<wzHw_{lz>$1KbV!~$@#p5`H%48l3@f#}B6;!5wu>tc}CpR9(0PoMDN<EB9;2~;b
z^QZ)tP!(N4{;XgP^)Fyj%EX63)Qw%J5?#Pr9KoYFjhX22nvG_dc~QMF!OffSDN+o3
zi=CLjdi3X;?ZEx0N)Mpc8O^8uDn*<R)EuAjAo@s?wd^FSGUrhn9mFGe4OOA{*nvOs
z1lI5+HRUj>VpGT^dxkoyIlO|)sEzg)QvYHm1Jv1tH&ESq6Lr=vQ+`G5Jd<>Fh83vm
z-KdR3u?DZ>R*Yi<en3^yL;dx=I@I-U?8d<ulS@pVqkbUB0qw><)Q$I0UHk%j@fB*}
zN;*|t9YJN<i~NM0!B!l?DtwH}{2i({exnj7;^r2Ng_!7vE~mVO9Gg8tPQ#{=B<wX-
z;{vM0Zpzk-?HI+2sEs6$*02DfOm)uc1r63tK50nnXvCZ>lk;TBG}oCa3+-GZM5s@c
zp&CjX(_-3)MkCQqsKgrlZ?Rp(K0=Mj1LHgi9Q*&F>bUj%?`5JUQ)jC*xkQlINu-A=
zKw{45;*}yekEV`FPl$R)4XX<2(NYD|Bf^A#lFp;2qw64aq+1AQ*HWX2*h8qSI-B&+
hqodJAgbDSD#lK{I&l$`1j%T#RC%n0NW6Q-4{sDp5cvAoX

delta 1623
zcmYk+OGs2v9LMp$sWoXn(#*8fYo+BQGfmCZd}L9$2%}nv6l0EM568wwl)+FCgi$0G
zMJ?Rq(q3+a))i6&5z#^tt4%==LPeO1zP~$TbnwjQ%(*k(^MBl#D!p13oKA|mWsFAV
z8fNt(GcUGA@xqviHd}!oaTWeT{w!g!SrMjSE;eE|o<s+)VHQ5XwfGuKa26|Y{SvdK
zW<hHWEvy5VbD<k|<0V{)lehtAupB*}&_QdFvsx?adq=|iXRw9$*O9N-SJc60Q8C4E
z*L9eHncUw>S?HwuF%<*29tXqkA7TpcUtlJFKnLeh5og4hrDHAXMlI-I4{pJm*oMzh
zf#k)SZNz5G;{JA?1=s8@9>7slDdsR4Q<sGzEkH$DgvD5gI`|oMa0r#^C#V44p$;~O
z3Lqsel+glY%Nj74#9|+d1Z+cnF@Q?ZZLG$pSct!|8FS*zBJnI<k1!iR^+-&j*=o!}
zl4Dg^g}ZPwUc@|nj5_#KBKg-1|FEHyIE1Gr*^7Jd0&-7#hRV=e)PbjQAI_pORnKN6
z9>zm>2i2V4Q9Y7L8u_SYqe@na19&i*{OhD|*hs@EjKZI&E}cWwyoB&%GwS5ss9N3#
z?@yo(@*WHD2j-wd-ivWJDx+snpSy>;J`rTm#9|tIF`t&#KNvx!{w3;*9y(LqT!^i>
z6?LE?RMR~|MLLQ6D|?0I_z80{jSngEI#iFep#lhAW>Lms4EeLqVdqgjkwRLij^!Xh
zSvlro6Dr01*np$B6~EvK%%Jmhpesm=xLH*RG-wyM%v2}np4Q#vMX9Z4Zd=&E9ZY3H
zr&bSWIPPmGwQ4Z#=^mmI)o8l0qTS9Ufo>@k#7-s;)xS}r=YL@+P5Nci(BrX%*~nCX
zXejzxcNHp;8g~;@QU5>G$Qmk-hO(rg&eu@(H1wpbIqoh)wNgFYTBDjHBYZ6~tjbZ!
z<QLQ(^rqVrl-M0AqaM>b_g&~kPmju)K0X%xZApB)ucNce*Y0?G9Itb9cx16NJQz0`
zQ9fQA?}=@2uXYA}PG6VP?>*($s>j>a?$<_#KXBUH>vvB2&ed?S&*${`y1fBywR@fZ
O&cHGMDc^8K+Wo&&`I%P$

diff --git a/locale/it/hammer-cli.po b/locale/it/hammer-cli.po
index c8e8818d..aa92feb3 100644
--- a/locale/it/hammer-cli.po
+++ b/locale/it/hammer-cli.po
@@ -8,7 +8,7 @@
 # fvalen <fvalen@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-28 01:00+0000\n"
 "Last-Translator: fvalen <fvalen@redhat.com>\n"
@@ -221,8 +221,8 @@ msgstr ""
 msgid "Comma-separated list of key=value."
 msgstr "Elenco separato da virgole di key=value."
 
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "definire un valore usando un formato key=value separato da virgole"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
 msgid "Comma separated list of values."
 msgstr "Elenco di valori separati da virgole"
@@ -283,12 +283,17 @@ msgstr "Id"
 msgid "Name"
 msgstr "Nome"
 
-msgid "yes"
-msgstr "si"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "no"
 
+msgid "yes"
+msgstr "si"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -327,8 +332,23 @@ msgstr "Impossibile impostare contemporaneamente tutte le opzioni %s"
 msgid "Options %s are required"
 msgstr "Le opzioni %s sono obbligatorie"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "Impossibile impostare le opzioni %s"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "Le opzioni %s sono obbligatorie"
+
 msgid "You can't set any of options %s"
 msgstr "Impossibile impostare le opzioni %s"
 
 msgid "At least one of options %s is required"
 msgstr "È necessario usare almeno una delle opzioni %s"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "È necessario usare almeno una delle opzioni %s"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/ja/LC_MESSAGES/hammer-cli.mo b/locale/ja/LC_MESSAGES/hammer-cli.mo
index 94fc702ca7667eb10b41e0bf9f8ba01ae5113c7c..eb1dfbf2d90d68956b4892daade14d08657d92f7 100644
GIT binary patch
delta 1489
zcmX}sOGs346vy#1IXY=NW0Pg6>1e*vDRnZRWzN_GN&>^cgrY186x{V#NCQDoxs)c1
zYL(!k%+f_|2HdoeR;@xa7cmr3s{#ol`u^_B^k>ff{O_H|J^yphf95;BwM9Sq-S>^r
zLzEEB8_dpNubTs7Hq)#CU*dLri@a==!(L2aH5O!<m18Fc@GO?$O{~Bt7{Uc?#b20h
z7PX+qnOF;M=8bMVil=ZJPGSwtVhesiCF<K~My?h_eXjv^J&c2R4*96PK_$L`TGJBl
z!c{Eg{+2-+%CrItF@lvim^zQ*R?Z(_DL%&lzC*3}2Nt0(CwZef)cZZygqLs#W2lAv
z##$`j#C^HH9cRKd8^(UTidxAcZox08m9C>!`WG89KR20p7z3PNK$ZFyY5`NI#1>Ht
zNT4dZj=apDNB#Xw%9!{tg!*CxRiY~x#BuDy*O-AhUbA~HGcT$)Ci${HH-i+zmaz*H
zcn~Y|lL-%@Dma04_$r_Jt3)eY2&0eX=^6JSFT2Bmd)h<P3Z`)Y<ES4fBzyHr1h3;=
z+=DL4riwLSIfk$i`|%OpMsl-?0_v}fLM(%Zv_3qI1K5r;7{afp(iW42R@#M1U<B1%
zF+7GZP@h}FUM!;CP9-tG`8aCVJi`;X9Az@bq=wGZws?vs@nh<|o?lmD7x4xTqkiBs
zs)_tNk}K^*t+Wdd<9Sq~Q@9)7V?F-CBUnpgs2QW9sYwirxe!Nw+m=%POqt7@`eGFx
zz!6lU(>RK2sNT3t=ejUJR1xZ@PC|n<C3hNnbwT@I<w*}cBMly}(+66SMmM3=QdMgp
zXcy=CsuCJaL>s}qouP_#5QhlzGB%8}6KIeBqncT^_P;t++fUi6B>XQp&s>d^9z1@d
za?XfwRE6jvrxGf&n^2>wCvpijS9<g?;ZM@pdg`@y!b9vNoUEnBK0@22nb=RHhn}B?
e`Xfx}IojMx=6BCTmN({VoqOyZ%bU1X68{I-p?R_Z

delta 1586
zcmX}sSx8h-9LMp$jZ2GLmYI&_ZL?*{TuQApmn?0eQVJr3vP_adQXgy)CM77Og&M_(
zz$eR)6sosCkf`XP<)KIj!;pxgmx3gshrYjir~b^jpL6caoqNvz{O|o*_;6$JLsDdq
z5f!v_TG2GKI;@T4KukoL&Bc#6AE%IyB}AKLVKQc71unu9=-_3{z#&|WFEJOtV*xIW
zF`Ho)v|6uY4LF-GPU1G~#CiA}m*WKH<Mip?L`#slS}p3jL*etyc#!cG<P!UWn)r9r
znr3p>C76H<xxeMn(M)SF1zT__c7?~on9TSYF2r$k@DFOm3uc<7VF~I+2hqV+%)xFv
zf=^KkSvkvW1y*AQ_qQ{2_|9(PKI}(r#c!O0DY4#41E`f|VK$bcCf<w=UPGn&K57AP
zQ4{-(T0nA~m(c)n%E~dAL}w431U!PeumzQ(UM#{#xEg<9H7<)c^I;oyMVOsM)kt)r
z_d7q59IL|3ScAoQ4YTnTDwC`xXsa-TWhqrVungN#dp&}D>?a5AZ86N&T?rmw96()v
z9#u2L*oITM2AfEqYUCC!!amdlM)4N@m_z=x@~cc=GwMSM)JAYWKEVy>=dQW9AC=;Z
zsEiDvCNPHDdmj~BiRq}{)#EO_fXe6_bnqAI=}8SzaXaZ$VLNtX0nX;%cH?%`_y%fX
zukjSVL;b<tRIiwVsFe<&Ryv3k_yRT2Bnn|AmS6xIaVrLU=%^~+hxPecE#m+O?qQW-
z4~IRCy6`%xHpZ|PlheHkw_p?FQB;j&FEES1NSd}%5l>S#*`=VnpE{{fHJ8x}H3)|a
zsEDR?>M2n;?$O)JP4ro$mD4uR*3y&-Wnm+YOuHGR=4=a%hw6V6>-ql|nRN7KQ^eA8
zXiA|fSwSgSiQDs1s3%25wk~|`A9}VGZiS<^Nul&BR4)n=XX(e?u2=2a1{Db}DqBV)
zb8aY&3KeP|O?9B4h}}0FCF90=j@s)|cjO)P)My*i9^8xi78758tf8^#SiMu%>eM+$
zLw(Uss4K2NBL6{le0!X)W7r9eC$5ScnC$4C?701D=;r5<yP->dzi;wfXXuXq@n5g+
Bkgfm#

diff --git a/locale/ja/hammer-cli.po b/locale/ja/hammer-cli.po
index 8298158d..16063b7e 100644
--- a/locale/ja/hammer-cli.po
+++ b/locale/ja/hammer-cli.po
@@ -6,7 +6,7 @@
 # asasaki <asasaki@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-27 06:44+0000\n"
 "Last-Translator: asasaki <asasaki@redhat.com>\n"
@@ -211,8 +211,8 @@ msgstr "エラー: 必要なモジュールの一部は設定で無効にされ
 msgid "Comma-separated list of key=value."
 msgstr "key=value のコンマ区切りの一覧です。"
 
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "値は key=value のコンマ区切りの一覧として定義する必要があります。"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
 msgid "Comma separated list of values."
 msgstr "コンマ区切りの値の一覧です。"
@@ -273,12 +273,17 @@ msgstr "ID"
 msgid "Name"
 msgstr "名前"
 
-msgid "yes"
-msgstr "yes"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "no"
 
+msgid "yes"
+msgstr "yes"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -313,8 +318,23 @@ msgstr "1 度にすべてのオプション %s を設定することはできま
 msgid "Options %s are required"
 msgstr "オプション %s は必須です"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "オプション %s のいずれも設定できません"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "オプション %s は必須です"
+
 msgid "You can't set any of options %s"
 msgstr "オプション %s のいずれも設定できません"
 
 msgid "At least one of options %s is required"
 msgstr "オプション %s が少なくとも 1 つ以上必要です"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "オプション %s が少なくとも 1 つ以上必要です"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/ko/LC_MESSAGES/hammer-cli.mo b/locale/ko/LC_MESSAGES/hammer-cli.mo
index 763f9d68b51dab530167eb1c25c8af4f011be31e..504118aa2eb06ba97505479d6664a1bfc30b77e2 100644
GIT binary patch
delta 1489
zcmX}sOGwmF6vy$Sj?Zkg8GD)OjFqMN9CfC$@)Z>oL=jPff)N!(MMyhqAR>aG2a?jF
z+9X6^Swd8cU^XqpMVqjKvKCTkwTdDH>HE9?(TjIJ_dnzO|L2^0?%a%hXpDaj_--4c
zoms?eNHsf*dwjewhSSXo@F_0CH^`q&@KTMFScU}|W?^i?5O!h-Uc^$ohY?I*41Z&`
zS==f!-NK@{h!0wDJMPCNcn8<wFh=n`D$u+vGh($$)c0yo@3&$Hb|L?2FHwOfP&s|X
zRXBmgJm1m?Ly?x^Qf$N3*pa-B<6^D{uo#Chgkz|Te_|o#<#-ROKz-hhb$AqyU_UC6
zf4C0A3wSQiw_PlF&rae2Jdes`6odE;mFWyB(^;&={9G^aRt$07jVkpeR04yjz(!FC
zOrk0}gZx=wA@vWiC}EL@5!4skP$fE!m3R&J;R{T|9KYG+6f-}nH~RRpdf_2bRU1d`
z^%tziV7}KQJ5T|hK~>;ZKJ~9*@rpOJw^O(c!=$N-97}o*6=*LW!W*cJzGEHEVkg$}
zPuj}ss6ZbhG1@aM#{~A`H0u5*g4AC(=%LPPmO*U6A>4|;P!*^mO-0^;Wq1LX;{#N4
zy~ZXSNA*aM=r&;lb^p_-Ub&CTJb}A$D$b&ZMU;(E1s-8De#I&b(~-(xFP_3KR6wJs
zt@?|pSVR=MaS3k0oyqGf7~=W~uEDn$!9S?`#LG#8wH-`)7WKfZs7wZs80|T3#xbnG
zY&uI7YQS#nL6!U+(i-ledZ2<-Wi*J@J87tAFygM!ytUWWTC<(58sX#zEvW1ii28*#
zaamWRhDyAFsZ*oDZ;LCxD!GEmfpI5+ZJ!_7#%!H`WuazJ^g5qeOqEFGpBrqe+izXB
zF;y{I!&O9O^f5Uct}?ku<Ij(FR{Ti1qo;~)WUALzGF{YCqn@d~YhX4q=Y~30BgSlH
buGhuLr}Q70eHs4#l-S5!zc06Mx^VD6Z902b

delta 1586
zcmYk+OGs2v9LMp0HJR0@qd8fl<~6m4Q<G(BmZsGZL{u0>VMdIPD1<15f(k~WO<|Hv
z7Kl+2(W(bMR=Ep`2;4-Ap4hUQ77<05MBm@NV|4J`&pCITd(Qd)|94)mx=<bekmKt&
zT9jTuubpfb!)6~B+UQiXT>OZ0@F((TS!rew4B`TeVlj50gXggb@8EnK!4>!otFd&N
z*>tnGHG2a)fZ2R-1UKPnoQ=<MA&z1drl)%wtw;81&8Y9~Pu)L?P0V|duh=Kl#=oJ?
zG=o)3Fbn6gzEv{NPIq7)c48@>OU>_Mkohy5hwstBany+mXPAYs9<@*tI@pEF@e;P+
zQ`A8g&oo<vjabC`c7g$)*#Pduo2XQb;VjJadnXN}P8z`qY(Q=NC_31O3iW-|0bZdt
zHikMtFvE*z7`bH|FrLF;JA*82L4C0k6{0Ixi;r;${=!Bq%QTyU$MMW0vy-SAu|TRO
zkZ4;JmGiAwiQTvWAEGw;HbDFpia*>~h6_2Ka=aU(*o%tH%ak8b8~%iQa2$2AUEExb
z9k>s#q9XGfwb6XS$R4c-7h?oZ;htH<UkkkAh8{4ADw-UQ(|{pdhkH>G7(ng(8R{gT
zaV}=F3*|nHYcYzdm2O;v*HF)YgQ^)nm92wE;taMh*o|Fy1FJBPO036ixD<O)Cm6;K
ze1Y0fHLEIRZ8#avq8{9Xb@(VX|Bepx0(M)5b+`iKtqk;_%gF!Ola%jJ3;sZz#78Bu
zc`HHHL=BeXG2Dzps7QUm7?$UIq3=OT#C`S1mfQ4PElzgg?nAxXUe4AtSv_$B^-wLS
zuq#z+j(hdq0)?AB+6H<JU3H{L6w}wx38?#nLy6f&Ixp3~R;TxWqA8#HWmEIhl`j<`
zuesYuwVM)6!gPgQsaZ+?zbX7`ike!)!!0}w6*V;iV+9A@p_g<0IOw%Yrz=N=bTw75
znqJXLdYUFQYSk@PO2KWbxGI$m?##RJ#=2<@J-9tJIW4oT{lKBa?QKr1%ZWLyiEC+2
x;#|hfNmUOjGJXC;Um!Oz637k?4u2UMbUxp^n7n$%N#5#CUhn_fpC}DI`U|cOkH-K2

diff --git a/locale/ko/hammer-cli.po b/locale/ko/hammer-cli.po
index 6dc014c2..f6bb7d70 100644
--- a/locale/ko/hammer-cli.po
+++ b/locale/ko/hammer-cli.po
@@ -7,7 +7,7 @@
 # eukim <eukim@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-28 12:45+0000\n"
 "Last-Translator: eukim <eukim@redhat.com>\n"
@@ -212,8 +212,8 @@ msgstr "오류: 필요한 모듈 중 일부가 설정에서 비활성화되어 
 msgid "Comma-separated list of key=value."
 msgstr "콤마로 구분된 key=value 목록입니다. "
 
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "콤마로 구분된 key=value 목록으로 값을 지정해야 합니다 "
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
 msgid "Comma separated list of values."
 msgstr "콤마로 구분된 값 목록입니다."
@@ -274,12 +274,17 @@ msgstr "ID "
 msgid "Name"
 msgstr "이름 "
 
-msgid "yes"
-msgstr "yes"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "no"
 
+msgid "yes"
+msgstr "yes"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -314,8 +319,23 @@ msgstr "한 번에 모든 옵션 %s을(를) 설정할 수 없습니다 "
 msgid "Options %s are required"
 msgstr "옵션 %s이(가) 필요합니다 "
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "옵션 %s을(를) 설정할 수 없습니다 "
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "옵션 %s이(가) 필요합니다 "
+
 msgid "You can't set any of options %s"
 msgstr "옵션 %s을(를) 설정할 수 없습니다 "
 
 msgid "At least one of options %s is required"
 msgstr "최소 하나의 옵션 %s이(가) 필요합니다 "
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "최소 하나의 옵션 %s이(가) 필요합니다 "
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/hammer-cli.mo b/locale/pt_BR/LC_MESSAGES/hammer-cli.mo
index b0cee6efb488b0443b2b918427d470bec2c2d3bc..119b1e53bfeed8ac8fc1b06c12e853ab1882ebc2 100644
GIT binary patch
delta 1489
zcmX}sOGs2v9LMp$IgXEP#%Anc4;`&E%{0eRt0|oawI~U!AQ~uo7?F!MAwi27h=Lxp
z8ZtsMTGS#6Cfw8_LLwIuL9~gWW|1P1K|z}kqVMnCnGT-$oI8(u|BrK=jXdtod<l4N
z8zaeF$BZm7JBouIUKqJDvs!$Ht8p6nvpg>yIET$x>ose{D2DJDHeec?a00_Pg?;!N
zE6p<2UhXWc7nk!v4EN$eT#0wF1#{SoA5nq&E6j-1+EKsjM7<x!6dp&uYA;ZMPoZ-9
zgc~rA^*rB72}6-K;VMkvMobm1Gq{55J6MlTF@$eX8UMgF=&y1g)Q0*ziCs91r*I6F
z$RFH{jZ1kh&$oRnc+W=gFpi=!nZY2=qcUAYW%?JlVNJCgcpO7qpG1}VGAe<GsK91W
z3Cy7?x`_N)U>WrfuxMc6$1v)L2~>&BVmsc%A$*RdSmiT&P-5mo?Ts8iUXO23d*drc
z@f&WzO*Kp$LRIi0ssdv*>OYHDys--xP(5xXO{!`qkT%%}@{wJ@19%11(+}8#3mC&D
zvT4TCsEXY{{q7bju?bA$Yt(%cLF%s??WfKj97f&n9O_2*u@$FL8U92C>?7^97)6!z
z2<rXws68=`>h((u;aov4eNZ4R*oA``7H3$b3m?p)N>|BUJ8=(EMH@wZ?<y*=@2CI*
z>{tcff!f5~7{NoR7G6UI^aQmx-W9HYVH?+(AnEHy{iqwHkha<-q^fou3EsxB19Pa}
z<*^Sd>fFF$sJ-zB*&0sP>bbI2LK-~NJ!z<CFfvY*?%LheTI<2ROhv8{W9p$4$Ek{X
zs{Se<4V7{`Q>RA5%iPHvU@AEdjB^rb`~RUTR_grsv(WKV^y-;5Mwq#kSsbbWi8&*|
zE6F=YQ=3+OR|_~CPD!g#Eh~;Bi!vr1b9Vm@)ITQeCnsvD(aqe=RR4OI#i0$Tp>oHW
bI#M?Ixon|4>-CM5^iAIL%~xgL*Jb|!iwAe2

delta 1595
zcmYk+T})4L9LMo*depNLQt6<g2kB8LN}8*NnweT2{?)%R52;o*ZT{x64O3y`0<$(_
zwABr>nVD%W7#FxO7Hez9O*XOS!uxa1pZU)3|N5PCoZrLu_dVS%ohl1_ObWYbL>(=i
zRyEJehb>|J5R>6%3-J>!!CB;=B}AANVhZM99WKYi=-^q*#Cx~`Ut$T)U<GDHn$0&0
zSc})O4qU*4<G2ma;39mEt8fz6VN{g2&}w9@)`EI(fAD@6HgkOrdBwh<7CwX8Q#7-#
z!~|T%{8mawD{aKZ*o|2@5WF766s{+58Gb+qf1`Gs5pA{<t5Fj*qk}zIjKkQ9&rlo5
zjWJt|4VcONc9IUy><aF}5!6x4VKOd`^>&(%+G!ycVGU~GUFhHiRI0~N8+e0S*c@sD
zDREv#^O0Lti-9CMJLn`}E9%8=REjQR6+XlQ{Dlpe9d8zjC-6pySwE^qG7@Q6f~t|7
zSc$ta9|tiTAE7cil}P@Ticq$t2?|gXHlfb?5|U+mfgGQ`L*BJX+>SG-l-IC}a%{pH
zJdZi}3RNRNQSZ&6HW))%Phn9q`Paas+|WSxF$`a$27HSeD3<NzVkv5edr=GS$27c!
zD%PjL`|nY;5k=m0=6UE~W6&PdLWTo$is?K+KYk59Xkav@t`FDZ80v^VqyFD_)WY^q
zv06X?weYK`nz)W-_!xDRKTr!wWtXavO4M~=ADuipr%?mlK@Bj09IH(uS+-eZQx=u#
zefJrtqpQby?8ORvf?D7lszwe_fgz~HX&i;dEunE50k<-BQ=y5s(AMiB7@JWwp;hZE
zQ8@0e_Z28h%w@H-4K!s-XRh6Cq>(6hVLJb<G(M_-u}R<m-%vWkgBP)=W2vL502SJO
zwcGQmS?9NgrZoQ_%8Ei2t|;_y>qlK>TcK>HA9TB3wX0BcRw~GBnhH&!G%9rdrL+iL
z5Y(po7mlNKqnuwAWsQ5~{qV)Qg}rqAZuqyz_;!ECp=17b$JgWdoVKBB5zf#++(^i}
w@uK+Y=p^^)q4rLvt@CK7(|gqC3?`-}_Bic+r|qDx&%de9ccim>C^GftANRM9uK)l5

diff --git a/locale/pt_BR/hammer-cli.po b/locale/pt_BR/hammer-cli.po
index 8c30e73e..f1633864 100644
--- a/locale/pt_BR/hammer-cli.po
+++ b/locale/pt_BR/hammer-cli.po
@@ -9,7 +9,7 @@
 # gcintra <gcintra@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-27 10:34+0000\n"
 "Last-Translator: gcintra <gcintra@redhat.com>\n"
@@ -218,8 +218,8 @@ msgstr "Erro: Alguns dos modelos requeridos estão desabilitados na configuraç
 msgid "Comma-separated list of key=value."
 msgstr "Lista da chave=valor separada por vírgulas."
 
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "valor deve ser definido como uma lista separada por vírgulas de chave=valor"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
 msgid "Comma separated list of values."
 msgstr "Lista de valores separada por vírgulas."
@@ -280,12 +280,17 @@ msgstr "Id"
 msgid "Name"
 msgstr "Nome"
 
-msgid "yes"
-msgstr "sim"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "não"
 
+msgid "yes"
+msgstr "sim"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -324,8 +329,23 @@ msgstr "Você não pode definir todas as opções %s de uma só vez"
 msgid "Options %s are required"
 msgstr "Opções %s são necessárias"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "Você não pode definir nenhuma das opções %s"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "Opções %s são necessárias"
+
 msgid "You can't set any of options %s"
 msgstr "Você não pode definir nenhuma das opções %s"
 
 msgid "At least one of options %s is required"
 msgstr "Ao menos uma das opções %s é necessária"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "Ao menos uma das opções %s é necessária"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/ru/LC_MESSAGES/hammer-cli.mo b/locale/ru/LC_MESSAGES/hammer-cli.mo
index 5c90086b0328026c7abbe33f1348f0bf6f6825f4..fc6952fd737a6774ada8b0d53b35198e9fe97748 100644
GIT binary patch
delta 1489
zcmXxkPe@cz6vy#n{!6nNoixqTnX%F`OPwaQ{L{=B_D9E3YLS$oNMX=Yil7E+5mbx7
zvRW8z-1LVGH-&B7xR9VWQA8<G;=&SwHX%gc-+Rtw?)%&~?~V7~bIx@vGToAx^`+f2
zS}T1MJ-o{7BzB~6p^c}T<>N~%!fE7Vb6j@eJeFgAhFK6BF@UGhk5{n_A7Kcmupa+l
zmRZ88GM$0dVIB`6*oNJ>9v@-_j$<8uLM_z0+KjbY73z1@sPCiLgT2VB_8PVDDb$`m
z<7S-0Qs%c*mZ6oFVIjtF3-+wsC$NC~`&f$4F@SGTJN|{m=*@N~szg0+#abM|ejGt<
z<S%Z+;2P#-emlZ|@9aDt$05{CW^f%Ypmw^9+UY;6!Q32o;ZY25--inIHPi;iPz#$u
zZD1Z1(PiXgzO}^P$H33Piy_nxW2g|F!z#RmUHA%9G23JICB@8xs*Oc{tesk}o5~PI
zxNX8_yn@R8ByPtgR1Fm65&sSb$JkaJN3jnVQ8|mVI^MOjsQZhk_wHaL&Z2T%Oqjwr
zgev4GsE94$4*ZP=u!Plqz<%VX)=)tFwUTz?LqXbgRQ2CPP4EK`VSu<raS-?5Q&gnB
zAs@@2aB8pwyRZ{g#E-EK7qA*j*+qk%<3YTUU~rqkJM6|&8_dq&3*3)h5?F#qaR@J<
zcK97tj1?Q*g|}fP_i^mSOL!PRqEZ;7pcIKtjNoO|f)bMq^ui*Bu!z|-VLKO{??F^8
zJis1&gGyN;vug(fco&~x8b<wQl!gW9Tj`2YBVCOkxF-!M9kqn>$KA0TLXAnk6Sm;W
zg9z%#kPT<mstM&+3skG6E3E9nX-efjx*|vbj05AG1m!&0${A$o{I@XB@l$2%eDZ(6
ziNsD!HtNO5h|^+R$(D08n^4iy&N&=T3UW}VDcO`R{l`?D5G316&!iJbchypDH@%r2
mrmM)3O-Dwpo~|NP9&O@l`p?Ya49`eP{luuJEqC~Y|NVb2Fncio

delta 1572
zcmYk+OGs2v9LMp$`OJKzWtN#<OU=nLOH)hDNe3%>8ZAskF&`9BWD-FI6Oja(LW~i#
zY2~6t4{{?~v@6<F61j*9dl5y8f~bgszQ23N=#S@q&b>3&bI$+#&)nZQ;t#$`jk;t+
zfR;(Cnq}6GEm2&E>1eb0_!<}DcjV8KW6X*$4f8R8Id}*i9K>wAflKibuEnodj=8aB
zv(19m;&rSWQ~2O0*5g@RfDdswPGcFy#d#C0LFQ^LsQ22!&wH?m`yu2N`-qzOSJax~
z8Fd*ZV;19E2_4OJ52oWW%*Foj{Y^~c{sCs;OLXuzYQ;<9%`&hCHBb{e*o$j$8296S
z)Ixl7%nGmpvl-t`(&00^f_rfUwH3c`9;PRFD=kE=v<QpQkD7Q7I(QM4>f5LVJVQ<F
z7is}%iC#tvkw;dG!BjfC=p^HQ)QiVZDY}eRIDsqiCpKVSl3664z!wo_r%*N0IM-Y8
zVI(<r75#V(tML=61`1e(51UiSzlx!c2ix&3?!b6v)sBs*l#V0s+SBm;JJk37U?pxN
zP1^JGSc-434%3;HYNQzpu@wW@kI(S&eDcr#uo3d3iHsoyYF}_4{y+`TKqYR$LEMB>
zxDFRmFv{3Y<dOAaG4`V}HGwMTL{?FTdvP@mV1+&p(%DSs8(zSwMHC`F#5T-i18eX!
zF2Or^9G|0BxO=fzl*6crkKzg($5wogTQNXEX$yx?nV3L720zfzj0*Vg`a&bF#Xi)4
zV_bC3r%*K!%@JrqA8O0aVGmBC7E(t=4&wkuq2riQB5t4Eb%Szo#~|}Tw=%=e-D*~P
zm71B@NT-UX%GN1SIPTR;btQe0Wwo^RG%ZGZo<rL})3%h;R6oiXhw5Kc>-^6|J{|qC
zDH3RFXet&}vVxj%w?ciTQ2V}$R!aLnbhZ^F#0_Onp^8^%dlc-9Wgc+5UUBHhK`D--
z<<XRWMWly&L`&#vpA{6j`wK^nxuJs87W&;g@4|_7Pf*6__2|#BNu6EY2aj}hI_<qq
qyVDW68smie6GtM-MvIf`=Z1V)PVBuWw<ga_4um>VDncDuZ~p>gvyb8c

diff --git a/locale/ru/hammer-cli.po b/locale/ru/hammer-cli.po
index 0d6e67ab..3f3afb27 100644
--- a/locale/ru/hammer-cli.po
+++ b/locale/ru/hammer-cli.po
@@ -8,7 +8,7 @@
 # ypoyarko <ypoyarko@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-28 04:41+0000\n"
 "Last-Translator: ypoyarko <ypoyarko@redhat.com>\n"
@@ -218,8 +218,8 @@ msgstr "Ошибка. Некоторые модули были отключен
 msgid "Comma-separated list of key=value."
 msgstr "Список пар «ключ=значение» через запятую."
 
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "значение должно содержать пары «ключ=значение» через запятую"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
 msgid "Comma separated list of values."
 msgstr "Список значений через запятую"
@@ -280,12 +280,17 @@ msgstr "ID"
 msgid "Name"
 msgstr "Имя"
 
-msgid "yes"
-msgstr "да"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "нет"
 
+msgid "yes"
+msgstr "да"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -324,8 +329,23 @@ msgstr "Вы не можете одновременно настроить вс
 msgid "Options %s are required"
 msgstr "Параметры %s являются обязательными"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "Вы не можете настроить параметры %s"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "Параметры %s являются обязательными"
+
 msgid "You can't set any of options %s"
 msgstr "Вы не можете настроить параметры %s"
 
 msgid "At least one of options %s is required"
 msgstr "Необходимо определить параметр %s"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "Необходимо определить параметр %s"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/hammer-cli.mo b/locale/zh_CN/LC_MESSAGES/hammer-cli.mo
index f9764fd878660ae33ed35059bcdcf16549001cba..266cd3d47449769a8974ea765799f3be2eea7733 100644
GIT binary patch
delta 1496
zcmX}sOGs2v9LMp$`5LWeY%;A(y*{!s)6sNBvxm+=RMbL=D9fNS3KwmnO++JYgaQdI
zBdExQs~#9`bZJq6^q>|MVY#w$5kv$LQ_=T#=S~Oz^Evm9bI<?$&pG#Y=x1&GV=&{Y
z(PG3ZqH%%Q0o<Lz2W>3VEFT}>a(sgP*(@KmIEPi3pJi5tt>|Dkmg0FV$6MHdQy9S?
zm}3^VnrydYVO+u&ZMYpfu>h~*8XUtgzC$G%@R^aT)u4V?hq~X6U3eJzSDQp7K82do
zd#u1&EMa_0Ck<s<j)fS-O6>Bk<G76LYgmH!(7|V@8Gpr<7|2ZyRE_#RhV|HkM{yW6
zkzcqL%N8;&<J&Ge+_PTXi)T<XnZ~8~88y=cYNmfNgn5gSiMOM}^$}F5FQ6tcib`x6
zHGw%)MH9%M1s7BQAe~Y=0c=41Fp4VC39P|O*ntz6j=6rbeQ9QX)ZRGGk5##|NHJ^>
zwbnOK3B5!m@EwcLmzS($Wghjf;zo=c8n72*IDmT4Yh<!EgQ~<AY{uWH#G5FGmTm_|
z@g!=1JE)31Ma^^?wFll}2Yy5LpGAYzUk~2N({!U7S7Q&VbQdv%qe$}h2J7$>>VXCP
zxESlu!9A$^r%;vb_pa}vD)bmtkq@30r+$aHQGpKjVHu8~X7UJCiCNr_^XOoddTO9!
zs3kdvO0W;>@iMN!hv?u8s#1SY&n;#nXq<Qp9VTN3(ajuHvVPAio+GH;e;@UL=NQI$
z>_ms@DUs8drfWi#R25nYHB~@Kr~+&qwYa<P$$qlb>a#rV!<C_08=)gZ@^1NAes_KK
z0#ehAn+cs7H7(^PVjH1kwTHBvnrNzN-{t81Z>6K-r|fk;c`vxTcLSyxRd>s&>nNd0
zv4pmn&<V*PI2=|@sCrt8RMUp$CFveLRj`H7i%I+De`(a;NNgb*i6$b|)_I)>wiD~U
d>!DYHqVYuLi|nB+|8QDl{HA}>H#Ar{@DGbtdBgw!

delta 1589
zcmXxkOGs2v9LMqhl%<xAX4yk6ucek*<CvvZmS!RtL1-l*MrbBIC`yT-786B_gdS!R
zNYDd}HmM{9X3?(KA}Wv;QW$6@<RXX+E9(2Zb3J(GbIuv(JpSi@?|9&5F!V7YqTMKE
z)D&vb6tg<4jo^baG|g-de!}_q6Zx~a>1F{;#7r#1G(3b3UcglB!o~O+SK)Uo!1PG7
zXtR*jh8xz1v-sjDmg5<mi!X604q-k<MTIw7jO^8FQNP>cjUU4r`WKO(*eGh_-%)3p
z!KzCz4i~Y$<<Zbit8gARVLG;W{ccR8{~Q<L2Xycc>ck6Ym?dE`YM~l*uo-jlD%RsO
z)IqXlnk~ahOl5sLNrUgK19xC2>MAC1HqMI)pEMhF(f|gr1hw&F=wK@<)b~*b7(i`o
z0(F4I*l<L%ks&L^Py&r@G~%!x^}{Aqh^}D~_Tvitg_W4$H=Bwlu-a#K3Y8=8m_!l$
zf&|C@q3%37KD@Ca)JFDTG9Hg7{t9U;1DV)^TKGL~#^0!kia9pHunJT}c48qOKpo&V
zDiRN{6bDcX%;!tx$ZFJy3s6^7hLyNGf%ub<*3Ez>eu(P7!VG+i3gI{gF@b+lq&8y?
zZbwac78l}mbnuZkK8T9w53j#~FeyT-P*=4j<TVasEd!U)!7)rjKk?E@f~ZJr#a&p9
z4tAq9@CJ1yqo@szVJ`l~1(?I5<X{CVQU_7<hFWN7p*zSS?FDMWK~%_oc>373`hL`v
zC8H)-hwHH#^YIE+;Y-wpQkcw#5mau)Eu@Q^7pxa@6T%yJceaU6;p6~rq$&v&E<GhG
zj{6zD5-qM1>fYB<buGGc9cmqw{ktz5QpwFJ<<Vr>pyz+GC;|0mQ_)EkzA~!9uELF2
zvD-4sM&0X5>S}Ln5<S~0ijqnojAeN)_f+&!_In+LPA>;#KQAgb`IJy93ZshdHIJ$U
zRUxO`Hyn|6%NjmcP)poi_=6|bz0RcGd(*x}`WyB&9yqeE!KrI@>YTl8H>NvnEwP=x
x{NA9yFDh>2>ABHc{lib5ez|&gxWBWlJl=^J>FOBnJO8=8XXNzbwy$$9{Raw{lac@c

diff --git a/locale/zh_CN/hammer-cli.po b/locale/zh_CN/hammer-cli.po
index 6d469c2e..2d469d47 100644
--- a/locale/zh_CN/hammer-cli.po
+++ b/locale/zh_CN/hammer-cli.po
@@ -3,7 +3,7 @@
 # Leah Liu <lliu@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-27 01:22+0000\n"
 "Last-Translator: Leah Liu <lliu@redhat.com>\n"
@@ -209,8 +209,8 @@ msgstr "错误：在配置中禁用了一些要求的模块：%s"
 msgid "Comma-separated list of key=value."
 msgstr "用逗号分开的 key=value 列表。"
 
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "必须使用以逗号分开的 key=value 列表定义数值"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
 msgid "Comma separated list of values."
 msgstr "逗号分开的数值列表。"
@@ -275,14 +275,19 @@ msgstr "Id"
 msgid "Name"
 msgstr "名称"
 
-# translation auto-copied from project NetworkManager, version 0.9.9.0, document NetworkManager
-msgid "yes"
-msgstr "是"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 # translation auto-copied from project firstboot, version 19.6, document firstboot, author Leah Liu
 msgid "no"
 msgstr "否"
 
+# translation auto-copied from project NetworkManager, version 0.9.9.0, document NetworkManager
+msgid "yes"
+msgstr "是"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -317,8 +322,23 @@ msgstr "无法一次设置所有选项 %s"
 msgid "Options %s are required"
 msgstr "需要选项 %s"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "无法设置任意选项 %s"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "需要选项 %s"
+
 msgid "You can't set any of options %s"
 msgstr "无法设置任意选项 %s"
 
 msgid "At least one of options %s is required"
 msgstr "至少需要选项 %s 中的一个"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "至少需要选项 %s 中的一个"
+
+msgid "Only one of options %s can be set"
+msgstr ""
diff --git a/locale/zh_TW/LC_MESSAGES/hammer-cli.mo b/locale/zh_TW/LC_MESSAGES/hammer-cli.mo
index 79a7b7560cde679aa82ae9ee6cbc8d1f3efa99d8..ab3bb13833f7ebed1f1990c80cf87d8e4690729d 100644
GIT binary patch
delta 1489
zcmXxkUr3Wt7{~F)+|+4pYig}O>N`^_^Y2o(v{E-HiHQE)WE2>KATTKCri%s@6nHtB
zbz#&+bR`%D<%JiE=t8=VC{zffF6<^E2qF6Z-n~2Q>~r3Cf6ntf=bU%3ce*FL67fAU
zTAIF_-nYr@0-p5oMw|1S)!{3Q;s@kqtGspL8n$6wg;@-T(7{XCgm<tRpJE&fn84o{
zFw0s;r8}?z+{y<dcnr_tHhhA6aSjLYGb+$fl^L;G2kLj-sQaThj+c?I+5#%@0xG93
zxCd9Uk@>BhFcfJsZpRe1;JA04#d@x%u@Ps{!H=knf8tIIRTn2}M}3~gUd-SX%%c+d
zi~BHE!@SIICm3+guHkvSh00_JYw<fO(+yOn|F8$cn~Q;uqQmtBs?>K;3A{iBwuDMx
z4OP(%<Ykd9)IY+Yi9rbCs2`?KCAx|oIE82MEtX?-(Cl%USrGNdFZr>9i%2nS1-tPF
zDv@ZI$*>=_6l0zfVd~$?joaMNgwIfG{~i@#4e64sMNyS#!9$otO?(p-@IxHKS=@zx
zP!)?XD=}C-#;_Gn;c;aDSw2Gj8QY9^V-6M28$5u^sK5fut_eG_9n;?RbySA;(ZT1a
z4Bw&F_^WsA;|OUf8c<7=ME(E8EQ1V#2dIhGQJW;pY>GIE#9-ri4kyvUg7^71)ROpE
zSXHbF2eBR<JdOIF8{T!!yMB$TRQ3}CP4LUp&k@icMLk<lC5)poPhkU2Vkb_ao)-(K
zKx#?93>~^EspT1>tMQfMNkg`dTGq|FI4<sLjafeTtSfT05xUArvhK!Wd${Y{g=)R@
zBwb6PrnOZShUv;udr0M1qNUcxAfWSql!1<)qF3pw=yAHTD>YWdc6b*l)Ecw2c9^ac
z;-hmo+zP3Bs#vL|8Ss#FkDi_%+Q51+sfupYQtcr92)&QqPcOCo-XMXabZs1)U-qw8
T<|=~uvc&vMFcZiPM(_Ox&scBh

delta 1604
zcmXxkOGs2v9LMp$<-61}&9byxndKvOvUi$R5>k-ZV_^v5lfsC`=uM1BMi>TWWz9wi
zX3?StJ)nqOW^LTHF){<igf>EjNQ=I|d#?x2{hV{hnREXC^S^hX<U=4dmKuHEXjSyp
z^s)tJjaVPeg*F~zmWDrY1^z|;EG5>g2-7hat8gv0ql3M;2A|<N9KkI(gF7%M&Md(!
zWcA*_+Hff!oWq0Ih0F0XZp3lij`8u{Mk|oLT0QD}4gUQgo@9Op`HD@WHa>%jDUnsz
zV+v-ozLhf2PLE;+c3=+n`19wO&U_fN@f$k$4;67%qFE+ZpcXob4xYyV-oqyRhzcZc
zk=Z7!#Wk#NR~hh`h4DB>P)9L`%P?cH7ij@1(jqLuO4P=K=wKfz)h|&2d_iq&4i!Lp
zl9$l}<d*HnP%48O1}WHt`eFwvMFUud@39bPu@*NZn=Qmk_%O=s8ft;GCEiBzk>uE6
zEXEV4fVxrZJw|2f%@Xpj!3Z}t;1p`%B*Ih;1W-G@j3mRlQ5osOT^K<v{2jINKUj^K
ztg;H5Q8l6{6<`<Y$nN41e4R@EDM(w$uX4{4QS&U+hH|g~51}@85w&0#^YMj0|B8xm
z1|3Z1kx^j9sI#v2=Rwqw^q`I^5@MhQK4A;~MlDpwDk_%is2xX88yv=CIEoGy@rda2
z8q|>lQ5m~{yRi!${DAtuF@LT~*F3bAfl_q<wLpV!2kM8qeea@DIEae;IcDJ~?!;N#
zi~+)~!v@rb-eD9*(>WctQ7-Pgfb~LdI{o`@HSc4hADnM{8K?-AE<Gh`j(hc<f<25^
z()ZI<6Dl~JxuR1B2-tn$P+E3?t~#1;<$C_-TP_2=+0+zyfL=vcC982VR^g7kBU8aC
z;;sI@d34@tdRM3wd03vWvZto3uRi4ty*HcATW23nSMe#mYD%M;(qBqffvQn!?i-HG
zyKNiSLVBe;^DaEGZXssAdK&X9F1e+(?ey8!7N_yN)95t!55_wEJxP(M?XOCbTM~*V
z-bW_hc23?JnC=|-`Dk#mw{tptZ~DRQsqhV_z4c1@#l|xiTAhiZo0HGNQ$tVsdop_e
E1Het1GXMYp

diff --git a/locale/zh_TW/hammer-cli.po b/locale/zh_TW/hammer-cli.po
index 60af1190..52cd29b7 100644
--- a/locale/zh_TW/hammer-cli.po
+++ b/locale/zh_TW/hammer-cli.po
@@ -7,7 +7,7 @@
 # tchuang <tchuang@redhat.com>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli 0.6.0\n"
+"Project-Id-Version: hammer-cli 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2015-04-28 05:21+0000\n"
 "Last-Translator: tchuang <tchuang@redhat.com>\n"
@@ -212,8 +212,8 @@ msgstr "錯誤：某些必要的模組在配置中已停用：%s "
 msgid "Comma-separated list of key=value."
 msgstr "逗號區隔開的一列 key=value。"
 
-msgid "value must be defined as a comma-separated list of key=value"
-msgstr "值必須以一列逗號區隔開的 key=value 來定義"
+msgid "value must be defined as a comma-separated list of key=value or valid JSON"
+msgstr ""
 
 msgid "Comma separated list of values."
 msgstr "逗號區隔開的值。"
@@ -274,12 +274,17 @@ msgstr "ID"
 msgid "Name"
 msgstr "名稱"
 
-msgid "yes"
-msgstr "是"
+msgid ""
+"\"Page #{collection.meta.page} of #{pages} (use --page and --per-page for navig"
+"ation)\""
+msgstr ""
 
 msgid "no"
 msgstr "否"
 
+msgid "yes"
+msgstr "是"
+
 msgid ""
 "Warning: location hammer.modules.d is deprecated, move your module configurati"
 "ons to cli.modules.d"
@@ -314,8 +319,23 @@ msgstr "您不可一次將所有選項設為 %s"
 msgid "Options %s are required"
 msgstr "%s 選項乃必要的"
 
+#, fuzzy
+msgid "You can't set option %s"
+msgstr "您不可將任何選項設為 %s"
+
+#, fuzzy
+msgid "Option %s is required"
+msgstr "%s 選項乃必要的"
+
 msgid "You can't set any of options %s"
 msgstr "您不可將任何選項設為 %s"
 
 msgid "At least one of options %s is required"
 msgstr "需要至少一項 %s 選項"
+
+#, fuzzy
+msgid "One of options %s is required"
+msgstr "需要至少一項 %s 選項"
+
+msgid "Only one of options %s can be set"
+msgstr ""