hammer_cli_foreman 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee543dac02c656e65986c6ee749715e063421a34
-  data.tar.gz: 61ce4eac9d70431ffdcddce15bc11c508c587298
+  metadata.gz: 954205c9eb6809133c66f3186248030d45ed9705
+  data.tar.gz: 5af8557f733f0c03ae206e407f16fd7971c3e245
 SHA512:
-  metadata.gz: e1445bbbb84e20c1713b394e8d5e6f4e58ef9434ff165cec79188dbf9c1264d030f6d6201940f35e08f399c6a7e492c99d8806e7e463516e6bd08be93d4e05ef
-  data.tar.gz: 0d1b5dccedb96c4dab684c19701e8a5603f44ef5d03a7950ebd0dea1a3a79edde66982415951467cac20c321f32462f764d7b42046e7d38db2cff66c654f3d3a
+  metadata.gz: 346c2d28aae1b82efbdc37e8f6acd6072d1e8ec168f0765ccaba3ac56ed04188b4bf9e04a709551935842ad8f445e71fadbc22259588ed1586c1f933875bff11
+  data.tar.gz: 6085ab58be173a202cf4d448af282213c1d1dc8627ee86c9c8f9fdb0295d07b2d3f312043b6f7bfe6cf7788b49050eab9dee90b0a8ccd28975cd4863cfa1cd65

data/README.md

@@ -38,11 +38,22 @@ look at [the development documentation](doc/developer_docs.md#hammer-development
 How to test
 ------------
 
-    $ bundle install
-    $ bundle exec "rake test"
+```bash
+   $ bundle install
+   $ bundle exec "rake test"
+```
 
 Generated coverage reports are stored in ./coverage directory.
 
+There is support for testing against API documentation (and sample data) generated from different versions of Foreman.
+The required version of Foreman can be set in env variable `TEST_API_VERSION`. Make sure the requested data are
+in `test/unit/data/<version>/`.
+
+```bash
+  $ TEST_API_VERSION=1.10 bundle exec rake test
+```
+
+
 License
 -------
 

data/doc/host_create.md

@@ -221,13 +221,19 @@ flavor_id
 image_id
 ```
 
-## vmWare
+## VMware
 Available keys for `--compute-attributes`:
 ```
-cpus       # cpu count
-memory_mb  # integer number
-cluster
-path
+cpus                 # cpu count
+corespersocket       # number of cores per socket
+                     # (applicable to hardware versions < 10 only)
+memory_mb            # integer number
+cluster              # cluster id from VMware
+path                 # path to folder
+guest_id             # guest OS id form VMware
+scsi_controller_type # id of the controller from VMWare
+hardware_version     # hardware version id from VMWare
+start                # 1/0
 ```
 
 Available keys for `--interface`:
@@ -242,12 +248,14 @@ compute_type      # Type of the network adapter, for example one of:
                   # See documentation center for your version of vSphere to find
                   # more details about available adapter types:
                   # https://www.vmware.com/support/pubs/
-compute_network
+compute_network   # network id from VMware
 ```
 
 Available keys for `--volume`:
 ```
-datastore
+datastore  # datastore id from VMware
 name
 size_gb    # integer number
+thin       # true/false
+eager_zero # true/false
 ```

data/doc/release_notes.md

@@ -1,6 +1,17 @@
 Release notes
 =============
 
+### 0.5.0 (2015-12-14)
+* Addng info command to role ([#7412](http://projects.theforeman.org/issues/7412))
+* Add defaults support for location/organization ([#11402](http://projects.theforeman.org/issues/11402))
+* Tests updated to work with Foreman 1.10 API ([#12260](http://projects.theforeman.org/issues/12260))
+* Commands for setting parameters at taxonomies ([#12699](http://projects.theforeman.org/issues/12699))
+* Change once to one in error message ([#12695](http://projects.theforeman.org/issues/12695))
+* Host create VMware docs update ([#12087](http://projects.theforeman.org/issues/12087))
+* Add option to overwrite conflicts on host changes ([#9208](http://projects.theforeman.org/issues/9208))
+* String parameters get double-quoted ([#12202](http://projects.theforeman.org/issues/12202))
+* Added IPAM desc on info command ([#11074](http://projects.theforeman.org/issues/11074))
+
 ### 0.4.0 (2015-09-21)
 * Adding match_default to smart variables and smart class parameters ([#10731](http://projects.theforeman.org/issues/10731))
 * Missing field for VMWare host creation docs ([#11088](http://projects.theforeman.org/issues/11088))

data/lib/hammer_cli_foreman/commands.rb

@@ -42,13 +42,17 @@ module HammerCLIForeman
     )
   end
 
+  def self.foreman_api
+    foreman_api_connection.api
+  end
+
   def self.foreman_resource!(resource_name, options={})
     if options[:singular]
       resource_name = ApipieBindings::Inflector.pluralize(resource_name.to_s).to_sym
     else
       resource_name = resource_name.to_sym
     end
-    foreman_api_connection.api.resource(resource_name)
+    foreman_api.resource(resource_name)
   end
 
   def self.foreman_resource(resource_name, options={})

data/lib/hammer_cli_foreman/defaults.rb

@@ -0,0 +1,29 @@
+require 'hammer_cli'
+module HammerCLIForeman
+  class Defaults < HammerCLI::BaseDefaultsProvider
+    def initialize
+      @provider_name = 'foreman'
+      @supported_defaults = [:organization_id, :location_id]
+      @description = _('Use the default organization and/or location from the server')
+    end
+
+    def get_defaults(param)
+      param = "default_organization" if param == :organization_id
+      param = "default_location" if param == :location_id
+      user = get_user
+      val = nil
+      if user
+        val = user["results"].first[param] if user["results"]
+        val = val["id"] if val.is_a?(Hash) && param.include?("default")
+      end
+      val
+    end
+
+    private
+    def get_user
+      HammerCLIForeman.foreman_resource(:users).action(:index).call(:search =>"login="+HammerCLIForeman.credentials.username)
+    end
+  end
+  HammerCLI.defaults.register_provider(Defaults.new())
+
+end

data/lib/hammer_cli_foreman/host.rb

@@ -38,6 +38,8 @@ module HammerCLIForeman
       base.option "--build", "BUILD", " ", bme_options
       bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
       base.option "--enabled", "ENABLED", " ",  bme_options
+      bme_options[:format] = HammerCLI::Options::Normalizers::Bool.new
+      base.option "--overwrite", "OVERWRITE", " ",  bme_options
 
       base.option "--parameters", "PARAMS", _("Host parameters."),
         :format => HammerCLI::Options::Normalizers::KeyValueList.new
@@ -81,6 +83,7 @@ module HammerCLIForeman
       params['host']['build'] = option_build unless option_build.nil?
       params['host']['managed'] = option_managed unless option_managed.nil?
       params['host']['enabled'] = option_enabled unless option_enabled.nil?
+      params['host']['overwrite'] = option_overwrite unless option_overwrite.nil?
 
       params['host']['host_parameters_attributes'] = parameter_attributes
       params['host']['compute_attributes'] = option_compute_attributes || {}
@@ -112,7 +115,11 @@ module HammerCLIForeman
     def parameter_attributes
       return {} unless option_parameters
       option_parameters.collect do |key, value|
-        {"name"=>key, "value"=>value.inspect, "nested"=>""}
+        if value.is_a? String
+          {"name"=>key, "value"=>value}
+        else
+          {"name"=>key, "value"=>value.inspect}
+        end
       end
     end
 

data/lib/hammer_cli_foreman/id_resolver.rb

@@ -198,7 +198,7 @@ module HammerCLIForeman
 
     def pick_result(results, resource)
       raise ResolverError.new(_("%s not found") % resource.singular_name, resource) if results.empty?
-      raise ResolverError.new(_("%s found more than once") % resource.singular_name, resource) if results.count > 1
+      raise ResolverError.new(_("found more than one %s") % resource.singular_name, resource) if results.count > 1
       results[0]
     end
 

data/lib/hammer_cli_foreman/location.rb

@@ -81,6 +81,27 @@ module HammerCLIForeman
       end
     end
 
+
+    class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
+      desc _("Create or update parameter for a location.")
+
+      success_message_for :update, _("Parameter [%{name}] updated to value [%{value}]")
+      success_message_for :create, _("Parameter [%{name}] created with value [%{value}]")
+      failure_message _("Could not set location parameter")
+
+      build_options
+    end
+
+
+    class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
+      desc _("Delete parameter for a location.")
+
+      success_message _("Parameter [%{name}] deleted")
+      failure_message _("Could not delete location parameter")
+
+      build_options
+    end
+
     HammerCLIForeman::AssociatingCommands::Hostgroup.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Environment.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Domain.extend_command(self)

data/lib/hammer_cli_foreman/organization.rb

@@ -83,6 +83,27 @@ module HammerCLIForeman
     end
 
 
+    class SetParameterCommand < HammerCLIForeman::Parameter::SetCommand
+      desc _("Create or update parameter for an organization.")
+
+      success_message_for :update, _("Parameter [%{name}] updated to value [%{value}]")
+      success_message_for :create, _("Parameter [%{name}] created with value [%{value}]")
+      failure_message _("Could not set organization parameter")
+
+      build_options
+    end
+
+
+    class DeleteParameterCommand < HammerCLIForeman::Parameter::DeleteCommand
+      desc _("Delete parameter for an organization.")
+
+      success_message _("Parameter [%{name}] deleted")
+      failure_message _("Could not delete organization parameter")
+
+      build_options
+    end
+
+
     HammerCLIForeman::AssociatingCommands::Hostgroup.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Environment.extend_command(self)
     HammerCLIForeman::AssociatingCommands::Domain.extend_command(self)

data/lib/hammer_cli_foreman/parameter.rb

@@ -55,11 +55,11 @@ module HammerCLIForeman
 
       def execute
         if parameter_exist?
-          update_parameter
-          print_message success_message_for :update if success_message_for :update
+          response = update_parameter
+          print_message(success_message_for(:update), response) if success_message_for(:update)
         else
-          create_parameter
-          print_message success_message_for :create if success_message_for :create
+          response = create_parameter
+          print_message(success_message_for(:create), response) if success_message_for(:create)
         end
         HammerCLI::EX_OK
       end
@@ -102,10 +102,10 @@ module HammerCLIForeman
       def execute
         params = {
           "id" => get_parameter_identifier
-        }.merge base_action_params
+        }.merge(base_action_params)
 
-        HammerCLIForeman.record_to_common_format(parameter_resource.call(:destroy, params))
-        print_message success_message if success_message
+        response = HammerCLIForeman.record_to_common_format(parameter_resource.call(:destroy, params))
+        print_message(success_message, response) if success_message
         HammerCLI::EX_OK
       end
 

data/lib/hammer_cli_foreman/role.rb

@@ -15,6 +15,19 @@ module HammerCLIForeman
       build_options
     end
 
+    class InfoCommand < HammerCLIForeman::InfoCommand
+      output ListCommand.output_definition do
+        field :builtin_text, _("Builtin")
+      end
+
+      def extend_data(data)
+        data['builtin_text'] = (data['builtin'].to_i > 0) ? _('Yes') : _('No')
+        data
+      end
+
+      build_options
+    end
+
 
     class FiltersCommand < HammerCLIForeman::ListCommand
       command_name "filters"

data/lib/hammer_cli_foreman/subnet.rb

@@ -26,7 +26,7 @@ module HammerCLIForeman
         field :dns_secondary, _("Secondary DNS")
         field :tftp, _("TFTP"), Fields::Reference, :details => :url
         field :dhcp, _("DHCP"), Fields::Reference, :details => :url
-
+        field :ipam, _("IPAM")
         field :vlanid, _("VLAN ID")
         field :gateway, _("Gateway")
         field :from, _("From")

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new '0.4.0'
+    @version ||= Gem::Version.new '0.5.0'
   end
 end

data/lib/hammer_cli_foreman.rb

@@ -19,6 +19,8 @@ module HammerCLIForeman
   require 'hammer_cli_foreman/param_filters'
   require 'hammer_cli_foreman/id_resolver'
   require 'hammer_cli_foreman/dependency_resolver'
+  require 'hammer_cli_foreman/defaults'
+
 
   begin
     require 'hammer_cli_foreman/commands'

data/locale/de/hammer-cli-foreman.edit.po

@@ -4,139 +4,137 @@
 #
 # Translators:
 # Christina Gurski <Gurski_christina@yahoo.de>, 2015
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
 # Marcel Fuhrmann <marcel@mfsystems.me>, 2015
 # simon11 <simon.stieger.98@live.de>, 2014
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-foreman 0.3.0\n"
+"Project-Id-Version: hammer-cli-foreman 0.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-21 16:50+0200\n"
-"PO-Revision-Date: 2015-06-27 20:10+0000\n"
-"Last-Translator: Christina Gurski <Gurski_christina@yahoo.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/foreman/language/de"
-"/)\n"
+"POT-Creation-Date: 2015-12-11 04:48+0000\n"
+"PO-Revision-Date: 2015-10-15 20:27+0000\n"
+"Last-Translator: mbacovsky <martin.bacovsky@gmail.com>\n"
+"Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../lib/hammer_cli_foreman.rb:30
+#: ../lib/hammer_cli_foreman.rb:32
 msgid "Foreman connection login/logout."
 msgstr "Anmeldung/Abmeldung für Foreman-Verbindung."
 
-#: ../lib/hammer_cli_foreman.rb:34
+#: ../lib/hammer_cli_foreman.rb:36
 msgid "Manipulate architectures."
 msgstr "Architekturen bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:38
+#: ../lib/hammer_cli_foreman.rb:40
 msgid "Manipulate auth sources."
-msgstr "Authentifizierungsquellen bearbeiten"
+msgstr "Authentifizierungsquellen bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:42
+#: ../lib/hammer_cli_foreman.rb:44
 msgid "Manipulate compute resources."
 msgstr "Rechnerressourcen bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:46
+#: ../lib/hammer_cli_foreman.rb:48
 msgid "Manipulate domains."
 msgstr "Domains bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:50
+#: ../lib/hammer_cli_foreman.rb:52
 msgid "Manipulate environments."
-msgstr "Umgebungen bearbeiten"
+msgstr "Umgebungen bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:54
+#: ../lib/hammer_cli_foreman.rb:56
 msgid "Search facts."
 msgstr "Fakten durchsuchen."
 
-#: ../lib/hammer_cli_foreman.rb:58
+#: ../lib/hammer_cli_foreman.rb:60
 msgid "Manage permission filters."
 msgstr "Berechtigungsfilter verwalten."
 
-#: ../lib/hammer_cli_foreman.rb:62
+#: ../lib/hammer_cli_foreman.rb:64
 msgid "Manipulate hosts."
-msgstr "Hosts bearbeiten"
+msgstr "Hosts bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:66
+#: ../lib/hammer_cli_foreman.rb:68
 msgid "Manipulate hostgroups."
-msgstr "Hostgruppen verändern"
+msgstr "Hostgruppen bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:70
+#: ../lib/hammer_cli_foreman.rb:72
 msgid "Manipulate locations."
-msgstr "Orte verändern."
+msgstr "Standorte bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:74
+#: ../lib/hammer_cli_foreman.rb:76
 msgid "Manipulate installation media."
-msgstr "Installationsmedium verändern"
+msgstr "Installationsmedien bearbeiten"
 
-#: ../lib/hammer_cli_foreman.rb:78
+#: ../lib/hammer_cli_foreman.rb:80
 msgid "Manipulate hardware models."
 msgstr "Hardwaremodelle bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:82
+#: ../lib/hammer_cli_foreman.rb:84
 msgid "Manipulate operating system."
-msgstr "Betriebssystem bearbeiten"
+msgstr "Betriebssystem bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:86
+#: ../lib/hammer_cli_foreman.rb:88
 msgid "Manipulate organizations."
-msgstr "Organisationen verändern"
+msgstr "Organisationen bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:90
+#: ../lib/hammer_cli_foreman.rb:92
 msgid "Manipulate partition tables."
 msgstr "Partitionstabellen bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:94
+#: ../lib/hammer_cli_foreman.rb:96
 msgid "Search puppet modules."
-msgstr "Puppet-Module suchen."
+msgstr "Puppet-Module durchsuchen."
 
-#: ../lib/hammer_cli_foreman.rb:98
+#: ../lib/hammer_cli_foreman.rb:100
 msgid "Browse and read reports."
 msgstr "Berichte durchsuchen und lesen."
 
-#: ../lib/hammer_cli_foreman.rb:102
+#: ../lib/hammer_cli_foreman.rb:104
 msgid "Manage user roles."
 msgstr "Benutzerrollen verwalten."
 
-#: ../lib/hammer_cli_foreman.rb:106
+#: ../lib/hammer_cli_foreman.rb:108
 msgid "Manipulate smart class parameters."
-msgstr "Smart Class-Parameter verändern"
+msgstr "Smart-Klassen-Parameter bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:110
-#, fuzzy
+#: ../lib/hammer_cli_foreman.rb:112
 msgid "Manipulate smart variables."
-msgstr "Smart Proxys verändern"
+msgstr ""
 
-#: ../lib/hammer_cli_foreman.rb:114
+#: ../lib/hammer_cli_foreman.rb:116
 msgid "Manipulate smart proxies."
-msgstr "Smart Proxys verändern"
+msgstr "Smart-Proxys bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:118
+#: ../lib/hammer_cli_foreman.rb:120
 msgid "Change server settings."
-msgstr ""
+msgstr "Servereinstellungen ändern."
 
-#: ../lib/hammer_cli_foreman.rb:122
+#: ../lib/hammer_cli_foreman.rb:124
 msgid "Manipulate subnets."
 msgstr "Subnetze bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:126
+#: ../lib/hammer_cli_foreman.rb:128
 msgid "Manipulate config templates."
 msgstr "Konfigurationsvorlagen bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:130
+#: ../lib/hammer_cli_foreman.rb:132
 msgid "Manipulate users."
 msgstr "Benutzer bearbeiten."
 
-#: ../lib/hammer_cli_foreman.rb:134
+#: ../lib/hammer_cli_foreman.rb:136
 msgid "Manage user groups."
 msgstr "Benutzergruppen verwalten."
 
-#: ../lib/hammer_cli_foreman/architecture.rb:10 ../lib/hammer_cli_foreman/auth_source_ldap.rb:13 ../lib/hammer_cli_foreman/compute_resource.rb:20 ../lib/hammer_cli_foreman/domain.rb:31 ../lib/hammer_cli_foreman/environment.rb:14 ../lib/hammer_cli_foreman/external_usergroup.rb:10 ../lib/hammer_cli_foreman/filter.rb:9 ../lib/hammer_cli_foreman/filter.rb:72 ../lib/hammer_cli_foreman/host.rb:163 ../lib/hammer_cli_foreman/host.rb:200 ../lib/hammer_cli_foreman/host.rb:231 ../lib/hammer_cli_foreman/hostgroup.rb:57 ../lib/hammer_cli_foreman/image.rb:29 ../lib/hammer_cli_foreman/interface.rb:23 ../lib/hammer_cli_foreman/interface.rb:43 ../lib/hammer_cli_foreman/location.rb:13 ../lib/hammer_cli_foreman/media.rb:9 ../lib/hammer_cli_foreman/model.rb:10 ../lib/hammer_cli_foreman/operating_system.rb:10 ../lib/hammer_cli_foreman/organization.rb:13 ../lib/hammer_cli_foreman/partition_table.rb:10 ../lib/hammer_cli_foreman/puppet_class.rb:13 ../lib/hammer_cli_foreman/report.rb:10 ../lib/hammer_cli_foreman/report.rb:30 ../lib/hammer_cli_foreman/role.rb:11 ../lib/hammer_cli_foreman/settings.rb:11 ../lib/hammer_cli_foreman/smart_class_parameter.rb:8 ../lib/hammer_cli_foreman/smart_class_parameter.rb:75 ../lib/hammer_cli_foreman/smart_proxy.rb:11 ../lib/hammer_cli_foreman/smart_variable.rb:8 ../lib/hammer_cli_foreman/smart_variable.rb:63 ../lib/hammer_cli_foreman/subnet.rb:10 ../lib/hammer_cli_foreman/template.rb:25 ../lib/hammer_cli_foreman/user.rb:10 ../lib/hammer_cli_foreman/usergroup.rb:11
+#: ../lib/hammer_cli_foreman/architecture.rb:10 ../lib/hammer_cli_foreman/auth_source_ldap.rb:13 ../lib/hammer_cli_foreman/compute_resource.rb:20 ../lib/hammer_cli_foreman/domain.rb:31 ../lib/hammer_cli_foreman/environment.rb:14 ../lib/hammer_cli_foreman/external_usergroup.rb:10 ../lib/hammer_cli_foreman/filter.rb:9 ../lib/hammer_cli_foreman/filter.rb:72 ../lib/hammer_cli_foreman/host.rb:170 ../lib/hammer_cli_foreman/host.rb:207 ../lib/hammer_cli_foreman/host.rb:238 ../lib/hammer_cli_foreman/hostgroup.rb:57 ../lib/hammer_cli_foreman/image.rb:29 ../lib/hammer_cli_foreman/interface.rb:23 ../lib/hammer_cli_foreman/interface.rb:43 ../lib/hammer_cli_foreman/location.rb:13 ../lib/hammer_cli_foreman/media.rb:9 ../lib/hammer_cli_foreman/model.rb:10 ../lib/hammer_cli_foreman/operating_system.rb:10 ../lib/hammer_cli_foreman/organization.rb:13 ../lib/hammer_cli_foreman/partition_table.rb:10 ../lib/hammer_cli_foreman/puppet_class.rb:13 ../lib/hammer_cli_foreman/report.rb:10 ../lib/hammer_cli_foreman/report.rb:30 ../lib/hammer_cli_foreman/role.rb:11 ../lib/hammer_cli_foreman/settings.rb:11 ../lib/hammer_cli_foreman/smart_class_parameter.rb:8 ../lib/hammer_cli_foreman/smart_class_parameter.rb:75 ../lib/hammer_cli_foreman/smart_proxy.rb:11 ../lib/hammer_cli_foreman/smart_variable.rb:8 ../lib/hammer_cli_foreman/smart_variable.rb:63 ../lib/hammer_cli_foreman/subnet.rb:10 ../lib/hammer_cli_foreman/template.rb:25 ../lib/hammer_cli_foreman/user.rb:10 ../lib/hammer_cli_foreman/usergroup.rb:11
 msgid "Id"
-msgstr "Kennung"
+msgstr "ID"
 
-#: ../lib/hammer_cli_foreman/architecture.rb:11 ../lib/hammer_cli_foreman/auth_source_ldap.rb:14 ../lib/hammer_cli_foreman/common_parameter.rb:12 ../lib/hammer_cli_foreman/compute_resource.rb:21 ../lib/hammer_cli_foreman/domain.rb:32 ../lib/hammer_cli_foreman/environment.rb:15 ../lib/hammer_cli_foreman/external_usergroup.rb:11 ../lib/hammer_cli_foreman/external_usergroup.rb:42 ../lib/hammer_cli_foreman/filter.rb:73 ../lib/hammer_cli_foreman/filter.rb:90 ../lib/hammer_cli_foreman/host.rb:164 ../lib/hammer_cli_foreman/host.rb:202 ../lib/hammer_cli_foreman/hostgroup.rb:58 ../lib/hammer_cli_foreman/image.rb:30 ../lib/hammer_cli_foreman/image.rb:70 ../lib/hammer_cli_foreman/location.rb:14 ../lib/hammer_cli_foreman/media.rb:10 ../lib/hammer_cli_foreman/model.rb:11 ../lib/hammer_cli_foreman/operating_system.rb:22 ../lib/hammer_cli_foreman/organization.rb:14 ../lib/hammer_cli_foreman/partition_table.rb:11 ../lib/hammer_cli_foreman/puppet_class.rb:14 ../lib/hammer_cli_foreman/role.rb:12 ../lib/hammer_cli_foreman/settings.rb:12 ../lib/hammer_cli_foreman/smart_proxy.rb:12 ../lib/hammer_cli_foreman/smart_variable.rb:10 ../lib/hammer_cli_foreman/subnet.rb:11 ../lib/hammer_cli_foreman/template.rb:26 ../lib/hammer_cli_foreman/template.rb:74 ../lib/hammer_cli_foreman/user.rb:12 ../lib/hammer_cli_foreman/usergroup.rb:12
+#: ../lib/hammer_cli_foreman/architecture.rb:11 ../lib/hammer_cli_foreman/auth_source_ldap.rb:14 ../lib/hammer_cli_foreman/common_parameter.rb:12 ../lib/hammer_cli_foreman/compute_resource.rb:21 ../lib/hammer_cli_foreman/domain.rb:32 ../lib/hammer_cli_foreman/environment.rb:15 ../lib/hammer_cli_foreman/external_usergroup.rb:11 ../lib/hammer_cli_foreman/external_usergroup.rb:42 ../lib/hammer_cli_foreman/filter.rb:73 ../lib/hammer_cli_foreman/filter.rb:90 ../lib/hammer_cli_foreman/host.rb:171 ../lib/hammer_cli_foreman/host.rb:209 ../lib/hammer_cli_foreman/hostgroup.rb:58 ../lib/hammer_cli_foreman/image.rb:30 ../lib/hammer_cli_foreman/image.rb:70 ../lib/hammer_cli_foreman/location.rb:14 ../lib/hammer_cli_foreman/media.rb:10 ../lib/hammer_cli_foreman/model.rb:11 ../lib/hammer_cli_foreman/operating_system.rb:22 ../lib/hammer_cli_foreman/organization.rb:14 ../lib/hammer_cli_foreman/partition_table.rb:11 ../lib/hammer_cli_foreman/puppet_class.rb:14 ../lib/hammer_cli_foreman/role.rb:12 ../lib/hammer_cli_foreman/settings.rb:12 ../lib/hammer_cli_foreman/smart_proxy.rb:12 ../lib/hammer_cli_foreman/smart_variable.rb:10 ../lib/hammer_cli_foreman/subnet.rb:11 ../lib/hammer_cli_foreman/template.rb:26 ../lib/hammer_cli_foreman/template.rb:74 ../lib/hammer_cli_foreman/user.rb:12 ../lib/hammer_cli_foreman/usergroup.rb:12
 msgid "Name"
 msgstr "Name"
 
@@ -225,28 +223,24 @@ msgid "Associate an user"
 msgstr "Benutzer zuweisen"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:149
-#, fuzzy
 msgid "The user has been associated"
-msgstr "Architektur wurde zugewiesen"
+msgstr "Benutzer wurde zugewiesen"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:150
-#, fuzzy
 msgid "Could not associate the user"
-msgstr "Der Benutzer konnte nicht erstellt werden"
+msgstr "Benutzer konnte nicht zugewiesen werden"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:155
 msgid "Disassociate an user"
 msgstr "Benutzer lösen"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:157
-#, fuzzy
 msgid "The user has been disassociated"
-msgstr "Architektur wurde gelöst"
+msgstr "Benutzer wurde gelöst"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:158
-#, fuzzy
 msgid "Could not disassociate the user"
-msgstr "Architektur konnte nicht gelöst werden"
+msgstr "Benutzer konnte nicht gelöst werden"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:167
 msgid "Associate an user group"
@@ -254,12 +248,11 @@ msgstr "Benutzergruppe zuweisen"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:171
 msgid "The user group has been associated"
-msgstr ""
+msgstr "Benutzergruppe wurde zugewiesen"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:172
-#, fuzzy
 msgid "Could not associate the user group"
-msgstr "Benutzergruppe konnte nicht erstellt werden"
+msgstr "Benutzergruppe konnte nicht zugewiesen werden"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:177
 msgid "Disassociate an user group"
@@ -267,12 +260,11 @@ msgstr "Benutzergruppe lösen"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:181
 msgid "The user group has been disassociated"
-msgstr ""
+msgstr "Benutzergruppe wurde gelöst"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:182
-#, fuzzy
 msgid "Could not disassociate the user group"
-msgstr "Benutzergruppe konnte nicht erstellt werden"
+msgstr "Benutzergruppe konnte nicht gelöst werden"
 
 #: ../lib/hammer_cli_foreman/associating_commands.rb:191
 msgid "Associate a configuration template"
@@ -388,7 +380,7 @@ msgstr "Benutzerrolle konnte nicht entfernt werden"
 
 #: ../lib/hammer_cli_foreman/auth.rb:7
 msgid "Set credentials"
-msgstr "Anmeldedaten festlegen"
+msgstr "Berechtigungsnachweise festlegen"
 
 #: ../lib/hammer_cli_foreman/auth.rb:20
 msgid "Wipe your credentials"
@@ -396,7 +388,7 @@ msgstr "Berechtigungsnachweise löschen"
 
 #: ../lib/hammer_cli_foreman/auth.rb:26
 msgid "Credentials deleted."
-msgstr "Anmeldedaten gelöscht."
+msgstr "Berechtigungsnachweise gelöscht."
 
 #: ../lib/hammer_cli_foreman/auth.rb:33
 msgid "Information about current connections"
@@ -404,19 +396,17 @@ msgstr "Informationen über aktuelle Verbindungen"
 
 #: ../lib/hammer_cli_foreman/auth.rb:37
 msgid "You are logged in as '%s'"
-msgstr "Sie sind als '%s' angemeldet"
+msgstr "Sie sind als \"%s\" angemeldet"
 
 #: ../lib/hammer_cli_foreman/auth.rb:39
 msgid ""
 "You are currently not logged in to any service.\n"
 "Use the service to set credentials."
 msgstr ""
-"Sie sind derzeit bei keinem Service angemeldet.\n"
-"Verwenden Sie den Service, um Berechtigungsnachweise festzulegen."
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:7
 msgid "Manage LDAP auth sources."
-msgstr "LDAP-Authentifizierungsquellen verwalten"
+msgstr "LDAP-Authentifizierungsquellen verwalten."
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:15
 msgid "LDAPS?"
@@ -432,35 +422,35 @@ msgstr "Servertyp"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:27
 msgid "Account Username"
-msgstr "Konto-Benutzername"
+msgstr "Account-Benutzername"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:28
 msgid "Base DN"
-msgstr "Base DN"
+msgstr "Basis-DN"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:29
 msgid "LDAP filter"
-msgstr "LDAP Filter"
+msgstr "LDAP-Filter"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:30
 msgid "Automatically Create Accounts?"
-msgstr "Konten automatisch erstellen?"
+msgstr "Accounts automatisch erstellen?"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:31
 msgid "Login Name Attribute"
-msgstr "Anmeldenamen-Attribut"
+msgstr "Benutzername-Attribut"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:32
 msgid "First Name Attribute"
-msgstr "Vornamen-Attribut"
+msgstr "Vorname-Attribut"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:33
 msgid "Last Name Attribute"
-msgstr "Nachnamen-Attribut"
+msgstr "Nachname-Attribut"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:34
 msgid "Email Address Attribute"
-msgstr "E-Mail-Adressen-Attribut"
+msgstr "E-Mail-Adress-Attribut"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:35
 msgid "Photo Attribute"
@@ -472,7 +462,7 @@ msgstr "Authentifizierungsquelle erstellt"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:44
 msgid "Could not create the Auth Source"
-msgstr "Authentifzierungsquelle konnte nicht erstellt werden"
+msgstr "Authentifizierungsquelle konnte nicht erstellt werden"
 
 #: ../lib/hammer_cli_foreman/auth_source_ldap.rb:51
 msgid "Auth source deleted"
@@ -490,37 +480,37 @@ msgstr "Authentifizierungsquelle aktualisiert"
 msgid "Could not update the Auth Source"
 msgstr "Authentifizierungsquelle konnte nicht aktualisiert werden"
 
-#: ../lib/hammer_cli_foreman/commands.rb:83
+#: ../lib/hammer_cli_foreman/commands.rb:87
 msgid "Received data of unknown format"
 msgstr "Daten in unbekanntem Format erhalten"
 
-#: ../lib/hammer_cli_foreman/commands.rb:191
+#: ../lib/hammer_cli_foreman/commands.rb:195
 msgid "Could not find %{resource}. Some search options were missing, please see --help."
-msgstr "%{resource} nicht gefunden. Einige Suchoptionen fehlten, siehe --help"
+msgstr "%{resource} konnte nicht gefunden werden. Einige Suchoptionen fehlten; siehe --help."
 
-#: ../lib/hammer_cli_foreman/commands.rb:193
+#: ../lib/hammer_cli_foreman/commands.rb:197
 msgid "Could not find %{resource}, please set option %{switches}."
-msgstr "%{resource} nicht gefunden. Bitte Option %{switches}  setzen."
+msgstr "%{resource} konnte nicht gefunden werden, bitte legen Sie die Option %{switches} fest."
 
-#: ../lib/hammer_cli_foreman/commands.rb:195
+#: ../lib/hammer_cli_foreman/commands.rb:199
 msgid "Could not find %{resource}, please set one of options %{switches}."
-msgstr "%{resource} nicht gefunden. Bitte eine der Optionen %{switches}  setzen."
+msgstr "%{resource} konnte nicht gefunden werden, bitte legen Sie eine der Optionen %{switches} fest."
 
-#: ../lib/hammer_cli_foreman/commands.rb:517
+#: ../lib/hammer_cli_foreman/commands.rb:521
 msgid "Associate a resource"
 msgstr "Ressource zuweisen"
 
-#: ../lib/hammer_cli_foreman/commands.rb:539
+#: ../lib/hammer_cli_foreman/commands.rb:543
 msgid "Disassociate a resource"
 msgstr "Ressource lösen"
 
-#: ../lib/hammer_cli_foreman/common_parameter.rb:13 ../lib/hammer_cli_foreman/fact.rb:14 ../lib/hammer_cli_foreman/host.rb:327 ../lib/hammer_cli_foreman/settings.rb:13 ../lib/hammer_cli_foreman/smart_class_parameter.rb:77 ../lib/hammer_cli_foreman/smart_variable.rb:65
+#: ../lib/hammer_cli_foreman/common_parameter.rb:13 ../lib/hammer_cli_foreman/fact.rb:14 ../lib/hammer_cli_foreman/host.rb:334 ../lib/hammer_cli_foreman/settings.rb:13 ../lib/hammer_cli_foreman/smart_class_parameter.rb:77 ../lib/hammer_cli_foreman/smart_variable.rb:65
 msgid "Value"
 msgstr "Wert"
 
 #: ../lib/hammer_cli_foreman/common_parameter.rb:22
 msgid "Set a global parameter."
-msgstr "Einen globalen Parameter festlegen."
+msgstr "Globalen Parameter festlegen."
 
 #: ../lib/hammer_cli_foreman/common_parameter.rb:24
 msgid "Created parameter [%{name}] with value [%{value}]."
@@ -554,7 +544,7 @@ msgstr "Globale Parameter bearbeiten."
 msgid "Provider"
 msgstr "Anbieter"
 
-#: ../lib/hammer_cli_foreman/compute_resource.rb:34 ../lib/hammer_cli_foreman/compute_resource.rb:40 ../lib/hammer_cli_foreman/host.rb:201 ../lib/hammer_cli_foreman/image.rb:33 ../lib/hammer_cli_foreman/image.rb:71
+#: ../lib/hammer_cli_foreman/compute_resource.rb:34 ../lib/hammer_cli_foreman/compute_resource.rb:40 ../lib/hammer_cli_foreman/host.rb:208 ../lib/hammer_cli_foreman/image.rb:33 ../lib/hammer_cli_foreman/image.rb:71
 msgid "UUID"
 msgstr "UUID"
 
@@ -568,7 +558,7 @@ msgstr "Server"
 
 #: ../lib/hammer_cli_foreman/compute_resource.rb:44
 msgid "Tenant"
-msgstr "Mieter"
+msgstr "Mandant"
 
 #: ../lib/hammer_cli_foreman/compute_resource.rb:54
 msgid "Url"
@@ -614,17 +604,21 @@ msgstr "[Foreman]-Benutzername: "
 msgid "[Foreman] Password for %s: "
 msgstr "[Foreman]-Passwort für %s: "
 
+#: ../lib/hammer_cli_foreman/defaults.rb:7
+msgid "Use the default organization and/or location from the server"
+msgstr ""
+
 #: ../lib/hammer_cli_foreman/domain.rb:6
 msgid "ID of DNS proxy to use within this domain"
-msgstr ""
+msgstr "ID des DNS-Proxys für diese Domain"
 
 #: ../lib/hammer_cli_foreman/domain.rb:7
 msgid "Name of DNS proxy to use within this domain"
-msgstr ""
+msgstr "Name des DNS-Proxys für diese Domain"
 
 #: ../lib/hammer_cli_foreman/domain.rb:43
 msgid "DNS Id"
-msgstr "DNS-Kennung"
+msgstr "DNS-ID"
 
 #: ../lib/hammer_cli_foreman/domain.rb:57
 msgid "Domain [%{name}] created"
@@ -636,7 +630,7 @@ msgstr "Domain konnte nicht erstellt werden"
 
 #: ../lib/hammer_cli_foreman/domain.rb:60 ../lib/hammer_cli_foreman/domain.rb:71
 msgid "Full name describing the domain"
-msgstr "Voller Name der die Domäne beschreibet"
+msgstr "Vollständiger Name der Domain"
 
 #: ../lib/hammer_cli_foreman/domain.rb:68
 msgid "Domain [%{name}] updated"
@@ -704,7 +698,7 @@ msgstr "Umgebung konnte nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/exception_handler.rb:41
 msgid "Forbidden - server refused to process the request"
-msgstr "Abgelehnt - Server verweigert die Verarbeitung der Anfrage"
+msgstr "Abgelehnt – Server verweigert die Verarbeitung der Anfrage"
 
 #: ../lib/hammer_cli_foreman/exception_handler.rb:75
 msgid "Could not load the API description from the server"
@@ -716,11 +710,11 @@ msgstr "ist der Server nicht verfügbar?"
 
 #: ../lib/hammer_cli_foreman/exception_handler.rb:77
 msgid "was '%s' run on the server when using apipie cache? (typical production settings)"
-msgstr "Wurde '%s' auf dem Server ausgeführt, während Apipe-Cache in Verwendung war? (typische Produktionseinstellungen)"
+msgstr "lief \"%s\" auf dem Server, als apipie-Cache verwendet wurde? (typische Produktionseinstellungen)"
 
 #: ../lib/hammer_cli_foreman/external_usergroup.rb:6
 msgid "View and manage user group's external user groups"
-msgstr "Externe Benutzergruppen der Benutzergruppe anzeigen und verwalten"
+msgstr "Externe Benutzergruppen dieser Benutzergruppe anzeigen und verwalten"
 
 #: ../lib/hammer_cli_foreman/external_usergroup.rb:12 ../lib/hammer_cli_foreman/external_usergroup.rb:43
 msgid "Auth source"
@@ -758,7 +752,7 @@ msgstr "Externe Benutzergruppe konnte nicht gelöscht werden"
 msgid "Host"
 msgstr "Host"
 
-#: ../lib/hammer_cli_foreman/fact.rb:13 ../lib/hammer_cli_foreman/host.rb:326
+#: ../lib/hammer_cli_foreman/fact.rb:13 ../lib/hammer_cli_foreman/host.rb:333
 msgid "Fact"
 msgstr "Fakt"
 
@@ -780,13 +774,13 @@ msgstr "Rolle"
 
 #: ../lib/hammer_cli_foreman/filter.rb:14
 msgid "Permissions"
-msgstr "Zugriffsrechte"
+msgstr "Berechtigungen"
 
-#: ../lib/hammer_cli_foreman/filter.rb:18 ../lib/hammer_cli_foreman/filter.rb:34 ../lib/hammer_cli_foreman/filter.rb:78 ../lib/hammer_cli_foreman/role.rb:33
+#: ../lib/hammer_cli_foreman/filter.rb:18 ../lib/hammer_cli_foreman/filter.rb:34 ../lib/hammer_cli_foreman/filter.rb:78 ../lib/hammer_cli_foreman/role.rb:46
 msgid "(Miscellaneous)"
 msgstr "(Verschiedenes)"
 
-#: ../lib/hammer_cli_foreman/filter.rb:19 ../lib/hammer_cli_foreman/filter.rb:35 ../lib/hammer_cli_foreman/role.rb:34
+#: ../lib/hammer_cli_foreman/filter.rb:19 ../lib/hammer_cli_foreman/filter.rb:35 ../lib/hammer_cli_foreman/role.rb:47
 msgid "none"
 msgstr "keine"
 
@@ -820,340 +814,331 @@ msgstr "Ressource"
 
 #: ../lib/hammer_cli_foreman/host.rb:15
 msgid "Login of the owner"
-msgstr "Anmeldung des Eigentümers"
+msgstr "Benutzername des Besitzers"
 
 #: ../lib/hammer_cli_foreman/host.rb:17
 msgid "ID of the owner"
-msgstr "Kennung des Eigentümers"
+msgstr "ID des Besitzers"
 
-#: ../lib/hammer_cli_foreman/host.rb:42
+#: ../lib/hammer_cli_foreman/host.rb:44
 msgid "Host parameters."
 msgstr "Hostparameter."
 
-#: ../lib/hammer_cli_foreman/host.rb:44
+#: ../lib/hammer_cli_foreman/host.rb:46
 msgid "Compute resource attributes."
 msgstr "Rechnerressourcenattribute."
 
-#: ../lib/hammer_cli_foreman/host.rb:46
+#: ../lib/hammer_cli_foreman/host.rb:48
 msgid "Volume parameters"
 msgstr "Datenträgerparameter"
 
-#: ../lib/hammer_cli_foreman/host.rb:48
+#: ../lib/hammer_cli_foreman/host.rb:50
 msgid "Interface parameters."
 msgstr "Schnittstellenparameter."
 
-#: ../lib/hammer_cli_foreman/host.rb:62
+#: ../lib/hammer_cli_foreman/host.rb:64
 msgid "Enter the root password for the host:"
-msgstr ""
+msgstr "Geben Sie das Root-Passwort für den Host ein:"
 
-#: ../lib/hammer_cli_foreman/host.rb:146
+#: ../lib/hammer_cli_foreman/host.rb:153
 msgid "At least one interface must be set as primary"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman/host.rb:149
+#: ../lib/hammer_cli_foreman/host.rb:156
 msgid "At least one interface must be set as provision"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman/host.rb:165 ../lib/hammer_cli_foreman/host.rb:241 ../lib/hammer_cli_foreman/hostgroup.rb:60 ../lib/hammer_cli_foreman/image.rb:31
+#: ../lib/hammer_cli_foreman/host.rb:172 ../lib/hammer_cli_foreman/host.rb:248 ../lib/hammer_cli_foreman/hostgroup.rb:60 ../lib/hammer_cli_foreman/image.rb:31
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-#: ../lib/hammer_cli_foreman/host.rb:166 ../lib/hammer_cli_foreman/host.rb:205
+#: ../lib/hammer_cli_foreman/host.rb:173 ../lib/hammer_cli_foreman/host.rb:212
 msgid "Host Group"
 msgstr "Hostgruppe"
 
-#: ../lib/hammer_cli_foreman/host.rb:167 ../lib/hammer_cli_foreman/host.rb:218
+#: ../lib/hammer_cli_foreman/host.rb:174 ../lib/hammer_cli_foreman/host.rb:225
 msgid "IP"
 msgstr "IP"
 
-#: ../lib/hammer_cli_foreman/host.rb:168 ../lib/hammer_cli_foreman/host.rb:219
+#: ../lib/hammer_cli_foreman/host.rb:175 ../lib/hammer_cli_foreman/host.rb:226
 msgid "MAC"
-msgstr "MAC"
+msgstr "MAC-Adresse"
 
-#: ../lib/hammer_cli_foreman/host.rb:178
+#: ../lib/hammer_cli_foreman/host.rb:185
 msgid "Bare Metal"
 msgstr ""
 
-#: ../lib/hammer_cli_foreman/host.rb:203
-#, fuzzy
+#: ../lib/hammer_cli_foreman/host.rb:210
 msgid "Organization"
-msgstr "Organisationen"
+msgstr "Organisation"
 
-#: ../lib/hammer_cli_foreman/host.rb:204
-#, fuzzy
+#: ../lib/hammer_cli_foreman/host.rb:211
 msgid "Location"
-msgstr "Orte"
+msgstr "Ort"
 
-#: ../lib/hammer_cli_foreman/host.rb:206
+#: ../lib/hammer_cli_foreman/host.rb:213
 msgid "Compute Resource"
 msgstr "Rechnerresource"
 
-#: ../lib/hammer_cli_foreman/host.rb:207
-#, fuzzy
+#: ../lib/hammer_cli_foreman/host.rb:214
 msgid "Compute Profile"
-msgstr "Rechnerprofil"
+msgstr "Rechenprofil"
 
-#: ../lib/hammer_cli_foreman/host.rb:208 ../lib/hammer_cli_foreman/hostgroup.rb:61
+#: ../lib/hammer_cli_foreman/host.rb:215 ../lib/hammer_cli_foreman/hostgroup.rb:61
 msgid "Environment"
 msgstr "Umgebung"
 
-#: ../lib/hammer_cli_foreman/host.rb:209
-#, fuzzy
+#: ../lib/hammer_cli_foreman/host.rb:216
 msgid "Puppet CA Id"
-msgstr "Puppet CA Proxy-Kennung"
+msgstr ""
 
-#: ../lib/hammer_cli_foreman/host.rb:210
-#, fuzzy
+#: ../lib/hammer_cli_foreman/host.rb:217
 msgid "Puppet Master Id"
-msgstr "Puppet Master Proxy-Kennung"
+msgstr ""
 
-#: ../lib/hammer_cli_foreman/host.rb:211
+#: ../lib/hammer_cli_foreman/host.rb:218
 msgid "Cert name"
 msgstr "Zertifikatsname"
 
-#: ../lib/hammer_cli_foreman/host.rb:212 ../lib/hammer_cli_foreman/interface.rb:51
+#: ../lib/hammer_cli_foreman/host.rb:219 ../lib/hammer_cli_foreman/interface.rb:51
 msgid "Managed"
 msgstr "Verwaltet"
 
-#: ../lib/hammer_cli_foreman/host.rb:214
+#: ../lib/hammer_cli_foreman/host.rb:221
 msgid "Installed at"
 msgstr "Installiert um"
 
-#: ../lib/hammer_cli_foreman/host.rb:215 ../lib/hammer_cli_foreman/report.rb:12
+#: ../lib/hammer_cli_foreman/host.rb:222 ../lib/hammer_cli_foreman/report.rb:12
 msgid "Last report"
-msgstr "letzter Report"
+msgstr "Letzter Bericht"
 
-#: ../lib/hammer_cli_foreman/host.rb:217 ../lib/hammer_cli_foreman/subnet.rb:12
+#: ../lib/hammer_cli_foreman/host.rb:224 ../lib/hammer_cli_foreman/subnet.rb:12
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../lib/hammer_cli_foreman/host.rb:220 ../lib/hammer_cli_foreman/hostgroup.rb:72 ../lib/hammer_cli_foreman/interface.rb:49
+#: ../lib/hammer_cli_foreman/host.rb:227 ../lib/hammer_cli_foreman/hostgroup.rb:72 ../lib/hammer_cli_foreman/interface.rb:49
 msgid "Subnet"
 msgstr "Subnetz"
 
-#: ../lib/hammer_cli_foreman/host.rb:221 ../lib/hammer_cli_foreman/hostgroup.rb:74 ../lib/hammer_cli_foreman/interface.rb:50
+#: ../lib/hammer_cli_foreman/host.rb:228 ../lib/hammer_cli_foreman/hostgroup.rb:74 ../lib/hammer_cli_foreman/interface.rb:50
 msgid "Domain"
-msgstr "Domäne"
+msgstr "Domain"
 
-#: ../lib/hammer_cli_foreman/host.rb:222
+#: ../lib/hammer_cli_foreman/host.rb:229
 msgid "Service provider"
-msgstr ""
+msgstr "Dienstanbieter"
 
-#: ../lib/hammer_cli_foreman/host.rb:223
+#: ../lib/hammer_cli_foreman/host.rb:230
 msgid "SP Name"
 msgstr "SP-Name"
 
-#: ../lib/hammer_cli_foreman/host.rb:224
+#: ../lib/hammer_cli_foreman/host.rb:231
 msgid "SP IP"
-msgstr "SP-Kennung"
+msgstr "SP-IP"
 
-#: ../lib/hammer_cli_foreman/host.rb:225
+#: ../lib/hammer_cli_foreman/host.rb:232
 msgid "SP MAC"
-msgstr "SP MAC"
+msgstr "SP-MAC"
 
-#: ../lib/hammer_cli_foreman/host.rb:226
+#: ../lib/hammer_cli_foreman/host.rb:233
 msgid "SP Subnet"
 msgstr "SP-Subnetz"
 
-#: ../lib/hammer_cli_foreman/host.rb:230
-#, fuzzy
+#: ../lib/hammer_cli_foreman/host.rb:237
 msgid "Network interfaces"
-msgstr "BMC-Netzwerkschnittstellen"
+msgstr "Netzwerkschnittstellen"
 
-#: ../lib/hammer_cli_foreman/host.rb:232 ../lib/hammer_cli_foreman/interface.rb:24 ../lib/hammer_cli_foreman/interface.rb:44
+#: ../lib/hammer_cli_foreman/host.rb:239 ../lib/hammer_cli_foreman/interface.rb:24 ../lib/hammer_cli_foreman/interface.rb:44
 msgid "Identifier"
-msgstr ""
+msgstr "Bezeichner"
 
-#: ../lib/hammer_cli_foreman/host.rb:233 ../lib/hammer_cli_foreman/interface.rb:25 ../lib/hammer_cli_foreman/interface.rb:45 ../lib/hammer_cli_foreman/smart_class_parameter.rb:62 ../lib/hammer_cli_foreman/smart_class_parameter.rb:66 ../lib/hammer_cli_foreman/smart_variable.rb:12 ../lib/hammer_cli_foreman/smart_variable.rb:54 ../lib/hammer_cli_foreman/template.rb:27
+#: ../lib/hammer_cli_foreman/host.rb:240 ../lib/hammer_cli_foreman/interface.rb:25 ../lib/hammer_cli_foreman/interface.rb:45 ../lib/hammer_cli_foreman/smart_class_parameter.rb:62 ../lib/hammer_cli_foreman/smart_class_parameter.rb:66 ../lib/hammer_cli_foreman/smart_variable.rb:12 ../lib/hammer_cli_foreman/smart_variable.rb:54 ../lib/hammer_cli_foreman/template.rb:27
 msgid "Type"
 msgstr "Typ"
 
-#: ../lib/hammer_cli_foreman/host.rb:234 ../lib/hammer_cli_foreman/interface.rb:26 ../lib/hammer_cli_foreman/interface.rb:46
+#: ../lib/hammer_cli_foreman/host.rb:241 ../lib/hammer_cli_foreman/interface.rb:26 ../lib/hammer_cli_foreman/interface.rb:46
 msgid "MAC address"
-msgstr ""
+msgstr "MAC-Adresse"
 
-#: ../lib/hammer_cli_foreman/host.rb:235 ../lib/hammer_cli_foreman/interface.rb:27 ../lib/hammer_cli_foreman/interface.rb:47
+#: ../lib/hammer_cli_foreman/host.rb:242 ../lib/hammer_cli_foreman/interface.rb:27 ../lib/hammer_cli_foreman/interface.rb:47
 msgid "IP address"
-msgstr ""
+msgstr "IP-Adresse"
 
-#: ../lib/hammer_cli_foreman/host.rb:236
+#: ../lib/hammer_cli_foreman/host.rb:243
 msgid "FQDN"
-msgstr ""
+msgstr "FQDN"
 
-#: ../lib/hammer_cli_foreman/host.rb:239
-#, fuzzy
+#: ../lib/hammer_cli_foreman/host.rb:246
 msgid "Operating system"
-msgstr "Betriebssysteme"
+msgstr "Betriebssystem"
 
-#: ../lib/hammer_cli_foreman/host.rb:240 ../lib/hammer_cli_foreman/hostgroup.rb:75 ../lib/hammer_cli_foreman/image.rb:45
+#: ../lib/hammer_cli_foreman/host.rb:247 ../lib/hammer_cli_foreman/hostgroup.rb:75 ../lib/hammer_cli_foreman/image.rb:45
 msgid "Architecture"
 msgstr "Architektur"
 
-#: ../lib/hammer_cli_foreman/host.rb:244
+#: ../lib/hammer_cli_foreman/host.rb:251
 msgid "Build"
-msgstr "Erstelle"
+msgstr "Build"
 
-#: ../lib/hammer_cli_foreman/host.rb:245 ../lib/hammer_cli_foreman/hostgroup.rb:77
+#: ../lib/hammer_cli_foreman/host.rb:252 ../lib/hammer_cli_foreman/hostgroup.rb:77
 msgid "Medium"
 msgstr "Medium"
 
-#: ../lib/hammer_cli_foreman/host.rb:246 ../lib/hammer_cli_foreman/hostgroup.rb:76
+#: ../lib/hammer_cli_foreman/host.rb:253 ../lib/hammer_cli_foreman/hostgroup.rb:76
 msgid "Partition Table"
 msgstr "Partitionstabelle"
 
-#: ../lib/hammer_cli_foreman/host.rb:247
-#, fuzzy
+#: ../lib/hammer_cli_foreman/host.rb:254
 msgid "Custom partition table"
-msgstr "Partitionstabelle zuweisen"
+msgstr "Benutzerdefinierte Partitionstabelle"
 
-#: ../lib/hammer_cli_foreman/host.rb:250
+#: ../lib/hammer_cli_foreman/host.rb:257
 msgid "Image"
-msgstr "Abbild"
+msgstr "Image"
 
-#: ../lib/hammer_cli_foreman/host.rb:251
+#: ../lib/hammer_cli_foreman/host.rb:258
 msgid "Image file"
-msgstr "Abbilddatei"
+msgstr "Image-Datei"
 
-#: ../lib/hammer_cli_foreman/host.rb:252
+#: ../lib/hammer_cli_foreman/host.rb:259
 msgid "Use image"
-msgstr "Abbild verwenden"
+msgstr "Image verwenden"
 
-#: ../lib/hammer_cli_foreman/host.rb:258
+#: ../lib/hammer_cli_foreman/host.rb:265
 msgid "Additional info"
-msgstr ""
+msgstr "Zusätzliche Informationen"
 
-#: ../lib/hammer_cli_foreman/host.rb:259
+#: ../lib/hammer_cli_foreman/host.rb:266
 msgid "Owner Id"
-msgstr "Eigentümerkennung"
+msgstr "Besitzer-ID"
 
-#: ../lib/hammer_cli_foreman/host.rb:260
+#: ../lib/hammer_cli_foreman/host.rb:267
 msgid "Owner Type"
-msgstr "Eigentümertyp"
+msgstr "Besitzertyp"
 
-#: ../lib/hammer_cli_foreman/host.rb:261
+#: ../lib/hammer_cli_foreman/host.rb:268
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../lib/hammer_cli_foreman/host.rb:262 ../lib/hammer_cli_foreman/hostgroup.rb:62
+#: ../lib/hammer_cli_foreman/host.rb:269 ../lib/hammer_cli_foreman/hostgroup.rb:62
 msgid "Model"
 msgstr "Modell"
 
-#: ../lib/hammer_cli_foreman/host.rb:263
+#: ../lib/hammer_cli_foreman/host.rb:270
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../lib/hammer_cli_foreman/host.rb:276
+#: ../lib/hammer_cli_foreman/host.rb:283
 msgid "Status"
 msgstr "Status"
 
-#: ../lib/hammer_cli_foreman/host.rb:277
+#: ../lib/hammer_cli_foreman/host.rb:284
 msgid "Power"
 msgstr "Strom"
 
-#: ../lib/hammer_cli_foreman/host.rb:313
+#: ../lib/hammer_cli_foreman/host.rb:320
 msgid "Puppet run triggered"
 msgstr "Puppet-Durchlauf ausgelöst"
 
-#: ../lib/hammer_cli_foreman/host.rb:366
+#: ../lib/hammer_cli_foreman/host.rb:373
 msgid "Host created"
 msgstr "Host erstellt"
 
-#: ../lib/hammer_cli_foreman/host.rb:367
+#: ../lib/hammer_cli_foreman/host.rb:374
 msgid "Could not create the host"
 msgstr "Host konnte nicht erstellt werden"
 
-#: ../lib/hammer_cli_foreman/host.rb:388
+#: ../lib/hammer_cli_foreman/host.rb:395
 msgid "Host updated"
 msgstr "Host aktualisiert"
 
-#: ../lib/hammer_cli_foreman/host.rb:389
+#: ../lib/hammer_cli_foreman/host.rb:396
 msgid "Could not update the host"
 msgstr "Host konnte nicht aktualisiert werden"
 
-#: ../lib/hammer_cli_foreman/host.rb:396
+#: ../lib/hammer_cli_foreman/host.rb:403
 msgid "Host deleted"
 msgstr "Host gelöscht"
 
-#: ../lib/hammer_cli_foreman/host.rb:397
+#: ../lib/hammer_cli_foreman/host.rb:404
 msgid "Could not delete the host"
 msgstr "Host konnte nicht gelöscht werden"
 
-#: ../lib/hammer_cli_foreman/host.rb:404
+#: ../lib/hammer_cli_foreman/host.rb:411
 msgid "Create or update parameter for a host."
 msgstr "Parameter für einen Host erstellen oder aktualisieren."
 
-#: ../lib/hammer_cli_foreman/host.rb:406
+#: ../lib/hammer_cli_foreman/host.rb:413
 msgid "Host parameter updated"
 msgstr "Hostparameter aktualisiert"
 
-#: ../lib/hammer_cli_foreman/host.rb:407
+#: ../lib/hammer_cli_foreman/host.rb:414
 msgid "New host parameter created"
 msgstr "Neuer Hostparameter erstellt"
 
-#: ../lib/hammer_cli_foreman/host.rb:408
+#: ../lib/hammer_cli_foreman/host.rb:415
 msgid "Could not set host parameter"
 msgstr "Hostparameter konnte nicht festgelegt werden"
 
-#: ../lib/hammer_cli_foreman/host.rb:420
+#: ../lib/hammer_cli_foreman/host.rb:427
 msgid "Delete parameter for a host."
 msgstr "Parameter für einen Host löschen."
 
-#: ../lib/hammer_cli_foreman/host.rb:422
+#: ../lib/hammer_cli_foreman/host.rb:429
 msgid "Host parameter deleted"
 msgstr "Hostparameter gelöscht"
 
-#: ../lib/hammer_cli_foreman/host.rb:437
+#: ../lib/hammer_cli_foreman/host.rb:444
 msgid "Power a host on"
 msgstr "Host anschalten"
 
-#: ../lib/hammer_cli_foreman/host.rb:438
+#: ../lib/hammer_cli_foreman/host.rb:445
 msgid "The host is starting."
 msgstr "Host wird gestartet."
 
-#: ../lib/hammer_cli_foreman/host.rb:455
+#: ../lib/hammer_cli_foreman/host.rb:462
 msgid "Force turning off a host"
 msgstr "Abschalten von Host erzwingen"
 
-#: ../lib/hammer_cli_foreman/host.rb:460
+#: ../lib/hammer_cli_foreman/host.rb:467
 msgid "Power a host off"
 msgstr "Host ausschalten"
 
-#: ../lib/hammer_cli_foreman/host.rb:472
+#: ../lib/hammer_cli_foreman/host.rb:479
 msgid "Power off forced."
 msgstr "Abschalten erzwingen."
 
-#: ../lib/hammer_cli_foreman/host.rb:474
+#: ../lib/hammer_cli_foreman/host.rb:481
 msgid "Powering the host off."
 msgstr "Host wird abgeschaltet."
 
-#: ../lib/hammer_cli_foreman/host.rb:491
+#: ../lib/hammer_cli_foreman/host.rb:498
 msgid "Reboot a host"
-msgstr "Host neustarten"
+msgstr "Host neu starten"
 
-#: ../lib/hammer_cli_foreman/host.rb:492
+#: ../lib/hammer_cli_foreman/host.rb:499
 msgid "Host reboot started."
 msgstr "Host wird neu gestartet."
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:10
 msgid "List of puppetclass ids"
-msgstr "Liste der Puppetklassen-IDs"
+msgstr "Liste mit Puppet-Klassen-IDs"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:12
 msgid "Name of puppet CA proxy"
-msgstr "Name des Puppet CA Proxy"
+msgstr "Name des Puppet-CA-Proxys"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:13
 msgid "Name of puppet proxy"
-msgstr "Name des Puppet Proxy"
+msgstr "Name des Puppet-Proxys"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:14
 msgid "Name of parent hostgroup"
 msgstr "Name der übergeordneten Hostgruppe"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:17
-#, fuzzy
 msgid "Root password"
-msgstr "BMC-Passwort"
+msgstr "Root-Passwort"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:23
 msgid "Enter the root password for the host group:"
@@ -1161,15 +1146,15 @@ msgstr ""
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:59 ../lib/hammer_cli_foreman/operating_system.rb:11
 msgid "Title"
-msgstr "Titel"
+msgstr "Title"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:78
 msgid "Puppet CA Proxy Id"
-msgstr "Puppet CA Proxy-Kennung"
+msgstr "Puppet-CA-Proxy-ID"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:79
 msgid "Puppet Master Proxy Id"
-msgstr "Puppet Master Proxy-Kennung"
+msgstr "Puppet-Master-Proxy-ID"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:80
 msgid "ComputeProfile"
@@ -1177,7 +1162,7 @@ msgstr "Rechnerprofil"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:84
 msgid "Parent Id"
-msgstr "Übergeordnete Kennung"
+msgstr "Übergeordnete ID"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:94
 msgid "Hostgroup created"
@@ -1197,11 +1182,11 @@ msgstr "Hostgruppe konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:112
 msgid "Hostgroup deleted"
-msgstr "Hostgruppe entfernt"
+msgstr "Hostgruppe gelöscht"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:113
 msgid "Could not delete the hostgroup"
-msgstr "Hostgruppe konnte nicht entfernt werden"
+msgstr "Hostgruppe konnte nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:137
 msgid "Create or update parameter for a hostgroup."
@@ -1209,15 +1194,15 @@ msgstr "Parameter für Hostgruppe erstellen oder aktualisieren."
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:139
 msgid "Hostgroup parameter updated"
-msgstr "Hostgruppen-Parameter aktualisiert"
+msgstr "Hostgruppenparameter aktualisiert"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:140
 msgid "New hostgroup parameter created"
-msgstr "Neuer Hostgruppen-Parameter erstellt"
+msgstr "Neuer Hostgruppenparameter erstellt"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:141
 msgid "Could not set hostgroup parameter"
-msgstr "Hostgruppen-Parameter konnte nicht gesetzt werden"
+msgstr "Hostgruppenparameter konnte nicht festgelegt werden"
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:148
 msgid "Delete parameter for a hostgroup."
@@ -1225,7 +1210,7 @@ msgstr "Parameter für Hostgruppe löschen."
 
 #: ../lib/hammer_cli_foreman/hostgroup.rb:150
 msgid "Hostgroup parameter deleted"
-msgstr "Hostgruppen-Parameter entfernt"
+msgstr "Hostgruppenparameter gelöscht"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:36
 msgid "Architecture name"
@@ -1245,12 +1230,11 @@ msgstr "Umgebungsname"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:42
 msgid "Host name"
-msgstr "Host name"
+msgstr "Hostname"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:43
-#, fuzzy
 msgid "Hostgroup title"
-msgstr "Hostgruppenname"
+msgstr "Hostgruppentitel"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:43
 msgid "Hostgroup name"
@@ -1274,7 +1258,7 @@ msgstr "Organisationsname"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:50
 msgid "Operating system title"
-msgstr "Betriebssystemname"
+msgstr "Betriebssystemtitel"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:52
 msgid "Partition table name"
@@ -1282,7 +1266,7 @@ msgstr "Partitionstabellenname"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:53
 msgid "Proxy name"
-msgstr "Proxyname"
+msgstr "Proxy-Name"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:54
 msgid "Puppet class name"
@@ -1297,9 +1281,8 @@ msgid "User role name"
 msgstr "Benutzerrollenname"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:57
-#, fuzzy
 msgid "Setting name"
-msgstr "Zertifikatsname"
+msgstr "Einstellungsname"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:58
 msgid "Subnet name"
@@ -1315,12 +1298,11 @@ msgstr "Allgemeiner Parametername"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:62
 msgid "Smart class parameter name"
-msgstr "Smart-Class-Parametername"
+msgstr "Smart-Klassen-Parametername"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:63
-#, fuzzy
 msgid "Smart variable name"
-msgstr "Smart variables"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:65
 msgid "Name to search by"
@@ -1328,14 +1310,15 @@ msgstr "Zu suchender Name"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:153
 msgid "one of %s not found"
-msgstr "eine von %s nicht gefunden"
+msgstr "eines von %s nicht gefunden"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:200
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:201
-msgid "%s found more than once"
+#, fuzzy
+msgid "found more than one %s"
 msgstr "%s mehr als einmal gefunden"
 
 #: ../lib/hammer_cli_foreman/id_resolver.rb:212
@@ -1360,7 +1343,7 @@ msgstr "Verfügbare Images anzeigen"
 
 #: ../lib/hammer_cli_foreman/image.rb:81
 msgid "Image created"
-msgstr "Abbild erstellt"
+msgstr "Image erstellt"
 
 #: ../lib/hammer_cli_foreman/image.rb:82
 msgid "Could not create the image"
@@ -1368,7 +1351,7 @@ msgstr "Image konnte nicht erstellt werden"
 
 #: ../lib/hammer_cli_foreman/image.rb:90
 msgid "Image updated"
-msgstr "Abbild aktualisiert"
+msgstr "Image aktualisiert"
 
 #: ../lib/hammer_cli_foreman/image.rb:91
 msgid "Could not update the image"
@@ -1376,7 +1359,7 @@ msgstr "Image konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/image.rb:99
 msgid "Image deleted"
-msgstr "Abbild gelöscht"
+msgstr "Image gelöscht"
 
 #: ../lib/hammer_cli_foreman/image.rb:100
 msgid "Could not delete the image"
@@ -1387,32 +1370,28 @@ msgid "View and manage host's network interfaces"
 msgstr ""
 
 #: ../lib/hammer_cli_foreman/interface.rb:10
-#, fuzzy
 msgid "primary"
-msgstr "Primärer DNS"
+msgstr "primär"
 
 #: ../lib/hammer_cli_foreman/interface.rb:11
 msgid "provision"
 msgstr ""
 
 #: ../lib/hammer_cli_foreman/interface.rb:28 ../lib/hammer_cli_foreman/interface.rb:48
-#, fuzzy
 msgid "DNS name"
-msgstr "Zertifikatsname"
+msgstr "DNS-Name"
 
 #: ../lib/hammer_cli_foreman/interface.rb:52
-#, fuzzy
 msgid "Primary"
-msgstr "Primärer DNS"
+msgstr "Primär"
 
 #: ../lib/hammer_cli_foreman/interface.rb:53
-#, fuzzy
 msgid "Provision"
-msgstr "Anbieter"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/interface.rb:54
 msgid "Virtual"
-msgstr ""
+msgstr "Virtuell"
 
 #: ../lib/hammer_cli_foreman/interface.rb:55
 msgid "Tag"
@@ -1420,24 +1399,23 @@ msgstr ""
 
 #: ../lib/hammer_cli_foreman/interface.rb:56
 msgid "Attached to"
-msgstr ""
+msgstr "Verbunden mit"
 
 #: ../lib/hammer_cli_foreman/interface.rb:58
 msgid "BMC"
-msgstr ""
+msgstr "BMC"
 
 #: ../lib/hammer_cli_foreman/interface.rb:63
 msgid "Bond"
 msgstr ""
 
 #: ../lib/hammer_cli_foreman/interface.rb:64
-#, fuzzy
 msgid "Mode"
-msgstr "Modell"
+msgstr "Modus"
 
 #: ../lib/hammer_cli_foreman/interface.rb:65
 msgid "Attached devices"
-msgstr ""
+msgstr "Verbundene Geräte"
 
 #: ../lib/hammer_cli_foreman/interface.rb:66
 msgid "Bond options"
@@ -1452,39 +1430,32 @@ msgid "Should this interface be used for TFTP of PXELinux (or SSH for image-base
 msgstr ""
 
 #: ../lib/hammer_cli_foreman/interface.rb:128
-#, fuzzy
 msgid "Interface created"
-msgstr "Abbild erstellt"
+msgstr "Schnittstelle erstellt"
 
 #: ../lib/hammer_cli_foreman/interface.rb:129
-#, fuzzy
 msgid "Could not create the interface"
-msgstr "Image konnte nicht erstellt werden"
+msgstr "Schnittstelle konnte nicht erstellt werden"
 
 #: ../lib/hammer_cli_foreman/interface.rb:131 ../lib/hammer_cli_foreman/interface.rb:144
-#, fuzzy
 msgid "Compute resource specific attributes."
-msgstr "Rechnerressourcenattribute."
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/interface.rb:141
-#, fuzzy
 msgid "Interface updated"
-msgstr "Abbild aktualisiert"
+msgstr "Schnittstelle aktualisiert"
 
 #: ../lib/hammer_cli_foreman/interface.rb:142
-#, fuzzy
 msgid "Could not update the interface"
-msgstr "Image konnte nicht aktualisiert werden"
+msgstr "Schnittstelle konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/interface.rb:154
-#, fuzzy
 msgid "Interface deleted"
-msgstr "Abbild gelöscht"
+msgstr "Schnittstelle gelöscht"
 
 #: ../lib/hammer_cli_foreman/interface.rb:155
-#, fuzzy
 msgid "Could not delete the interface"
-msgstr "Image konnte nicht gelöscht werden"
+msgstr "Schnittstelle konnte nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/location.rb:24 ../lib/hammer_cli_foreman/location.rb:62 ../lib/hammer_cli_foreman/location.rb:74
 msgid "Location numeric id to search by"
@@ -1496,27 +1467,61 @@ msgstr "Organisationen"
 
 #: ../lib/hammer_cli_foreman/location.rb:52
 msgid "Location created"
-msgstr "Ort erstellt"
+msgstr "Standort erstellt"
 
 #: ../lib/hammer_cli_foreman/location.rb:53
 msgid "Could not create the location"
-msgstr "Ort konnte nicht erstellt werden"
+msgstr "Standort konnte nicht erstellt werden"
 
 #: ../lib/hammer_cli_foreman/location.rb:64
 msgid "Location updated"
-msgstr "Ort aktualisiert"
+msgstr "Standort aktualisiert"
 
 #: ../lib/hammer_cli_foreman/location.rb:65
 msgid "Could not update the location"
-msgstr "Ort konnte nicht aktualisiert werden"
+msgstr "Standort konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/location.rb:76
 msgid "Location deleted"
-msgstr "Ort entfernt"
+msgstr "Standort gelöscht"
 
 #: ../lib/hammer_cli_foreman/location.rb:77
 msgid "Could not delete the location"
-msgstr "Ort konnte nicht entfernt werden"
+msgstr "Standort konnte nicht gelöscht werden"
+
+#: ../lib/hammer_cli_foreman/location.rb:86
+#, fuzzy
+msgid "Create or update parameter for a location."
+msgstr "Parameter für eine Domain erstellen oder aktualisieren."
+
+#: ../lib/hammer_cli_foreman/location.rb:88 ../lib/hammer_cli_foreman/organization.rb:89
+#, fuzzy
+msgid "Parameter [%{name}] updated to value [%{value}]"
+msgstr "Parameter [%{name}] aktualisiert auf [%{value}]."
+
+#: ../lib/hammer_cli_foreman/location.rb:89 ../lib/hammer_cli_foreman/organization.rb:90
+msgid "Parameter [%{name}] created with value [%{value}]"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman/location.rb:90
+#, fuzzy
+msgid "Could not set location parameter"
+msgstr "Domainparameter konnte nicht festgelegt werden"
+
+#: ../lib/hammer_cli_foreman/location.rb:97
+#, fuzzy
+msgid "Delete parameter for a location."
+msgstr "Parameter für eine Domain löschen."
+
+#: ../lib/hammer_cli_foreman/location.rb:99 ../lib/hammer_cli_foreman/organization.rb:100
+#, fuzzy
+msgid "Parameter [%{name}] deleted"
+msgstr "Globaler Parameter [%{name}] gelöscht."
+
+#: ../lib/hammer_cli_foreman/location.rb:100
+#, fuzzy
+msgid "Could not delete location parameter"
+msgstr "Domainparameter konnte nicht festgelegt werden"
 
 #: ../lib/hammer_cli_foreman/media.rb:11
 msgid "Path"
@@ -1544,15 +1549,15 @@ msgstr "Installationsmedium konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/media.rb:50
 msgid "Installation medium deleted"
-msgstr "Installationsmedium entfernt"
+msgstr "Installationsmedium gelöscht"
 
 #: ../lib/hammer_cli_foreman/media.rb:51
 msgid "Could not delete the installation media"
-msgstr "Installationsmedium konnte nicht entfernt werden"
+msgstr "Installationsmedium konnte nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/model.rb:12
 msgid "Vendor class"
-msgstr "Herstellerklassen"
+msgstr "Herstellerklasse"
 
 #: ../lib/hammer_cli_foreman/model.rb:13
 msgid "HW model"
@@ -1596,7 +1601,7 @@ msgstr "Familie"
 
 #: ../lib/hammer_cli_foreman/operating_system.rb:23
 msgid "Major version"
-msgstr "Hauptversion"
+msgstr "Hauptrelease"
 
 #: ../lib/hammer_cli_foreman/operating_system.rb:24
 msgid "Minor version"
@@ -1632,7 +1637,7 @@ msgstr "Betriebssystem konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/operating_system.rb:60
 msgid "Operating system deleted"
-msgstr "Betriebssystem entfernt"
+msgstr "Betriebssystem gelöscht"
 
 #: ../lib/hammer_cli_foreman/operating_system.rb:61
 msgid "Could not delete the operating system"
@@ -1640,7 +1645,7 @@ msgstr "Betriebssystem konnte nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/operating_system.rb:68
 msgid "Create or update parameter for an operating system."
-msgstr "Parameter für ein Betriebssystem konnten nicht erstellt oder aktualisiert werden."
+msgstr "Parameter für ein Betriebssystem konnte nicht erstellt oder aktualisiert werden."
 
 #: ../lib/hammer_cli_foreman/operating_system.rb:70
 msgid "Operating system parameter updated"
@@ -1664,7 +1669,7 @@ msgstr "Betriebssystemparameter gelöscht"
 
 #: ../lib/hammer_cli_foreman/operating_system.rb:101 ../lib/hammer_cli_foreman/operating_system.rb:167
 msgid "operatingsystem id"
-msgstr "Betriebssystemkennung"
+msgstr "Betriebssystem-ID"
 
 #: ../lib/hammer_cli_foreman/operating_system.rb:102
 msgid "config template id to be set"
@@ -1692,11 +1697,11 @@ msgstr "Standardvorlage konnte nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/operating_system.rb:178
 msgid "Default template of type %s not found"
-msgstr "Standardvorlage von Typ %s nicht gefunden"
+msgstr "Standardvorlage des Typs %s nicht gefunden"
 
 #: ../lib/hammer_cli_foreman/organization.rb:37 ../lib/hammer_cli_foreman/references.rb:15
 msgid "Locations"
-msgstr "Orte"
+msgstr "Standorte"
 
 #: ../lib/hammer_cli_foreman/organization.rb:53
 msgid "Organization created"
@@ -1716,11 +1721,30 @@ msgstr "Organisation konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/organization.rb:77
 msgid "Organization deleted"
-msgstr "Organisation entfernt"
+msgstr "Organisation gelöscht"
 
 #: ../lib/hammer_cli_foreman/organization.rb:78
 msgid "Could not delete the organization"
-msgstr "Organisation konnte nicht entfernt werden"
+msgstr "Organisation konnte nicht gelöscht werden"
+
+#: ../lib/hammer_cli_foreman/organization.rb:87
+#, fuzzy
+msgid "Create or update parameter for an organization."
+msgstr "Parameter für eine Domain erstellen oder aktualisieren."
+
+#: ../lib/hammer_cli_foreman/organization.rb:91
+#, fuzzy
+msgid "Could not set organization parameter"
+msgstr "Domainparameter konnte nicht festgelegt werden"
+
+#: ../lib/hammer_cli_foreman/organization.rb:98
+#, fuzzy
+msgid "Delete parameter for an organization."
+msgstr "Parameter für eine Domain löschen."
+
+#: ../lib/hammer_cli_foreman/organization.rb:101
+msgid "Could not delete organization parameter"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/partition_table.rb:31
 msgid "View partition table content."
@@ -1756,7 +1780,7 @@ msgstr "Partitionstabelle konnte nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/puppet_class.rb:34
 msgid "Smart variables"
-msgstr "Smart variables"
+msgstr "Smart-Variablen"
 
 #: ../lib/hammer_cli_foreman/puppet_class.rb:35 ../lib/hammer_cli_foreman/smart_class_parameter.rb:10
 msgid "Parameter"
@@ -1788,11 +1812,11 @@ msgstr "Benutzergruppen"
 
 #: ../lib/hammer_cli_foreman/references.rb:42
 msgid "Smart proxies"
-msgstr "Smart Proxys"
+msgstr "Smart-Proxys"
 
 #: ../lib/hammer_cli_foreman/references.rb:50
 msgid "Compute resources"
-msgstr "Rechnerresourcen"
+msgstr "Rechnerressourcen"
 
 #: ../lib/hammer_cli_foreman/references.rb:58
 msgid "Installation media"
@@ -1804,7 +1828,7 @@ msgstr "Vorlagen"
 
 #: ../lib/hammer_cli_foreman/references.rb:74
 msgid "Domains"
-msgstr "Domänen"
+msgstr "Domains"
 
 #: ../lib/hammer_cli_foreman/references.rb:82
 msgid "Environments"
@@ -1844,15 +1868,15 @@ msgstr "Angewendet"
 
 #: ../lib/hammer_cli_foreman/report.rb:15 ../lib/hammer_cli_foreman/report.rb:36
 msgid "Restarted"
-msgstr "neu gestartet"
+msgstr "Neu gestartet"
 
 #: ../lib/hammer_cli_foreman/report.rb:16 ../lib/hammer_cli_foreman/report.rb:37
 msgid "Failed"
-msgstr "fehlgeschlagen"
+msgstr "Fehlgeschlagen"
 
 #: ../lib/hammer_cli_foreman/report.rb:17 ../lib/hammer_cli_foreman/report.rb:38
 msgid "Restart Failures"
-msgstr "Neustarts - Fehler"
+msgstr "Fehlgeschlagene Neustarts"
 
 #: ../lib/hammer_cli_foreman/report.rb:18 ../lib/hammer_cli_foreman/report.rb:39
 msgid "Skipped"
@@ -1860,7 +1884,7 @@ msgstr "Übersprungen"
 
 #: ../lib/hammer_cli_foreman/report.rb:19 ../lib/hammer_cli_foreman/report.rb:40
 msgid "Pending"
-msgstr "ausstehende"
+msgstr "Ausstehend"
 
 #: ../lib/hammer_cli_foreman/report.rb:32
 msgid "Reported at"
@@ -1934,43 +1958,54 @@ msgstr "Bericht konnte nicht gelöscht werden"
 msgid "The server does not support such operation."
 msgstr "Diese Operation wird vom Server nicht unterstützt."
 
-#: ../lib/hammer_cli_foreman/role.rb:23
+#: ../lib/hammer_cli_foreman/role.rb:20
+#, fuzzy
+msgid "Builtin"
+msgstr "Build"
+
+#: ../lib/hammer_cli_foreman/role.rb:24
+msgid "No"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman/role.rb:24
+msgid "Yes"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman/role.rb:36
 msgid "User role id"
 msgstr "Benutzerrollen-ID"
 
-#: ../lib/hammer_cli_foreman/role.rb:47
+#: ../lib/hammer_cli_foreman/role.rb:60
 msgid "User role [%<name>s] created"
 msgstr "Benutzerrolle [%<name>s] erstellt"
 
-#: ../lib/hammer_cli_foreman/role.rb:48
+#: ../lib/hammer_cli_foreman/role.rb:61
 msgid "Could not create the user role"
 msgstr "Benutzerrolle konnte nicht erstellt werden"
 
-#: ../lib/hammer_cli_foreman/role.rb:55
+#: ../lib/hammer_cli_foreman/role.rb:68
 msgid "User role [%<name>s] updated"
 msgstr "Benutzerrolle [%<name>s] aktualisiert"
 
-#: ../lib/hammer_cli_foreman/role.rb:56
+#: ../lib/hammer_cli_foreman/role.rb:69
 msgid "Could not update the user role"
 msgstr "Benutzerrolle konnte nicht aktualisiert werden"
 
-#: ../lib/hammer_cli_foreman/role.rb:63
+#: ../lib/hammer_cli_foreman/role.rb:76
 msgid "User role [%<name>s] deleted"
 msgstr "Benutzerrolle [%<name>s] gelöscht"
 
-#: ../lib/hammer_cli_foreman/role.rb:64
+#: ../lib/hammer_cli_foreman/role.rb:77
 msgid "Could not delete the user roles"
 msgstr "Benutzerrollen konnten nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/settings.rb:28
-#, fuzzy
 msgid "Setting [%{name}] updated to [%{value}]"
-msgstr "Parameter [%{name}] aktualisiert auf [%{value}]."
+msgstr "Einstellung [%{name}] aktualisiert auf [%{value}]."
 
 #: ../lib/hammer_cli_foreman/settings.rb:29
-#, fuzzy
 msgid "Could not update the setting"
-msgstr "Domain konnte nicht aktualisiert werden"
+msgstr "Einstellung konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:11 ../lib/hammer_cli_foreman/smart_variable.rb:11
 msgid "Default Value"
@@ -1978,23 +2013,23 @@ msgstr "Standardwert"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:12
 msgid "Override"
-msgstr "Übergehen"
+msgstr "Überschreiben"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:36 ../lib/hammer_cli_foreman/smart_variable.rb:27
 msgid "Puppet class"
-msgstr "Puppet Klasse"
+msgstr "Puppet-Klasse"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:37 ../lib/hammer_cli_foreman/smart_variable.rb:28
 msgid "Class Id"
-msgstr "Klassenkennung"
+msgstr "Klassen-ID"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:63
 msgid "Required"
-msgstr "Benötigt"
+msgstr "Erforderlich"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:65 ../lib/hammer_cli_foreman/smart_variable.rb:53
 msgid "Validator"
-msgstr "Validator"
+msgstr "Prüfung"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:67 ../lib/hammer_cli_foreman/smart_variable.rb:55
 msgid "Rule"
@@ -2002,29 +2037,27 @@ msgstr "Regel"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:69 ../lib/hammer_cli_foreman/smart_variable.rb:57
 msgid "Override values"
-msgstr "Werte übergehen"
+msgstr "Überschreibungswerte"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:70 ../lib/hammer_cli_foreman/smart_variable.rb:58
 msgid "Merge overrides"
 msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:71 ../lib/hammer_cli_foreman/smart_variable.rb:59
-#, fuzzy
 msgid "Merge default value"
-msgstr "Standardwert"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:72 ../lib/hammer_cli_foreman/smart_variable.rb:60
 msgid "Avoid duplicates"
-msgstr ""
+msgstr "Duplikate vermeiden"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:73 ../lib/hammer_cli_foreman/smart_variable.rb:61
 msgid "Order"
 msgstr "Reihenfolge"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:74 ../lib/hammer_cli_foreman/smart_variable.rb:62
-#, fuzzy
 msgid "Values"
-msgstr "Wert"
+msgstr "Werte"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:76 ../lib/hammer_cli_foreman/smart_variable.rb:64
 msgid "Match"
@@ -2040,39 +2073,35 @@ msgstr "Parameter konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:111
 msgid "Override this parameter."
-msgstr "Diesen Parameter übergehen."
+msgstr "Diesen Parameter überschreiben."
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:113
 msgid "This parameter is required."
-msgstr "Dieser Parameter wird benötigt."
+msgstr "Dieser Parameter ist erforderlich."
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:115
 msgid "Type of the parameter."
-msgstr "Typ des Parameters"
+msgstr "Typ des Parameters."
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:118 ../lib/hammer_cli_foreman/smart_variable.rb:90 ../lib/hammer_cli_foreman/smart_variable.rb:104
 msgid "Type of the validator."
-msgstr "Typ des Validators."
+msgstr "Typ der Prüfung."
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:132 ../lib/hammer_cli_foreman/smart_variable.rb:122
-#, fuzzy
 msgid "Override value created"
-msgstr "Werte übergehen"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:133 ../lib/hammer_cli_foreman/smart_variable.rb:123
-#, fuzzy
 msgid "Could not create the override_value"
-msgstr "Benutzerrolle konnte nicht erstellt werden"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:152 ../lib/hammer_cli_foreman/smart_variable.rb:135
-#, fuzzy
 msgid "Override value deleted"
-msgstr "Werte übergehen"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_class_parameter.rb:153 ../lib/hammer_cli_foreman/smart_variable.rb:136
-#, fuzzy
 msgid "Could not delete the override value"
-msgstr "Betriebssystem konnte nicht gelöscht werden"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_proxy.rb:13
 msgid "URL"
@@ -2080,19 +2109,19 @@ msgstr "URL"
 
 #: ../lib/hammer_cli_foreman/smart_proxy.rb:14 ../lib/hammer_cli_foreman/smart_proxy.rb:29
 msgid "Features"
-msgstr "Eigenschaften"
+msgstr "Funktionen"
 
 #: ../lib/hammer_cli_foreman/smart_proxy.rb:41
 msgid "Smart proxy created"
-msgstr "Smart Proxy erstellt"
+msgstr "Smart-Proxy erstellt"
 
 #: ../lib/hammer_cli_foreman/smart_proxy.rb:42
 msgid "Could not create the proxy"
-msgstr "Smart Proxy konnte nicht erstellt werden"
+msgstr "Smart-Proxy konnte nicht erstellt werden"
 
 #: ../lib/hammer_cli_foreman/smart_proxy.rb:49
 msgid "Smart proxy updated"
-msgstr "Smart Proxy aktualisiert"
+msgstr "Smart-Proxy aktualisiert"
 
 #: ../lib/hammer_cli_foreman/smart_proxy.rb:50
 msgid "Could not update the proxy"
@@ -2100,11 +2129,11 @@ msgstr "Proxy konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/smart_proxy.rb:57
 msgid "Smart proxy deleted"
-msgstr "Smart Proxy entfernt"
+msgstr "Smart-Proxy gelöscht"
 
 #: ../lib/hammer_cli_foreman/smart_proxy.rb:58
 msgid "Could not delete the proxy"
-msgstr "Smart Proxy konnte nicht entfernt werden"
+msgstr "Smart-Proxy konnte nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/smart_proxy.rb:69
 msgid "Puppet classes were imported"
@@ -2131,32 +2160,28 @@ msgid "Smart variable [%{variable}] created"
 msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_variable.rb:83
-#, fuzzy
 msgid "Could not create the smart variable"
-msgstr "Partitionstabelle konnte nicht erstellt werden"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_variable.rb:87 ../lib/hammer_cli_foreman/smart_variable.rb:101
-#, fuzzy
 msgid "Type of the variable."
-msgstr "Typ des Validators."
+msgstr "Typ der Variable."
 
 #: ../lib/hammer_cli_foreman/smart_variable.rb:96
 msgid "Smart variable [%{variable}] updated"
 msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_variable.rb:97
-#, fuzzy
 msgid "Could not update the smart variable"
-msgstr "Partitionstabelle konnte nicht aktualisiert werden"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_variable.rb:111
 msgid "Smart variable [%{variable}] deleted"
 msgstr ""
 
 #: ../lib/hammer_cli_foreman/smart_variable.rb:112
-#, fuzzy
 msgid "Could not delete the smart variable"
-msgstr "Partitionstabelle konnte nicht gelöscht werden"
+msgstr ""
 
 #: ../lib/hammer_cli_foreman/subnet.rb:13
 msgid "Mask"
@@ -2186,9 +2211,13 @@ msgstr "TFTP"
 msgid "DHCP"
 msgstr "DHCP"
 
+#: ../lib/hammer_cli_foreman/subnet.rb:29
+msgid "IPAM"
+msgstr ""
+
 #: ../lib/hammer_cli_foreman/subnet.rb:30
 msgid "VLAN ID"
-msgstr "VLAN-Kennung"
+msgstr "VLAN-ID"
 
 #: ../lib/hammer_cli_foreman/subnet.rb:31
 msgid "Gateway"
@@ -2200,7 +2229,7 @@ msgstr "Von"
 
 #: ../lib/hammer_cli_foreman/subnet.rb:33
 msgid "To"
-msgstr "An"
+msgstr "Bis"
 
 #: ../lib/hammer_cli_foreman/subnet.rb:44
 msgid "Subnet created"
@@ -2236,7 +2265,7 @@ msgstr "Konfigurationsvorlageninhalte anzeigen."
 
 #: ../lib/hammer_cli_foreman/template.rb:102 ../lib/hammer_cli_foreman/template.rb:120
 msgid "Path to a file that contains the template"
-msgstr "Pfad zur Datei, dass die Vorlage enthält"
+msgstr "Pfad zur Datei, welche die Vorlage enthält"
 
 #: ../lib/hammer_cli_foreman/template.rb:104 ../lib/hammer_cli_foreman/template.rb:122
 msgid "Template type. Eg. snippet, script, provision"
@@ -2268,7 +2297,7 @@ msgstr "Konfigurationsvorlage konnte nicht gelöscht werden"
 
 #: ../lib/hammer_cli_foreman/template.rb:150
 msgid "Update the default PXE menu on all configured TFTP servers"
-msgstr ""
+msgstr "Standard-PXE-Menü auf allen konfigurierten TFTP-Servern aktualisieren"
 
 #: ../lib/hammer_cli_foreman/user.rb:11
 msgid "Login"
@@ -2276,7 +2305,7 @@ msgstr "Anmeldung"
 
 #: ../lib/hammer_cli_foreman/user.rb:13
 msgid "Email"
-msgstr "E-Mail"
+msgstr "E-Mail-Adresse"
 
 #: ../lib/hammer_cli_foreman/user.rb:28
 msgid "Admin"
@@ -2288,49 +2317,47 @@ msgstr "Autorisiert durch"
 
 #: ../lib/hammer_cli_foreman/user.rb:30
 msgid "Locale"
-msgstr ""
+msgstr "Sprachumgebung"
 
 #: ../lib/hammer_cli_foreman/user.rb:31
 msgid "Timezone"
-msgstr ""
+msgstr "Zeitzone"
 
 #: ../lib/hammer_cli_foreman/user.rb:32
 msgid "Last login"
 msgstr "Letzte Anmeldung"
 
 #: ../lib/hammer_cli_foreman/user.rb:33
-#, fuzzy
 msgid "Default organization"
-msgstr "Organisationen verändern"
+msgstr "Standardmäßige Organisation"
 
 #: ../lib/hammer_cli_foreman/user.rb:34
-#, fuzzy
 msgid "Default location"
-msgstr "Orte verändern."
+msgstr "Standardmäßiger Standort"
 
 #: ../lib/hammer_cli_foreman/user.rb:42 ../lib/hammer_cli_foreman/user.rb:43
 msgid "default"
-msgstr ""
+msgstr "Standard"
 
 #: ../lib/hammer_cli_foreman/user.rb:53
 msgid "User [%{login}] created"
-msgstr ""
+msgstr "Benutzer [%{login}] erstellt"
 
 #: ../lib/hammer_cli_foreman/user.rb:54
 msgid "Could not create the user"
-msgstr "Der Benutzer konnte nicht erstellt werden"
+msgstr "Benutzer konnte nicht erstellt werden"
 
 #: ../lib/hammer_cli_foreman/user.rb:61
 msgid "User [%{login}] updated"
-msgstr ""
+msgstr "Benutzer [%{login}] aktualisiert"
 
 #: ../lib/hammer_cli_foreman/user.rb:62
 msgid "Could not update the user"
-msgstr "Der Benutzer konnte nicht aktualisiert werden"
+msgstr "Benutzer konnte nicht aktualisiert werden"
 
 #: ../lib/hammer_cli_foreman/user.rb:69
 msgid "User [%{login}] deleted"
-msgstr ""
+msgstr "Benutzer [%{login}] gelöscht"
 
 #: ../lib/hammer_cli_foreman/user.rb:70
 msgid "Could not delete the user"
@@ -2360,62 +2387,6 @@ msgstr "Benutzergruppe [%<name>s] gelöscht"
 msgid "Could not delete the user group"
 msgstr "Benutzergruppe konnte nicht gelöscht werden"
 
-#: lib/hammer_cli_foreman/host.rb:171
-#~ msgid "Disk"
-#~ msgstr "Festplatte"
-
-#: lib/hammer_cli_foreman/host.rb:189
-#~ msgid "Puppet Proxy Id"
-#~ msgstr "Puppet-Proxy-ID"
-
-#: lib/hammer_cli_foreman/host.rb:198
-#~ msgid "BMC Network Interfaces"
-#~ msgstr "BMC-Netzwerkschnittstellen"
-
-#: lib/hammer_cli_foreman/host.rb:203 lib/hammer_cli_foreman/host.rb:216
-#~ msgid "Domain Id"
-#~ msgstr "Domain-Kennung"
-
-#: lib/hammer_cli_foreman/host.rb:204 lib/hammer_cli_foreman/host.rb:217
-#~ msgid "Domain Name"
-#~ msgstr "Domainname"
-
-#: lib/hammer_cli_foreman/host.rb:205 lib/hammer_cli_foreman/host.rb:218
-#~ msgid "Subnet Id"
-#~ msgstr "Subnetzkennung"
-
-#: lib/hammer_cli_foreman/host.rb:206 lib/hammer_cli_foreman/host.rb:219
-#~ msgid "Subnet Name"
-#~ msgstr "Subnetzname"
-
-#: lib/hammer_cli_foreman/host.rb:207
-#~ msgid "BMC Username"
-#~ msgstr "BMC-Benutzername"
-
-#: lib/hammer_cli_foreman/host.rb:208
-#~ msgid "BMC Password"
-#~ msgstr "BMC-Passwort"
-
-#: lib/hammer_cli_foreman/host.rb:211
-#~ msgid "Managed Network Interfaces"
-#~ msgstr "Verwaltete Netzwerkschnittstellen"
-
-#: lib/hammer_cli_foreman/commands.rb:288
-#~ msgid "List next page? (%s): "
-#~ msgstr "Nächste Seite auflisten? (%s): "
-
-#: lib/hammer_cli_foreman/smart_class_parameter.rb:63
-#~ msgid "Count"
-#~ msgstr "Zähler"
-
-#: lib/hammer_cli_foreman/user.rb:47
-#~ msgid "User created"
-#~ msgstr "Benutzer erstellt"
-
-#: lib/hammer_cli_foreman/user.rb:55
-#~ msgid "User updated"
-#~ msgstr "Benutzer aktualisiert"
-
-#: lib/hammer_cli_foreman/user.rb:63
-#~ msgid "User deleted"
-#~ msgstr "Benutzer gelöscht"
+#: ../lib/hammer_cli_foreman/id_resolver.rb:201
+#~ msgid "%s found more than once"
+#~ msgstr "%s mehr als einmal gefunden"