puppet 6.21.0-x64-mingw32 → 6.24.0-x64-mingw32

data/lib/puppet/util/fact_dif.rb

@@ -1,15 +1,24 @@
 require 'json'
 
 class FactDif
-  def initialize(old_output, new_output, exclude_list = [])
-    @c_facter = JSON.parse(old_output)['values']
-    @next_facter = JSON.parse(new_output)['values']
+  def initialize(old_output, new_output, exclude_list, save_structured)
+    @c_facter = JSON.parse(old_output)
+    @next_facter = JSON.parse(new_output)
     @exclude_list = exclude_list
+    @save_structured = save_structured
+    @flat_diff = []
     @diff = {}
   end
 
   def difs
-    search_hash(@c_facter, [])
+    search_hash(((@c_facter.to_a - @next_facter.to_a) | (@next_facter.to_a - @c_facter.to_a)).to_h)
+
+    @flat_diff.sort_by { |a| a[0] }.each do |pair|
+      fact_path = pair[0]
+      value = pair[1]
+      compare(fact_path, value, @c_facter)
+      compare(fact_path, value, @next_facter)
+    end
 
     @diff
   end
@@ -28,29 +37,39 @@ class FactDif
         path.pop
       end
     else
-      compare(path, sh)
+      @flat_diff.push([path.dup, sh])
     end
   end
 
-  def compare(fact_path, old_value)
-    new_value = @next_facter.dig(*fact_path)
-    if different?(new_value, old_value) && !excluded?(fact_path.join('.'))
-      @diff[fact_path.join('.')] = { new_value: new_value, old_value: old_value }
+  def compare(fact_path, given_value, compared_hash)
+    compared_value = compared_hash.dig(*fact_path)
+    if different?(compared_value, given_value) && !excluded?(fact_path.join('.'))
+      fact_path = fact_path.map{|f| f.to_s.include?('.') ? "\"#{f}\"" : f}.join('.') unless @save_structured
+      if compared_hash == @c_facter
+        bury(*fact_path, { :new_value => given_value, :old_value => compared_value }, @diff)
+      else
+        bury(*fact_path, { :new_value => compared_value, :old_value => given_value }, @diff)
+      end
+    end
+  end
+
+  def bury(*paths, value, hash)
+    if paths.count > 1
+      path = paths.shift
+      hash[path] = Hash.new unless hash.key?(path)
+      bury(*paths, value, hash[path])
+    else
+      hash[*paths] = value
     end
   end
 
   def different?(new, old)
-    if old.is_a?(String) && new.is_a?(String)
+    if old.is_a?(String) && new.is_a?(String) && (old.include?(',') || new.include?(','))
       old_values = old.split(',')
       new_values = new.split(',')
 
-      diff = old_values - new_values
-      # also add new entries only available in Facter 4
-      diff.concat(new_values - old_values)
-
-      return true if diff.any?
-
-      return false
+      diff = (old_values - new_values) | (new_values - old_values)
+      return diff.size.positive?
     end
 
     old != new

data/lib/puppet/util/monkey_patches.rb

@@ -32,6 +32,13 @@ end
 # (#19151) Reject all SSLv2 ciphers and handshakes
 require '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

data/lib/puppet/util/selinux.rb

@@ -13,6 +13,10 @@ require 'pathname'
 
 module Puppet::Util::SELinux
 
+  S_IFREG = 0100000
+  S_IFDIR = 0040000
+  S_IFLNK = 0120000
+
   def self.selinux_support?
     return false unless defined?(Selinux)
     if Selinux.is_selinux_enabled == 1
@@ -38,7 +42,7 @@ module Puppet::Util::SELinux
 
   # Retrieve and return the default context of the file.  If we don't have
   # SELinux support or if the SELinux call fails to file a default then return nil.
-  def get_selinux_default_context(file)
+  def get_selinux_default_context(file, resource_ensure=nil)
     return nil unless selinux_support?
     # If the filesystem has no support for SELinux labels, return a default of nil
     # instead of what matchpathcon would return
@@ -48,8 +52,14 @@ module Puppet::Util::SELinux
     begin
       filestat = file_lstat(file)
       mode = filestat.mode
-    rescue Errno::EACCES, Errno::ENOENT
+    rescue Errno::EACCES
       mode = 0
+    rescue Errno::ENOENT
+      if resource_ensure
+        mode = get_create_mode(resource_ensure)
+      else
+        mode = 0
+      end
     end
 
     retval = Selinux.matchpathcon(file, mode)
@@ -136,8 +146,8 @@ module Puppet::Util::SELinux
   # Puppet uses.  This will set the file's SELinux context to the policy's
   # default context (if any) if it differs from the context currently on
   # the file.
-  def set_selinux_default_context(file)
-    new_context = get_selinux_default_context(file)
+  def set_selinux_default_context(file, resource_ensure=nil)
+    new_context = get_selinux_default_context(file, resource_ensure)
     return nil unless new_context
     cur_context = get_selinux_current_context(file)
     if new_context != cur_context
@@ -198,6 +208,22 @@ module Puppet::Util::SELinux
     filesystems.include?(fstype)
   end
 
+  # Get mode file type bits set based on ensure on
+  # the file resource. This helps SELinux determine
+  # what context a new resource being created should have.
+  def get_create_mode(resource_ensure)
+    mode = 0
+    case resource_ensure
+    when :present, :file
+      mode |= S_IFREG
+    when :directory
+      mode |= S_IFDIR
+    when :link
+      mode |= S_IFLNK
+    end
+    mode
+  end
+
   # Internal helper function to read and parse /proc/mounts
   def read_mounts
     mounts = ""

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/windows/adsi.rb

@@ -504,6 +504,43 @@ module Puppet::Util::Windows::ADSI
       user_name
     end
 
+    # https://docs.microsoft.com/en-us/windows/win32/api/secext/ne-secext-extended_name_format
+    NameUnknown           = 0
+    NameFullyQualifiedDN  = 1
+    NameSamCompatible     = 2
+    NameDisplay           = 3
+    NameUniqueId          = 6
+    NameCanonical         = 7
+    NameUserPrincipal     = 8
+    NameCanonicalEx       = 9
+    NameServicePrincipal  = 10
+    NameDnsDomain         = 12
+    NameGivenName         = 13
+    NameSurname           = 14
+
+    def self.current_user_name_with_format(format)
+      user_name = ''
+      max_length = 1024
+
+      FFI::MemoryPointer.new(:lpwstr, max_length * 2 + 1) do |buffer|
+        FFI::MemoryPointer.new(:dword, 1) do |buffer_size|
+          buffer_size.write_dword(max_length + 1)
+
+          if GetUserNameExW(format.to_i, buffer, buffer_size) == FFI::WIN32_FALSE
+            raise Puppet::Util::Windows::Error.new(_("Failed to get user name"), FFI.errno)
+          end
+
+          user_name = buffer.read_wide_string(buffer_size.read_dword).chomp
+        end
+      end
+
+      user_name
+    end
+
+    def self.current_sam_compatible_user_name
+      current_user_name_with_format(NameSamCompatible)
+    end
+
     def self.current_user_sid
       Puppet::Util::Windows::SID.name_to_principal(current_user_name)
     end
@@ -518,6 +555,15 @@ module Puppet::Util::Windows::ADSI
     ffi_lib :advapi32
     attach_function_private :GetUserNameW,
       [:lpwstr, :lpdword], :win32_bool
+
+    # https://docs.microsoft.com/en-us/windows/win32/api/secext/nf-secext-getusernameexa
+    # BOOLEAN SEC_ENTRY GetUserNameExA(
+    #   EXTENDED_NAME_FORMAT NameFormat,
+    #   LPSTR                lpNameBuffer,
+    #   PULONG               nSize
+    # );type
+    ffi_lib :secur32
+    attach_function_private :GetUserNameExW, [:uint16, :lpwstr, :pointer], :win32_bool
   end
 
   class UserProfile

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

@@ -19,7 +19,7 @@ module Puppet::Util::Windows::APITypes
 
   class ::FFI::Pointer
     NULL_HANDLE = 0
-    WCHAR_NULL = "\0\0".encode('UTF-16LE').freeze
+    WCHAR_NULL = "\0\0".force_encoding('UTF-16LE').freeze
 
     def self.from_string_to_wide_string(str, &block)
       str = Puppet::Util::Windows::String.wide_string(str)

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

@@ -44,7 +44,8 @@ module Puppet::Util::Windows::SID
     ERROR_INVALID_PARAMETER   = 87
     ERROR_INSUFFICIENT_BUFFER = 122
 
-    def self.lookup_account_name(system_name = nil, account_name)
+    def self.lookup_account_name(system_name = nil, sanitize = true, account_name)
+      account_name = sanitize_account_name(account_name) if sanitize
       system_name_ptr = FFI::Pointer::NULL
       begin
         if system_name
@@ -146,6 +147,13 @@ module Puppet::Util::Windows::SID
       end
     end
 
+    # Sanitize the given account name for lookup to avoid known issues
+    def self.sanitize_account_name(account_name)
+      return account_name unless account_name.start_with?('APPLICATION PACKAGE AUTHORITY\\')
+      account_name.split('\\').last
+    end
+    private_class_method :sanitize_account_name
+
     ffi_convention :stdcall
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/aa379601(v=vs.85).aspx
@@ -191,4 +199,3 @@ module Puppet::Util::Windows::SID
       [:lpcwstr, :pointer, :lpwstr, :lpdword, :lpwstr, :lpdword, :pointer], :win32_bool
   end
 end
-

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

@@ -74,11 +74,15 @@ module Puppet::Util::Windows
         string_to_sid_ptr(name) do |sid_ptr|
           raw_sid_bytes = sid_ptr.read_array_of_uchar(get_length_sid(sid_ptr))
         end
-      rescue
+      rescue => e
+        # 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)
-    rescue
+    rescue => e
+      Puppet.debug("#{e.message}")
       (allow_unresolved && raw_sid_bytes) ? unresolved_principal(name, raw_sid_bytes) : nil
     end
     module_function :name_to_principal

data/lib/puppet/version.rb

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

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.19.1-133-gcc65fe8151\n"
+"Project-Id-Version: Puppet automation framework 6.23.0-71-gd3d8d38898\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2021-01-14 12:33+0000\n"
-"PO-Revision-Date: 2021-01-14 12:33+0000\n"
+"POT-Creation-Date: 2021-07-06 11:17+0000\n"
+"PO-Revision-Date: 2021-07-06 11:17+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 ""
 
@@ -250,47 +250,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:317
+#: ../lib/puppet/application/device.rb:318
 msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:332
+#: ../lib/puppet/application/device.rb:333
 msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:355
+#: ../lib/puppet/application/device.rb:356
 msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:393 ../lib/puppet/application/resource.rb:196
+#: ../lib/puppet/application/device.rb:394 ../lib/puppet/application/resource.rb:201
 msgid "You must specify the type to display"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:394 ../lib/puppet/application/resource.rb:197
+#: ../lib/puppet/application/device.rb:395 ../lib/puppet/application/resource.rb:202
 msgid "Could not find type %{type}"
 msgstr ""
 
@@ -352,31 +352,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:221
+#: ../lib/puppet/application/filebucket.rb:222
 msgid "You must specify a file to back up"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:225
+#: ../lib/puppet/application/filebucket.rb:226
 msgid "%{file}: no such file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:229
+#: ../lib/puppet/application/filebucket.rb:230
 msgid "%{file}: cannot read file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:251 ../lib/puppet/application/filebucket.rb:274
+#: ../lib/puppet/application/filebucket.rb:252 ../lib/puppet/application/filebucket.rb:275
 msgid "Need exactly two arguments: filebucket diff <file_a> <file_b>"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:271
+#: ../lib/puppet/application/filebucket.rb:272
 msgid "Comparing %{checksum_a} %{checksum_b} %{file_a} %{file_b}"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:285
+#: ../lib/puppet/application/filebucket.rb:286
 msgid "Cancelling"
 msgstr ""
 
@@ -418,19 +418,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 ""
 
@@ -438,11 +438,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,59 +450,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/ssl/key.rb:26
+#: ../lib/puppet/application/ssl.rb:169 ../lib/puppet/ssl/key.rb:26
 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"
@@ -510,7 +510,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,44 +587,44 @@ msgstr ""
 msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:426
+#: ../lib/puppet/configurer.rb:436
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:455 ../lib/puppet/http/resolver/server_list.rb:67
+#: ../lib/puppet/configurer.rb:465 ../lib/puppet/http/resolver/server_list.rb:68 ../lib/puppet/http/resolver/server_list.rb:72
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:459 ../lib/puppet/http/resolver/server_list.rb:70
+#: ../lib/puppet/configurer.rb:469 ../lib/puppet/http/resolver/server_list.rb:77 ../lib/puppet/http/resolver/server_list.rb:80
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:470 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:480 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:479
+#: ../lib/puppet/configurer.rb:489
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:498
+#: ../lib/puppet/configurer.rb:508
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:506
+#: ../lib/puppet/configurer.rb:516
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:521
+#: ../lib/puppet/configurer.rb:531
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:539
+#: ../lib/puppet/configurer.rb:549
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:560
+#: ../lib/puppet/configurer.rb:570
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -692,47 +692,47 @@ msgstr ""
 msgid "a data type can only have one implementation"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:179
+#: ../lib/puppet/defaults.rb:191
 msgid "Cannot disable unrecognized warning types '%{invalid}'."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:180
+#: ../lib/puppet/defaults.rb:192
 msgid "Valid values are '%{values}'."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:547
+#: ../lib/puppet/defaults.rb:559
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:549
+#: ../lib/puppet/defaults.rb:561
 msgid "Convert custom terminus to hiera 5 API."
 msgstr ""
 
 #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:762
+#: ../lib/puppet/defaults.rb:774
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:847
+#: ../lib/puppet/defaults.rb:859
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1042
+#: ../lib/puppet/defaults.rb:1054
 msgid "Setting 'ssl_client_ca_auth' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1121 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1141 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
 #. TRANSLATORS 'pluginsync' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:1995
+#: ../lib/puppet/defaults.rb:2017
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:2230
+#: ../lib/puppet/defaults.rb:2252
 msgid "The 'func3x_check' setting is deprecated and will be removed in a future release."
 msgstr ""
 
@@ -778,7 +778,7 @@ msgstr ""
 msgid "no matching resources found"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:7 ../lib/puppet/face/epp.rb:8 ../lib/puppet/face/facts.rb:30 ../lib/puppet/face/generate.rb:7 ../lib/puppet/face/help.rb:9 ../lib/puppet/face/key.rb:5 ../lib/puppet/face/man.rb:8 ../lib/puppet/face/module.rb:9 ../lib/puppet/face/node.rb:4 ../lib/puppet/face/parser.rb:6 ../lib/puppet/face/plugin.rb:6 ../lib/puppet/face/report.rb:5 ../lib/puppet/face/resource.rb:5 ../lib/puppet/face/status.rb:5
+#: ../lib/puppet/face/config.rb:7 ../lib/puppet/face/epp.rb:8 ../lib/puppet/face/facts.rb:22 ../lib/puppet/face/generate.rb:7 ../lib/puppet/face/help.rb:9 ../lib/puppet/face/key.rb:5 ../lib/puppet/face/man.rb:8 ../lib/puppet/face/module.rb:9 ../lib/puppet/face/node.rb:4 ../lib/puppet/face/parser.rb:6 ../lib/puppet/face/plugin.rb:6 ../lib/puppet/face/report.rb:5 ../lib/puppet/face/resource.rb:5 ../lib/puppet/face/status.rb:5
 msgid "Apache 2 license; see COPYING"
 msgstr ""
 
@@ -1015,34 +1015,86 @@ msgstr ""
 msgid "--values option must evaluate to a Hash or undef, got: '%{values_class}'"
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:32
+#: ../lib/puppet/face/facts.rb:24
 msgid "Retrieve and store facts."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:40
+#: ../lib/puppet/face/facts.rb:32
 msgid "Retrieve a node's facts."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:41
+#: ../lib/puppet/face/facts.rb:33
 msgid "[<node_certname>]"
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:64
+#: ../lib/puppet/face/facts.rb:56
 msgid "Upload local facts to the puppet master."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:106
+#: ../lib/puppet/face/facts.rb:98
 msgid "Uploading facts for '%{node}' to '%{server}'"
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:116
+#: ../lib/puppet/face/facts.rb:108
 msgid "Compare Facter 3 output with Facter 4 output"
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:145
+#: ../lib/puppet/face/facts.rb:122
+msgid "Render the different facts as structured."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:125
+msgid "<regex>"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:126
+msgid "Regex used to exclude specific facts from diff."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:151
 msgid "Already using Facter 4. To use `puppet facts diff` remove facterng from the .conf file or run `puppet config set facterng false`."
 msgstr ""
 
+#: ../lib/puppet/face/facts.rb:167
+msgid "Retrieve current node's facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:168
+msgid "[<facts>]"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:183 ../lib/puppet/face/facts.rb:188 ../lib/puppet/face/facts.rb:193 ../lib/puppet/face/module/changes.rb:21
+msgid "<path>"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:185
+msgid "The location of the config file for Facter."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:190
+msgid "The path to a directory that contains custom facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:195
+msgid "The path to a directory that contains external facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:199
+msgid "Disable fact blocking mechanism."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:203
+msgid "Disable fact caching mechanism."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:207
+msgid "Show legacy facts when querying all facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:211
+msgid "Show only the value when the action is called with a single query"
+msgstr ""
+
 #: ../lib/puppet/face/generate.rb:9
 msgid "Generates Puppet code from Ruby definitions."
 msgstr ""
@@ -1206,10 +1258,6 @@ msgstr ""
 msgid "Array of strings representing paths of modified files."
 msgstr ""
 
-#: ../lib/puppet/face/module/changes.rb:21
-msgid "<path>"
-msgstr ""
-
 #: ../lib/puppet/face/module/changes.rb:27
 msgid "Could not find a valid module at %{path}"
 msgstr ""
@@ -1702,21 +1750,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 ""
 
@@ -1844,11 +1900,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 ""
 
@@ -2080,7 +2136,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 ""
 
@@ -2170,7 +2226,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 ""
 
@@ -2288,6 +2344,10 @@ msgstr ""
 msgid "Location URI is invalid: %{detail}"
 msgstr ""
 
+#: ../lib/puppet/http/resolver/server_list.rb:70 ../lib/puppet/http/resolver/server_list.rb:78
+msgid "Trying with next server from server_list."
+msgstr ""
+
 #: ../lib/puppet/http/retry_after_handler.rb:83
 msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
 msgstr ""
@@ -2362,87 +2422,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 ""
 
@@ -2546,7 +2606,11 @@ msgstr ""
 msgid "You cannot save facts to the code store; it is only used for getting facts from Facter"
 msgstr ""
 
-#: ../lib/puppet/indirector/facts/facter.rb:56
+#: ../lib/puppet/indirector/facts/facter.rb:36
+msgid "puppet facts show requires version 4.0.40 or greater of Facter."
+msgstr ""
+
+#: ../lib/puppet/indirector/facts/facter.rb:62
 msgid "Loading facts"
 msgstr ""
 
@@ -2833,7 +2897,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 ""
 
@@ -3051,43 +3115,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 ""
 
@@ -3348,19 +3412,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 ""
 
@@ -3483,7 +3547,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 ""
 
@@ -3573,68 +3637,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 ""
 
@@ -6652,15 +6728,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 ""
 
@@ -6824,26 +6900,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 ""
@@ -6936,31 +7016,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}'"
@@ -7179,10 +7259,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 ""
@@ -7199,19 +7275,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 ""
 
@@ -7669,49 +7745,57 @@ msgstr ""
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:905
+#: ../lib/puppet/settings.rb:868
+msgid "Cannot manage owner permissions, because the provider for '%{name}' is not functional"
+msgstr ""
+
+#: ../lib/puppet/settings.rb:884
+msgid "Cannot manage group permissions, because the provider for '%{name}' is not functional"
+msgstr ""
+
+#: ../lib/puppet/settings.rb:920
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:978
+#: ../lib/puppet/settings.rb:1001
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:983
+#: ../lib/puppet/settings.rb:1006
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:989
+#: ../lib/puppet/settings.rb:1012
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1253
+#: ../lib/puppet/settings.rb:1276
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
-#: ../lib/puppet/settings.rb:1258
+#: ../lib/puppet/settings.rb:1281
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1435
+#: ../lib/puppet/settings.rb:1468
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1459
+#: ../lib/puppet/settings.rb:1492
 msgid "Could not find value for %{expression}"
 msgstr ""
 
 #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
-#: ../lib/puppet/settings.rb:1469
+#: ../lib/puppet/settings.rb:1502
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1470
+#: ../lib/puppet/settings.rb:1503
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1501
+#: ../lib/puppet/settings.rb:1534
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7805,19 +7889,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 ""
 
@@ -8598,56 +8682,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 ""
 
@@ -8667,74 +8751,74 @@ msgstr ""
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:418
+#: ../lib/puppet/type/file.rb:435
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:420
+#: ../lib/puppet/type/file.rb:437
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:422
+#: ../lib/puppet/type/file.rb:439
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:425
+#: ../lib/puppet/type/file.rb:442
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:428
+#: ../lib/puppet/type/file.rb:445
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:436
+#: ../lib/puppet/type/file.rb:453
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:439
+#: ../lib/puppet/type/file.rb:456
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:477
+#: ../lib/puppet/type/file.rb:494
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:482
+#: ../lib/puppet/type/file.rb:499
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:780
+#: ../lib/puppet/type/file.rb:798
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:795
+#: ../lib/puppet/type/file.rb:813
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:806
+#: ../lib/puppet/type/file.rb:824
 msgid "Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore."
 msgstr ""
 
 #. TRANSLATORS "stat" is a program name and should not be translated
-#: ../lib/puppet/type/file.rb:887 ../lib/puppet/type/tidy.rb:352
+#: ../lib/puppet/type/file.rb:905 ../lib/puppet/type/tidy.rb:371
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:890
+#: ../lib/puppet/type/file.rb:908
 msgid "Could not stat; invalid pathname"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1018
+#: ../lib/puppet/type/file.rb:1036
 msgid "Not removing directory; use 'force' to override"
 msgstr ""
 
 #. TRANSLATORS refers to a file which could not be backed up
-#: ../lib/puppet/type/file.rb:1043
+#: ../lib/puppet/type/file.rb:1061
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1058
+#: ../lib/puppet/type/file.rb:1076
 msgid "File written to disk did not match desired checksum; discarding changes (%{content_checksum} vs %{desired_checksum})"
 msgstr ""
 
@@ -8771,7 +8855,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 ""
 
@@ -8884,128 +8968,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 ""
 
@@ -9764,31 +9844,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 ""
 
@@ -9832,39 +9912,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 ""
 
@@ -9912,15 +9992,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 ""
 
@@ -9983,20 +10063,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 ""
 
@@ -10106,7 +10186,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 ""
 
@@ -10262,19 +10342,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 ""