puppet 7.7.0-universal-darwin → 7.11.0-universal-darwin

data/lib/puppet/util/logging.rb

@@ -2,8 +2,6 @@
 require_relative '../../puppet/util/log'
 require_relative '../../puppet/error'
 
-require 'facter'
-
 module Puppet::Util
 module Logging
 
@@ -254,29 +252,7 @@ module Logging
   # Sets up Facter logging.
   # This method causes Facter output to be forwarded to Puppet.
   def self.setup_facter_logging!
-    # Only recent versions of Facter support this feature
-    return false unless Facter.respond_to? :on_message
-
-    # The current Facter log levels are: :trace, :debug, :info, :warn, :error, and :fatal.
-    # Convert to the corresponding levels in Puppet
-    Facter.on_message do |level, message|
-      case level
-      when :trace, :debug
-        level = :debug
-      when :info
-        # Same as Puppet
-      when :warn
-        level = :warning
-      when :error
-        level = :err
-      when :fatal
-        level = :crit
-      else
-        next
-      end
-      Puppet::Util::Log.create({:level => level, :source => 'Facter', :message => message})
-      nil
-    end
+    Puppet.runtime[:facter]
     true
   end
 

data/lib/puppet/util/monkey_patches.rb

@@ -32,13 +32,6 @@ end
 # (#19151) Reject all SSLv2 ciphers and handshakes
 require_relative '../../puppet/ssl/openssl_loader'
 unless Puppet::Util::Platform.jruby_fips?
-  unless defined?(OpenSSL::SSL::TLS1_VERSION)
-    module OpenSSL::SSL
-      # see https://github.com/ruby/ruby/commit/609103dbb5fb182eec12f052226c43e39b907682#diff-09f822c26289f5347111795ca22ed7ed1cfadd6ebd28f987991d1d414eef565aR2755-R2759
-      OpenSSL::SSL::TLS1_VERSION = 0x301
-    end
-  end
-
   class OpenSSL::SSL::SSLContext
     if DEFAULT_PARAMS[:options]
       DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
@@ -94,20 +87,12 @@ unless Puppet::Util::Platform.jruby_fips?
     OpenSSL::X509.const_set(:V_ERR_HOSTNAME_MISMATCH, 62)
   end
 
+  # jruby-openssl doesn't support this
   unless OpenSSL::X509::Name.instance_methods.include?(:to_utf8)
     class OpenSSL::X509::Name
-      # https://github.com/openssl/openssl/blob/OpenSSL_1_1_0j/include/openssl/asn1.h#L362
-      ASN1_STRFLGS_ESC_MSB = 4
-
-      FLAGS = if RUBY_PLATFORM == 'java'
-                OpenSSL::X509::Name::RFC2253
-              else
-                OpenSSL::X509::Name::RFC2253 & ~ASN1_STRFLGS_ESC_MSB
-              end
-
       def to_utf8
         # https://github.com/ruby/ruby/blob/v2_5_5/ext/openssl/ossl_x509name.c#L317
-        str = to_s(FLAGS)
+        str = to_s(OpenSSL::X509::Name::RFC2253)
         str.force_encoding(Encoding::UTF_8)
       end
     end

data/lib/puppet/util/pidlock.rb

@@ -46,7 +46,7 @@ class Puppet::Util::Pidlock
   private
 
   def ps_argument_for_current_kernel
-    case Facter.value(:kernel)
+    case Puppet.runtime[:facter].value(:kernel)
       when "Linux"
         "-eq"
       when "AIX"

data/lib/puppet/util/rdoc/parser/puppet_parser_core.rb

@@ -154,7 +154,7 @@ module RDoc::PuppetParserCore
         # fetch comments
         if line =~ /^[ \t]*# ?(.*)$/
           comments += $1 + "\n"
-        elsif line =~ /^[ \t]*Facter.add\(['"](.*?)['"]\)/
+        elsif line =~ /^[ \t]*(Facter.add|Puppet\.runtime\[:facter\].add)\(['"](.*?)['"]\)/
           current_fact = RDoc::Fact.new($1,{})
           look_for_directives_in(container, comments) unless comments.empty?
           current_fact.comment = comments

data/lib/puppet/util/suidmanager.rb

@@ -1,4 +1,3 @@
-require 'facter'
 require_relative '../../puppet/util/warnings'
 require 'forwardable'
 require 'etc'
@@ -18,7 +17,7 @@ module Puppet::Util::SUIDManager
 
   def osx_maj_ver
     return @osx_maj_ver unless @osx_maj_ver.nil?
-    @osx_maj_ver = Facter.value('macosx_productversion_major') || false
+    @osx_maj_ver = Puppet.runtime[:facter].value('macosx_productversion_major') || false
   end
   module_function :osx_maj_ver
 

data/lib/puppet/util/symbolic_file_mode.rb

@@ -19,25 +19,37 @@ module SymbolicFileMode
     return false
   end
 
+  def display_mode(value)
+    if value =~ /^0?[0-7]{1,4}$/
+      value.rjust(4, "0")
+    else
+      value
+    end
+  end
+
   def normalize_symbolic_mode(value)
     return nil if value.nil?
 
     # We need to treat integers as octal numbers.
-    if value.is_a? Numeric then
-      return value.to_s(8)
-    elsif value =~ /^0?[0-7]{1,4}$/ then
-      return value.to_i(8).to_s(8)
+    #
+    # "A numeric mode is from one to four octal digits (0-7), derived by adding
+    # up the bits with values 4, 2, and 1. Omitted digits are assumed to be
+    # leading zeros."
+    if value.is_a? Numeric
+      value.to_s(8)
+    elsif value =~ /^0?[0-7]{1,4}$/
+      value.to_i(8).to_s(8) # strip leading 0's
     else
-      return value
+      value
     end
   end
 
   def symbolic_mode_to_int(modification, to_mode = 0, is_a_directory = false)
-    if modification.nil? or modification == '' then
+    if modification.nil? or modification == ''
       raise Puppet::Error, _("An empty mode string is illegal")
-    end
-    if modification =~ /^[0-7]+$/ then return modification.to_i(8) end
-    if modification =~ /^\d+$/ then
+    elsif modification =~ /^[0-7]+$/
+      return modification.to_i(8)
+    elsif modification =~ /^\d+$/
       raise Puppet::Error, _("Numeric modes must be in octal, not decimal!")
     end
 
@@ -84,31 +96,31 @@ module SymbolicFileMode
 
           dsl.split('').each do |op|
             case op
-            when /[-+=]/ then
+            when /[-+=]/
               action = op
               # Clear all bits, if this is assignment
               value  = 0 if op == '='
 
-            when /[ugo]/ then
+            when /[ugo]/
               value = actions[action].call(value, snapshot_mode[op])
 
-            when /[rwx]/ then
+            when /[rwx]/
               value = actions[action].call(value, SymbolicMode[op])
 
-            when 'X' then
+            when 'X'
               # Only meaningful in combination with "set" actions.
-              if action != '+' then
+              if action != '+'
                 raise Puppet::Error, _("X only works with the '+' operator")
               end
 
               # As per the BSD manual page, set if this is a directory, or if
               # any execute bit is set on the original (unmodified) mode.
               # Ignored otherwise; it is "add if", not "add or clear".
-              if is_a_directory or original_mode['any x?'] then
+              if is_a_directory or original_mode['any x?']
                 value = actions[action].call(value, ExecBit)
               end
 
-            when /[st]/ then
+            when /[st]/
               bit = SymbolicSpecialToBit[op][who] or fail _("internal error")
               final_mode['s'] = actions[action].call(final_mode['s'], bit)
 
@@ -122,7 +134,7 @@ module SymbolicFileMode
         end
 
       rescue Puppet::Error => e
-        if part.inspect != modification.inspect then
+        if part.inspect != modification.inspect
           rest = " at #{part.inspect}"
         else
           rest = ''

data/lib/puppet/util/tagging.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative '../../puppet/util/tag_set'
 
 module Puppet::Util::Tagging

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

@@ -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,6 +1,5 @@
 require_relative '../../../puppet/util/windows'
 
-require 'facter'
 require 'ffi'
 
 module Puppet::Util::Windows::User

data/lib/puppet/util.rb

@@ -772,12 +772,13 @@ module Util
   # Executes a block of code, wrapped around Facter.load_external(false) and
   # Facter.load_external(true) which will cause Facter to not evaluate external facts.
   def skip_external_facts
-    return yield unless Facter.respond_to? :load_external
+    return yield unless Puppet.runtime[:facter].load_external?
+
     begin
-      Facter.load_external(false)
+      Puppet.runtime[:facter].load_external(false)
       yield
     ensure
-      Facter.load_external(true)
+      Puppet.runtime[:facter].load_external(true)
     end
   end
   module_function :skip_external_facts

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

data/lib/puppet/x509/cert_provider.rb

@@ -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.rb

@@ -12,7 +12,6 @@ $LOAD_PATH.extend(Puppet::Concurrent::Synchronized)
 # see the bottom of the file for further inclusions
 # Also see the new Vendor support - towards the end
 #
-require 'facter'
 require_relative 'puppet/error'
 require_relative 'puppet/util'
 require_relative 'puppet/util/autoload'
@@ -88,9 +87,6 @@ module Puppet
   require_relative 'puppet/util/logging'
   extend Puppet::Util::Logging
 
-  # Setup facter's logging
-  Puppet::Util::Logging.setup_facter_logging!
-
   # The feature collection
   @features = Puppet::Util::Feature.new('puppet/feature')
 
@@ -193,15 +189,15 @@ module Puppet
   def self.initialize_facts
     # Add the puppetversion fact; this is done before generating the hash so it is
     # accessible to custom facts.
-    Facter.add(:puppetversion) do
+    Puppet.runtime[:facter].add(:puppetversion) do
       setcode { Puppet.version.to_s }
     end
 
-    Facter.add(:agent_specified_environment) do
+    Puppet.runtime[:facter].add(:agent_specified_environment) do
       setcode do
-        if Puppet.settings.set_by_config?(:environment)
-          Puppet[:environment]
-        end
+        Puppet.settings.set_by_cli(:environment) ||
+          Puppet.settings.set_in_section(:environment, :agent) ||
+          Puppet.settings.set_in_section(:environment, :main)
       end
     end
   end

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 7.6.1-91-g3f8691353f\n"
+"Project-Id-Version: Puppet automation framework 7.9.0-154-gc8aa8b2175\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2021-05-12 16:37+0000\n"
-"PO-Revision-Date: 2021-05-12 16:37+0000\n"
+"POT-Creation-Date: 2021-08-11 13:52+0000\n"
+"PO-Revision-Date: 2021-08-11 13:52+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 ""
 
@@ -450,55 +450,55 @@ msgstr ""
 msgid "An action must be specified."
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:129 ../lib/puppet/application/ssl.rb:136
+#: ../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:147
+#: ../lib/puppet/application/ssl.rb:148
 msgid "Completed SSL initialization"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:151
+#: ../lib/puppet/application/ssl.rb:152
 msgid "Unknown action '%{action}'"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:165 ../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:168
+#: ../lib/puppet/application/ssl.rb:169
 msgid "Creating a new SSL key for %{name}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:178
+#: ../lib/puppet/application/ssl.rb:179
 msgid "Submitted certificate request for '%{name}' to %{url}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:181
+#: ../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:183 ../lib/puppet/application/ssl.rb:186
+#: ../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:194
+#: ../lib/puppet/application/ssl.rb:195
 msgid "Downloading certificate '%{name}' from %{url}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:198
+#: ../lib/puppet/application/ssl.rb:199
 msgid "Downloaded certificate '%{name}' with fingerprint %{fingerprint}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:211 ../lib/puppet/application/ssl.rb:214
+#: ../lib/puppet/application/ssl.rb:212 ../lib/puppet/application/ssl.rb:215
 msgid "Failed to download certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:243 ../lib/puppet/application/ssl.rb:246
+#: ../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:250
+#: ../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:273
+#: ../lib/puppet/application/ssl.rb:274
 msgid "Removed %{label} %{path}"
 msgstr ""
 
@@ -534,93 +534,133 @@ msgstr ""
 msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:100 ../lib/puppet/configurer.rb:182
+#: ../lib/puppet/configurer.rb:100 ../lib/puppet/configurer.rb:272
 msgid "Using cached catalog from environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:175
+#: ../lib/puppet/configurer.rb:130
+msgid "The current total number of facts: %{size} exceeds the number of facts limit: %{max_size}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:134
+msgid "Fact %{name} with length: '%{length}' exceeds the length limit: %{limit}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:138
+msgid "The current number of top level facts: %{size} exceeds the top facts limit: %{max_size}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:142
+msgid "Fact value '%{value}' with the value length: '%{length}' exceeds the value length limit: %{max_length}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:146
+msgid "Payload with the current size of: '%{payload}' exceeds the payload size limit: %{max_size}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:184
+msgid "The size of the payload is %{payload}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:214
+msgid "The total number of facts registered is %{number_of_facts}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:265
 msgid "Could not retrieve catalog; skipping run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:191
+#: ../lib/puppet/configurer.rb:281
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:225
+#: ../lib/puppet/configurer.rb:315
 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:239
+#: ../lib/puppet/configurer.rb:329
 msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:275
+#: ../lib/puppet/configurer.rb:366
 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:320
-msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
+#: ../lib/puppet/configurer.rb:389
+msgid "Environment not passed via CLI and no catalog was given, attempting to find out the last server-specified environment"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:335
-msgid "Using configured environment '%{env}'"
+#: ../lib/puppet/configurer.rb:394
+msgid "Could not find a usable environment in the lastrunfile. Either the file does not exist, does not have the required keys, or the values of 'initial_environment' and 'converged_environment' are identical."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:339
-msgid "Unable to fetch my node definition, but the agent run will continue:"
+#: ../lib/puppet/configurer.rb:398
+msgid "Using environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:367
+#: ../lib/puppet/configurer.rb:429
 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:378
+#: ../lib/puppet/configurer.rb:440
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:380
+#: ../lib/puppet/configurer.rb:442
 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:434
+#: ../lib/puppet/configurer.rb:505
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:463 ../lib/puppet/http/resolver/server_list.rb:64 ../lib/puppet/http/resolver/server_list.rb:68
+#: ../lib/puppet/configurer.rb:536
+msgid "Environment '%{environment}' not found on server, skipping initial pluginsync."
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:553 ../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:73 ../lib/puppet/http/resolver/server_list.rb:76
+#: ../lib/puppet/configurer.rb:557 ../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 ""
 
-#: ../lib/puppet/configurer.rb:478 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:573
+msgid "Found last server-specified environment: %{environment}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:576
+msgid "Could not find last server-specified environment: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:586 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:487
+#: ../lib/puppet/configurer.rb:595
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:506
+#: ../lib/puppet/configurer.rb:614
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:514
+#: ../lib/puppet/configurer.rb:622
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:529
+#: ../lib/puppet/configurer.rb:637
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:547
+#: ../lib/puppet/configurer.rb:655
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:568
+#: ../lib/puppet/configurer.rb:677
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -697,30 +737,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:1077 ../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:1914
+#: ../lib/puppet/defaults.rb:1944
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
@@ -1589,15 +1629,15 @@ msgstr ""
 msgid "Relative paths must not be fully qualified"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration.rb:55
+#: ../lib/puppet/file_serving/configuration.rb:56
 msgid "Cannot find file: Invalid mount '%{mount_name}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration.rb:56
+#: ../lib/puppet/file_serving/configuration.rb:57
 msgid "Cannot find file: Invalid relative path '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration.rb:104
+#: ../lib/puppet/file_serving/configuration.rb:106
 msgid "Error parsing fileserver configuration: %{detail}; using old configuration"
 msgstr ""
 
@@ -1625,11 +1665,11 @@ msgstr ""
 msgid "%{mount} is already mounted at %{name} at %{error_location}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:98
+#: ../lib/puppet/file_serving/configuration/parser.rb:100
 msgid "Removing mount \"%{mount}\": %{detail}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:102
+#: ../lib/puppet/file_serving/configuration/parser.rb:104
 msgid "The '%{mount}' module can not have a path. Ignoring attempt to set it"
 msgstr ""
 
@@ -1719,7 +1759,7 @@ msgstr ""
 msgid "No client; expanding '%{path}' with local host"
 msgstr ""
 
-#: ../lib/puppet/file_serving/mount/modules.rb:8
+#: ../lib/puppet/file_serving/mount/modules.rb:8 ../lib/puppet/file_serving/mount/scripts.rb:6
 msgid "No module specified"
 msgstr ""
 
@@ -2027,7 +2067,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 ""
 
@@ -2117,7 +2157,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 ""
 
@@ -2284,120 +2324,120 @@ msgstr ""
 msgid "Catalog for %{request} was requested with fact definition for the wrong node (%{fact_name})."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:71
+#: ../lib/puppet/indirector/catalog/compiler.rb:85
 msgid "Setup server facts for compiling"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:95
+#: ../lib/puppet/indirector/catalog/compiler.rb:113
 msgid "Unsupported facts format"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:136
+#: ../lib/puppet/indirector/catalog/compiler.rb:154
 msgid "Not inlining absent resource"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:139
+#: ../lib/puppet/indirector/catalog/compiler.rb:157
 msgid "Not inlining resource without sources"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:142
+#: ../lib/puppet/indirector/catalog/compiler.rb:160
 msgid "Not inlining unsupported source scheme"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:164
+#: ../lib/puppet/indirector/catalog/compiler.rb:182
 msgid "Not inlining file outside environment"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:170
+#: ../lib/puppet/indirector/catalog/compiler.rb:188
 msgid "Inlining file metadata"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:260
+#: ../lib/puppet/indirector/catalog/compiler.rb:278
 msgid "Could not get metadata for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:281
+#: ../lib/puppet/indirector/catalog/compiler.rb:299
 msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:288
+#: ../lib/puppet/indirector/catalog/compiler.rb:306
 msgid "Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:289
+#: ../lib/puppet/indirector/catalog/compiler.rb:307
 msgid "Compiled static catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:291
+#: ../lib/puppet/indirector/catalog/compiler.rb:309
 msgid "Compiled static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:292
+#: ../lib/puppet/indirector/catalog/compiler.rb:310
 msgid "Compiled static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:297
+#: ../lib/puppet/indirector/catalog/compiler.rb:315
 msgid "Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:298
+#: ../lib/puppet/indirector/catalog/compiler.rb:316
 msgid "Compiled catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:300
+#: ../lib/puppet/indirector/catalog/compiler.rb:318
 msgid "Compiled catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:301
+#: ../lib/puppet/indirector/catalog/compiler.rb:319
 msgid "Compiled catalog for %{node}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:323
+#: ../lib/puppet/indirector/catalog/compiler.rb:341
 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:325
+#: ../lib/puppet/indirector/catalog/compiler.rb:343
 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:328
+#: ../lib/puppet/indirector/catalog/compiler.rb:346
 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:330
+#: ../lib/puppet/indirector/catalog/compiler.rb:348
 msgid "Inlined resource metadata into static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:347
+#: ../lib/puppet/indirector/catalog/compiler.rb:365
 msgid "Found node information"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:355
+#: ../lib/puppet/indirector/catalog/compiler.rb:373
 msgid "Failed when searching for node %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:375
+#: ../lib/puppet/indirector/catalog/compiler.rb:393
 msgid "Invalid option use_node for a remote request"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:394
+#: ../lib/puppet/indirector/catalog/compiler.rb:412
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:427
+#: ../lib/puppet/indirector/catalog/compiler.rb:445
 msgid "Could not retrieve fact servername"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:436
+#: ../lib/puppet/indirector/catalog/compiler.rb:454
 msgid "Could not retrieve either serverip or serverip6 fact"
 msgstr ""
 
@@ -2409,7 +2449,7 @@ msgstr ""
 msgid "Unable to serialize catalog to json, retrying with pson"
 msgstr ""
 
-#: ../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
+#: ../lib/puppet/indirector/catalog/rest.rb:33 ../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 ""
 
@@ -2752,7 +2792,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 ""
 
@@ -2780,11 +2820,11 @@ msgstr ""
 msgid "Cannot create instances of abstract terminus types"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:163
+#: ../lib/puppet/indirector/terminus.rb:167
 msgid "Instance name %{name} does not match requested key %{key}"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:169
+#: ../lib/puppet/indirector/terminus.rb:173
 msgid "Invalid instance type %{klass}, expected %{model_type}"
 msgstr ""
 
@@ -2905,43 +2945,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 ""
 
@@ -3094,19 +3134,19 @@ msgstr ""
 msgid "Plan %{plan_name} not found in module %{module_name}."
 msgstr ""
 
-#: ../lib/puppet/module/plan.rb:64
+#: ../lib/puppet/module/plan.rb:63
 msgid "Plan names must start with a lowercase letter and be composed of only lowercase letters, numbers, and underscores"
 msgstr ""
 
-#: ../lib/puppet/module/plan.rb:66
+#: ../lib/puppet/module/plan.rb:65
 msgid "Plan name cannot have extension %{ext}, must be .pp or .yaml"
 msgstr ""
 
-#: ../lib/puppet/module/plan.rb:69
+#: ../lib/puppet/module/plan.rb:68
 msgid "Plan name cannot be a reserved word, but was '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/module/plan.rb:72
+#: ../lib/puppet/module/plan.rb:71
 msgid "Plan name cannot be a Puppet data type, but was '%{name}'"
 msgstr ""
 
@@ -3202,19 +3242,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:216
 msgid "Preparing to install ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:211
+#: ../lib/puppet/module_tool/applications/installer.rb:219
 msgid "Installing -- do not interrupt ..."
 msgstr ""
 
@@ -3333,7 +3373,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 ""
 
@@ -3423,68 +3463,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 ""
 
@@ -3872,7 +3924,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:575 ../lib/puppet/pops/loaders.rb:301
+#: ../lib/puppet/node/environment.rb:574 ../lib/puppet/pops/loaders.rb:301
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -6190,15 +6242,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 ""
 
@@ -6474,31 +6526,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}'"
@@ -6580,19 +6632,19 @@ msgstr ""
 msgid "Implicit version %{should} has %{n} possible matches"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:170
+#: ../lib/puppet/provider/package/pkg.rb:177
 msgid "Selecting version '%{version}' for implicit '%{should}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:175
+#: ../lib/puppet/provider/package/pkg.rb:182
 msgid "No version of %{name} matching %{should} is installable, even though the package is currently installed"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:194
+#: ../lib/puppet/provider/package/pkg.rb:201
 msgid "pkg warning: %{warnings}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:238 ../lib/puppet/provider/package/pkg.rb:264
+#: ../lib/puppet/provider/package/pkg.rb:245 ../lib/puppet/provider/package/pkg.rb:271
 msgid "Unable to update %{package}"
 msgstr ""
 
@@ -6673,22 +6725,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 ""
@@ -6697,7 +6757,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 ""
 
@@ -6733,19 +6793,19 @@ 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 ""
 
@@ -7052,26 +7112,34 @@ 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 ""
 
@@ -7095,49 +7163,57 @@ msgstr ""
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:911
+#: ../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:984
+#: ../lib/puppet/settings.rb:1007
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:989
+#: ../lib/puppet/settings.rb:1012
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:995
+#: ../lib/puppet/settings.rb:1018
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1266
+#: ../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:1271
+#: ../lib/puppet/settings.rb:1294
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1458
+#: ../lib/puppet/settings.rb:1481
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1482
+#: ../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:1492
+#: ../lib/puppet/settings.rb:1515
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1493
+#: ../lib/puppet/settings.rb:1516
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1524
+#: ../lib/puppet/settings.rb:1547
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7214,15 +7290,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 ""
 
@@ -7291,7 +7367,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 ""
 
@@ -7932,72 +8008,72 @@ msgstr ""
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:118
+#: ../lib/puppet/type/exec.rb:121
 msgid "executed successfully"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:152
+#: ../lib/puppet/type/exec.rb:155
 msgid "Command exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:181
+#: ../lib/puppet/type/exec.rb:184
 msgid "[command redacted] returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:183
+#: ../lib/puppet/type/exec.rb:186
 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:208
+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:241
 msgid "Unable to execute commands as other users on Windows"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:238
+#: ../lib/puppet/type/exec.rb:243
 msgid "Only root can execute commands as other users"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:294
+#: ../lib/puppet/type/exec.rb:299
 msgid "Invalid environment setting '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:307
+#: ../lib/puppet/type/exec.rb:312
 msgid "The umask specification is invalid: %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:323
+#: ../lib/puppet/type/exec.rb:328
 msgid "The timeout must be a number."
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:340
+#: ../lib/puppet/type/exec.rb:345
 msgid "Tries must be an integer"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:344
+#: ../lib/puppet/type/exec.rb:349
 msgid "Tries must be an integer >= 1"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:357
+#: ../lib/puppet/type/exec.rb:362
 msgid "try_sleep must be a number"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:361
+#: ../lib/puppet/type/exec.rb:366
 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:438
 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:490 ../lib/puppet/type/exec.rb:553
 msgid "Check %{value} exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:623
+#: ../lib/puppet/type/exec.rb:645
 msgid "'%{cmd}' won't be executed because of failed check '%{check}'"
 msgstr ""
 
@@ -8121,7 +8197,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 ""
 
@@ -8234,19 +8310,15 @@ 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:152 ../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:279
+#: ../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/service.rb:301
+#: ../lib/puppet/type/service.rb:300
 msgid "The 'logonaccount' parameter is mandatory when setting 'logonpassword'."
 msgstr ""
 
@@ -8281,81 +8353,81 @@ msgstr ""
 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 ""
 
@@ -9151,39 +9223,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 ""
 
@@ -9417,7 +9489,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:157 ../lib/puppet/util/windows/sid.rb:219 ../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 ""
 
@@ -9573,19 +9645,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:96
+#: ../lib/puppet/util/windows/sid.rb:98
 msgid "Octet string must be an array of bytes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:163
+#: ../lib/puppet/util/windows/sid.rb:165
 msgid "Failed to convert binary SID"
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:168
+#: ../lib/puppet/util/windows/sid.rb:170
 msgid "ConvertSidToStringSidW failed to allocate buffer for sid"
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:188
+#: ../lib/puppet/util/windows/sid.rb:190
 msgid "Failed to convert string SID: %{string_sid}"
 msgstr ""
 
@@ -9609,72 +9681,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 ""