puppet 7.5.0-x64-mingw32 → 7.9.0-x64-mingw32

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

@@ -293,7 +293,7 @@ module Puppet::Util::Windows::ADSI
   class User < ADSIObject
     extend FFI::Library
 
-    require 'puppet/util/windows/sid'
+    require_relative '../../../puppet/util/windows/sid'
 
     # https://msdn.microsoft.com/en-us/library/aa746340.aspx
     # IADsUser interface

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

@@ -1,4 +1,4 @@
-require 'puppet/ffi/windows'
+require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows
 

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

@@ -1,5 +1,5 @@
-require 'puppet/util/windows'
-require 'puppet/error'
+require_relative '../../../puppet/util/windows'
+require_relative '../../../puppet/error'
 
 # represents an error resulting from a Win32 error code
 class Puppet::Util::Windows::Error < Puppet::Error

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

@@ -1,4 +1,4 @@
-require 'puppet/ffi/windows'
+require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows::File
   extend Puppet::Util::Windows::String

data/lib/puppet/util/windows/monkey_patches/process.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'ffi'
-require 'puppet/ffi/windows'
-require 'puppet/util/windows/string'
+require_relative '../../../../puppet/ffi/windows'
+require_relative '../../../../puppet/util/windows/string'
 
 module Process
   extend FFI::Library

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

@@ -1,4 +1,4 @@
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 
 module Puppet::Util::Windows::SID
   class Principal

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

@@ -1,5 +1,5 @@
-require 'puppet/util/windows/monkey_patches/process'
-require 'puppet/ffi/windows'
+require_relative '../../../puppet/util/windows/monkey_patches/process'
+require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows::Process
   extend Puppet::FFI::Windows::Functions

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

@@ -1,4 +1,4 @@
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 
 module Puppet::Util::Windows
   module Registry

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

@@ -1,5 +1,5 @@
-require 'puppet/util/windows'
-require 'puppet/ssl/openssl_loader'
+require_relative '../../../puppet/util/windows'
+require_relative '../../../puppet/ssl/openssl_loader'
 require 'ffi'
 
 # Represents a collection of trusted root certificates.

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

@@ -61,7 +61,7 @@
 #   automatically rebuild the access control list based on the new
 #   (and different) owner or group.
 
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 require 'pathname'
 require 'ffi'
 

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

@@ -8,7 +8,7 @@
 # @see https://msdn.microsoft.com/en-us/library/windows/desktop/aa379563(v=vs.85).aspx
 # @api private
 class Puppet::Util::Windows::SecurityDescriptor
-  require 'puppet/util/windows/security'
+  require_relative '../../../puppet/util/windows/security'
   include Puppet::Util::Windows::SID
 
   attr_reader :owner, :group, :dacl

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

@@ -1,5 +1,5 @@
 # coding: utf-8
-require 'puppet/ffi/windows'
+require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows
   # This module is designed to provide an API between the windows system and puppet for

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

@@ -1,4 +1,4 @@
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 
 module Puppet::Util::Windows
   module SID
@@ -75,7 +75,9 @@ module Puppet::Util::Windows
           raw_sid_bytes = sid_ptr.read_array_of_uchar(get_length_sid(sid_ptr))
         end
       rescue => e
-        Puppet.debug("Could not retrieve raw SID bytes from '#{name}': #{e.message}")
+        # Avoid debug logs pollution with valid account names
+        # https://docs.microsoft.com/en-us/windows/win32/api/sddl/nf-sddl-convertstringsidtosidw#return-value
+        Puppet.debug("Could not retrieve raw SID bytes from '#{name}': #{e.message}") unless e.code == ERROR_INVALID_SID_STRUCTURE
       end
 
       raw_sid_bytes ? Principal.lookup_account_sid(raw_sid_bytes) : Principal.lookup_account_name(name)

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

@@ -1,4 +1,4 @@
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 
 require 'facter'
 require 'ffi'

data/lib/puppet/vendor.rb

@@ -37,7 +37,7 @@ module Puppet
 
       # @api private
       def require_libs
-        require 'puppet/vendor/require_vendored'
+        require_relative 'vendor/require_vendored'
       end
 
       # Configures the path for all vendored libraries and loads required libraries.

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 = '7.5.0'
+  PUPPETVERSION = '7.9.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/lib/puppet/x509.rb

@@ -1,11 +1,11 @@
-require 'puppet'
-require 'puppet/ssl/openssl_loader'
+require_relative '../puppet'
+require_relative '../puppet/ssl/openssl_loader'
 
 # 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'
+  require_relative 'x509/pem_store'
+  require_relative 'x509/cert_provider'
 end

data/lib/puppet/x509/cert_provider.rb

@@ -1,4 +1,4 @@
-require 'puppet/x509'
+require_relative '../../puppet/x509'
 
 # 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]`.
@@ -15,7 +15,6 @@ class Puppet::X509::CertProvider
   VALID_CERTNAME = /\A[ -.0-~]+\Z/
   CERT_DELIMITERS = /-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----/m
   CRL_DELIMITERS = /-----BEGIN X509 CRL-----.*?-----END X509 CRL-----/m
-  EC_HEADER = /-----BEGIN EC PRIVATE KEY-----/
 
   def initialize(capath: Puppet[:localcacert],
                  crlpath: Puppet[:hostcrl],
@@ -207,26 +206,9 @@ class Puppet::X509::CertProvider
   # @api private
   def load_private_key_from_pem(pem, password: nil)
     # set a non-nil password to ensure openssl doesn't prompt
-    # but ruby 2.4.0 & 2.4.1 require at least 4 bytes due to
-    # https://github.com/ruby/openssl/commit/f38501249f33bff7ca9d208670b8cde695ea8b7b
-    # and corrected in https://github.com/ruby/openssl/commit/a896c3d1dfa090e92dec1abf8ac12843af6af721
-    password ||= '    '
-
-    # Can't use OpenSSL::PKey.read, because it's broken in MRI 2.3, doesn't exist
-    # in JRuby 9.1, and is broken in JRuby 9.2
-    begin
-      if pem =~ EC_HEADER
-        OpenSSL::PKey::EC.new(pem, password)
-      else
-        OpenSSL::PKey::RSA.new(pem, password)
-      end
-    rescue OpenSSL::PKey::PKeyError => e
-      if e.message =~ /Neither PUB key nor PRIV key/
-        raise OpenSSL::PKey::PKeyError, "Could not parse PKey: no start line"
-      else
-        raise e
-      end
-    end
+    password ||= ''
+
+    OpenSSL::PKey.read(pem, password)
   end
 
   # Load the private key password.

data/lib/puppet/x509/pem_store.rb

@@ -1,4 +1,4 @@
-require 'puppet/x509'
+require_relative '../../puppet/x509'
 
 # Methods for managing PEM encoded files. While PEM encoded strings are
 # always ASCII, the files may contain user specified comments, so they are

data/lib/puppet_pal.rb

@@ -4,5 +4,5 @@
 # This requires all of puppet because 'settings' and many other things are still required in PAL.
 # Eventually that will not be the case.
 #
-require 'puppet'
-require 'puppet/pal/pal_api'
+require_relative 'puppet'
+require_relative 'puppet/pal/pal_api'

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 7.3.0-6-g7c55ccd544\n"
+"Project-Id-Version: Puppet automation framework 7.8.0-115-g2e290b736f\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2021-01-21 13:07+0000\n"
-"PO-Revision-Date: 2021-01-21 13:07+0000\n"
+"POT-Creation-Date: 2021-07-06 12:22+0000\n"
+"PO-Revision-Date: 2021-07-06 12:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -184,19 +184,19 @@ msgstr ""
 msgid "The puppet agent daemon"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:415
+#: ../lib/puppet/application/agent.rb:422
 msgid "Fingerprint asked but neither the certificate, nor the certificate request have been issued"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:420
+#: ../lib/puppet/application/agent.rb:427
 msgid "Failed to generate fingerprint: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:443
+#: ../lib/puppet/application/agent.rb:450
 msgid "Starting Puppet client version %{version}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:459
+#: ../lib/puppet/application/agent.rb:466
 msgid "The puppet agent command does not take parameters"
 msgstr ""
 
@@ -206,35 +206,35 @@ msgstr ""
 
 #. TRANSLATORS "puppet apply" is a program command and should not be translated
 #. TRANSLATORS "puppet apply" is a program command and should not be translated
-#: ../lib/puppet/application/apply.rb:208 ../lib/puppet/application/apply.rb:321
+#: ../lib/puppet/application/apply.rb:209 ../lib/puppet/application/apply.rb:322
 msgid "For puppet apply"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:216
+#: ../lib/puppet/application/apply.rb:217
 msgid "%{file} is not readable"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:287 ../lib/puppet/application/script.rb:240
+#: ../lib/puppet/application/apply.rb:288 ../lib/puppet/application/script.rb:241
 msgid "Exiting"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:331
+#: ../lib/puppet/application/apply.rb:332
 msgid "Could not deserialize catalog from %{format}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:352 ../lib/puppet/application/script.rb:145
+#: ../lib/puppet/application/apply.rb:353 ../lib/puppet/application/script.rb:146
 msgid "Could not find facts for %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:364 ../lib/puppet/application/script.rb:153
+#: ../lib/puppet/application/apply.rb:365 ../lib/puppet/application/script.rb:154
 msgid "Could not find node %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:377 ../lib/puppet/application/script.rb:138
+#: ../lib/puppet/application/apply.rb:378 ../lib/puppet/application/script.rb:139
 msgid "Could not find file %{manifest}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:378
+#: ../lib/puppet/application/apply.rb:379
 msgid "Only one file can be applied per run.  Skipping %{files}"
 msgstr ""
 
@@ -246,47 +246,47 @@ msgstr ""
 msgid "Manage remote network devices"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:231
+#: ../lib/puppet/application/device.rb:232
 msgid "resource command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:234
+#: ../lib/puppet/application/device.rb:235
 msgid "facts command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:237
+#: ../lib/puppet/application/device.rb:238
 msgid "missing argument: --target is required when using --apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:238
+#: ../lib/puppet/application/device.rb:239
 msgid "%{file} does not exist, cannot apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:256
+#: ../lib/puppet/application/device.rb:257
 msgid "Target device / certificate '%{target}' not found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:258
+#: ../lib/puppet/application/device.rb:259
 msgid "No device found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:315
+#: ../lib/puppet/application/device.rb:316
 msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:330
+#: ../lib/puppet/application/device.rb:331
 msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:353
+#: ../lib/puppet/application/device.rb:354
 msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:389 ../lib/puppet/application/resource.rb:196
+#: ../lib/puppet/application/device.rb:390 ../lib/puppet/application/resource.rb:201
 msgid "You must specify the type to display"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:390 ../lib/puppet/application/resource.rb:197
+#: ../lib/puppet/application/device.rb:391 ../lib/puppet/application/resource.rb:202
 msgid "Could not find type %{type}"
 msgstr ""
 
@@ -348,31 +348,31 @@ msgstr ""
 msgid "Try 'puppet help %{face} %{action}' for usage"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:16
+#: ../lib/puppet/application/filebucket.rb:17
 msgid "Store and retrieve files in a filebucket"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:225
+#: ../lib/puppet/application/filebucket.rb:226
 msgid "You must specify a file to back up"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:229
+#: ../lib/puppet/application/filebucket.rb:230
 msgid "%{file}: no such file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:233
+#: ../lib/puppet/application/filebucket.rb:234
 msgid "%{file}: cannot read file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:255 ../lib/puppet/application/filebucket.rb:278
+#: ../lib/puppet/application/filebucket.rb:256 ../lib/puppet/application/filebucket.rb:279
 msgid "Need exactly two arguments: filebucket diff <file_a> <file_b>"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:275
+#: ../lib/puppet/application/filebucket.rb:276
 msgid "Comparing %{checksum_a} %{checksum_b} %{file_a} %{file_b}"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:289
+#: ../lib/puppet/application/filebucket.rb:290
 msgid "Cancelling"
 msgstr ""
 
@@ -414,19 +414,19 @@ msgstr ""
 msgid "Incorrect formatted data in %{fact_file} given via the --facts flag"
 msgstr ""
 
-#: ../lib/puppet/application/resource.rb:32
+#: ../lib/puppet/application/resource.rb:34
 msgid "The resource abstraction layer shell"
 msgstr ""
 
-#: ../lib/puppet/application/resource.rb:140
+#: ../lib/puppet/application/resource.rb:145
 msgid "Editing with Yaml output is not supported"
 msgstr ""
 
-#: ../lib/puppet/application/resource.rb:204
+#: ../lib/puppet/application/resource.rb:209
 msgid "Invalid parameter setting %{setting}"
 msgstr ""
 
-#: ../lib/puppet/application/resource.rb:226
+#: ../lib/puppet/application/resource.rb:240
 msgid "Listing all file instances is not supported.  Please specify a file or directory, e.g. puppet resource file /etc"
 msgstr ""
 
@@ -434,11 +434,11 @@ msgstr ""
 msgid "Run a puppet manifests as a script without compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/application/script.rb:125
+#: ../lib/puppet/application/script.rb:126
 msgid "Bolt must be installed to use the script application"
 msgstr ""
 
-#: ../lib/puppet/application/script.rb:139
+#: ../lib/puppet/application/script.rb:140
 msgid "Only one file can be used per run. Skipping %{files}"
 msgstr ""
 
@@ -446,59 +446,59 @@ msgstr ""
 msgid "Manage SSL keys and certificates for puppet SSL clients"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:103
+#: ../lib/puppet/application/ssl.rb:106
 msgid "An action must be specified."
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:126 ../lib/puppet/application/ssl.rb:133
+#: ../lib/puppet/application/ssl.rb:130 ../lib/puppet/application/ssl.rb:137
 msgid "The certificate for '%{name}' has not yet been signed"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:144
+#: ../lib/puppet/application/ssl.rb:148
 msgid "Completed SSL initialization"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:146
+#: ../lib/puppet/application/ssl.rb:152
 msgid "Unknown action '%{action}'"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:154 ../lib/puppet/ssl/state_machine.rb:180
+#: ../lib/puppet/application/ssl.rb:166 ../lib/puppet/ssl/state_machine.rb:180
 msgid "Creating a new EC SSL key for %{name} using curve %{curve}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:157
+#: ../lib/puppet/application/ssl.rb:169
 msgid "Creating a new SSL key for %{name}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:167
+#: ../lib/puppet/application/ssl.rb:179
 msgid "Submitted certificate request for '%{name}' to %{url}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:170
+#: ../lib/puppet/application/ssl.rb:182
 msgid "Could not submit certificate request for '%{name}' to %{url} due to a conflict on the server"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:172 ../lib/puppet/application/ssl.rb:175
+#: ../lib/puppet/application/ssl.rb:184 ../lib/puppet/application/ssl.rb:187
 msgid "Failed to submit certificate request: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:183
+#: ../lib/puppet/application/ssl.rb:195
 msgid "Downloading certificate '%{name}' from %{url}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:187
+#: ../lib/puppet/application/ssl.rb:199
 msgid "Downloaded certificate '%{name}' with fingerprint %{fingerprint}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:200 ../lib/puppet/application/ssl.rb:203
+#: ../lib/puppet/application/ssl.rb:212 ../lib/puppet/application/ssl.rb:215
 msgid "Failed to download certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:232 ../lib/puppet/application/ssl.rb:235
+#: ../lib/puppet/application/ssl.rb:244 ../lib/puppet/application/ssl.rb:247
 msgid "Failed to connect to the CA to determine if certificate %{certname} has been cleaned"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:239
+#: ../lib/puppet/application/ssl.rb:251
 msgid ""
 "The certificate %{certname} must be cleaned from the CA first. To fix this,\n"
 "run the following commands on the CA:\n"
@@ -506,7 +506,7 @@ msgid ""
 "  puppet ssl clean\n"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:262
+#: ../lib/puppet/application/ssl.rb:274
 msgid "Removed %{label} %{path}"
 msgstr ""
 
@@ -587,12 +587,12 @@ msgstr ""
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:463 ../lib/puppet/http/resolver/server_list.rb:63
+#: ../lib/puppet/configurer.rb:463 ../lib/puppet/http/resolver/server_list.rb:64 ../lib/puppet/http/resolver/server_list.rb:68
 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:467 ../lib/puppet/http/resolver/server_list.rb:66
+#: ../lib/puppet/configurer.rb:467 ../lib/puppet/http/resolver/server_list.rb:73 ../lib/puppet/http/resolver/server_list.rb:76
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
@@ -697,30 +697,30 @@ msgid "Valid values are '%{values}'."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:538
+#: ../lib/puppet/defaults.rb:539
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:540
+#: ../lib/puppet/defaults.rb:541
 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:733
+#: ../lib/puppet/defaults.rb:735
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:818
+#: ../lib/puppet/defaults.rb:820
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1069 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1079 ../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:1906
+#: ../lib/puppet/defaults.rb:1919
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
@@ -1641,21 +1641,29 @@ msgstr ""
 msgid "Fileset paths must be fully qualified: %{path}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/fileset.rb:50
+#: ../lib/puppet/file_serving/fileset.rb:51
 msgid "Fileset paths must exist"
 msgstr ""
 
 #. TRANSLATORS "recurse" and "recurselimit" are parameter names and should not be translated
-#: ../lib/puppet/file_serving/fileset.rb:52
+#: ../lib/puppet/file_serving/fileset.rb:53
 msgid "Fileset recurse parameter must not be a number anymore, please use recurselimit"
 msgstr ""
 
+#: ../lib/puppet/file_serving/fileset.rb:69
+msgid "The directory '%{path}' contains %{entries} entries, which exceeds the limit of %{munged_max_files} specified by the max_files parameter for this resource. The limit may be increased, but be aware that large number of file resources can result in excessive resource consumption and degraded performance. Consider using an alternate method to manage large directory trees"
+msgstr ""
+
+#: ../lib/puppet/file_serving/fileset.rb:71
+msgid "The directory '%{path}' contains %{entries} entries, which exceeds the default soft limit %{soft_max_files} and may cause excessive resource consumption and degraded performance. To remove this warning set a value for `max_files` parameter or consider using an alternate method to manage large directory trees"
+msgstr ""
+
 #. TRANSLATORS ":links" is a parameter name and should not be translated
-#: ../lib/puppet/file_serving/fileset.rb:80
+#: ../lib/puppet/file_serving/fileset.rb:92
 msgid "Invalid :links value '%{links}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/fileset.rb:93
+#: ../lib/puppet/file_serving/fileset.rb:105
 msgid "Invalid option '%{option}'"
 msgstr ""
 
@@ -1739,7 +1747,7 @@ msgstr ""
 msgid "Timeout waiting for exclusive lock on %{path}"
 msgstr ""
 
-#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:127 ../lib/puppet/util.rb:706
+#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:127 ../lib/puppet/util.rb:715
 msgid "Is a directory: %{directory}"
 msgstr ""
 
@@ -1783,11 +1791,11 @@ msgstr ""
 msgid "%{dest} already exists and the :force option was not specified"
 msgstr ""
 
-#: ../lib/puppet/file_system/windows.rb:202
+#: ../lib/puppet/file_system/windows.rb:204
 msgid "This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required."
 msgstr ""
 
-#: ../lib/puppet/file_system/windows.rb:207
+#: ../lib/puppet/file_system/windows.rb:209
 msgid "The current user does not have the necessary permission to manage symlinks."
 msgstr ""
 
@@ -2019,7 +2027,7 @@ msgstr ""
 msgid "The given data requires an Integer index at %{walked_path}, got '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/functions/empty.rb:74
+#: ../lib/puppet/functions/empty.rb:82
 msgid "Calling function empty() with %{arg_type} value is deprecated."
 msgstr ""
 
@@ -2109,7 +2117,7 @@ msgstr ""
 msgid "slice(): block must define one parameter, or the same number of parameters as the given size of the slice (%{slice_size}). Block has %{serving_size}; %{parameter_names}"
 msgstr ""
 
-#: ../lib/puppet/functions/strftime.rb:207
+#: ../lib/puppet/functions/strftime.rb:208
 msgid "The argument signature (String format, [String timezone]) is deprecated for #strftime. See #strftime documentation and Timespan type for more info"
 msgstr ""
 
@@ -2231,6 +2239,10 @@ msgstr ""
 msgid "Location URI is invalid: %{detail}"
 msgstr ""
 
+#: ../lib/puppet/http/resolver/server_list.rb:66 ../lib/puppet/http/resolver/server_list.rb:74
+msgid "Trying with next server from server_list."
+msgstr ""
+
 #: ../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 ""
@@ -2305,87 +2317,87 @@ msgstr ""
 msgid "Inlining file metadata"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:259
+#: ../lib/puppet/indirector/catalog/compiler.rb:260
 msgid "Could not get metadata for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:280
+#: ../lib/puppet/indirector/catalog/compiler.rb:281
 msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:287
+#: ../lib/puppet/indirector/catalog/compiler.rb:288
 msgid "Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:288
+#: ../lib/puppet/indirector/catalog/compiler.rb:289
 msgid "Compiled static catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:290
+#: ../lib/puppet/indirector/catalog/compiler.rb:291
 msgid "Compiled static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:291
+#: ../lib/puppet/indirector/catalog/compiler.rb:292
 msgid "Compiled static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:296
+#: ../lib/puppet/indirector/catalog/compiler.rb:297
 msgid "Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:297
+#: ../lib/puppet/indirector/catalog/compiler.rb:298
 msgid "Compiled catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:299
+#: ../lib/puppet/indirector/catalog/compiler.rb:300
 msgid "Compiled catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:300
+#: ../lib/puppet/indirector/catalog/compiler.rb:301
 msgid "Compiled catalog for %{node}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:322
+#: ../lib/puppet/indirector/catalog/compiler.rb:323
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:324
+#: ../lib/puppet/indirector/catalog/compiler.rb:325
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:327
+#: ../lib/puppet/indirector/catalog/compiler.rb:328
 msgid "Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:329
+#: ../lib/puppet/indirector/catalog/compiler.rb:330
 msgid "Inlined resource metadata into static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:346
+#: ../lib/puppet/indirector/catalog/compiler.rb:347
 msgid "Found node information"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:354
+#: ../lib/puppet/indirector/catalog/compiler.rb:355
 msgid "Failed when searching for node %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:374
+#: ../lib/puppet/indirector/catalog/compiler.rb:375
 msgid "Invalid option use_node for a remote request"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:393
+#: ../lib/puppet/indirector/catalog/compiler.rb:394
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:426
+#: ../lib/puppet/indirector/catalog/compiler.rb:427
 msgid "Could not retrieve fact servername"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:435
+#: ../lib/puppet/indirector/catalog/compiler.rb:436
 msgid "Could not retrieve either serverip or serverip6 fact"
 msgstr ""
 
@@ -2740,7 +2752,7 @@ msgstr ""
 msgid "Could not understand URL %{key}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/resource/ral.rb:59
+#: ../lib/puppet/indirector/resource/ral.rb:64
 msgid "Could not find type %{request_type}"
 msgstr ""
 
@@ -2893,43 +2905,43 @@ msgid "Face summary should be a single line; put the long text in 'description'
 msgstr ""
 
 #. TRANSLATORS 'author' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:205
+#: ../lib/puppet/interface/documentation.rb:206
 msgid "author must be a string; use multiple statements for multiple authors"
 msgstr ""
 
 #. TRANSLATORS 'author' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:210
+#: ../lib/puppet/interface/documentation.rb:211
 msgid "author should be a single line; use multiple statements for multiple authors"
 msgstr ""
 
 #. TRANSLATORS 'author' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:230
+#: ../lib/puppet/interface/documentation.rb:231
 msgid "author should be a single line; use multiple statements"
 msgstr ""
 
 #. TRANSLATORS 'copyright' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:251
+#: ../lib/puppet/interface/documentation.rb:252
 msgid "copyright takes the owners names, then the years covered"
 msgstr ""
 
 #. TRANSLATORS 'copyright' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:275
+#: ../lib/puppet/interface/documentation.rb:276
 msgid "copyright owner must be a string or an array of strings"
 msgstr ""
 
 #. TRANSLATORS 'copyright' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:312
+#: ../lib/puppet/interface/documentation.rb:313
 msgid "copyright with a year %{value} is very strange; did you accidentally add or subtract two years?"
 msgstr ""
 
 #. TRANSLATORS 'copyright' is an attribute name and should not be translated
 #. TRANSLATORS 'copyright' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:328 ../lib/puppet/interface/documentation.rb:333
+#: ../lib/puppet/interface/documentation.rb:329 ../lib/puppet/interface/documentation.rb:334
 msgid "%{value} is not a good copyright year or range"
 msgstr ""
 
 #. TRANSLATORS 'copyright' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:352
+#: ../lib/puppet/interface/documentation.rb:353
 msgid "%{value} is not a good copyright year, set, or range"
 msgstr ""
 
@@ -3067,11 +3079,11 @@ msgid "Loaded puppet/type/%{name} but no class was created"
 msgstr ""
 
 #. TRANSLATORS 'metadata.json' is a specific file name and should not be translated.
-#: ../lib/puppet/module.rb:221
+#: ../lib/puppet/module.rb:222
 msgid "%{name} has an invalid and unparsable metadata.json file. The parse error: %{error}"
 msgstr ""
 
-#: ../lib/puppet/module.rb:467
+#: ../lib/puppet/module.rb:468
 msgid ""
 "        Invalid module name '%{name}'; module names must match either:\n"
 "        An installed module name (ex. modulename) matching the expression /^[a-z][a-z0-9_]*$/ -or-\n"
@@ -3190,19 +3202,19 @@ msgstr ""
 msgid "No file containing checksums found."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:84 ../lib/puppet/module_tool/applications/upgrader.rb:102
+#: ../lib/puppet/module_tool/applications/installer.rb:88 ../lib/puppet/module_tool/applications/upgrader.rb:102
 msgid "Downloading from %{host} ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:132 ../lib/puppet/module_tool/applications/upgrader.rb:140
+#: ../lib/puppet/module_tool/applications/installer.rb:136 ../lib/puppet/module_tool/applications/upgrader.rb:140
 msgid "Resolving dependencies ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:208
+#: ../lib/puppet/module_tool/applications/installer.rb:212
 msgid "Preparing to install ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:211
+#: ../lib/puppet/module_tool/applications/installer.rb:215
 msgid "Installing -- do not interrupt ..."
 msgstr ""
 
@@ -3321,7 +3333,7 @@ msgstr ""
 msgid "Could not %{action} '%{module_name}' (%{version}); no version satisfies all dependencies"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:17 ../lib/puppet/module_tool/errors/shared.rb:186 ../lib/puppet/module_tool/errors/upgrader.rb:58
+#: ../lib/puppet/module_tool/errors/shared.rb:17 ../lib/puppet/module_tool/errors/shared.rb:203 ../lib/puppet/module_tool/errors/upgrader.rb:58
 msgid "Could not %{action} module '%{module_name}' (%{version})"
 msgstr ""
 
@@ -3411,68 +3423,80 @@ msgid "  No version of '%{module_name}' will satisfy dependencies"
 msgstr ""
 
 #: ../lib/puppet/module_tool/errors/shared.rb:135
-msgid "Could not %{action} '%{module_name}'; module is not installed"
+msgid "Could not %{action} '%{module_name}', did you mean '%{suggestion}'?"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:140 ../lib/puppet/module_tool/errors/shared.rb:163 ../lib/puppet/module_tool/errors/shared.rb:204
+#: ../lib/puppet/module_tool/errors/shared.rb:140 ../lib/puppet/module_tool/errors/shared.rb:157 ../lib/puppet/module_tool/errors/shared.rb:180 ../lib/puppet/module_tool/errors/shared.rb:221
 msgid "Could not %{action} module '%{module_name}'"
 msgstr ""
 
 #: ../lib/puppet/module_tool/errors/shared.rb:141
+msgid "  The name '%{module_name}' is invalid"
+msgstr ""
+
+#: ../lib/puppet/module_tool/errors/shared.rb:142
+msgid "    Did you mean `puppet module %{action} %{suggestion}`?"
+msgstr ""
+
+#: ../lib/puppet/module_tool/errors/shared.rb:152
+msgid "Could not %{action} '%{module_name}'; module is not installed"
+msgstr ""
+
+#: ../lib/puppet/module_tool/errors/shared.rb:158
 msgid "  Module '%{module_name}' is not installed"
 msgstr ""
 
 #. TRANSLATORS `puppet module %{action} %{suggestion}` is a command line and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:144
+#: ../lib/puppet/module_tool/errors/shared.rb:161
 msgid "    You may have meant `puppet module %{action} %{suggestion}`"
 msgstr ""
 
 #. TRANSLATORS `puppet module install` is a command line and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:147
+#: ../lib/puppet/module_tool/errors/shared.rb:164
 msgid "    Use `puppet module install` to install this module"
 msgstr ""
 
 #. TRANSLATORS "module path" refers to a set of directories where modules may be installed
-#: ../lib/puppet/module_tool/errors/shared.rb:158
+#: ../lib/puppet/module_tool/errors/shared.rb:175
 msgid "Could not %{action} '%{module_name}'; module appears in multiple places in the module path"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:164
+#: ../lib/puppet/module_tool/errors/shared.rb:181
 msgid "  Module '%{module_name}' appears multiple places in the module path"
 msgstr ""
 
 #. TRANSLATORS This is repeats as separate lines as a list under "Module '%{module_name}' appears multiple places in the module path"
-#: ../lib/puppet/module_tool/errors/shared.rb:167
+#: ../lib/puppet/module_tool/errors/shared.rb:184
 msgid "    '%{module_name}' (%{version}) was found in %{path}"
 msgstr ""
 
 #. TRANSLATORS `--modulepath` is command line option and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:170
+#: ../lib/puppet/module_tool/errors/shared.rb:187
 msgid "    Use the `--modulepath` option to limit the search to specific directories"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:181
+#: ../lib/puppet/module_tool/errors/shared.rb:198
 msgid "Could not %{action} '%{module_name}'; module has had changes made locally"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:187
+#: ../lib/puppet/module_tool/errors/shared.rb:204
 msgid "  Installed module has had changes made locally"
 msgstr ""
 
 #. TRANSLATORS `puppet module %{action} --ignore-changes` is a command line and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:189
+#: ../lib/puppet/module_tool/errors/shared.rb:206
 msgid "    Use `puppet module %{action} --ignore-changes` to %{action} this module anyway"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:199
+#: ../lib/puppet/module_tool/errors/shared.rb:216
 msgid "Could not %{action} '%{module_name}'; %{error}"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:205
+#: ../lib/puppet/module_tool/errors/shared.rb:222
 msgid "  Failure trying to parse metadata"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:206
+#: ../lib/puppet/module_tool/errors/shared.rb:223
 msgid "    Original message was: %{message}"
 msgstr ""
 
@@ -3860,7 +3884,7 @@ msgstr ""
 msgid "The 'disable_per_environment_manifest' setting is true, and the '%{env_name}' environment has an environment.conf manifest that conflicts with the 'default_manifest' setting."
 msgstr ""
 
-#: ../lib/puppet/node/environment.rb:568 ../lib/puppet/pops/loaders.rb:301
+#: ../lib/puppet/node/environment.rb:575 ../lib/puppet/pops/loaders.rb:301
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -5315,15 +5339,15 @@ msgstr ""
 msgid "<%{string}> does not appear to contain a word"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/base_loader.rb:124
+#: ../lib/puppet/pops/loader/base_loader.rb:134
 msgid "Originally set %{original}."
 msgstr ""
 
-#: ../lib/puppet/pops/loader/base_loader.rb:124
+#: ../lib/puppet/pops/loader/base_loader.rb:134
 msgid "Set at unknown location"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/base_loader.rb:125
+#: ../lib/puppet/pops/loader/base_loader.rb:135
 msgid "Attempt to redefine entity '%{name}'. %{origin_info}"
 msgstr ""
 
@@ -6178,15 +6202,15 @@ msgstr ""
 msgid "'%{exe}' is not qualified and no path was specified. Please qualify the command or specify a path."
 msgstr ""
 
-#: ../lib/puppet/provider/exec/posix.rb:21 ../lib/puppet/provider/exec/posix.rb:38 ../lib/puppet/provider/exec/windows.rb:40 ../lib/puppet/provider/exec/windows.rb:53
+#: ../lib/puppet/provider/exec/posix.rb:33 ../lib/puppet/provider/exec/posix.rb:50 ../lib/puppet/provider/exec/windows.rb:40 ../lib/puppet/provider/exec/windows.rb:53
 msgid "Could not find command '%{exe}'"
 msgstr ""
 
-#: ../lib/puppet/provider/exec/posix.rb:23 ../lib/puppet/provider/exec/windows.rb:42
+#: ../lib/puppet/provider/exec/posix.rb:35 ../lib/puppet/provider/exec/windows.rb:42
 msgid "'%{exe}' is a %{klass}, not a file"
 msgstr ""
 
-#: ../lib/puppet/provider/exec/posix.rb:25
+#: ../lib/puppet/provider/exec/posix.rb:37
 msgid "'%{exe}' is not executable"
 msgstr ""
 
@@ -6346,26 +6370,30 @@ msgstr ""
 msgid "Mac OS X packages must specify a package source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:85
+#: ../lib/puppet/provider/package/apt.rb:89
 msgid "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:167 ../lib/puppet/provider/package/fink.rb:55
+#: ../lib/puppet/provider/package/apt.rb:172 ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:94 ../lib/puppet/provider/package/portupgrade.rb:152 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:312 ../lib/puppet/provider/package/zypper.rb:146
+msgid "Could not find package %{name}"
+msgstr ""
+
+#: ../lib/puppet/provider/package/apt.rb:176 ../lib/puppet/provider/package/yum.rb:317
+msgid "Failed to update to version %{should}, got version %{version} instead"
+msgstr ""
+
+#: ../lib/puppet/provider/package/apt.rb:189 ../lib/puppet/provider/package/fink.rb:55
 msgid "Could not find latest version"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:178 ../lib/puppet/provider/package/fink.rb:66
+#: ../lib/puppet/provider/package/apt.rb:200 ../lib/puppet/provider/package/fink.rb:66
 msgid "Preseeding %{response} to debconf-set-selections"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:182 ../lib/puppet/provider/package/fink.rb:70
+#: ../lib/puppet/provider/package/apt.rb:204 ../lib/puppet/provider/package/fink.rb:70
 msgid "No responsefile specified or non existent, not preseeding anything"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:94 ../lib/puppet/provider/package/portupgrade.rb:152 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:312 ../lib/puppet/provider/package/zypper.rb:146
-msgid "Could not find package %{name}"
-msgstr ""
-
 #: ../lib/puppet/provider/package/aptrpm.rb:53
 msgid "Could not match version '%{version}'"
 msgstr ""
@@ -6458,31 +6486,31 @@ msgstr ""
 msgid "NIM package provider is unable to downgrade packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:212
+#: ../lib/puppet/provider/package/nim.rb:217
 msgid ""
 "Unable to parse output from nimclient showres: line does not match expected package header format:\n"
 "'%{line}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:219
+#: ../lib/puppet/provider/package/nim.rb:224
 msgid ""
 "Unable to parse output from nimclient showres: package string does not match expected installp package string format:\n"
 "'%{package_string}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:229
+#: ../lib/puppet/provider/package/nim.rb:234
 msgid ""
 "Unable to parse output from nimclient showres: package string does not match expected rpm package string format:\n"
 "'%{package_string}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:239
+#: ../lib/puppet/provider/package/nim.rb:244
 msgid ""
 "Unable to parse output from nimclient showres: line does not match expected package line format:\n"
 "'%{line}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:251
+#: ../lib/puppet/provider/package/nim.rb:256
 msgid ""
 "Unrecognized package type specifier: '%{package_type_flag}' in package line:\n"
 "'%{line}'"
@@ -6657,22 +6685,30 @@ msgstr ""
 msgid "Package %{name} was not present after trying to install it"
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows.rb:97
+#: ../lib/puppet/provider/package/windows.rb:42
+msgid "Error when unlinking %{path}: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/provider/package/windows.rb:110
 msgid "The package %{operation}ed successfully and the system is rebooting now."
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows.rb:99
+#: ../lib/puppet/provider/package/windows.rb:112
 msgid "The package %{operation}ed successfully, but the system must be rebooted."
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows.rb:101
+#: ../lib/puppet/provider/package/windows.rb:114
 msgid "Failed to %{operation}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows.rb:107
+#: ../lib/puppet/provider/package/windows.rb:120
 msgid "The source parameter cannot be empty when using the Windows provider."
 msgstr ""
 
+#: ../lib/puppet/provider/package/windows/exe_package.rb:79
+msgid "Error when installing %{package}: %{detail}"
+msgstr ""
+
 #: ../lib/puppet/provider/package/windows/package.rb:62
 msgid "The source parameter is required when using the Windows provider."
 msgstr ""
@@ -6681,7 +6717,7 @@ msgstr ""
 msgid "The source does not exist: '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows/package.rb:73
+#: ../lib/puppet/provider/package/windows/package.rb:74
 msgid "Don't know how to install '%{source}'"
 msgstr ""
 
@@ -6701,10 +6737,6 @@ msgstr ""
 msgid "Could not find package %{wanted}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:317
-msgid "Failed to update to version %{should}, got version %{version} instead"
-msgstr ""
-
 #: ../lib/puppet/provider/package_targetable.rb:56
 msgid "Provider %{name} package command is not functional on this host"
 msgstr ""
@@ -6721,23 +6753,23 @@ msgstr ""
 msgid "Failed to read %{target}'s records when prefetching them. Reason: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:291
-msgid "Could not prefetch %{resource} provider '%{name}' target '%{target}': %{detail}. Treating as empty"
+#: ../lib/puppet/provider/parsedfile.rb:284 ../lib/puppet/provider/parsedfile.rb:308
+msgid "Prefetching %{target} for provider %{name} returned nil"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:305
-msgid "Prefetching %{target} for provider %{name} returned nil"
+#: ../lib/puppet/provider/parsedfile.rb:294
+msgid "Could not prefetch %{resource} provider '%{name}' target '%{target}': %{detail}. Treating as empty"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:378
+#: ../lib/puppet/provider/parsedfile.rb:381
 msgid "Parsed Providers must define a default target"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:469
+#: ../lib/puppet/provider/parsedfile.rb:472
 msgid "Somehow got told to prefetch with no resource set"
 msgstr ""
 
-#: ../lib/puppet/provider/service/base.rb:121
+#: ../lib/puppet/provider/service/base.rb:123
 msgid "%{name} is not running"
 msgstr ""
 
@@ -6763,15 +6795,15 @@ msgstr ""
 msgid "Waiting 5 seconds for runsvdir to discover service %{service}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/smf.rb:120
+#: ../lib/puppet/provider/service/smf.rb:96
 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:135
+#: ../lib/puppet/provider/service/smf.rb:111
 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:221
+#: ../lib/puppet/provider/service/smf.rb:197
 msgid "The %{service} service is incomplete so its status will be reported as :stopped. See `svcs -xv %{fmri}` for more details."
 msgstr ""
 
@@ -7040,92 +7072,108 @@ msgid "Class '%{klass}' is already defined%{error}; cannot redefine"
 msgstr ""
 
 #: ../lib/puppet/resource/type_collection.rb:64
+msgid "Node '%{klass}' is already defined%{error}; cannot be redefined as a class"
+msgstr ""
+
+#: ../lib/puppet/resource/type_collection.rb:65
 msgid "Definition '%{klass}' is already defined%{error}; cannot be redefined as a class"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:95
+#: ../lib/puppet/resource/type_collection.rb:96
 msgid "Node '%{name}' is already defined%{error}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:130
+#: ../lib/puppet/resource/type_collection.rb:97
+msgid "Class '%{klass}' is already defined%{error}; cannot be redefined as a node"
+msgstr ""
+
+#: ../lib/puppet/resource/type_collection.rb:132
 msgid "'%{name}' is already defined%{error} as a class; cannot redefine as a definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:131
+#: ../lib/puppet/resource/type_collection.rb:133
 msgid "Definition '%{name}' is already defined%{error}; cannot be redefined"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:175
+#: ../lib/puppet/resource/type_collection.rb:177
 msgid "Execution of config_version command `%{cmd}` failed: %{message}"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:196
+#: ../lib/puppet/resource/type_collection.rb:198
 msgid "Not attempting to load %{type} %{fqname} as this object was missing during a prior compilation"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:102
+#: ../lib/puppet/settings.rb:103
 msgid "New environment loaders generated from the requested section."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:304
+#: ../lib/puppet/settings.rb:305
 msgid "Attempting to initialize global default settings more than once!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:504
+#: ../lib/puppet/settings.rb:505
 msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:646
+#: ../lib/puppet/settings.rb:647
 msgid "Could not load %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:755
+#: ../lib/puppet/settings.rb:756
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:910
+#: ../lib/puppet/settings.rb:874
+msgid "Cannot manage owner permissions, because the provider for '%{name}' is not functional"
+msgstr ""
+
+#: ../lib/puppet/settings.rb:890
+msgid "Cannot manage group permissions, because the provider for '%{name}' is not functional"
+msgstr ""
+
+#: ../lib/puppet/settings.rb:926
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:983
+#: ../lib/puppet/settings.rb:1007
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:988
+#: ../lib/puppet/settings.rb:1012
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:994
+#: ../lib/puppet/settings.rb:1018
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1265
+#: ../lib/puppet/settings.rb:1289
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
-#: ../lib/puppet/settings.rb:1270
+#: ../lib/puppet/settings.rb:1294
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1457
+#: ../lib/puppet/settings.rb:1481
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1481
+#: ../lib/puppet/settings.rb:1505
 msgid "Could not find value for %{expression}"
 msgstr ""
 
 #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
-#: ../lib/puppet/settings.rb:1491
+#: ../lib/puppet/settings.rb:1515
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1492
+#: ../lib/puppet/settings.rb:1516
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1523
+#: ../lib/puppet/settings.rb:1547
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7202,15 +7250,15 @@ msgstr ""
 msgid "(See https://puppet.com/docs/puppet/latest/environments_about.html)"
 msgstr ""
 
-#: ../lib/puppet/settings/config_file.rb:138
+#: ../lib/puppet/settings/config_file.rb:131
 msgid "Invalid file option '%{parameter}'"
 msgstr ""
 
-#: ../lib/puppet/settings/config_file.rb:142
+#: ../lib/puppet/settings/config_file.rb:135
 msgid "File modes must be numbers"
 msgstr ""
 
-#: ../lib/puppet/settings/config_file.rb:145
+#: ../lib/puppet/settings/config_file.rb:138
 msgid "Could not parse '%{string}'"
 msgstr ""
 
@@ -7219,19 +7267,19 @@ msgid "Invalid duration format '%{value}' for parameter: %{name}"
 msgstr ""
 
 #. TRANSLATORS 'disable_per_environment_manifest' is a setting and 'environment.conf' is a file name and should not be translated
-#: ../lib/puppet/settings/environment_conf.rb:69
+#: ../lib/puppet/settings/environment_conf.rb:70
 msgid "The 'disable_per_environment_manifest' setting is true, but the environment located at %{path_to_env} has a manifest setting in its environment.conf of '%{environment_conf}' which does not match the default_manifest setting '%{puppet_conf}'."
 msgstr ""
 
-#: ../lib/puppet/settings/environment_conf.rb:71
+#: ../lib/puppet/settings/environment_conf.rb:72
 msgid "If this environment is expecting to find modules in '%{environment_conf}', they will not be available!"
 msgstr ""
 
-#: ../lib/puppet/settings/environment_conf.rb:141
+#: ../lib/puppet/settings/environment_conf.rb:142
 msgid "Invalid sections in environment.conf at '%{path_to_conf_file}'. Environment conf may not have sections. The following sections are being ignored: '%{sections}'"
 msgstr ""
 
-#: ../lib/puppet/settings/environment_conf.rb:153
+#: ../lib/puppet/settings/environment_conf.rb:154
 msgid "Invalid settings in environment.conf at '%{path_to_conf_file}'. The following unknown setting(s) are being ignored: %{ignored_settings}"
 msgstr ""
 
@@ -7279,7 +7327,7 @@ msgstr ""
 msgid "%{name} has not declared what class it wraps"
 msgstr ""
 
-#: ../lib/puppet/ssl/base.rb:31 ../lib/puppet/x509/cert_provider.rb:370
+#: ../lib/puppet/ssl/base.rb:31 ../lib/puppet/x509/cert_provider.rb:352
 msgid "Certname %{name} must not contain unprintable or non-ASCII characters"
 msgstr ""
 
@@ -7588,7 +7636,7 @@ 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:130
+#: ../lib/puppet/ssl/verifier.rb:134
 msgid "certificate verify failed [%{error} for %{subject}]"
 msgstr ""
 
@@ -7936,56 +7984,56 @@ msgstr ""
 msgid "'%{cmd}' returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:204
-msgid "Command must be a String, got value of class %{klass}"
+#: ../lib/puppet/type/exec.rb:205
+msgid "Command must be a String or Array<String>, got value of class %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:236
+#: ../lib/puppet/type/exec.rb:238
 msgid "Unable to execute commands as other users on Windows"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:238
+#: ../lib/puppet/type/exec.rb:240
 msgid "Only root can execute commands as other users"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:294
+#: ../lib/puppet/type/exec.rb:296
 msgid "Invalid environment setting '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:307
+#: ../lib/puppet/type/exec.rb:309
 msgid "The umask specification is invalid: %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:323
+#: ../lib/puppet/type/exec.rb:325
 msgid "The timeout must be a number."
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:340
+#: ../lib/puppet/type/exec.rb:342
 msgid "Tries must be an integer"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:344
+#: ../lib/puppet/type/exec.rb:346
 msgid "Tries must be an integer >= 1"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:357
+#: ../lib/puppet/type/exec.rb:359
 msgid "try_sleep must be a number"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:361
+#: ../lib/puppet/type/exec.rb:363
 msgid "try_sleep cannot be a negative number"
 msgstr ""
 
 #. TRANSLATORS 'creates' is a parameter name and should not be translated
-#: ../lib/puppet/type/exec.rb:433
+#: ../lib/puppet/type/exec.rb:435
 msgid "Checking that 'creates' path '%{creates_path}' exists"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:478 ../lib/puppet/type/exec.rb:534
+#: ../lib/puppet/type/exec.rb:484 ../lib/puppet/type/exec.rb:544
 msgid "Check %{value} exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:623
+#: ../lib/puppet/type/exec.rb:636
 msgid "'%{cmd}' won't be executed because of failed check '%{check}'"
 msgstr ""
 
@@ -8005,74 +8053,74 @@ msgstr ""
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:416
+#: ../lib/puppet/type/file.rb:433
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:418
+#: ../lib/puppet/type/file.rb:435
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:420
+#: ../lib/puppet/type/file.rb:437
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:423
+#: ../lib/puppet/type/file.rb:440
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:426
+#: ../lib/puppet/type/file.rb:443
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:434
+#: ../lib/puppet/type/file.rb:451
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:437
+#: ../lib/puppet/type/file.rb:454
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:475
+#: ../lib/puppet/type/file.rb:492
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:480
+#: ../lib/puppet/type/file.rb:497
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:778
+#: ../lib/puppet/type/file.rb:796
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:793
+#: ../lib/puppet/type/file.rb:811
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:804
+#: ../lib/puppet/type/file.rb:822
 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:885 ../lib/puppet/type/tidy.rb:352
+#: ../lib/puppet/type/file.rb:903 ../lib/puppet/type/tidy.rb:371
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:888
+#: ../lib/puppet/type/file.rb:906
 msgid "Could not stat; invalid pathname"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1016
+#: ../lib/puppet/type/file.rb:1034
 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:1041
+#: ../lib/puppet/type/file.rb:1059
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1056
+#: ../lib/puppet/type/file.rb:1074
 msgid "File written to disk did not match desired checksum; discarding changes (%{content_checksum} vs %{desired_checksum})"
 msgstr ""
 
@@ -8109,7 +8157,7 @@ msgstr ""
 msgid "Ensure set to :present but file type is %{file_type} so no content will be synced"
 msgstr ""
 
-#: ../lib/puppet/type/file/mode.rb:126
+#: ../lib/puppet/type/file/mode.rb:132
 msgid "Not managing symlink mode"
 msgstr ""
 
@@ -8222,128 +8270,124 @@ msgstr ""
 msgid "%{value} is not a valid day of the week"
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:96
-msgid "Setting enable to %{value} is only supported on Microsoft Windows."
-msgstr ""
-
-#: ../lib/puppet/type/service.rb:166
-msgid "The 'logonaccount' parameter is mandatory when setting 'logonpassword'."
-msgstr ""
-
-#: ../lib/puppet/type/service.rb:167 ../lib/puppet/type/user.rb:271
+#: ../lib/puppet/type/service.rb:151 ../lib/puppet/type/user.rb:272
 msgid "Passwords cannot include ':'"
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:304
+#: ../lib/puppet/type/service.rb:278
 msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:85
+#: ../lib/puppet/type/service.rb:300
+msgid "The 'logonaccount' parameter is mandatory when setting 'logonpassword'."
+msgstr ""
+
+#: ../lib/puppet/type/tidy.rb:101
 msgid "Tidy can't use matches with recurse 0, false, or undef"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:125
+#: ../lib/puppet/type/tidy.rb:141
 msgid "Invalid age unit '%{unit}'"
 msgstr ""
 
 #. TRANSLATORS tidy is the name of a program and should not be translated
-#: ../lib/puppet/type/tidy.rb:145
+#: ../lib/puppet/type/tidy.rb:161
 msgid "Invalid tidy age %{age}"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:167
+#: ../lib/puppet/type/tidy.rb:183
 msgid "Invalid size unit '%{unit}'"
 msgstr ""
 
 #. TRANSLATORS tidy is the name of a program and should not be translated
-#: ../lib/puppet/type/tidy.rb:185
+#: ../lib/puppet/type/tidy.rb:201
 msgid "Invalid tidy size %{age}"
 msgstr ""
 
 #. TRANSLATORS "Tidy" is a program name and should not be translated
-#: ../lib/puppet/type/tidy.rb:275
+#: ../lib/puppet/type/tidy.rb:294
 msgid "Tidying %{count} files"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:348
+#: ../lib/puppet/type/tidy.rb:367
 msgid "File does not exist"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:182
+#: ../lib/puppet/type/user.rb:183
 msgid "Could not find group(s) %{groups}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:291
+#: ../lib/puppet/type/user.rb:292
 msgid "Password minimum age must be provided as a number."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:310
+#: ../lib/puppet/type/user.rb:311
 msgid "Password maximum age must be provided as a number."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:341
+#: ../lib/puppet/type/user.rb:342
 msgid "Group names must be provided, not GID numbers."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:343
+#: ../lib/puppet/type/user.rb:344
 msgid "Group names must be provided as an array, not a comma-separated list."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:344
+#: ../lib/puppet/type/user.rb:345
 msgid "Group names must not be empty. If you want to specify \"no groups\" pass an empty array"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:437
+#: ../lib/puppet/type/user.rb:438
 msgid "User provider %{name} can not manage home directories"
 msgstr ""
 
 #. TRANSLATORS YYYY-MM-DD represents a date with a four-digit year, a two-digit month, and a two-digit day,
 #. TRANSLATORS separated by dashes.
-#: ../lib/puppet/type/user.rb:454
+#: ../lib/puppet/type/user.rb:455
 msgid "Expiry dates must be YYYY-MM-DD or the string \"absent\""
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:521
+#: ../lib/puppet/type/user.rb:522
 msgid "Role names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:523
+#: ../lib/puppet/type/user.rb:524
 msgid "Role names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:560
+#: ../lib/puppet/type/user.rb:561
 msgid "Auth names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:562
+#: ../lib/puppet/type/user.rb:563
 msgid "Auth names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:586
+#: ../lib/puppet/type/user.rb:587
 msgid "Profile names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:588
+#: ../lib/puppet/type/user.rb:589
 msgid "Profile names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:699
+#: ../lib/puppet/type/user.rb:701
 msgid "Ssh_authorized_key type is not available. Cannot purge SSH keys."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:737
+#: ../lib/puppet/type/user.rb:739
 msgid "Each entry for purge_ssh_keys must be a string, not a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:740
+#: ../lib/puppet/type/user.rb:742
 msgid "Paths to keyfiles must be absolute, not %{entry}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:744
+#: ../lib/puppet/type/user.rb:746
 msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:772
+#: ../lib/puppet/type/user.rb:755
 msgid "Class name must be provided."
 msgstr ""
 
@@ -8406,11 +8450,11 @@ msgstr ""
 msgid "path may not be nil"
 msgstr ""
 
-#: ../lib/puppet/util.rb:621
+#: ../lib/puppet/util.rb:630
 msgid "replace_file requires a block"
 msgstr ""
 
-#: ../lib/puppet/util.rb:625
+#: ../lib/puppet/util.rb:634
 msgid "replace_file default_mode: %{default_mode} is invalid"
 msgstr ""
 
@@ -9071,31 +9115,31 @@ msgstr ""
 msgid "Caught exception %{klass}:%{error} retrying"
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:71
+#: ../lib/puppet/util/selinux.rb:81
 msgid "Invalid context to parse: %{context}"
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:83
+#: ../lib/puppet/util/selinux.rb:93
 msgid "Invalid SELinux parameter type"
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:104
+#: ../lib/puppet/util/selinux.rb:114
 msgid "Can't set SELinux context on file unless the file already has some kind of context"
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:118
+#: ../lib/puppet/util/selinux.rb:128
 msgid "set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange"
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:129
+#: ../lib/puppet/util/selinux.rb:139
 msgid "Failed to set SELinux context %{context} on %{file}"
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:180
+#: ../lib/puppet/util/selinux.rb:190
 msgid "Could not open SELinux category translation file %{path}."
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:250
+#: ../lib/puppet/util/selinux.rb:276
 msgid "got a relative path in SELinux find_fs: %{path}"
 msgstr ""
 
@@ -9139,39 +9183,39 @@ msgstr ""
 msgid "Invalid %{klass}: %{id}"
 msgstr ""
 
-#: ../lib/puppet/util/symbolic_file_mode.rb:37
+#: ../lib/puppet/util/symbolic_file_mode.rb:49
 msgid "An empty mode string is illegal"
 msgstr ""
 
-#: ../lib/puppet/util/symbolic_file_mode.rb:41
+#: ../lib/puppet/util/symbolic_file_mode.rb:53
 msgid "Numeric modes must be in octal, not decimal!"
 msgstr ""
 
-#: ../lib/puppet/util/symbolic_file_mode.rb:44
+#: ../lib/puppet/util/symbolic_file_mode.rb:56
 msgid "non-numeric current mode (%{mode})"
 msgstr ""
 
-#: ../lib/puppet/util/symbolic_file_mode.rb:64
+#: ../lib/puppet/util/symbolic_file_mode.rb:76
 msgid "Missing action"
 msgstr ""
 
-#: ../lib/puppet/util/symbolic_file_mode.rb:79
+#: ../lib/puppet/util/symbolic_file_mode.rb:91
 msgid "Missing operation (-, =, or +)"
 msgstr ""
 
-#: ../lib/puppet/util/symbolic_file_mode.rb:101
+#: ../lib/puppet/util/symbolic_file_mode.rb:113
 msgid "X only works with the '+' operator"
 msgstr ""
 
-#: ../lib/puppet/util/symbolic_file_mode.rb:112
+#: ../lib/puppet/util/symbolic_file_mode.rb:124
 msgid "internal error"
 msgstr ""
 
-#: ../lib/puppet/util/symbolic_file_mode.rb:116
+#: ../lib/puppet/util/symbolic_file_mode.rb:128
 msgid "Unknown operation"
 msgstr ""
 
-#: ../lib/puppet/util/symbolic_file_mode.rb:131
+#: ../lib/puppet/util/symbolic_file_mode.rb:143
 msgid "%{error}%{rest} in symbolic mode %{modification}"
 msgstr ""
 
@@ -9219,15 +9263,15 @@ msgstr ""
 msgid "Unrecognized ADS UserFlags: %{unrecognized_flags}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:497
+#: ../lib/puppet/util/windows/adsi.rb:497 ../lib/puppet/util/windows/adsi.rb:530
 msgid "Failed to get user name"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:534
+#: ../lib/puppet/util/windows/adsi.rb:580
 msgid "Cannot delete user profile for '%{sid}' prior to Vista SP1"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:552
+#: ../lib/puppet/util/windows/adsi.rb:598
 msgid "Cannot create group if user '%{name}' exists."
 msgstr ""
 
@@ -9282,20 +9326,20 @@ msgstr ""
 msgid "Failed to call GetLongPathName"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:67 ../lib/puppet/util/windows/principal.rb:74
+#: ../lib/puppet/util/windows/principal.rb:68 ../lib/puppet/util/windows/principal.rb:75
 msgid "Failed to call LookupAccountNameW with account: %{account_name}"
 msgstr ""
 
 #. TRANSLATORS `lookup_account_sid` is a variable name and should not be translated
-#: ../lib/puppet/util/windows/principal.rb:97
+#: ../lib/puppet/util/windows/principal.rb:98
 msgid "Byte array for lookup_account_sid must not be nil and must be at least 1 byte long"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:114
+#: ../lib/puppet/util/windows/principal.rb:115
 msgid "Byte array for lookup_account_sid is invalid: %{sid_bytes}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:122 ../lib/puppet/util/windows/principal.rb:129
+#: ../lib/puppet/util/windows/principal.rb:123 ../lib/puppet/util/windows/principal.rb:130
 msgid "Failed to call LookupAccountSidW with bytes: %{sid_bytes}"
 msgstr ""
 
@@ -9405,7 +9449,7 @@ msgstr ""
 msgid "An attempt to set mode %{mode} on item %{path} would result in the group, SYSTEM, to have less than Full Control rights. This attempt has been corrected to Full Control"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:433 ../lib/puppet/util/windows/security.rb:450 ../lib/puppet/util/windows/sid.rb:155 ../lib/puppet/util/windows/sid.rb:217 ../lib/puppet/util/windows/user.rb:59
+#: ../lib/puppet/util/windows/security.rb:433 ../lib/puppet/util/windows/security.rb:450 ../lib/puppet/util/windows/sid.rb:159 ../lib/puppet/util/windows/sid.rb:221 ../lib/puppet/util/windows/user.rb:59
 msgid "Invalid SID"
 msgstr ""
 
@@ -9561,19 +9605,19 @@ msgstr ""
 msgid "Timed out while waiting for the pending transition from %{pending_state} to %{final_state} to finish. The current state is %{current_state}."
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:94
+#: ../lib/puppet/util/windows/sid.rb:98
 msgid "Octet string must be an array of bytes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:161
+#: ../lib/puppet/util/windows/sid.rb:165
 msgid "Failed to convert binary SID"
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:166
+#: ../lib/puppet/util/windows/sid.rb:170
 msgid "ConvertSidToStringSidW failed to allocate buffer for sid"
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:186
+#: ../lib/puppet/util/windows/sid.rb:190
 msgid "Failed to convert string SID: %{string_sid}"
 msgstr ""
 
@@ -9597,72 +9641,72 @@ msgstr ""
 msgid "Failed to unload user profile %{user}"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:45
+#: ../lib/puppet/x509/cert_provider.rb:44
 msgid "Failed to save CA certificates to '%{capath}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:59
+#: ../lib/puppet/x509/cert_provider.rb:58
 msgid "The CA certificates are missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:63
+#: ../lib/puppet/x509/cert_provider.rb:62
 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:75
+#: ../lib/puppet/x509/cert_provider.rb:74
 msgid "Failed to parse CA certificates as PEM"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:91
+#: ../lib/puppet/x509/cert_provider.rb:90
 msgid "Failed to save CRLs to '%{crlpath}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:105
+#: ../lib/puppet/x509/cert_provider.rb:104
 msgid "The CRL is missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:109
+#: ../lib/puppet/x509/cert_provider.rb:108
 msgid "Failed to load CRLs from '%{crlpath}'"
 msgstr ""
 
 #. TRANSLATORS 'PEM' is an acronym and shouldn't be translated
-#: ../lib/puppet/x509/cert_provider.rb:121
+#: ../lib/puppet/x509/cert_provider.rb:120
 msgid "Failed to parse CRLs as PEM"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:171
+#: ../lib/puppet/x509/cert_provider.rb:170
 msgid "Failed to save private key for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:191
+#: ../lib/puppet/x509/cert_provider.rb:190
 msgid "The private key is missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:195
+#: ../lib/puppet/x509/cert_provider.rb:194
 msgid "Failed to load private key for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:255
+#: ../lib/puppet/x509/cert_provider.rb:237
 msgid "Failed to save client certificate for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:271
+#: ../lib/puppet/x509/cert_provider.rb:253
 msgid "The client certificate is missing from '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:275
+#: ../lib/puppet/x509/cert_provider.rb:257
 msgid "Failed to load client certificate for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:324
+#: ../lib/puppet/x509/cert_provider.rb:306
 msgid "Failed to save certificate request for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:340
+#: ../lib/puppet/x509/cert_provider.rb:322
 msgid "Failed to load certificate request for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/x509/cert_provider.rb:353
+#: ../lib/puppet/x509/cert_provider.rb:335
 msgid "Failed to delete certificate request for '%{name}'"
 msgstr ""