puppet 6.21.1 → 7.4.1

data/lib/puppet/util/windows/string.rb

@@ -1,16 +1,15 @@
-require 'puppet/util/windows'
+module Puppet
+  module Util
+    module Windows
+      module String
+        def wide_string(str)
+          # if given a nil string, assume caller wants to pass a nil pointer to win32
+          return nil if str.nil?
 
-module Puppet::Util::Windows::String
-  def wide_string(str)
-    # if given a nil string, assume caller wants to pass a nil pointer to win32
-    return nil if str.nil?
-    # ruby (< 2.1) does not respect multibyte terminators, so it is possible
-    # for a string to contain a single trailing null byte, followed by garbage
-    # causing buffer overruns.
-    #
-    # See http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?revision=41920&view=revision
-    newstr = str + "\0".encode(str.encoding)
-    newstr.encode!('UTF-16LE')
+          str.encode('UTF-16LE')
+        end
+        module_function :wide_string
+      end
+    end
   end
-  module_function :wide_string
 end

data/lib/puppet/util/yaml.rb

@@ -42,28 +42,6 @@ module Puppet::Util::Yaml
     safe_load(yaml, allowed_classes, filename)
   end
 
-  # @deprecated Use {#safe_load_file} instead.
-  def self.load_file(filename, default_value = false, strip_classes = false)
-    Puppet.deprecation_warning(_("Puppet::Util::Yaml.load_file is deprecated. Use safe_load_file instead."))
-
-    if(strip_classes) then
-      data = YAML::parse_file(filename)
-      data.root.each do |o|
-        if o.respond_to?(:tag=) and
-           o.tag != nil and
-           o.tag.start_with?("!ruby")
-          o.tag = nil
-        end
-      end
-      data.to_ruby || default_value
-    else
-      yaml = YAML.load_file(filename)
-      yaml || default_value
-    end
-  rescue *YamlLoadExceptions => detail
-    raise YamlLoadError.new(detail.message, detail)
-  end
-
   def self.dump(structure, filename)
     Puppet::FileSystem.replace_file(filename, 0660) do |fh|
       YAML.dump(structure, fh)

data/lib/puppet/vendor/require_vendored.rb

@@ -2,4 +2,3 @@
 # Add one requirement per vendored package (or a comment if it is loaded on demand).
 
 # The vendored library 'rgen' is loaded on demand.
-# The vendored library 'pathspec' is loaded on demand.

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '6.21.1'
+  PUPPETVERSION = '7.4.1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/lib/puppet/x509.rb

@@ -1,7 +1,11 @@
 require 'puppet'
 require 'puppet/ssl/openssl_loader'
 
-module Puppet::X509 # :nodoc:
+# Responsible for loading and saving certificates and private keys.
+#
+# @see Puppet::X509::CertProvider
+# @api private
+module Puppet::X509
   require 'puppet/x509/pem_store'
   require 'puppet/x509/cert_provider'
 end

data/lib/puppet/x509/cert_provider.rb

@@ -1,6 +1,11 @@
 require 'puppet/x509'
 
-# Class for loading and saving cert related objects.
+# Class for loading and saving cert related objects. By default the provider
+# loads and saves based on puppet's default settings, such as `Puppet[:localcacert]`.
+# The providers sets the permissions on files it saves, such as the private key.
+# All of the `load_*` methods take an optional `required` parameter. If an object
+# doesn't exist, then by default the provider returns `nil`. However, if the
+# `required` parameter is true, then an exception will be raised instead.
 #
 # @api private
 class Puppet::X509::CertProvider
@@ -32,6 +37,7 @@ class Puppet::X509::CertProvider
   #
   # @param certs [Array<OpenSSL::X509::Certificate>] Array of CA certs to save
   # @raise [Puppet::Error] if the certs cannot be saved
+  #
   # @api private
   def save_cacerts(certs)
     save_pem(certs.map(&:to_pem).join, @capath, **permissions_for_setting(:localcacert))
@@ -45,6 +51,7 @@ class Puppet::X509::CertProvider
   # @return (see #load_cacerts_from_pem)
   # @raise (see #load_cacerts_from_pem)
   # @raise [Puppet::Error] if the certs cannot be loaded
+  #
   # @api private
   def load_cacerts(required: false)
     pem = load_pem(@capath)
@@ -61,6 +68,7 @@ class Puppet::X509::CertProvider
   # @param pem [String] PEM encoded certificate(s)
   # @return [Array<OpenSSL::X509::Certificate>] Array of CA certs
   # @raise [OpenSSL::X509::CertificateError] The `pem` text does not contain a valid cert
+  #
   # @api private
   def load_cacerts_from_pem(pem)
     # TRANSLATORS 'PEM' is an acronym and shouldn't be translated
@@ -75,6 +83,7 @@ class Puppet::X509::CertProvider
   #
   # @param crls [Array<OpenSSL::X509::CRL>] Array of CRLs to save
   # @raise [Puppet::Error] if the CRLs cannot be saved
+  #
   # @api private
   def save_crls(crls)
     save_pem(crls.map(&:to_pem).join, @crlpath, **permissions_for_setting(:hostcrl))
@@ -88,6 +97,7 @@ class Puppet::X509::CertProvider
   # @return (see #load_crls_from_pem)
   # @raise (see #load_crls_from_pem)
   # @raise [Puppet::Error] if the CRLs cannot be loaded
+  #
   # @api private
   def load_crls(required: false)
     pem = load_pem(@crlpath)
@@ -104,6 +114,7 @@ class Puppet::X509::CertProvider
   # @param pem [String] PEM encoded CRL(s)
   # @return [Array<OpenSSL::X509::CRL>] Array of CRLs
   # @raise [OpenSSL::X509::CRLError] The `pem` text does not contain a valid CRL
+  #
   # @api private
   def load_crls_from_pem(pem)
     # TRANSLATORS 'PEM' is an acronym and shouldn't be translated
@@ -118,6 +129,8 @@ class Puppet::X509::CertProvider
   #
   # @return [Time, nil] Time when the CRL was last updated, or nil if we don't
   #   have a CRL
+  #
+  # @api private
   def crl_last_update
     stat = Puppet::FileSystem.stat(@crlpath)
     Time.at(stat.mtime)
@@ -129,6 +142,7 @@ class Puppet::X509::CertProvider
   #
   # @param time [Time] The last updated time
   #
+  # @api private
   def crl_last_update=(time)
     Puppet::FileSystem.touch(@crlpath, mtime: time)
   end
@@ -142,6 +156,7 @@ class Puppet::X509::CertProvider
   #   from the password, and use that to encrypt the private key. If nil,
   #   save the private key unencrypted.
   # @raise [Puppet::Error] if the private key cannot be saved
+  #
   # @api private
   def save_private_key(name, key, password: nil)
     pem = if password
@@ -167,6 +182,7 @@ class Puppet::X509::CertProvider
   # @return (see #load_private_key_from_pem)
   # @raise (see #load_private_key_from_pem)
   # @raise [Puppet::Error] if the private key cannot be loaded
+  #
   # @api private
   def load_private_key(name, required: false, password: nil)
     path = @hostprivkey || to_path(@privatekeydir, name)
@@ -187,6 +203,7 @@ class Puppet::X509::CertProvider
   #   not specified, then the key cannot be loaded.
   # @return [OpenSSL::PKey::RSA, OpenSSL::PKey::EC] The private key
   # @raise [OpenSSL::PKey::PKeyError] The `pem` text does not contain a valid key
+  #
   # @api private
   def load_private_key_from_pem(pem, password: nil)
     # set a non-nil password to ensure openssl doesn't prompt
@@ -216,6 +233,8 @@ class Puppet::X509::CertProvider
   #
   # @return [String, nil] The private key password as a binary string or nil
   #   if there is none.
+  #
+  # @api private
   def load_private_key_password
     Puppet::FileSystem.read(Puppet[:passfile], :encoding => Encoding::BINARY)
   rescue Errno::ENOENT
@@ -227,6 +246,7 @@ class Puppet::X509::CertProvider
   # @param name [String] The client cert identity
   # @param cert [OpenSSL::X509::Certificate] The cert to save
   # @raise [Puppet::Error] if the client cert cannot be saved
+  #
   # @api private
   def save_client_cert(name, cert)
     path = @hostcert || to_path(@certdir, name)
@@ -242,6 +262,7 @@ class Puppet::X509::CertProvider
   # @return (see #load_request_from_pem)
   # @raise (see #load_client_cert_from_pem)
   # @raise [Puppet::Error] if the client cert cannot be loaded
+  #
   # @api private
   def load_client_cert(name, required: false)
     path = @hostcert || to_path(@certdir, name)
@@ -259,6 +280,7 @@ class Puppet::X509::CertProvider
   # @param pem [String] PEM encoded cert
   # @return [OpenSSL::X509::Certificate] the certificate
   # @raise [OpenSSL::X509::CertificateError] The `pem` text does not contain a valid cert
+  #
   # @api private
   def load_client_cert_from_pem(pem)
     OpenSSL::X509::Certificate.new(pem)
@@ -270,6 +292,7 @@ class Puppet::X509::CertProvider
   # @param private_key [OpenSSL::PKey::RSA] private key
   # @return [Puppet::X509::Request] The request
   #
+  # @api private
   def create_request(name, private_key)
     options = {}
 
@@ -292,6 +315,7 @@ class Puppet::X509::CertProvider
   # @param name [String] the request identity
   # @param csr [OpenSSL::X509::Request] the request
   # @raise [Puppet::Error] if the cert request cannot be saved
+  #
   # @api private
   def save_request(name, csr)
     path = to_path(@requestdir, name)
@@ -306,6 +330,7 @@ class Puppet::X509::CertProvider
   # @return (see #load_request_from_pem)
   # @raise (see #load_request_from_pem)
   # @raise [Puppet::Error] if the cert request cannot be saved
+  #
   # @api private
   def load_request(name)
     path = to_path(@requestdir, name)
@@ -319,6 +344,8 @@ class Puppet::X509::CertProvider
   #
   # @param name [String] The request identity
   # @return [Boolean] true if the CSR was deleted
+  #
+  # @api private
   def delete_request(name)
     path = to_path(@requestdir, name)
     delete_pem(path)
@@ -331,6 +358,7 @@ class Puppet::X509::CertProvider
   # @param pem [String] PEM encoded request
   # @return [OpenSSL::X509::Request] the request
   # @raise [OpenSSL::X509::RequestError] The `pem` text does not contain a valid request
+  #
   # @api private
   def load_request_from_pem(pem)
     OpenSSL::X509::Request.new(pem)

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.19.1-133-gcc65fe8151\n"
+"Project-Id-Version: Puppet automation framework 7.3.0-6-g7c55ccd544\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2021-01-14 12:33+0000\n"
-"PO-Revision-Date: 2021-01-14 12:33+0000\n"
+"POT-Creation-Date: 2021-01-21 13:07+0000\n"
+"PO-Revision-Date: 2021-01-21 13:07+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -48,21 +48,21 @@ msgstr ""
 msgid "Config file %{hiera_config} not found, using Hiera defaults"
 msgstr ""
 
-#: ../lib/puppet.rb:144
+#: ../lib/puppet.rb:138
 msgid "Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions."
 msgstr ""
 
-#: ../lib/puppet.rb:230
+#: ../lib/puppet.rb:224
 msgid "The environmentpath setting cannot be empty or nil."
 msgstr ""
 
 #. TRANSLATORS: `message` is an already translated string of why SSL failed to initialize
-#: ../lib/puppet.rb:257
+#: ../lib/puppet.rb:250
 msgid "Failed to initialize SSL: %{message}"
 msgstr ""
 
 #. TRANSLATORS: `puppet agent -t` is a command and should not be translated
-#: ../lib/puppet.rb:259
+#: ../lib/puppet.rb:252
 msgid "Run `puppet agent -t`"
 msgstr ""
 
@@ -120,59 +120,59 @@ msgstr ""
 msgid "Failed to acquire lock"
 msgstr ""
 
-#: ../lib/puppet/application.rb:238
+#: ../lib/puppet/application.rb:231
 msgid "Unable to find application '%{application_name}'. %{error}"
 msgstr ""
 
-#: ../lib/puppet/application.rb:259
+#: ../lib/puppet/application.rb:252
 msgid "Unable to load application class '%{class_name}' from file 'puppet/application/%{application_name}.rb'"
 msgstr ""
 
-#: ../lib/puppet/application.rb:298
+#: ../lib/puppet/application.rb:305
 msgid "Invalid environment mode '%{mode_name}'"
 msgstr ""
 
-#: ../lib/puppet/application.rb:366
+#: ../lib/puppet/application.rb:405
 msgid "Could not get application-specific default settings"
 msgstr ""
 
-#: ../lib/puppet/application.rb:372
+#: ../lib/puppet/application.rb:411
 msgid "Could not initialize"
 msgstr ""
 
-#: ../lib/puppet/application.rb:373
+#: ../lib/puppet/application.rb:412
 msgid "Could not parse application options"
 msgstr ""
 
-#: ../lib/puppet/application.rb:374
+#: ../lib/puppet/application.rb:413
 msgid "Could not prepare for execution"
 msgstr ""
 
-#: ../lib/puppet/application.rb:377
+#: ../lib/puppet/application.rb:416
 msgid "`puppet %{name}` is deprecated and will be removed in a future release."
 msgstr ""
 
-#: ../lib/puppet/application.rb:380
+#: ../lib/puppet/application.rb:419
 msgid "Could not configure routes from %{route_file}"
 msgstr ""
 
-#: ../lib/puppet/application.rb:381
+#: ../lib/puppet/application.rb:420
 msgid "Could not log runtime debug info"
 msgstr ""
 
-#: ../lib/puppet/application.rb:382
+#: ../lib/puppet/application.rb:421
 msgid "Could not run"
 msgstr ""
 
-#: ../lib/puppet/application.rb:386
+#: ../lib/puppet/application.rb:430
 msgid "No valid command or main"
 msgstr ""
 
-#: ../lib/puppet/application.rb:431
+#: ../lib/puppet/application.rb:486
 msgid "Could not set logdest to %{dest}."
 msgstr ""
 
-#: ../lib/puppet/application.rb:508
+#: ../lib/puppet/application.rb:580
 msgid "No help available for puppet %{app_name}"
 msgstr ""
 
@@ -238,10 +238,6 @@ msgstr ""
 msgid "Only one file can be applied per run.  Skipping %{files}"
 msgstr ""
 
-#: ../lib/puppet/application/cert.rb:6
-msgid "Manage certificates and requests (Disabled)"
-msgstr ""
-
 #: ../lib/puppet/application/describe.rb:177
 msgid "Display help about resource types"
 msgstr ""
@@ -274,23 +270,23 @@ msgstr ""
 msgid "No device found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:317
+#: ../lib/puppet/application/device.rb:315
 msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:332
+#: ../lib/puppet/application/device.rb:330
 msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:355
+#: ../lib/puppet/application/device.rb:353
 msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:393 ../lib/puppet/application/resource.rb:196
+#: ../lib/puppet/application/device.rb:389 ../lib/puppet/application/resource.rb:196
 msgid "You must specify the type to display"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:394 ../lib/puppet/application/resource.rb:197
+#: ../lib/puppet/application/device.rb:390 ../lib/puppet/application/resource.rb:197
 msgid "Could not find type %{type}"
 msgstr ""
 
@@ -356,27 +352,27 @@ msgstr ""
 msgid "Store and retrieve files in a filebucket"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:221
+#: ../lib/puppet/application/filebucket.rb:225
 msgid "You must specify a file to back up"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:225
+#: ../lib/puppet/application/filebucket.rb:229
 msgid "%{file}: no such file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:229
+#: ../lib/puppet/application/filebucket.rb:233
 msgid "%{file}: cannot read file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:251 ../lib/puppet/application/filebucket.rb:274
+#: ../lib/puppet/application/filebucket.rb:255 ../lib/puppet/application/filebucket.rb:278
 msgid "Need exactly two arguments: filebucket diff <file_a> <file_b>"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:271
+#: ../lib/puppet/application/filebucket.rb:275
 msgid "Comparing %{checksum_a} %{checksum_b} %{file_a} %{file_b}"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:285
+#: ../lib/puppet/application/filebucket.rb:289
 msgid "Cancelling"
 msgstr ""
 
@@ -470,7 +466,7 @@ msgstr ""
 msgid "Creating a new EC SSL key for %{name} using curve %{curve}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:157 ../lib/puppet/ssl/key.rb:26
+#: ../lib/puppet/application/ssl.rb:157
 msgid "Creating a new SSL key for %{name}"
 msgstr ""
 
@@ -550,81 +546,81 @@ msgstr ""
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:227
+#: ../lib/puppet/configurer.rb:225
 msgid "Could not select a functional puppet server from server_list: '%{server_list}'"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:241
+#: ../lib/puppet/configurer.rb:239
 msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:277
+#: ../lib/puppet/configurer.rb:275
 msgid "Local environment: '%{local_env}' doesn't match the environment of the cached catalog '%{catalog_env}', switching agent to '%{catalog_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:322
+#: ../lib/puppet/configurer.rb:320
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:337
+#: ../lib/puppet/configurer.rb:335
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:341
+#: ../lib/puppet/configurer.rb:339
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:369
+#: ../lib/puppet/configurer.rb:367
 msgid "Not using catalog because its environment '%{catalog_env}' does not match agent specified environment '%{local_env}' and strict_environment_mode is set"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:380
+#: ../lib/puppet/configurer.rb:378
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:382
+#: ../lib/puppet/configurer.rb:380
 msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:426
+#: ../lib/puppet/configurer.rb:434
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:455 ../lib/puppet/http/resolver/server_list.rb:67
+#: ../lib/puppet/configurer.rb:463 ../lib/puppet/http/resolver/server_list.rb:63
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:459 ../lib/puppet/http/resolver/server_list.rb:70
+#: ../lib/puppet/configurer.rb:467 ../lib/puppet/http/resolver/server_list.rb:66
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:470 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:478 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:479
+#: ../lib/puppet/configurer.rb:487
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:498
+#: ../lib/puppet/configurer.rb:506
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:506
+#: ../lib/puppet/configurer.rb:514
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:521
+#: ../lib/puppet/configurer.rb:529
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:539
+#: ../lib/puppet/configurer.rb:547
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:560
+#: ../lib/puppet/configurer.rb:568
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -692,50 +688,42 @@ msgstr ""
 msgid "a data type can only have one implementation"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:179
+#: ../lib/puppet/defaults.rb:172
 msgid "Cannot disable unrecognized warning types '%{invalid}'."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:180
+#: ../lib/puppet/defaults.rb:173
 msgid "Valid values are '%{values}'."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:547
+#: ../lib/puppet/defaults.rb:538
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:549
+#: ../lib/puppet/defaults.rb:540
 msgid "Convert custom terminus to hiera 5 API."
 msgstr ""
 
 #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:762
+#: ../lib/puppet/defaults.rb:733
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:847
+#: ../lib/puppet/defaults.rb:818
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1042
-msgid "Setting 'ssl_client_ca_auth' is deprecated."
-msgstr ""
-
-#: ../lib/puppet/defaults.rb:1121 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1069 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
 #. TRANSLATORS 'pluginsync' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:1995
+#: ../lib/puppet/defaults.rb:1906
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:2230
-msgid "The 'func3x_check' setting is deprecated and will be removed in a future release."
-msgstr ""
-
 #: ../lib/puppet/error.rb:77
 msgid "Could not parse for environment %{environment}: %{message}"
 msgstr ""
@@ -778,7 +766,7 @@ msgstr ""
 msgid "no matching resources found"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:7 ../lib/puppet/face/epp.rb:8 ../lib/puppet/face/facts.rb:30 ../lib/puppet/face/generate.rb:7 ../lib/puppet/face/help.rb:9 ../lib/puppet/face/key.rb:5 ../lib/puppet/face/man.rb:8 ../lib/puppet/face/module.rb:9 ../lib/puppet/face/node.rb:4 ../lib/puppet/face/parser.rb:6 ../lib/puppet/face/plugin.rb:6 ../lib/puppet/face/report.rb:5 ../lib/puppet/face/resource.rb:5 ../lib/puppet/face/status.rb:5
+#: ../lib/puppet/face/config.rb:7 ../lib/puppet/face/epp.rb:8 ../lib/puppet/face/facts.rb:6 ../lib/puppet/face/generate.rb:7 ../lib/puppet/face/help.rb:9 ../lib/puppet/face/module.rb:9 ../lib/puppet/face/node.rb:4 ../lib/puppet/face/parser.rb:6 ../lib/puppet/face/plugin.rb:6 ../lib/puppet/face/report.rb:5 ../lib/puppet/face/resource.rb:5
 msgid "Apache 2 license; see COPYING"
 msgstr ""
 
@@ -1015,32 +1003,68 @@ msgstr ""
 msgid "--values option must evaluate to a Hash or undef, got: '%{values_class}'"
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:32
+#: ../lib/puppet/face/facts.rb:8
 msgid "Retrieve and store facts."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:40
+#: ../lib/puppet/face/facts.rb:16
 msgid "Retrieve a node's facts."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:41
+#: ../lib/puppet/face/facts.rb:17
 msgid "[<node_certname>]"
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:64
+#: ../lib/puppet/face/facts.rb:39
 msgid "Upload local facts to the puppet master."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:106
+#: ../lib/puppet/face/facts.rb:77
 msgid "Uploading facts for '%{node}' to '%{server}'"
 msgstr ""
 
+#: ../lib/puppet/face/facts.rb:87
+msgid "Retrieve current node's facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:88
+msgid "[<facts>]"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:104 ../lib/puppet/face/facts.rb:109 ../lib/puppet/face/facts.rb:114 ../lib/puppet/face/module/changes.rb:21
+msgid "<path>"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:106
+msgid "The location of the config file for Facter."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:111
+msgid "The path to a directory that contains custom facts."
+msgstr ""
+
 #: ../lib/puppet/face/facts.rb:116
-msgid "Compare Facter 3 output with Facter 4 output"
+msgid "The path to a directory that contains external facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:120
+msgid "Disable fact blocking mechanism."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:145
-msgid "Already using Facter 4. To use `puppet facts diff` remove facterng from the .conf file or run `puppet config set facterng false`."
+#: ../lib/puppet/face/facts.rb:124
+msgid "Disable fact caching mechanism."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:128
+msgid "Show legacy facts when querying all facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:132
+msgid "Show only the value when the action is called with a single query"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:136
+msgid "Show how much time it took to resolve each fact."
 msgstr ""
 
 #: ../lib/puppet/face/generate.rb:9
@@ -1152,52 +1176,10 @@ msgstr ""
 msgid "Check error logs."
 msgstr ""
 
-#: ../lib/puppet/face/key.rb:7
-msgid "Create, save, and remove certificate keys."
-msgstr ""
-
-#: ../lib/puppet/face/man.rb:10
-msgid "Display Puppet manual pages."
-msgstr ""
-
-#: ../lib/puppet/face/man.rb:28
-msgid "Display the manual page for a Puppet subcommand."
-msgstr ""
-
-#: ../lib/puppet/face/man.rb:29
-msgid "<subcommand>"
-msgstr ""
-
-#. TRANSLATORS '--render-as s' is a command line option and should not be translated
-#: ../lib/puppet/face/man.rb:31
-msgid ""
-"      The man data, in Markdown format, suitable for consumption by Ronn.\n"
-"\n"
-"      RENDERING ISSUES: To skip fancy formatting and output the raw Markdown\n"
-"      text (e.g. for use in a pipeline), call this action with '--render-as s'.\n"
-msgstr ""
-
-#. TRANSLATORS 'puppet man' is a specific command line and should not be translated
-#: ../lib/puppet/face/man.rb:56
-msgid "The 'puppet man' command takes a single subcommand to review the subcommand's manpage"
-msgstr ""
-
 #: ../lib/puppet/face/module.rb:11
 msgid "Creates, installs and searches for modules on the Puppet Forge."
 msgstr ""
 
-#: ../lib/puppet/face/module/build.rb:3
-msgid "Build a module release package."
-msgstr ""
-
-#. TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
-#. TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
-#. TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
-#. TRANSLATORS 'Puppet Development Kit' is the name of the software package replacing this action and should not be translated.
-#: ../lib/puppet/face/module/build.rb:5 ../lib/puppet/face/module/build.rb:9 ../lib/puppet/face/module/generate.rb:5 ../lib/puppet/face/module/generate.rb:9
-msgid "This action has been replaced by Puppet Development Kit. For more information visit https://puppet.com/docs/pdk/latest/pdk.html."
-msgstr ""
-
 #: ../lib/puppet/face/module/changes.rb:3
 msgid "Show modified files of an installed module."
 msgstr ""
@@ -1206,10 +1188,6 @@ msgstr ""
 msgid "Array of strings representing paths of modified files."
 msgstr ""
 
-#: ../lib/puppet/face/module/changes.rb:21
-msgid "<path>"
-msgstr ""
-
 #: ../lib/puppet/face/module/changes.rb:27
 msgid "Could not find a valid module at %{path}"
 msgstr ""
@@ -1222,10 +1200,6 @@ msgstr ""
 msgid "%{count} files modified"
 msgstr ""
 
-#: ../lib/puppet/face/module/generate.rb:3
-msgid "Generate boilerplate for a new module."
-msgstr ""
-
 #: ../lib/puppet/face/module/install.rb:8
 msgid "Install a module from the Puppet Forge or a release archive."
 msgstr ""
@@ -1301,26 +1275,6 @@ msgstr ""
 msgid "invalid"
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:6
-msgid "Search the Puppet Forge for a module."
-msgstr ""
-
-#: ../lib/puppet/face/module/search.rb:14
-msgid "Array of module metadata hashes"
-msgstr ""
-
-#: ../lib/puppet/face/module/search.rb:24
-msgid "<search_term>"
-msgstr ""
-
-#: ../lib/puppet/face/module/search.rb:27
-msgid "This action has been deprecated. Please use the Puppet Forge to search for modules."
-msgstr ""
-
-#: ../lib/puppet/face/module/search.rb:37
-msgid "No results found for '%{term}'."
-msgstr ""
-
 #: ../lib/puppet/face/module/uninstall.rb:3
 msgid "Uninstall a puppet module."
 msgstr ""
@@ -1412,19 +1366,19 @@ msgstr ""
 msgid "At least one node should be passed"
 msgstr ""
 
-#: ../lib/puppet/face/node/clean.rb:64
+#: ../lib/puppet/face/node/clean.rb:72
 msgid "Not managing %{node} certs as this host is not a CA"
 msgstr ""
 
-#: ../lib/puppet/face/node/clean.rb:71
+#: ../lib/puppet/face/node/clean.rb:79
 msgid "%{node}'s facts removed"
 msgstr ""
 
-#: ../lib/puppet/face/node/clean.rb:77
+#: ../lib/puppet/face/node/clean.rb:85
 msgid "%{node}'s cached node removed"
 msgstr ""
 
-#: ../lib/puppet/face/node/clean.rb:83
+#: ../lib/puppet/face/node/clean.rb:91
 msgid "%{node}'s reports removed"
 msgstr ""
 
@@ -1490,11 +1444,11 @@ msgid ""
 "      the files downloaded, which will be empty if none were retrieved.\n"
 msgstr ""
 
-#: ../lib/puppet/face/plugin.rb:57
+#: ../lib/puppet/face/plugin.rb:54
 msgid "No plugins downloaded."
 msgstr ""
 
-#: ../lib/puppet/face/plugin.rb:59
+#: ../lib/puppet/face/plugin.rb:56
 msgid "Downloaded these plugins: %{plugins}"
 msgstr ""
 
@@ -1562,23 +1516,16 @@ msgstr ""
 msgid "The same resource object passed as an argument."
 msgstr ""
 
-#: ../lib/puppet/face/status.rb:7
-msgid "View puppet server status."
-msgstr ""
-
-#: ../lib/puppet/face/status.rb:15
-msgid "Check status of puppet master server."
+#: ../lib/puppet/feature/base.rb:19
+msgid "Cannot determine basic system flavour"
 msgstr ""
 
-#. TRANSLATORS the string 'Puppet::Status' is a Puppet language object and should not be translated
-#: ../lib/puppet/face/status.rb:17
-msgid ""
-"    A \"true\" response or a low-level connection error. When used from the Ruby\n"
-"    API: returns a Puppet::Status object.\n"
+#: ../lib/puppet/ffi/windows/api_types.rb:86
+msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
 msgstr ""
 
-#: ../lib/puppet/feature/base.rb:19
-msgid "Cannot determine basic system flavour"
+#: ../lib/puppet/ffi/windows/api_types.rb:231
+msgid "Bad GUID format."
 msgstr ""
 
 #: ../lib/puppet/file_bucket/dipper.rb:39
@@ -1650,7 +1597,7 @@ msgstr ""
 msgid "Cannot find file: Invalid relative path '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration.rb:109
+#: ../lib/puppet/file_serving/configuration.rb:104
 msgid "Error parsing fileserver configuration: %{detail}; using old configuration"
 msgstr ""
 
@@ -1666,31 +1613,23 @@ msgstr ""
 msgid "Fileserver configuration file does not use '=' as a separator"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:41 ../lib/puppet/network/auth_config_parser.rb:72 ../lib/puppet/util/network_device/config.rb:101
+#: ../lib/puppet/file_serving/configuration/parser.rb:43 ../lib/puppet/util/network_device/config.rb:101
 msgid "Invalid argument '%{var}' at %{error_location}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:46
+#: ../lib/puppet/file_serving/configuration/parser.rb:48
 msgid "Invalid entry at %{error_location}: '%{file_text}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:71
-msgid "allowing %{val} access"
-msgstr ""
-
-#: ../lib/puppet/file_serving/configuration/parser.rb:85
-msgid "denying %{val} access"
-msgstr ""
-
-#: ../lib/puppet/file_serving/configuration/parser.rb:99
+#: ../lib/puppet/file_serving/configuration/parser.rb:73
 msgid "%{mount} is already mounted at %{name} at %{error_location}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:124
+#: ../lib/puppet/file_serving/configuration/parser.rb:98
 msgid "Removing mount \"%{mount}\": %{detail}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:128
+#: ../lib/puppet/file_serving/configuration/parser.rb:102
 msgid "The '%{mount}' module can not have a path. Ignoring attempt to set it"
 msgstr ""
 
@@ -1748,7 +1687,7 @@ msgstr ""
 msgid "Cannot manage files of type %{file_type}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/mount.rb:21
+#: ../lib/puppet/file_serving/mount.rb:20
 msgid "Invalid mount name format '%{name}'"
 msgstr ""
 
@@ -2248,64 +2187,68 @@ msgstr ""
 msgid "Try the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:90
+#: ../lib/puppet/http/client.rb:156
 msgid "Request to %{uri} timed out connect operation after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:92
+#: ../lib/puppet/http/client.rb:158
 msgid "Request to %{uri} timed out read operation after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:94
+#: ../lib/puppet/http/client.rb:160
 msgid "Request to %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:100
+#: ../lib/puppet/http/client.rb:166
 msgid "Request to %{uri} failed after %{elapsed} seconds: %{message}"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:326
+#: ../lib/puppet/http/client.rb:369
 msgid "Sleeping for %{interval} seconds before retrying the request"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:369 ../lib/puppet/indirector/request.rb:142
+#: ../lib/puppet/http/client.rb:419
 msgid "HTTP REST queries cannot handle values of type '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/http/errors.rb:23
+#: ../lib/puppet/http/errors.rb:37
 msgid "Too many HTTP redirections for %{addr}"
 msgstr ""
 
-#: ../lib/puppet/http/errors.rb:29
+#: ../lib/puppet/http/errors.rb:45
 msgid "Too many HTTP retries for %{addr}"
 msgstr ""
 
-#: ../lib/puppet/http/redirector.rb:78
+#: ../lib/puppet/http/pool.rb:84
+msgid "Failed to close connection for %{site}: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/http/redirector.rb:70
 msgid "Location response header is missing"
 msgstr ""
 
-#: ../lib/puppet/http/redirector.rb:82
+#: ../lib/puppet/http/redirector.rb:74
 msgid "Location URI is invalid: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/http/retry_after_handler.rb:83
+#: ../lib/puppet/http/retry_after_handler.rb:74
 msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
 msgstr ""
 
-#: ../lib/puppet/http/service.rb:121
+#: ../lib/puppet/http/service.rb:107
 msgid "Ignoring extra header \"%{name}\" as it was previously set."
 msgstr ""
 
-#: ../lib/puppet/http/service.rb:124
+#: ../lib/puppet/http/service.rb:110
 msgid "Ignoring extra header \"%{name}\" as it has no value."
 msgstr ""
 
-#: ../lib/puppet/http/service.rb:147 ../lib/puppet/indirector/rest.rb:288
+#: ../lib/puppet/http/service.rb:133 ../lib/puppet/indirector/rest.rb:53
 msgid "No content type in http response; cannot parse"
 msgstr ""
 
 #. TRANSLATORS "pson", "preferred_serialization_format", and "puppetserver" should not be translated
-#: ../lib/puppet/http/service/report.rb:61
+#: ../lib/puppet/http/service/report.rb:59
 msgid "To submit reports to a server running puppetserver %{server_version}, set preferred_serialization_format to pson"
 msgstr ""
 
@@ -2454,7 +2397,7 @@ msgstr ""
 msgid "Unable to serialize catalog to json, retrying with pson"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/rest.rb:34 ../lib/puppet/indirector/facts/rest.rb:22 ../lib/puppet/indirector/file_content/rest.rb:33 ../lib/puppet/indirector/file_metadata/rest.rb:30 ../lib/puppet/indirector/node/rest.rb:25 ../lib/puppet/indirector/rest.rb:146 ../lib/puppet/indirector/status/rest.rb:21
+#: ../lib/puppet/indirector/catalog/rest.rb:32 ../lib/puppet/indirector/facts/rest.rb:20 ../lib/puppet/indirector/file_content/rest.rb:29 ../lib/puppet/indirector/file_metadata/rest.rb:26 ../lib/puppet/indirector/node/rest.rb:23
 msgid "Find %{uri} resulted in 404 with the message: %{body}"
 msgstr ""
 
@@ -2546,7 +2489,11 @@ msgstr ""
 msgid "You cannot save facts to the code store; it is only used for getting facts from Facter"
 msgstr ""
 
-#: ../lib/puppet/indirector/facts/facter.rb:56
+#: ../lib/puppet/indirector/facts/facter.rb:36
+msgid "puppet facts show requires version 4.0.40 or greater of Facter."
+msgstr ""
+
+#: ../lib/puppet/indirector/facts/facter.rb:62
 msgid "Loading facts"
 msgstr ""
 
@@ -2558,7 +2505,7 @@ msgstr ""
 msgid "You cannot save facts to the code store; it is only used for getting facts from a remote device"
 msgstr ""
 
-#: ../lib/puppet/indirector/facts/rest.rb:30 ../lib/puppet/indirector/rest.rb:198
+#: ../lib/puppet/indirector/facts/rest.rb:28
 msgid "PUT does not accept options"
 msgstr ""
 
@@ -2609,19 +2556,11 @@ msgstr ""
 msgid "Invalid checksum %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/indirector/file_content/http.rb:14
-msgid "Puppet::Indirector::FileContent::Http is deprecated. Use Puppet::HTTP::Client instead."
-msgstr ""
-
 #: ../lib/puppet/indirector/file_metadata/http.rb:32
 msgid "cannot lookup multiple files"
 msgstr ""
 
-#: ../lib/puppet/indirector/file_server.rb:25
-msgid "Denying %{method} request for %{desc} on fileserver mount '%{mount_name}'. Use of auth directives for 'fileserver.conf' mount points is no longer supported. Remove these directives and use the 'auth.conf' file instead for access control."
-msgstr ""
-
-#: ../lib/puppet/indirector/file_server.rb:49
+#: ../lib/puppet/indirector/file_server.rb:42
 msgid "Could not find filesystem info for file '%{request}' in environment %{env}"
 msgstr ""
 
@@ -2716,7 +2655,7 @@ msgstr ""
 msgid "directory traversal detected in %{json}: %{name}"
 msgstr ""
 
-#: ../lib/puppet/indirector/json.rb:41 ../lib/puppet/indirector/msgpack.rb:48 ../lib/puppet/indirector/ssl_file.rb:40 ../lib/puppet/indirector/yaml.rb:40
+#: ../lib/puppet/indirector/json.rb:41 ../lib/puppet/indirector/msgpack.rb:48 ../lib/puppet/indirector/yaml.rb:40
 msgid "invalid key"
 msgstr ""
 
@@ -2728,14 +2667,6 @@ msgstr ""
 msgid "Could not parse JSON data for %{name} %{key}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/key/file.rb:29
-msgid "Could not remove %{request} public key: %{detail}"
-msgstr ""
-
-#: ../lib/puppet/indirector/key/file.rb:43
-msgid "Could not write %{request}: %{detail}"
-msgstr ""
-
 #: ../lib/puppet/indirector/memory.rb:14
 msgid "Could not find %{request} to destroy"
 msgstr ""
@@ -2752,7 +2683,7 @@ msgstr ""
 msgid "Could not destroy %{name} %{request}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/msgpack.rb:47 ../lib/puppet/indirector/ssl_file.rb:39 ../lib/puppet/indirector/yaml.rb:39
+#: ../lib/puppet/indirector/msgpack.rb:47 ../lib/puppet/indirector/yaml.rb:39
 msgid "directory traversal detected in %{indirection}: %{name}"
 msgstr ""
 
@@ -2797,39 +2728,15 @@ msgstr ""
 msgid "No report named '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/indirector/report/rest.rb:36
+#: ../lib/puppet/indirector/report/rest.rb:31
 msgid "Server version %{version} does not accept reports in '%{format}', use `preferred_serialization_format=pson`"
 msgstr ""
 
-#: ../lib/puppet/indirector/request.rb:103
+#: ../lib/puppet/indirector/request.rb:102
 msgid "Could not find indirection '%{indirection}'"
 msgstr ""
 
-#: ../lib/puppet/indirector/request.rb:202
-msgid "Error connecting to %{srv_server}:%{srv_port}: %{message}"
-msgstr ""
-
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/indirector/request.rb:214
-msgid "Selected server from first entry of the `server_list` setting: %{server}"
-msgstr ""
-
-#. TRANSLATORS 'server' is the name of a setting and should not be translated
-#: ../lib/puppet/indirector/request.rb:218
-msgid "Selected server from the `server` setting: %{server}"
-msgstr ""
-
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/indirector/request.rb:231
-msgid "Selected port from the first entry of the `server_list` setting: %{port}"
-msgstr ""
-
-#. TRANSLATORS 'serverport' is the name of a setting and should not be translated
-#: ../lib/puppet/indirector/request.rb:235
-msgid "Selected port from the `serverport` setting: %{port}"
-msgstr ""
-
-#: ../lib/puppet/indirector/request.rb:266
+#: ../lib/puppet/indirector/request.rb:165
 msgid "Could not understand URL %{key}: %{detail}"
 msgstr ""
 
@@ -2841,75 +2748,10 @@ msgstr ""
 msgid "Resource instance does not match request key"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:115
-msgid "Puppet::Indirector::Rest#find is deprecated. Use Puppet::HTTP::Client instead."
-msgstr ""
-
-#: ../lib/puppet/indirector/rest.rb:154
-msgid "Puppet::Indirector::Rest#head is deprecated. Use Puppet::HTTP::Client instead."
-msgstr ""
-
-#: ../lib/puppet/indirector/rest.rb:167
-msgid "Puppet::Indirector::Rest#search is deprecated. Use Puppet::HTTP::Client instead."
-msgstr ""
-
-#: ../lib/puppet/indirector/rest.rb:181
-msgid "Puppet::Indirector::Rest#destroy is deprecated. Use Puppet::HTTP::Client instead."
-msgstr ""
-
-#: ../lib/puppet/indirector/rest.rb:182
-msgid "DELETE does not accept options"
-msgstr ""
-
-#: ../lib/puppet/indirector/rest.rb:197
-msgid "Puppet::Indirector::Rest#save is deprecated. Use Puppet::HTTP::Client instead."
-msgstr ""
-
-#. TRANSLATORS "PSON" should not be translated
-#: ../lib/puppet/indirector/rest.rb:235
-msgid "Downgrading to PSON for future requests"
-msgstr ""
-
-#: ../lib/puppet/indirector/rest.rb:277 ../lib/puppet/rest/response.rb:31
+#: ../lib/puppet/indirector/rest.rb:43
 msgid "Error %{code} on SERVER: %{returned_message}"
 msgstr ""
 
-#: ../lib/puppet/indirector/ssl_file.rb:34
-msgid "No file or directory setting provided; terminus %{class_name} cannot function"
-msgstr ""
-
-#: ../lib/puppet/indirector/ssl_file.rb:55
-msgid "Removing file %{model} %{request} at '%{path}'"
-msgstr ""
-
-#: ../lib/puppet/indirector/ssl_file.rb:59
-msgid "Could not remove %{request}: %{detail}"
-msgstr ""
-
-#: ../lib/puppet/indirector/ssl_file.rb:75
-msgid "Cannot save %{request}; parent directory %{dir} does not exist"
-msgstr ""
-
-#: ../lib/puppet/indirector/ssl_file.rb:76
-msgid "Cannot save %{request}; parent directory %{dir} is not writable"
-msgstr ""
-
-#: ../lib/puppet/indirector/ssl_file.rb:121
-msgid "Tried to fix SSL files to a file containing uppercase"
-msgstr ""
-
-#: ../lib/puppet/indirector/ssl_file.rb:130
-msgid "Automatic downcasing and renaming of ssl files is deprecated; please request the file using its correct case: %{full_file}"
-msgstr ""
-
-#: ../lib/puppet/indirector/ssl_file.rb:150
-msgid "Could not write %{path} to %{setting}: %{detail}"
-msgstr ""
-
-#: ../lib/puppet/indirector/ssl_file.rb:153
-msgid "You must provide a setting to determine where the files are stored"
-msgstr ""
-
 #: ../lib/puppet/indirector/terminus.rb:37
 msgid "Could not find indirection instance %{name} for %{terminus}"
 msgstr ""
@@ -3364,10 +3206,6 @@ msgstr ""
 msgid "Installing -- do not interrupt ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/searcher.rb:15
-msgid "Searching %{host} ..."
-msgstr ""
-
 #: ../lib/puppet/module_tool/applications/uninstaller.rb:92
 msgid "Either the `--ignore_changes` or `--force` argument must be specified to uninstall modules when running in FIPS mode."
 msgstr ""
@@ -3789,67 +3627,6 @@ msgstr ""
 msgid "No suitable tar implementation found"
 msgstr ""
 
-#. TRANSLATORS "path" is a configuration file entry and should not be translated
-#: ../lib/puppet/network/auth_config_parser.rb:32
-msgid "Missing or invalid 'path' before right directive at %{error_location}"
-msgstr ""
-
-#: ../lib/puppet/network/auth_config_parser.rb:38 ../lib/puppet/util/network_device/config.rb:71
-msgid "Invalid entry at %{error_location}: %{file_text}"
-msgstr ""
-
-#: ../lib/puppet/network/auth_config_parser.rb:57
-msgid "allowing %{value} access"
-msgstr ""
-
-#: ../lib/puppet/network/auth_config_parser.rb:59
-msgid "denying %{value} access"
-msgstr ""
-
-#: ../lib/puppet/network/auth_config_parser.rb:61
-msgid "allowing IP %{value} access"
-msgstr ""
-
-#: ../lib/puppet/network/auth_config_parser.rb:63
-msgid "denying IP %{value} access"
-msgstr ""
-
-#: ../lib/puppet/network/auth_config_parser.rb:65
-msgid "allowing 'method' %{value}"
-msgstr ""
-
-#: ../lib/puppet/network/auth_config_parser.rb:67
-msgid "adding environment %{value}"
-msgstr ""
-
-#: ../lib/puppet/network/auth_config_parser.rb:69
-msgid "adding authentication %{value}"
-msgstr ""
-
-#: ../lib/puppet/network/authconfig.rb:41
-msgid "Inserting default '%{acl}' (auth %{auth}) ACL"
-msgstr ""
-
-#: ../lib/puppet/network/authconfig.rb:71
-msgid "Denying access: %{authorization_failure_exception}"
-msgstr ""
-
-#: ../lib/puppet/network/authstore.rb:22
-msgid "Name and IP must be passed to 'allowed?'"
-msgstr ""
-
-#: ../lib/puppet/network/authstore.rb:37
-msgid "defaulting to no access for %{name}"
-msgstr ""
-
-#: ../lib/puppet/network/authstore.rb:190
-msgid "Invalid declaration type %{type}"
-msgstr ""
-
-#: ../lib/puppet/network/authstore.rb:258
-msgid "Invalid IP pattern %{value}"
-msgstr ""
-
 #: ../lib/puppet/network/client_request.rb:15
 msgid "Request is not set up; cannot build call"
 msgstr ""
@@ -3903,77 +3680,77 @@ msgstr ""
 msgid "Serialized YAML did not contain a valid instance of %{klass}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:43
+#: ../lib/puppet/network/http/api/indirected_routes.rb:42
 msgid "No handler for %{indirection}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:66
+#: ../lib/puppet/network/http/api/indirected_routes.rb:65
 msgid "The indirection name must be purely alphanumeric, not '%{indirection_name}'"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:76
+#: ../lib/puppet/network/http/api/indirected_routes.rb:75
 msgid "Indirection '%{indirection_name}' does not match url prefix '%{url_prefix}'"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:82
+#: ../lib/puppet/network/http/api/indirected_routes.rb:81
 msgid "Could not find indirection '%{indirection_name}'"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:88
+#: ../lib/puppet/network/http/api/indirected_routes.rb:87
 msgid "An environment parameter must be specified"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:93
+#: ../lib/puppet/network/http/api/indirected_routes.rb:92
 msgid "The environment must be purely alphanumeric, not '%{environment}'"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:110
+#: ../lib/puppet/network/http/api/indirected_routes.rb:103
 msgid "Could not find environment '%{environment}'"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:117
+#: ../lib/puppet/network/http/api/indirected_routes.rb:110
 msgid "No request key specified in %{uri}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:140
+#: ../lib/puppet/network/http/api/indirected_routes.rb:122
 msgid "Could not find %{value0} %{key}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:147
+#: ../lib/puppet/network/http/api/indirected_routes.rb:129
 msgid "Rendered result in %{format}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:153
+#: ../lib/puppet/network/http/api/indirected_routes.rb:135
 msgid "Sent response"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:161
+#: ../lib/puppet/network/http/api/indirected_routes.rb:143
 msgid "Could not find %{indirection} %{key}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:173
+#: ../lib/puppet/network/http/api/indirected_routes.rb:155
 msgid "Could not find instances in %{indirection} with '%{key}'"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:221 ../lib/puppet/network/http/request.rb:61
+#: ../lib/puppet/network/http/api/indirected_routes.rb:203 ../lib/puppet/network/http/request.rb:61
 msgid "No supported formats are acceptable (Accept: %{accepted_formats})"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:246
+#: ../lib/puppet/network/http/api/indirected_routes.rb:228
 msgid "The request body is invalid: %{message}"
 msgstr ""
 
 #. TRANSLATORS "mime-type" is a keyword and should not be translated
 #. TRANSLATORS "mime-type" is a keyword and should not be translated
-#: ../lib/puppet/network/http/api/indirected_routes.rb:252 ../lib/puppet/network/http/request.rb:32
+#: ../lib/puppet/network/http/api/indirected_routes.rb:234 ../lib/puppet/network/http/request.rb:32
 msgid "Client sent a mime-type (%{header}) that doesn't correspond to a format we support"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:258
+#: ../lib/puppet/network/http/api/indirected_routes.rb:240
 msgid "No support for http method %{http_method}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:263
+#: ../lib/puppet/network/http/api/indirected_routes.rb:245
 msgid "No support for plurality %{indirection} for %{http_method} operations"
 msgstr ""
 
@@ -3981,92 +3758,18 @@ msgstr ""
 msgid "Not a valid indirection type"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:14
-msgid "%{env_name} is not a known environment"
-msgstr ""
-
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:43
-msgid "Application %{application} assigns nodes to non-existent components: %{component_list}"
-msgstr ""
-
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:49
-msgid "Application %{application} has components without assigned nodes: %{component_list}"
-msgstr ""
-
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:58
-msgid "Application %{app} assigns multiple nodes to component %{comp}"
-msgstr ""
-
-#: ../lib/puppet/network/http/compression.rb:23 ../lib/puppet/network/http/compression.rb:27
-msgid "Puppet::Network::HTTP::Compression::Active#uncompress_body is deprecated."
-msgstr ""
-
-#: ../lib/puppet/network/http/compression.rb:32 ../lib/puppet/network/http/compression.rb:46
-msgid "Unknown content encoding - %{encoding}"
-msgstr ""
-
-#: ../lib/puppet/network/http/compression.rb:37
-msgid "Puppet::Network::HTTP::Compression::Active#uncompress is deprecated."
-msgstr ""
-
-#: ../lib/puppet/network/http/compression.rb:77
-msgid "Puppet::Network::HTTP::Compression::ZlibAdapter#uncompress is deprecated."
-msgstr ""
-
-#: ../lib/puppet/network/http/compression.rb:104
-msgid "Puppet::Network::HTTP::Compression::None#uncompress_body is deprecated."
-msgstr ""
-
-#: ../lib/puppet/network/http/compression.rb:113
-msgid "Puppet::Network::HTTP::Compression::None#uncompress is deprecated."
-msgstr ""
-
-#: ../lib/puppet/network/http/compression.rb:120
-msgid "Puppet::Network::HTTP::Compression::IdentityAdapter#uncompress is deprecated."
-msgstr ""
-
-#: ../lib/puppet/network/http/connection.rb:56
+#: ../lib/puppet/network/http/connection.rb:47
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:63
+#: ../lib/puppet/network/http/connection.rb:53
 msgid "Expected an instance of Puppet::SSL::Verifier but was passed a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:229 ../lib/puppet/network/http/connection_adapter.rb:174
+#: ../lib/puppet/network/http/connection.rb:276
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr ""
 
-#. TRANSLATORS: Used in the phrase:
-#. "Received a response from the remote server."
-#: ../lib/puppet/network/http/connection.rb:259
-msgid "the remote server"
-msgstr ""
-
-#: ../lib/puppet/network/http/connection.rb:263
-msgid "Received a %{status_code} response from %{server_hostname}, but the Retry-After header value of \"%{retry_after}\" could not be converted to an integer or RFC 2822 date."
-msgstr ""
-
-#: ../lib/puppet/network/http/connection.rb:274
-msgid "Received a %{status_code} response from %{server_hostname}. Sleeping for %{retry_sleep} seconds before retrying the request."
-msgstr ""
-
-#: ../lib/puppet/network/http/connection.rb:335
-msgid "request %{uri} interrupted after %{elapsed} seconds"
-msgstr ""
-
-#: ../lib/puppet/network/http/connection.rb:337
-msgid "request %{uri} timed out after %{elapsed} seconds"
-msgstr ""
-
-#: ../lib/puppet/network/http/connection.rb:339
-msgid "request %{uri} failed: %{msg}"
-msgstr ""
-
-#: ../lib/puppet/network/http/connection.rb:346
-msgid "Puppet::Network::HTTP::Connection is deprecated. Please use Puppet::Network::HTTP::ConnectionAdapter instead."
-msgstr ""
-
 #: ../lib/puppet/network/http/error.rb:23
 msgid "Not Acceptable: %{message}"
 msgstr ""
@@ -4095,30 +3798,22 @@ msgstr ""
 msgid "Server Error: %{message}"
 msgstr ""
 
-#: ../lib/puppet/network/http/handler.rb:23
+#: ../lib/puppet/network/http/handler.rb:22
 msgid "Given multiple routes with identical path regexes: %{regexes}"
 msgstr ""
 
-#: ../lib/puppet/network/http/handler.rb:67
+#: ../lib/puppet/network/http/handler.rb:66
 msgid "Processed request %{request_method} %{request_path}"
 msgstr ""
 
-#: ../lib/puppet/network/http/handler.rb:113
+#: ../lib/puppet/network/http/handler.rb:112
 msgid "No route for %{request} %{path}"
 msgstr ""
 
-#: ../lib/puppet/network/http/handler.rb:138
+#: ../lib/puppet/network/http/handler.rb:137
 msgid "Could not resolve %{ip}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/network/http/nocache_pool.rb:6
-msgid "Puppet::Network::HTTP::NoCachePool is deprecated."
-msgstr ""
-
-#: ../lib/puppet/network/http/pool.rb:66
-msgid "Failed to close connection for %{site}: %{detail}"
-msgstr ""
-
 #: ../lib/puppet/network/http/request.rb:14
 msgid "Unknown arguments: %{args}"
 msgstr ""
@@ -4132,39 +3827,15 @@ msgid "Missing required Accept header"
 msgstr ""
 
 #. TRANSLATORS 'ssl_context' is an argument and should not be translated
-#: ../lib/puppet/network/http_pool.rb:81
+#: ../lib/puppet/network/http_pool.rb:63
 msgid "An ssl_context is required when connecting to 'https://%{host}:%{port}'"
 msgstr ""
 
 #. TRANSLATORS 'ssl_context' is an argument and should not be translated
-#: ../lib/puppet/network/http_pool.rb:89
+#: ../lib/puppet/network/http_pool.rb:71
 msgid "An ssl_context is unnecessary when connecting to 'http://%{host}:%{port}' and will be ignored"
 msgstr ""
 
-#: ../lib/puppet/network/rights.rb:59
-msgid "Forbidden request: %{msg}"
-msgstr ""
-
-#: ../lib/puppet/network/rights.rb:127
-msgid "Unknown right type '%{name}'"
-msgstr ""
-
-#: ../lib/puppet/network/rights.rb:169
-msgid "'%{m}' is not an allowed value for method directive"
-msgstr ""
-
-#: ../lib/puppet/network/rights.rb:176
-msgid "'%{m}' is already in the '%{name}' ACL"
-msgstr ""
-
-#: ../lib/puppet/network/rights.rb:183
-msgid "'%{env}' is already in the '%{name}' ACL"
-msgstr ""
-
-#: ../lib/puppet/network/rights.rb:195
-msgid "'%{name}' incorrect authenticated value: %{authentication}"
-msgstr ""
-
 #: ../lib/puppet/node.rb:27
 msgid "No name provided in serialized data"
 msgstr ""
@@ -4181,11 +3852,7 @@ msgstr ""
 msgid "The node parameter '%{param_name}' for node '%{node_name}' was already set to '%{value}'. It could not be set to '%{desired_value}'"
 msgstr ""
 
-#: ../lib/puppet/node.rb:198
-msgid "Host is missing hostname and/or domain: %{name}"
-msgstr ""
-
-#: ../lib/puppet/node.rb:230
+#: ../lib/puppet/node.rb:201
 msgid "Trusted node data modified for node %{name}"
 msgstr ""
 
@@ -4219,60 +3886,60 @@ msgid "Given data_type value is not a data type, got '%{type}'"
 msgstr ""
 
 #. TRANSLATORS 'type' and 'title' are internal parameter names - do not translate
-#: ../lib/puppet/pal/json_catalog_encoder.rb:52
+#: ../lib/puppet/pal/json_catalog_encoder.rb:54
 msgid "Both type and title must be given"
 msgstr ""
 
 #. TRANSLATORS: do not translate the variable names in this error message
 #. TRANSLATORS: do not translate the variable names in this error message
-#: ../lib/puppet/pal/pal_impl.rb:75 ../lib/puppet/pal/pal_impl.rb:181
+#: ../lib/puppet/pal/pal_impl.rb:76 ../lib/puppet/pal/pal_impl.rb:182
 msgid "manifest_file or code_string cannot be given when configured_by_env is true"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:237
+#: ../lib/puppet/pal/pal_impl.rb:238
 msgid "temporary environment name"
 msgstr ""
 
 #. TRANSLATORS: do not translate variable name string in these assertions
-#: ../lib/puppet/pal/pal_impl.rb:242
+#: ../lib/puppet/pal/pal_impl.rb:243
 msgid "A block must be given to 'in_tmp_environment'"
 msgstr ""
 
 #. TRANSLATORS terms in the assertions below are names of terms in code
-#: ../lib/puppet/pal/pal_impl.rb:296
+#: ../lib/puppet/pal/pal_impl.rb:298
 msgid "A block must be given to 'in_environment'"
 msgstr ""
 
 #. TRANSLATORS 'in_environment' is a name, do not translate
-#: ../lib/puppet/pal/pal_impl.rb:301
+#: ../lib/puppet/pal/pal_impl.rb:303
 msgid "The environment directory '%{env_dir}' does not exist"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:324
+#: ../lib/puppet/pal/pal_impl.rb:326
 msgid "No directory found for the environment '%{env_name}' on the path '%{envpath}'"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:378
+#: ../lib/puppet/pal/pal_impl.rb:380
 msgid "Given variables must be a hash, got %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:384
+#: ../lib/puppet/pal/pal_impl.rb:386
 msgid "Given variable '%{varname}' has illegal name"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:388
+#: ../lib/puppet/pal/pal_impl.rb:390
 msgid "Given value for '%{varname}' has illegal type - got: %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:562
+#: ../lib/puppet/pal/pal_impl.rb:564
 msgid "Puppet Pal: %{what}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:576
+#: ../lib/puppet/pal/pal_impl.rb:578
 msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:583
+#: ../lib/puppet/pal/pal_impl.rb:585
 msgid "A block must be given"
 msgstr ""
 
@@ -4337,7 +4004,7 @@ msgstr ""
 msgid "Node inheritance is removed in Puppet 4.0.0. See http://links.puppet.com/puppet-node-inheritance-deprecation"
 msgstr ""
 
-#: ../lib/puppet/parser/ast/pops_bridge.rb:186
+#: ../lib/puppet/parser/ast/pops_bridge.rb:180
 msgid "Instantiating Resource with type checked parameters - scope is missing, skipping type checking."
 msgstr ""
 
@@ -4362,209 +4029,100 @@ msgid "For more information, see https://puppet.com/docs/puppet/latest/environme
 msgstr ""
 
 #. TRANSLATORS "stage" is a keyword in Puppet and should not be translated
-#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:137
+#: ../lib/puppet/parser/compiler.rb:82
 msgid "Only classes can set 'stage'; normal resources like %{resource} cannot change run stage"
 msgstr ""
 
-#. TRANSLATORS "Site" is a puppet keyword and should not be translated
-#: ../lib/puppet/parser/compiler.rb:125
-msgid "Application instances like '%{resource}' can only be contained within a Site"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:155
+#: ../lib/puppet/parser/compiler.rb:123
 msgid "For compiling %{node}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:159
+#: ../lib/puppet/parser/compiler.rb:127
 msgid "Compile: Set node parameters"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:161
+#: ../lib/puppet/parser/compiler.rb:129
 msgid "Compile: Created settings scope"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:163
-msgid "Compile: Evaluated capability mappings"
-msgstr ""
-
 #. TRANSLATORS "main" is a function name and should not be translated
-#: ../lib/puppet/parser/compiler.rb:166
+#: ../lib/puppet/parser/compiler.rb:132
 msgid "Compile: Evaluated main"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:168
-msgid "Compile: Evaluated site"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:170
+#: ../lib/puppet/parser/compiler.rb:134
 msgid "Compile: Evaluated AST node"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:172
+#: ../lib/puppet/parser/compiler.rb:136
 msgid "Compile: Evaluated node classes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:174
-msgid "Compile: Evaluated application instances"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:177
-msgid "Compile: Evaluated site capability mappings"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:179
+#: ../lib/puppet/parser/compiler.rb:138
 msgid "Compile: Evaluated generators"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:181
+#: ../lib/puppet/parser/compiler.rb:140
 msgid "Compile: Validate Catalog pre-finish"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:185
+#: ../lib/puppet/parser/compiler.rb:144
 msgid "Compile: Finished catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:187
-msgid "Compile: Prune"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:191
+#: ../lib/puppet/parser/compiler.rb:148
 msgid "Compile: Validate Catalog final"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:321
-msgid "Invalid node mapping in %{app}: Mapping must be a hash"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:324
-msgid "Invalid node mapping in %{app}: Key %{k} is not a Node"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:327
-msgid "Invalid node mapping in %{app}: Value %{res} is not a resource"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:328
-msgid "Application %{app} maps component %{res} to multiple nodes"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:367
+#: ../lib/puppet/parser/compiler.rb:218
 msgid "Could not find node statement with name 'default' or '%{names}'"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:385
+#: ../lib/puppet/parser/compiler.rb:236
 msgid "No source for scope passed to evaluate_classes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:401
+#: ../lib/puppet/parser/compiler.rb:246
 msgid "Could not find class %{name} for %{node}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:503
-msgid "Capability mapping error: %{kind} clause references nonexistent %{component_type} %{component_name}"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:526
+#: ../lib/puppet/parser/compiler.rb:328
 msgid "Evaluated collections"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:541
+#: ../lib/puppet/parser/compiler.rb:343
 msgid "Evaluated definitions"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:570
+#: ../lib/puppet/parser/compiler.rb:372
 msgid "Iterated (%{count}) on generators"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:581
+#: ../lib/puppet/parser/compiler.rb:383
 msgid "Somehow looped more than 1000 times while evaluating host catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:613
+#: ../lib/puppet/parser/compiler.rb:415
 msgid "Could not find resource(s) %{resources} for overriding"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:624
+#: ../lib/puppet/parser/compiler.rb:426
 msgid "Failed to realize virtual resources %{resources}"
 msgstr ""
 
 #. TRANSLATORS "main" is a function name and should not be translated
-#: ../lib/puppet/parser/compiler.rb:657
+#: ../lib/puppet/parser/compiler.rb:459
 msgid "Couldn't find main"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:730
+#: ../lib/puppet/parser/compiler.rb:532
 msgid "For initializing compiler"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:19
-msgid "Capability '%{cap}' referenced by '%{param}' is never exported"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:58
-msgid "'%{value}' is exported by both '%{hash}' and '%{resource}'"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb:27
-msgid "'%{param}' is not a valid relationship to a capability"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb:43
+#: ../lib/puppet/parser/compiler/catalog_validator/relationship_validator.rb:31
 msgid "Could not find resource '%{res}' in parameter '%{param}'"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/site_validator.rb:16
-msgid "Only application components can appear inside a site - %{res} is not allowed"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:13
-msgid "%{detail} in environment %{env}"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:62
-msgid "For compiling environment catalog %{env}"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:65
-msgid "Env Compile: Created settings scope"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:67
-msgid "Env Compile: Evaluated main"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:69
-msgid "Env Compile: Evaluated site"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:71
-msgid "Env Compile: Evaluated application instances"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:73
-msgid "Env Compile: Prune"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:75
-msgid "Env Compile: Validate Catalog pre-finish"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:79
-msgid "Env Compile: Finished catalog"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:83
-msgid "Env Compile: Validate Catalog final"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:159
-msgid "Environment Compiler: Could not find a site definition to evaluate"
-msgstr ""
-
-#: ../lib/puppet/parser/environment_compiler.rb:165
-msgid "Evaluated application %{resource}"
-msgstr ""
-
 #: ../lib/puppet/parser/functions.rb:43
 msgid "The method 'Puppet::Parser::Functions.autoloader#loadall' is deprecated in favor of using 'Scope#call_function'."
 msgstr ""
@@ -4699,55 +4257,35 @@ msgstr ""
 msgid "Resources require a scope"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:168
+#: ../lib/puppet/parser/resource.rb:159
 msgid "Only subclasses can override parameters"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:174
+#: ../lib/puppet/parser/resource.rb:165
 msgid "Attempt to override an already evaluated resource with new values"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:176
+#: ../lib/puppet/parser/resource.rb:167
 msgid "Attempt to override an already evaluated resource, defined at %{error_location}, with new values"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:273
-msgid "Invalid consume in %{value0}: %{ref} is not a resource"
-msgstr ""
-
-#: ../lib/puppet/parser/resource.rb:280
-msgid "Resource %{ref} could not be found; it might not have been produced yet"
-msgstr ""
-
-#: ../lib/puppet/parser/resource.rb:284
-msgid "Invalid consume in %{ref}: %{cap} is not a capability resource"
-msgstr ""
-
-#: ../lib/puppet/parser/resource.rb:293
-msgid "Resource %{res} tries to consume %{cns} but no 'consumes' mapping exists for %{resource_type} and %{cns_type}"
-msgstr ""
-
-#: ../lib/puppet/parser/resource.rb:313
-msgid "Attempt to reassign attribute '%{name}' in '%{resource}' caused by multiple consumed mappings to the same attribute"
-msgstr ""
-
-#: ../lib/puppet/parser/resource.rb:365
+#: ../lib/puppet/parser/resource.rb:296
 msgid "Parameter '%{name}' is already set on %{resource}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:368
+#: ../lib/puppet/parser/resource.rb:299
 msgid "Parameter '%{name}' is already set on %{resource} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:373
+#: ../lib/puppet/parser/resource.rb:304
 msgid "Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:376
+#: ../lib/puppet/parser/resource.rb:307
 msgid "Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:415
+#: ../lib/puppet/parser/resource.rb:346
 msgid "Duplicate parameter '%{param}' for on %{resource}"
 msgstr ""
 
@@ -4989,19 +4527,19 @@ msgstr ""
 msgid "break() from context where this is illegal"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1241
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1236
 msgid "Can only append Array or Hash to a Hash"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1245
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1240
 msgid "An URI can only be merged with an URI or String"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1248
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1243
 msgid "Can only append Binary to a Binary"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1281
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1276
 msgid "Can only delete from an Array or Hash."
 msgstr ""
 
@@ -5773,10 +5311,6 @@ msgstr ""
 msgid "Failed to load: %{type_name}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:925
-msgid "Use of the application-orchestration %{expr} is deprecated. See https://puppet.com/docs/puppet/5.5/deprecated_language.html"
-msgstr ""
-
 #: ../lib/puppet/pops/label_provider.rb:76
 msgid "<%{string}> does not appear to contain a word"
 msgstr ""
@@ -5899,21 +5433,21 @@ msgstr ""
 msgid "The code loaded from %{source_ref} did not produce a Function class when evaluated. Got '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:24
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:23
 msgid "The code loaded from %{source_ref} does not seem to be a Puppet 3x API function - no 'newfunction' call."
 msgstr ""
 
 #. TRANSLATORS - the word 'newfunction' should not be translated as it is a method name.
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:47
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:45
 msgid "Illegal legacy function definition! The code loaded from %{source_ref} did not return the result of calling 'newfunction'. Got '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:50
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:48
 msgid "The code loaded from %{source_ref} produced mis-matched name, expected 'function_%{type_name}', got '%{created_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:94
-msgid "Illegal method definition of method '%{method_name}' on line %{line}' in legacy function. See %{url} for more information"
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:92
+msgid "Illegal method definition of method '%{method_name}' on line %{line} in legacy function. See %{url} for more information"
 msgstr ""
 
 #: ../lib/puppet/pops/loader/task_instantiator.rb:22
@@ -6115,19 +5649,19 @@ msgid "Unacceptable transform - found an Object without a rule: %{klass}"
 msgstr ""
 
 #. TRANSLATORS 'NUMBER' refers to a method name and the 'name_or_numeric' was the passed in value and should not be translated
-#: ../lib/puppet/pops/model/factory.rb:849
+#: ../lib/puppet/pops/model/factory.rb:812
 msgid "Internal Error, NUMBER token does not contain a valid number, %{name_or_numeric}"
 msgstr ""
 
-#: ../lib/puppet/pops/model/factory.rb:1166
+#: ../lib/puppet/pops/model/factory.rb:1121
 msgid "can only concatenate strings, got %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/parser_support.rb:204
+#: ../lib/puppet/pops/parser/parser_support.rb:199
 msgid "attempt to pass argument list to the function '%{name}' which cannot be called without parentheses"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/parser_support.rb:206
+#: ../lib/puppet/pops/parser/parser_support.rb:201
 msgid "illegal comma separated argument list"
 msgstr ""
 
@@ -6167,7 +5701,7 @@ msgstr ""
 msgid "digit expected"
 msgstr ""
 
-#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:444
+#: ../lib/puppet/pops/resource/resource_type_impl.rb:165 ../lib/puppet/type.rb:421
 msgid "you must specify title patterns when there are two or more key attributes"
 msgstr ""
 
@@ -6292,10 +5826,6 @@ msgstr ""
 msgid "%{klass} cannot be subtracted from a Timestamp"
 msgstr ""
 
-#: ../lib/puppet/pops/types/enumeration.rb:7 ../lib/puppet/pops/types/enumeration.rb:12
-msgid "Enumeration.enumerator is deprecated. Use Iterable.on instead"
-msgstr ""
-
 #: ../lib/puppet/pops/types/p_binary_type.rb:77
 msgid "The given string in encoding '%{enc}' is invalid. Cannot create a Binary UTF-8 representation"
 msgstr ""
@@ -6409,10 +5939,6 @@ msgstr ""
 msgid "Options 'include_containers' and 'include_values' cannot both be false"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_calculator.rb:187
-msgid "TypeCalculator.enumerable is deprecated. Use iterable"
-msgstr ""
-
 #. TRANSLATORS 'TypeFactory#string' is a class and method name and should not be translated
 #: ../lib/puppet/pops/types/type_factory.rb:117
 msgid "Passing more than one argument to TypeFactory#string is deprecated"
@@ -6427,85 +5953,85 @@ msgstr ""
 msgid "Everything is now reported using present tense"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:429
+#: ../lib/puppet/pops/types/type_parser.rb:425
 msgid "Enum parameters must be identifiers or strings"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:665
+#: ../lib/puppet/pops/types/type_parser.rb:661
 msgid "The expression <%{expression}> is not a valid type specification."
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:670
+#: ../lib/puppet/pops/types/type_parser.rb:666
 msgid "Invalid number of type parameters specified: %{type} requires %{required}, %{given} provided"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:675
+#: ../lib/puppet/pops/types/type_parser.rb:671
 msgid "Not a parameterized type <%{type}>"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:679
+#: ../lib/puppet/pops/types/type_parser.rb:675
 msgid "Unknown type <%{type}>"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:930
+#: ../lib/puppet/pops/types/types.rb:929
 msgid "The string '%{str}' cannot be converted to Numeric"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:933
+#: ../lib/puppet/pops/types/types.rb:932
 msgid "Value of type %{type} cannot be converted to Numeric"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1171
+#: ../lib/puppet/pops/types/types.rb:1170
 msgid "The string '%{str}' cannot be converted to Integer"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1174
+#: ../lib/puppet/pops/types/types.rb:1173
 msgid "Value of type %{type} cannot be converted to Integer"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1182
+#: ../lib/puppet/pops/types/types.rb:1181
 msgid "Illegal radix: %{radix}, expected 2, 8, 10, 16, or default"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1295
+#: ../lib/puppet/pops/types/types.rb:1294
 msgid "The string '%{str}' cannot be converted to Float"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1298
+#: ../lib/puppet/pops/types/types.rb:1297
 msgid "Value of type %{type} cannot be converted to Float"
 msgstr ""
 
 #. TRANSLATORS 'PStringType#initialize' is a class and method name and should not be translated
-#: ../lib/puppet/pops/types/types.rb:1515
+#: ../lib/puppet/pops/types/types.rb:1514
 msgid "Passing more than one argument to PStringType#initialize is deprecated"
 msgstr ""
 
 #. TRANSLATORS 'PStringType#values' and '#value' are classes and method names and should not be translated
-#: ../lib/puppet/pops/types/types.rb:1569
+#: ../lib/puppet/pops/types/types.rb:1568
 msgid "Method PStringType#values is deprecated. Use #value instead"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1895
+#: ../lib/puppet/pops/types/types.rb:1894
 msgid "The string '%{str}' cannot be converted to Boolean"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1898
+#: ../lib/puppet/pops/types/types.rb:1897
 msgid "Value of type %{type} cannot be converted to Boolean"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:2626
+#: ../lib/puppet/pops/types/types.rb:2625
 msgid "Value of type %{type} cannot be converted to Array"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:2696
+#: ../lib/puppet/pops/types/types.rb:2695
 msgid "Puppet::Pops::Types::PHashType#element_type is deprecated, use #value_type instead"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:2833
+#: ../lib/puppet/pops/types/types.rb:2832
 msgid "odd number of arguments for Hash"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:2844
+#: ../lib/puppet/pops/types/types.rb:2843
 msgid "Value of type %{type} cannot be converted to Hash"
 msgstr ""
 
@@ -6584,19 +6110,19 @@ msgstr ""
 msgid "Key/value pairs must be separated by '%{separator}'"
 msgstr ""
 
-#: ../lib/puppet/provider.rb:145
+#: ../lib/puppet/provider.rb:132
 msgid "No command %{command} defined for provider %{provider}"
 msgstr ""
 
-#: ../lib/puppet/provider.rb:397
+#: ../lib/puppet/provider.rb:384
 msgid "To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api"
 msgstr ""
 
-#: ../lib/puppet/provider.rb:470
+#: ../lib/puppet/provider.rb:457
 msgid "'%{parameter_name}' is not a valid parameter for %{resource_type}"
 msgstr ""
 
-#: ../lib/puppet/provider.rb:556
+#: ../lib/puppet/provider.rb:543
 msgid "No resource and no name in property hash in %{class_name} instance"
 msgstr ""
 
@@ -6624,11 +6150,11 @@ msgstr ""
 msgid "aix.object_info(): Could not find %{resource}[%{name}]"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:471 ../lib/puppet/provider/nameservice.rb:182 ../lib/puppet/provider/nameservice/directoryservice.rb:425
+#: ../lib/puppet/provider/aix_object.rb:471 ../lib/puppet/provider/nameservice.rb:164 ../lib/puppet/provider/nameservice/directoryservice.rb:425
 msgid "Could not create %{resource} %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:483 ../lib/puppet/provider/nameservice.rb:196
+#: ../lib/puppet/provider/aix_object.rb:483 ../lib/puppet/provider/nameservice.rb:178
 msgid "Could not delete %{resource} %{name}: %{detail}"
 msgstr ""
 
@@ -6717,32 +6243,28 @@ msgstr ""
 msgid "%{name} is not a valid attribute for %{resource_type}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:60
-msgid "listbyname is deprecated and will be removed in a future release of Puppet. Please use `self.instances` to obtain a list of users."
-msgstr ""
-
-#: ../lib/puppet/provider/nameservice.rb:103
+#: ../lib/puppet/provider/nameservice.rb:85
 msgid "Invalid value %{value}: %{error}"
 msgstr ""
 
 #. TRANSLATORS "autogen_id()" is a method name and should not be translated
-#: ../lib/puppet/provider/nameservice.rb:148
+#: ../lib/puppet/provider/nameservice.rb:130
 msgid "autogen_id() does not support auto generation of id for resource type %{resource_type}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:170 ../lib/puppet/provider/nameservice/directoryservice.rb:379
+#: ../lib/puppet/provider/nameservice.rb:152 ../lib/puppet/provider/nameservice/directoryservice.rb:379
 msgid "already exists"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:188
+#: ../lib/puppet/provider/nameservice.rb:170
 msgid "already absent"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:282
+#: ../lib/puppet/provider/nameservice.rb:264
 msgid "Nameservice command must be an array"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:287 ../lib/puppet/provider/nameservice/directoryservice.rb:340 ../lib/puppet/provider/nameservice/directoryservice.rb:369
+#: ../lib/puppet/provider/nameservice.rb:269 ../lib/puppet/provider/nameservice/directoryservice.rb:340 ../lib/puppet/provider/nameservice/directoryservice.rb:369
 msgid "Could not set %{param} on %{resource}[%{name}]: %{detail}"
 msgstr ""
 
@@ -6888,27 +6410,27 @@ msgstr ""
 msgid "source is defined but does not have trailing slash, ignoring %{source}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:102 ../lib/puppet/provider/package/puppetserver_gem.rb:61
+#: ../lib/puppet/provider/package/gem.rb:122 ../lib/puppet/provider/package/puppetserver_gem.rb:61
 msgid "Could not list gems: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:128
+#: ../lib/puppet/provider/package/gem.rb:148
 msgid "Could not match %{desc}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:206 ../lib/puppet/provider/package/puppetserver_gem.rb:93
+#: ../lib/puppet/provider/package/gem.rb:226 ../lib/puppet/provider/package/puppetserver_gem.rb:93
 msgid "Invalid source '%{uri}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:217 ../lib/puppet/provider/package/puppetserver_gem.rb:104
+#: ../lib/puppet/provider/package/gem.rb:237 ../lib/puppet/provider/package/puppetserver_gem.rb:104
 msgid "puppet:// URLs are not supported as gem sources"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:233 ../lib/puppet/provider/package/puppetserver_gem.rb:115
+#: ../lib/puppet/provider/package/gem.rb:253 ../lib/puppet/provider/package/puppetserver_gem.rb:115
 msgid "Could not install: %{output}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:259 ../lib/puppet/provider/package/puppetserver_gem.rb:125
+#: ../lib/puppet/provider/package/gem.rb:279 ../lib/puppet/provider/package/puppetserver_gem.rb:125
 msgid "Could not uninstall: %{output}"
 msgstr ""
 
@@ -7018,7 +6540,7 @@ msgstr ""
 msgid "Refusing to install package group %{resource_name}, because allow_virtual is false."
 msgstr ""
 
-#: ../lib/puppet/provider/package/pip.rb:58
+#: ../lib/puppet/provider/package/pip.rb:57
 msgid "Cannot resolve pip version"
 msgstr ""
 
@@ -7034,27 +6556,27 @@ msgstr ""
 msgid "Unknown line format %{resource_name}: %{parse_line}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:127
+#: ../lib/puppet/provider/package/pkg.rb:123
 msgid "Unable to unfreeze %{package}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:162
+#: ../lib/puppet/provider/package/pkg.rb:158
 msgid "Implicit version %{should} has %{n} possible matches"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:174
+#: ../lib/puppet/provider/package/pkg.rb:170
 msgid "Selecting version '%{version}' for implicit '%{should}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:179
+#: ../lib/puppet/provider/package/pkg.rb:175
 msgid "No version of %{name} matching %{should} is installable, even though the package is currently installed"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:198
+#: ../lib/puppet/provider/package/pkg.rb:194
 msgid "pkg warning: %{warnings}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:242 ../lib/puppet/provider/package/pkg.rb:268
+#: ../lib/puppet/provider/package/pkg.rb:238 ../lib/puppet/provider/package/pkg.rb:264
 msgid "Unable to update %{package}"
 msgstr ""
 
@@ -7241,15 +6763,15 @@ msgstr ""
 msgid "Waiting 5 seconds for runsvdir to discover service %{service}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/smf.rb:68
+#: ../lib/puppet/provider/service/smf.rb:120
 msgid "Failed to get the FMRI of the %{service} service: The pattern '%{service}' matches multiple FMRIs! These are the FMRIs it matches: %{all_fmris}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/smf.rb:83
+#: ../lib/puppet/provider/service/smf.rb:135
 msgid "Cannot query if the %{service} service is complete: The concept of complete/incomplete services was introduced in Solaris 11.1. You are on a Solaris %{release} machine."
 msgstr ""
 
-#: ../lib/puppet/provider/service/smf.rb:182
+#: ../lib/puppet/provider/service/smf.rb:221
 msgid "The %{service} service is incomplete so its status will be reported as :stopped. See `svcs -xv %{fmri}` for more details."
 msgstr ""
 
@@ -7374,142 +6896,90 @@ msgstr ""
 msgid "Invalid node name %{host}"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:48
+#: ../lib/puppet/resource.rb:47
 msgid "No resource type provided in serialized data"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:50
+#: ../lib/puppet/resource.rb:49
 msgid "No resource title provided in serialized data"
 msgstr ""
 
 #. TRANSLATORS 'Puppet::Resource.new' should not be translated
-#: ../lib/puppet/resource.rb:277
+#: ../lib/puppet/resource.rb:276
 msgid "Puppet::Resource.new does not take a hash as the first argument."
 msgstr ""
 
-#: ../lib/puppet/resource.rb:278
+#: ../lib/puppet/resource.rb:277
 msgid "Did you mean (%{type}, %{title}) ?"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:315
+#: ../lib/puppet/resource.rb:314
 msgid "Could not find declared class %{title}"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:317
+#: ../lib/puppet/resource.rb:316
 msgid "Invalid resource type %{type}"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:521
-msgid "The method Puppet::Resource.set_default_parameters is deprecated and will be removed in the next major release of Puppet."
-msgstr ""
-
-#: ../lib/puppet/resource.rb:526
-msgid "Cannot evaluate default parameters for %{resource} - not a parser resource"
-msgstr ""
-
-#: ../lib/puppet/resource.rb:566
-msgid "The method Puppet::Resource.validate_complete is deprecated and will be removed in the next major release of Puppet."
-msgstr ""
-
-#: ../lib/puppet/resource.rb:572
-msgid "Must pass %{param} to %{resource}"
-msgstr ""
-
-#: ../lib/puppet/resource.rb:584
-msgid "Expected parameter '%{name}' of '%{value0}' to have type %{value1}, got %{value2}"
-msgstr ""
-
-#: ../lib/puppet/resource.rb:590
+#: ../lib/puppet/resource.rb:502
 msgid "no parameter named '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:635
+#: ../lib/puppet/resource.rb:547
 msgid "No title provided and %{type} is not a valid resource reference"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:709
+#: ../lib/puppet/resource.rb:621
 msgid "No set of title patterns matched the title \"%{title}\"."
 msgstr ""
 
-#: ../lib/puppet/resource/capability_finder.rb:27
-msgid "PuppetDB is not available"
-msgstr ""
-
-#: ../lib/puppet/resource/capability_finder.rb:47
-msgid "Unexpected response from PuppetDB when looking up %{capability}:"
-msgstr ""
-
-#: ../lib/puppet/resource/capability_finder.rb:48
-msgid "expected exactly one resource but got %{count};"
-msgstr ""
-
-#: ../lib/puppet/resource/capability_finder.rb:49
-msgid ""
-"returned data is:\n"
-"%{resources}"
-msgstr ""
-
-#: ../lib/puppet/resource/capability_finder.rb:81
-msgid "Looking up capability %{capability} in PuppetDB: %{query_terms}"
-msgstr ""
-
-#: ../lib/puppet/resource/capability_finder.rb:105
-msgid "Unexpected response from PuppetDB when looking up %{capability}: expected an Array but got %{result}"
-msgstr ""
-
-#: ../lib/puppet/resource/capability_finder.rb:112
-msgid ""
-"Invalid JSON from PuppetDB when looking up %{capability}\n"
-"%{detail}"
-msgstr ""
-
-#: ../lib/puppet/resource/catalog.rb:104
+#: ../lib/puppet/resource/catalog.rb:102
 msgid "Cannot add resource %{resource_1} before %{resource_2} because %{resource_2} is not yet in the catalog"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:119
+#: ../lib/puppet/resource/catalog.rb:117
 msgid "Cannot add resource %{resource_1} after %{resource_2} because %{resource_2} is not yet in the catalog"
 msgstr ""
 
 #. TRANSLATORS 'alias' should not be translated
-#: ../lib/puppet/resource/catalog.rb:206
+#: ../lib/puppet/resource/catalog.rb:204
 msgid "Cannot alias %{resource} to %{key}; resource %{newref} already declared"
 msgstr ""
 
 #. TRANSLATORS 'alias' should not be translated
-#: ../lib/puppet/resource/catalog.rb:210
+#: ../lib/puppet/resource/catalog.rb:208
 msgid "Cannot alias %{resource} to %{key} at %{resource_declaration}; resource %{newref} already declared"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:292
+#: ../lib/puppet/resource/catalog.rb:290
 msgid "Unknown resource type %{type}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:446
+#: ../lib/puppet/resource/catalog.rb:433
 msgid "Could not intern from data: Could not find relationship source %{source} for %{target}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:453
+#: ../lib/puppet/resource/catalog.rb:440
 msgid "Could not intern from data: Could not find relationship target %{target} for %{source}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:543
+#: ../lib/puppet/resource/catalog.rb:530
 msgid "Could not create class file %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:559
+#: ../lib/puppet/resource/catalog.rb:546
 msgid "Could not create resource file %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:594
+#: ../lib/puppet/resource/catalog.rb:581
 msgid "Duplicate declaration: %{resource} is already declared; cannot redeclare"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:596
+#: ../lib/puppet/resource/catalog.rb:583
 msgid "Duplicate declaration: %{resource} is already declared at %{error_location}; cannot redeclare"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:645 ../lib/puppet/resource/catalog.rb:650
+#: ../lib/puppet/resource/catalog.rb:632 ../lib/puppet/resource/catalog.rb:637
 msgid "Could not find resource %{resource} when converting %{message} resources"
 msgstr ""
 
@@ -7517,201 +6987,145 @@ msgstr ""
 msgid "Could not evaluate: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:82
-msgid "Invalid export in %{reference}: %{ex} is not a resource"
-msgstr ""
-
-#: ../lib/puppet/resource/type.rb:83
-msgid "Invalid export in %{reference}: %{ex} is not a capability resource"
-msgstr ""
-
 #: ../lib/puppet/resource/type.rb:87
-msgid "Resource type %{res_type} does not produce %{ex_type}"
-msgstr ""
-
-#: ../lib/puppet/resource/type.rb:148
 msgid "Invalid resource supertype '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:200
+#: ../lib/puppet/resource/type.rb:117
 msgid "%{name} is not a class; cannot add code to it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:201
+#: ../lib/puppet/resource/type.rb:118
 msgid "%{name} is not a class; cannot add code from it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:205
+#: ../lib/puppet/resource/type.rb:122
 msgid "Cannot have code outside of a class/node/define because 'freeze_main' is enabled"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:209
+#: ../lib/puppet/resource/type.rb:126
 msgid "Cannot merge classes with different parent classes (%{name} => %{parent} vs. %{other_name} => %{other_parent})"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:240
+#: ../lib/puppet/resource/type.rb:157
 msgid "Cannot create resources for defined resource types"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:295
-msgid "The method Puppet::Resource::Type.assign_parameter_values is deprecated and will be removed in the next major release of Puppet."
-msgstr ""
-
-#: ../lib/puppet/resource/type.rb:311
+#: ../lib/puppet/resource/type.rb:210
 msgid "Could not find parent resource type '%{parent}' of type %{parent_type} in %{env}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:438
+#: ../lib/puppet/resource/type.rb:336
 msgid "Parameter '%{name}' is given a type, but is not a valid parameter."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:441
+#: ../lib/puppet/resource/type.rb:339
 msgid "Parameter '%{name}' is given a type that is not a Puppet Type, got %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:483
+#: ../lib/puppet/resource/type.rb:373
 msgid "Could not find scope for %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:504
+#: ../lib/puppet/resource/type.rb:394
 msgid "%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:506
+#: ../lib/puppet/resource/type.rb:396
 msgid "%{param} is a metaparameter; please choose another parameter name in the %{name} definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:72
+#: ../lib/puppet/resource/type_collection.rb:63
 msgid "Class '%{klass}' is already defined%{error}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:73
+#: ../lib/puppet/resource/type_collection.rb:64
 msgid "Definition '%{klass}' is already defined%{error}; cannot be redefined as a class"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:74
-msgid "Application '%{klass}' is already defined%{error}; cannot be redefined as a class"
-msgstr ""
-
-#: ../lib/puppet/resource/type_collection.rb:105
+#: ../lib/puppet/resource/type_collection.rb:95
 msgid "Node '%{name}' is already defined%{error}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:113
-msgid "Site is already defined%{error}; cannot redefine"
-msgstr ""
-
-#: ../lib/puppet/resource/type_collection.rb:150
+#: ../lib/puppet/resource/type_collection.rb:130
 msgid "'%{name}' is already defined%{error} as a class; cannot redefine as a definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:151
+#: ../lib/puppet/resource/type_collection.rb:131
 msgid "Definition '%{name}' is already defined%{error}; cannot be redefined"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:152 ../lib/puppet/resource/type_collection.rb:168
-msgid "'%{name}' is already defined%{error} as an application; cannot be redefined"
-msgstr ""
-
-#: ../lib/puppet/resource/type_collection.rb:157
-msgid "'%{name}' is already defined%{error} as a class; cannot redefine as a mapping"
-msgstr ""
-
-#: ../lib/puppet/resource/type_collection.rb:166
-msgid "'%{name}' is already defined%{error} as a class; cannot redefine as an application"
-msgstr ""
-
-#: ../lib/puppet/resource/type_collection.rb:167
-msgid "'%{name}' is already defined%{error} as a definition; cannot redefine as an application"
-msgstr ""
-
-#: ../lib/puppet/resource/type_collection.rb:220
+#: ../lib/puppet/resource/type_collection.rb:175
 msgid "Execution of config_version command `%{cmd}` failed: %{message}"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:241
+#: ../lib/puppet/resource/type_collection.rb:196
 msgid "Not attempting to load %{type} %{fqname} as this object was missing during a prior compilation"
 msgstr ""
 
-#: ../lib/puppet/rest/route.rb:47
-msgid "Connection to cached server and port %{server}:%{port} failed: %{message}"
-msgstr ""
-
-#: ../lib/puppet/rest/routes.rb:46
-msgid "Downloaded certificate for %{name} from %{server}"
-msgstr ""
-
-#: ../lib/puppet/rest/routes.rb:76
-msgid "Downloaded certificate revocation list for %{name} from %{server}"
-msgstr ""
-
-#: ../lib/puppet/rest/routes.rb:129
-msgid "Downloaded existing certificate request for %{name} from %{server}"
-msgstr ""
-
-#: ../lib/puppet/settings.rb:99
+#: ../lib/puppet/settings.rb:102
 msgid "New environment loaders generated from the requested section."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:301
+#: ../lib/puppet/settings.rb:304
 msgid "Attempting to initialize global default settings more than once!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:501
+#: ../lib/puppet/settings.rb:504
 msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:643
+#: ../lib/puppet/settings.rb:646
 msgid "Could not load %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:750
+#: ../lib/puppet/settings.rb:755
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:905
+#: ../lib/puppet/settings.rb:910
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:978
+#: ../lib/puppet/settings.rb:983
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:983
+#: ../lib/puppet/settings.rb:988
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:989
+#: ../lib/puppet/settings.rb:994
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1253
+#: ../lib/puppet/settings.rb:1265
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
-#: ../lib/puppet/settings.rb:1258
+#: ../lib/puppet/settings.rb:1270
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1435
+#: ../lib/puppet/settings.rb:1457
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1459
+#: ../lib/puppet/settings.rb:1481
 msgid "Could not find value for %{expression}"
 msgstr ""
 
 #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
-#: ../lib/puppet/settings.rb:1469
+#: ../lib/puppet/settings.rb:1491
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1470
+#: ../lib/puppet/settings.rb:1492
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1501
+#: ../lib/puppet/settings.rb:1523
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7833,7 +7247,15 @@ msgstr ""
 msgid "Expected an Array, String, or Hash, got a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/settings/priority_setting.rb:39
+#: ../lib/puppet/settings/integer_setting.rb:8
+msgid "Cannot convert '%{value}' to an integer for parameter: %{name}"
+msgstr ""
+
+#: ../lib/puppet/settings/port_setting.rb:6
+msgid "Value '%{value}' is not a valid port number for parameter: %{name}"
+msgstr ""
+
+#: ../lib/puppet/settings/priority_setting.rb:40
 msgid "Invalid priority format '%{value}' for parameter: %{name}"
 msgstr ""
 
@@ -7853,83 +7275,83 @@ msgstr ""
 msgid "Invalid 'time to live' format '%{value}' for parameter: %{param_name}"
 msgstr ""
 
-#: ../lib/puppet/ssl/base.rb:27
+#: ../lib/puppet/ssl/base.rb:26
 msgid "%{name} has not declared what class it wraps"
 msgstr ""
 
-#: ../lib/puppet/ssl/base.rb:32 ../lib/puppet/x509/cert_provider.rb:342
+#: ../lib/puppet/ssl/base.rb:31 ../lib/puppet/x509/cert_provider.rb:370
 msgid "Certname %{name} must not contain unprintable or non-ASCII characters"
 msgstr ""
 
-#: ../lib/puppet/ssl/base.rb:38
+#: ../lib/puppet/ssl/base.rb:37
 msgid "%{class_name} did not override 'generate'"
 msgstr ""
 
-#: ../lib/puppet/ssl/base.rb:63
+#: ../lib/puppet/ssl/base.rb:64
 msgid "Object must be an instance of %{class_name}, %{actual_class} given"
 msgstr ""
 
-#: ../lib/puppet/ssl/base.rb:67
+#: ../lib/puppet/ssl/base.rb:68
 msgid "Name must be supplied if it cannot be determined from the instance"
 msgstr ""
 
-#: ../lib/puppet/ssl/base.rb:142
+#: ../lib/puppet/ssl/base.rb:140
 msgid "Unknown signature algorithm '%{ln}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:65
+#: ../lib/puppet/ssl/certificate_request.rb:57
 msgid "Creating a new SSL certificate request for %{name}"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:101
+#: ../lib/puppet/ssl/certificate_request.rb:90
 msgid "CSR sign verification failed; you need to clean the certificate request for %{name} on the server"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:107
+#: ../lib/puppet/ssl/certificate_request.rb:96
 msgid "Certificate Request fingerprint (%{digest}): %{hex_digest}"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:151
+#: ../lib/puppet/ssl/certificate_request.rb:140
 msgid "CSR needs content to extract fields"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:178
+#: ../lib/puppet/ssl/certificate_request.rb:167
 msgid "In %{attr}, expected extension record %{index} to have two or three items, but found %{count}"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:229
+#: ../lib/puppet/ssl/certificate_request.rb:218
 msgid "Cannot specify CSR attribute %{oid}: conflicts with internally used CSR attribute"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:238
+#: ../lib/puppet/ssl/certificate_request.rb:227
 msgid "Cannot create CSR with attribute %{oid}: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:255
+#: ../lib/puppet/ssl/certificate_request.rb:244
 msgid "Cannot specify CSR extension request %{oid}: conflicts with internally used extension request"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:261
+#: ../lib/puppet/ssl/certificate_request.rb:250
 msgid "Cannot create CSR with extension request %{oid}: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:312
+#: ../lib/puppet/ssl/certificate_request.rb:301
 msgid "In %{attr}, expected Set but found %{klass}"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:316
+#: ../lib/puppet/ssl/certificate_request.rb:305
 msgid "In %{attr}, expected Set[Array] but found %{klass}"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:320
+#: ../lib/puppet/ssl/certificate_request.rb:309
 msgid "In %{attr}, expected Set[Array] with one value but found %{count} elements"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:324
+#: ../lib/puppet/ssl/certificate_request.rb:313
 msgid "In %{attr}, expected Set[Array[Sequence[...]]], but found %{klass}"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_request.rb:328
+#: ../lib/puppet/ssl/certificate_request.rb:317
 msgid "In %{attr}, expected Set[Array[Sequence[Array[...]]]], but found %{klass}"
 msgstr ""
 
@@ -7957,195 +7379,107 @@ msgstr ""
 msgid "Server hostname '%{host}' did not match server certificate; %{expected_certnames}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:154
-msgid "No certificate to validate."
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:155
-msgid "No private key with which to validate certificate with fingerprint: %{fingerprint}"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:157
-msgid ""
-"The certificate retrieved from the master does not match the agent's private key. Did you forget to run as root?\n"
-"Certificate fingerprint: %{fingerprint}\n"
-"To fix this, remove the certificate from both the master and the agent and then start a puppet run, which will automatically regenerate a certificate.\n"
-"On the master:\n"
-"  puppetserver ca clean --certname %{cert_name}\n"
-"On the agent:\n"
-"  1. puppet ssl clean %{clean_params}\n"
-"  2. puppet %{puppet_params}\n"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:212
-msgid ""
-"The CSR retrieved from the master does not match the agent's public key.\n"
-"CSR fingerprint: %{fingerprint}\n"
-"CSR public key: %{csr_public_key}\n"
-"Agent public key: %{agent_public_key}\n"
-"To fix this, remove the CSR from both the master and the agent and then start a puppet run, which will automatically regenerate a CSR.\n"
-"On the master:\n"
-"  puppetserver ca clean --certname %{cert_name}\n"
-"On the agent:\n"
-"  1. puppet ssl clean %{clean_params}\n"
-"  2. puppet %{puppet_params}\n"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:235
-msgid "Puppet::SSL::Host is deprecated and will be removed in a future release of Puppet."
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:267 ../lib/puppet/ssl/host.rb:288
-msgid "Could not request certificate: %{message}"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:269
-msgid "Exiting; failed to retrieve certificate and waitforcert is disabled"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:278
-msgid "Exiting; no certificate found and waitforcert is disabled"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:286
-msgid "Did not receive certificate"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:326
-msgid "Response from the CA did not contain a valid certificate request: %{message}"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:332
-msgid "Could not download certificate request: %{message}"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:359
-msgid ""
-"Failed attempting to load CRL from %{crl_path}! The CRL below caused the error '%{error}':\n"
-"%{crl}"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:391 ../lib/puppet/ssl/state_machine.rb:120
-msgid "Could not download CRLs: %{message}"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:425
-msgid "The certificate at %{file_path} is invalid. Could not load."
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:446
-msgid "Response from the CA did not contain a valid certificate for %{cert_name}."
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:450
-msgid "No certificate for %{cert_name} on CA"
-msgstr ""
-
-#: ../lib/puppet/ssl/host.rb:453
-msgid "Could not download host certificate: %{message}"
-msgstr ""
-
-#: ../lib/puppet/ssl/oids.rb:110
+#: ../lib/puppet/ssl/oids.rb:112
 msgid "Error loading ssl custom OIDs mapping file from '%{custom_oid_file}': %{err}"
 msgstr ""
 
-#: ../lib/puppet/ssl/oids.rb:114
+#: ../lib/puppet/ssl/oids.rb:116
 msgid "Error loading ssl custom OIDs mapping file from '%{custom_oid_file}': no such index '%{map_key}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/oids.rb:118
+#: ../lib/puppet/ssl/oids.rb:120
 msgid "Error loading ssl custom OIDs mapping file from '%{custom_oid_file}': data under index '%{map_key}' must be a Hash"
 msgstr ""
 
-#: ../lib/puppet/ssl/oids.rb:125
+#: ../lib/puppet/ssl/oids.rb:127
 msgid "Error loading ssl custom OIDs mapping file from '%{custom_oid_file}': incomplete definition of oid '%{oid}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/oids.rb:157
+#: ../lib/puppet/ssl/oids.rb:159
 msgid "Error registering ssl custom OIDs mapping from file '%{custom_oid_file}': %{err}"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:66
+#: ../lib/puppet/ssl/ssl_provider.rb:83
 msgid "Failed to add '%{path}' as a trusted CA file: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:70
+#: ../lib/puppet/ssl/ssl_provider.rb:87
 msgid "The 'ssl_trust_store' setting does not refer to a file and will be ignored: '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:104
+#: ../lib/puppet/ssl/ssl_provider.rb:121
 msgid "CA certs are missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:105
+#: ../lib/puppet/ssl/ssl_provider.rb:122
 msgid "CRLs are missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:106
+#: ../lib/puppet/ssl/ssl_provider.rb:123
 msgid "Private key is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:107
+#: ../lib/puppet/ssl/ssl_provider.rb:124
 msgid "Client cert is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:113
+#: ../lib/puppet/ssl/ssl_provider.rb:130
 msgid "Unsupported key '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:117
+#: ../lib/puppet/ssl/ssl_provider.rb:134
 msgid "The certificate for '%{name}' does not match its private key"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:156
+#: ../lib/puppet/ssl/ssl_provider.rb:173
 msgid "Failed to load private key for host '%{name}': %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:170
+#: ../lib/puppet/ssl/ssl_provider.rb:187
 msgid "The CSR for host '%{name}' does not match the public key"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:234
+#: ../lib/puppet/ssl/ssl_provider.rb:251
 msgid "The issuer '%{issuer}' of certificate '%{subject}' cannot be found locally"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:250
+#: ../lib/puppet/ssl/ssl_provider.rb:267
 msgid "The certificate '%{subject}' is not yet valid, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:252
+#: ../lib/puppet/ssl/ssl_provider.rb:269
 msgid "The certificate '%{subject}' has expired, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:254
+#: ../lib/puppet/ssl/ssl_provider.rb:271
 msgid "The CRL issued by '%{issuer}' is not yet valid, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:256
+#: ../lib/puppet/ssl/ssl_provider.rb:273
 msgid "The CRL issued by '%{issuer}' has expired, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:258
+#: ../lib/puppet/ssl/ssl_provider.rb:275
 msgid "Invalid signature for certificate '%{subject}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:260
+#: ../lib/puppet/ssl/ssl_provider.rb:277
 msgid "Invalid signature for CRL issued by '%{issuer}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:262
+#: ../lib/puppet/ssl/ssl_provider.rb:279
 msgid "The issuer '%{issuer}' of certificate '%{subject}' is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:265
+#: ../lib/puppet/ssl/ssl_provider.rb:282
 msgid "The CRL issued by '%{issuer}' is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:267
+#: ../lib/puppet/ssl/ssl_provider.rb:284
 msgid "Certificate '%{subject}' is revoked"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:271
+#: ../lib/puppet/ssl/ssl_provider.rb:288
 msgid "Certificate '%{subject}' failed verification (%{err}): %{err_utf8}"
 msgstr ""
 
@@ -8169,6 +7503,10 @@ msgstr ""
 msgid "CRL is missing from the server"
 msgstr ""
 
+#: ../lib/puppet/ssl/state_machine.rb:120
+msgid "Could not download CRLs: %{message}"
+msgstr ""
+
 #: ../lib/puppet/ssl/state_machine.rb:127
 msgid "Refreshing CRL"
 msgstr ""
@@ -8241,16 +7579,16 @@ msgstr ""
 msgid "Another puppet instance is already running; waiting for it to finish"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:427
+#: ../lib/puppet/ssl/state_machine.rb:429
 msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:429
+#: ../lib/puppet/ssl/state_machine.rb:431
 msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
 #. TRANSLATORS: `error` is an untranslated message from openssl describing why a certificate in the server's chain is invalid, and `subject` is the identity/name of the failed certificate
-#: ../lib/puppet/ssl/verifier.rb:128
+#: ../lib/puppet/ssl/verifier.rb:130
 msgid "certificate verify failed [%{error} for %{subject}]"
 msgstr ""
 
@@ -8375,19 +7713,19 @@ msgid "Prefetch failed for %{type_name} provider '%{name}'"
 msgstr ""
 
 #. TRANSLATORS `prefetch` is a function name and should not be translated
-#: ../lib/puppet/transaction.rb:381 ../lib/puppet/transaction.rb:384
+#: ../lib/puppet/transaction.rb:381
 msgid "Could not prefetch %{type_name} provider '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:421
+#: ../lib/puppet/transaction.rb:415
 msgid "Skipping resources in class because of failed class dependencies"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:425
+#: ../lib/puppet/transaction.rb:419
 msgid "Skipping because of failed dependencies"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:430
+#: ../lib/puppet/transaction.rb:424
 msgid "Skipping because provider prefetch failed"
 msgstr ""
 
@@ -8508,77 +7846,77 @@ msgstr ""
 msgid "There is more than one '%{basename}' script in %{dir}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:519
+#: ../lib/puppet/type.rb:496
 msgid "Options must be a hash, not %{type}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:522
+#: ../lib/puppet/type.rb:499
 msgid "Class %{class_name} already has a property named %{property}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:609
+#: ../lib/puppet/type.rb:586
 msgid "Class %{class_name} has not defined parameters"
 msgstr ""
 
-#: ../lib/puppet/type.rb:696
+#: ../lib/puppet/type.rb:673
 msgid "Parameter %{name} failed on %{ref}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:719
+#: ../lib/puppet/type.rb:696
 msgid "Undefined attribute '%{attribute}' in %{name}"
 msgstr ""
 
 #. TRANSLATORS 'is' is a variable name and should not be translated
 #. TRANSLATORS 'is' is a variable name and should not be translated
-#: ../lib/puppet/type.rb:1062 ../lib/puppet/type.rb:1073
+#: ../lib/puppet/type.rb:1039 ../lib/puppet/type.rb:1050
 msgid "The 'is' value is not in the 'is' array for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1204
+#: ../lib/puppet/type.rb:1181
 msgid "%{name} has no providers and has not overridden 'instances'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1468
+#: ../lib/puppet/type.rb:1445
 msgid "Cannot add aliases without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1548
+#: ../lib/puppet/type.rb:1525
 msgid "Could not find %{description} %{ref} for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1825
+#: ../lib/puppet/type.rb:1749
 msgid "Found multiple default providers for %{name}: %{provider_list}; using %{selected_provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1912
+#: ../lib/puppet/type.rb:1836
 msgid "Could not find parent provider %{parent} of %{name}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1986
+#: ../lib/puppet/type.rb:1910
 msgid "Invalid %{resource} provider '%{provider_class}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2071
+#: ../lib/puppet/type.rb:1995
 msgid "Could not find %{name} provider of %{provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2189
+#: ../lib/puppet/type.rb:2113
 msgid "You cannot add relationships without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2492
+#: ../lib/puppet/type.rb:2416
 msgid "Unable to mark '%{name}' as sensitive: %{name} is a parameter and not a property, and cannot be automatically redacted."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2495
+#: ../lib/puppet/type.rb:2419
 msgid "Unable to mark '%{name}' as sensitive: the property itself was not assigned a value."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2497
+#: ../lib/puppet/type.rb:2421
 msgid "Unable to mark '%{name}' as sensitive: the property itself is not defined on %{type}."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2555
+#: ../lib/puppet/type.rb:2479
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
@@ -8655,86 +7993,86 @@ msgstr ""
 msgid "File paths must be fully qualified, not '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:142
+#: ../lib/puppet/type/file.rb:140
 msgid "Invalid backup type %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:186 ../lib/puppet/type/tidy.rb:48
+#: ../lib/puppet/type/file.rb:184 ../lib/puppet/type/tidy.rb:48
 msgid "Invalid recurse value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:218
+#: ../lib/puppet/type/file.rb:216
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:418
+#: ../lib/puppet/type/file.rb:416
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:420
+#: ../lib/puppet/type/file.rb:418
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:422
+#: ../lib/puppet/type/file.rb:420
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:425
+#: ../lib/puppet/type/file.rb:423
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:428
+#: ../lib/puppet/type/file.rb:426
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:436
+#: ../lib/puppet/type/file.rb:434
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:439
+#: ../lib/puppet/type/file.rb:437
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:477
+#: ../lib/puppet/type/file.rb:475
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:482
+#: ../lib/puppet/type/file.rb:480
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:780
+#: ../lib/puppet/type/file.rb:778
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:795
+#: ../lib/puppet/type/file.rb:793
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:806
+#: ../lib/puppet/type/file.rb:804
 msgid "Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore."
 msgstr ""
 
 #. TRANSLATORS "stat" is a program name and should not be translated
-#: ../lib/puppet/type/file.rb:887 ../lib/puppet/type/tidy.rb:352
+#: ../lib/puppet/type/file.rb:885 ../lib/puppet/type/tidy.rb:352
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:890
+#: ../lib/puppet/type/file.rb:888
 msgid "Could not stat; invalid pathname"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1018
+#: ../lib/puppet/type/file.rb:1016
 msgid "Not removing directory; use 'force' to override"
 msgstr ""
 
 #. TRANSLATORS refers to a file which could not be backed up
-#: ../lib/puppet/type/file.rb:1043
+#: ../lib/puppet/type/file.rb:1041
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1058
+#: ../lib/puppet/type/file.rb:1056
 msgid "File written to disk did not match desired checksum; discarding changes (%{content_checksum} vs %{desired_checksum})"
 msgstr ""
 
@@ -8800,36 +8138,36 @@ msgstr ""
 msgid "Invalid GID %{gid}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:128 ../lib/puppet/type/package.rb:142
+#: ../lib/puppet/type/package.rb:124 ../lib/puppet/type/package.rb:138
 msgid "Could not update: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:177
+#: ../lib/puppet/type/package.rb:173
 msgid "Could not get latest version: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:277
+#: ../lib/puppet/type/package.rb:273
 msgid "Name must be a String not %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:423
+#: ../lib/puppet/type/package.rb:419
 msgid "Cannot have both `ensure => disabled` and `flavor`"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:522
+#: ../lib/puppet/type/package.rb:518
 msgid "Cannot have both `enable_only => true` and `flavor`"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:525
+#: ../lib/puppet/type/package.rb:521
 msgid "Cannot have both `ensure => disabled` and `enable_only => true`"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:687
+#: ../lib/puppet/type/package.rb:682
 msgid "Invalid hold value %{value}. %{doc}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:717
-msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\", \"held\"]"
+#: ../lib/puppet/type/package.rb:709
+msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\"]"
 msgstr ""
 
 #: ../lib/puppet/type/resources.rb:15
@@ -9321,37 +8659,6 @@ msgstr ""
 msgid "Trollop::die can only be called after Trollop::options"
 msgstr ""
 
-#: ../lib/puppet/util/connection.rb:28
-msgid "Selected server from the %{setting} setting: %{server}"
-msgstr ""
-
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/util/connection.rb:35
-msgid "Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}"
-msgstr ""
-
-#: ../lib/puppet/util/connection.rb:39
-msgid "Dynamically-bound server lookup failed, falling back to %{setting} setting: %{server}"
-msgstr ""
-
-#: ../lib/puppet/util/connection.rb:60
-msgid "Selected port from the %{setting} setting: %{port}"
-msgstr ""
-
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/util/connection.rb:71
-msgid "Dynamically-bound port lookup failed; using first entry from the `server_list` setting: %{port}"
-msgstr ""
-
-#. TRANSLATORS 'serverport' is the name of a setting and should not be translated
-#: ../lib/puppet/util/connection.rb:75
-msgid "Dynamically-bound port lookup failed; falling back to `serverport` setting: %{port}"
-msgstr ""
-
-#: ../lib/puppet/util/connection.rb:80
-msgid "Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}"
-msgstr ""
-
 #: ../lib/puppet/util/diff.rb:30
 msgid "Cannot provide diff without the diff/lcs Ruby library"
 msgstr ""
@@ -9384,23 +8691,23 @@ msgstr ""
 msgid "%{klass} failed with error %{error_type}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:196
+#: ../lib/puppet/util/execution.rb:185
 msgid "Working directory %{cwd} does not exist!"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:288
+#: ../lib/puppet/util/execution.rb:277
 msgid "Could not get output"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:297
+#: ../lib/puppet/util/execution.rb:286
 msgid "Execution of '%{str}' returned %{exit_status}: %{output}"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:374
+#: ../lib/puppet/util/execution.rb:363
 msgid "Could not execute posix command: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:422
+#: ../lib/puppet/util/execution.rb:411
 msgid "Waiting for output; will sleep %{time_to_sleep} seconds"
 msgstr ""
 
@@ -9512,10 +8819,6 @@ msgstr ""
 msgid "Could not write crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/http_proxy.rb:215
-msgid "Too many HTTP redirections for %{uri}"
-msgstr ""
-
 #: ../lib/puppet/util/inifile.rb:139
 msgid "Cannot read nonexistent file %{file}"
 msgstr ""
@@ -9664,6 +8967,10 @@ msgstr ""
 msgid "Duplicate device found at %{file_error_location}, already found at %{device_error_location}"
 msgstr ""
 
+#: ../lib/puppet/util/network_device/config.rb:71
+msgid "Invalid entry at %{error_location}: %{file_text}"
+msgstr ""
+
 #: ../lib/puppet/util/network_device/config.rb:77
 msgid "Configuration error: Cannot read %{file}; cannot serve"
 msgstr ""
@@ -9720,7 +9027,7 @@ msgstr ""
 msgid "Could not create feature %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/rdoc.rb:44 ../lib/puppet/util/rdoc.rb:50 ../lib/puppet/util/rdoc.rb:54 ../lib/puppet/util/rdoc.rb:58
+#: ../lib/puppet/util/rdoc.rb:37 ../lib/puppet/util/rdoc.rb:43 ../lib/puppet/util/rdoc.rb:47 ../lib/puppet/util/rdoc.rb:51
 msgid "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
 msgstr ""
 
@@ -9924,14 +9231,6 @@ msgstr ""
 msgid "Cannot create group if user '%{name}' exists."
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:85
-msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
-msgstr ""
-
-#: ../lib/puppet/util/windows/api_types.rb:230
-msgid "Bad GUID format."
-msgstr ""
-
 #: ../lib/puppet/util/windows/com.rb:17
 msgid "%{name} failed (hresult %{result})."
 msgstr ""
@@ -9944,11 +9243,11 @@ msgstr ""
 msgid "CoCreateInstance failed (%{klass})."
 msgstr ""
 
-#: ../lib/puppet/util/windows/error.rb:42
+#: ../lib/puppet/util/windows/error.rb:43
 msgid "FormatMessageW could not format code %{code}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/error.rb:48
+#: ../lib/puppet/util/windows/error.rb:49
 msgid "FormatMessageW failed to allocate buffer for code %{code}"
 msgstr ""
 
@@ -9971,15 +9270,15 @@ msgstr ""
 msgid "(Win32 error: %{detail})"
 msgstr ""
 
-#: ../lib/puppet/util/windows/file.rb:180
+#: ../lib/puppet/util/windows/file.rb:117
 msgid "Failed to set file attributes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/file.rb:255
+#: ../lib/puppet/util/windows/file.rb:180
 msgid "out_buffer is required"
 msgstr ""
 
-#: ../lib/puppet/util/windows/file.rb:342
+#: ../lib/puppet/util/windows/file.rb:253
 msgid "Failed to call GetLongPathName"
 msgstr ""
 
@@ -10146,119 +9445,119 @@ msgstr ""
 msgid "Failed to set security information"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:338
+#: ../lib/puppet/util/windows/service.rb:44
 msgid "Starting the %{service_name} service. Timeout set to: %{timeout} seconds"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:348
+#: ../lib/puppet/util/windows/service.rb:54
 msgid "Failed to start the service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:352
+#: ../lib/puppet/util/windows/service.rb:58
 msgid "Successfully started the %{service_name} service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:361
+#: ../lib/puppet/util/windows/service.rb:67
 msgid "Stopping the %{service_name} service. Timeout set to: %{timeout} seconds"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:369
+#: ../lib/puppet/util/windows/service.rb:75
 msgid "Successfully stopped the %{service_name} service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:378
+#: ../lib/puppet/util/windows/service.rb:84
 msgid "Resuming the %{service_name} service. Timeout set to: %{timeout} seconds"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:394
+#: ../lib/puppet/util/windows/service.rb:100
 msgid "Successfully resumed the %{service_name} service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:410
+#: ../lib/puppet/util/windows/service.rb:116
 msgid "Unknown Service state '%{current_state}' for '%{service_name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:437
+#: ../lib/puppet/util/windows/service.rb:143
 msgid "Unknown start type '%{start_type}' for '%{service_name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:487
+#: ../lib/puppet/util/windows/service.rb:193
 msgid "Failed to update service configuration"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:552
+#: ../lib/puppet/util/windows/service.rb:258
 msgid "Failed to fetch services"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:601
+#: ../lib/puppet/util/windows/service.rb:307
 msgid "Failed to open a handle to the service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:618
+#: ../lib/puppet/util/windows/service.rb:324
 msgid "Failed to open a handle to the service control manager"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:641
+#: ../lib/puppet/util/windows/service.rb:347
 msgid "The service is already in the %{final_state} state. No further work needs to be done."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:653
+#: ../lib/puppet/util/windows/service.rb:359
 msgid "The service must be in one of the %{valid_initial_states} states to perform this transition. It is currently in the %{current_state} state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:664
+#: ../lib/puppet/util/windows/service.rb:370
 msgid "There is already a pending transition to the %{final_state} state for the %{service_name} service."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:680
+#: ../lib/puppet/util/windows/service.rb:386
 msgid "The service is in the %{pending_state} state, which is an unsafe pending state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:685
+#: ../lib/puppet/util/windows/service.rb:391
 msgid "Transitioning the %{service_name} service from %{initial_state} to %{final_state}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:689
+#: ../lib/puppet/util/windows/service.rb:395
 msgid "Waiting for the transition to finish"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:694
+#: ../lib/puppet/util/windows/service.rb:400
 msgid "Failed to transition the %{service_name} service to the %{final_state} state. Detail: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:733 ../lib/puppet/util/windows/service.rb:769
+#: ../lib/puppet/util/windows/service.rb:439 ../lib/puppet/util/windows/service.rb:475
 msgid "Service query failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:812
+#: ../lib/puppet/util/windows/service.rb:518
 msgid "Service query for %{parameter_name} failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:835
+#: ../lib/puppet/util/windows/service.rb:541
 msgid "Failed to update service %{change} configuration"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:862
+#: ../lib/puppet/util/windows/service.rb:568
 msgid "Failed to send the %{control_signal} signal to the service. Its current state is %{current_state}. Reason for failure:"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:897
+#: ../lib/puppet/util/windows/service.rb:603
 msgid "The service transitioned to the %{pending_state} state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:911
+#: ../lib/puppet/util/windows/service.rb:617
 msgid "Timed out while waiting for the service to transition from %{initial_state} to %{final_state} OR from %{initial_state} to %{pending_state} to %{final_state}. The service's current state is %{current_state}."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:926
+#: ../lib/puppet/util/windows/service.rb:632
 msgid "Waiting for the pending transition to the %{final_state} state to finish."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:940
+#: ../lib/puppet/util/windows/service.rb:646
 msgid "Unexpected transition to the %{current_state} state while waiting for the pending transition from %{pending_state} to %{final_state} to finish."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:954
+#: ../lib/puppet/util/windows/service.rb:660
 msgid "Timed out while waiting for the pending transition from %{pending_state} to %{final_state} to finish. The current state is %{current_state}."
 msgstr ""
 
@@ -10298,76 +9597,72 @@ msgstr ""
 msgid "Failed to unload user profile %{user}"
 msgstr ""
 
-#: ../lib/puppet/util/yaml.rb:47
-msgid "Puppet::Util::Yaml.load_file is deprecated. Use safe_load_file instead."
-msgstr ""
-
-#: ../lib/puppet/x509/cert_provider.rb:39
+#: ../lib/puppet/x509/cert_provider.rb:45
 msgid "Failed to save CA certificates to '%{capath}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:52
+#: ../lib/puppet/x509/cert_provider.rb:59
 msgid "The CA certificates are missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:56
+#: ../lib/puppet/x509/cert_provider.rb:63
 msgid "Failed to load CA certificates from '%{capath}'"
 msgstr ""
 
 #. TRANSLATORS 'PEM' is an acronym and shouldn't be translated
-#: ../lib/puppet/x509/cert_provider.rb:67
+#: ../lib/puppet/x509/cert_provider.rb:75
 msgid "Failed to parse CA certificates as PEM"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:82
+#: ../lib/puppet/x509/cert_provider.rb:91
 msgid "Failed to save CRLs to '%{crlpath}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:95
+#: ../lib/puppet/x509/cert_provider.rb:105
 msgid "The CRL is missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:99
+#: ../lib/puppet/x509/cert_provider.rb:109
 msgid "Failed to load CRLs from '%{crlpath}'"
 msgstr ""
 
 #. TRANSLATORS 'PEM' is an acronym and shouldn't be translated
-#: ../lib/puppet/x509/cert_provider.rb:110
+#: ../lib/puppet/x509/cert_provider.rb:121
 msgid "Failed to parse CRLs as PEM"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:156
+#: ../lib/puppet/x509/cert_provider.rb:171
 msgid "Failed to save private key for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:175
+#: ../lib/puppet/x509/cert_provider.rb:191
 msgid "The private key is missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:179
+#: ../lib/puppet/x509/cert_provider.rb:195
 msgid "Failed to load private key for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:235
+#: ../lib/puppet/x509/cert_provider.rb:255
 msgid "Failed to save client certificate for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:250
+#: ../lib/puppet/x509/cert_provider.rb:271
 msgid "The client certificate is missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:254
+#: ../lib/puppet/x509/cert_provider.rb:275
 msgid "Failed to load client certificate for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:300
+#: ../lib/puppet/x509/cert_provider.rb:324
 msgid "Failed to save certificate request for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:315
+#: ../lib/puppet/x509/cert_provider.rb:340
 msgid "Failed to load certificate request for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:326
+#: ../lib/puppet/x509/cert_provider.rb:353
 msgid "Failed to delete certificate request for '%{name}'"
 msgstr ""