puppet 5.5.17-universal-darwin → 5.5.22-universal-darwin

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

@@ -19,15 +19,11 @@ module Puppet::Util::Windows::APITypes
 
   class ::FFI::Pointer
     NULL_HANDLE = 0
+    WCHAR_NULL = "\0\0".encode('UTF-16LE').freeze
 
     def self.from_string_to_wide_string(str, &block)
       str = Puppet::Util::Windows::String.wide_string(str)
-      FFI::MemoryPointer.new(:byte, str.bytesize) do |ptr|
-        # uchar here is synonymous with byte
-        ptr.put_array_of_uchar(0, str.bytes.to_a)
-
-        yield ptr
-      end
+      FFI::MemoryPointer.from_wide_string(str, &block)
 
       # ptr has already had free called, so nothing to return
       nil
@@ -53,11 +49,17 @@ module Puppet::Util::Windows::APITypes
     alias_method :read_word,  :read_uint16
     alias_method :read_array_of_wchar, :read_array_of_uint16
 
-    def read_wide_string(char_length, dst_encoding = Encoding::UTF_8, encode_options = {})
+    def read_wide_string(char_length, dst_encoding = Encoding::UTF_8, strip = false, encode_options = {})
       # char_length is number of wide chars (typically excluding NULLs), *not* bytes
       str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
+
+      if strip
+        i = str.index(WCHAR_NULL)
+        str = str[0, i] if i
+      end
+
       str.encode(dst_encoding, str.encoding, encode_options)
-    rescue Exception => e
+    rescue EncodingError => e
       Puppet.debug "Unable to convert value #{str.nil? ? 'nil' : str.dump} to encoding #{dst_encoding} due to #{e.inspect}"
       raise
     end
@@ -68,32 +70,31 @@ module Puppet::Util::Windows::APITypes
     #   null_terminator = :double_null, then the terminating sequence is four bytes of zero.  This is UNIT32 = 0
     # @param encode_options [Hash] Accepts the same option hash that may be passed to String#encode in Ruby
     def read_arbitrary_wide_string_up_to(max_char_length = 512, null_terminator = :single_null, encode_options = {})
-      if null_terminator != :single_null && null_terminator != :double_null
-        raise _("Unable to read wide strings with %{null_terminator} terminal nulls") % { null_terminator: null_terminator }
-      end
-
-      terminator_width = null_terminator == :single_null ? 1 : 2
-      reader_method = null_terminator == :single_null ? :get_uint16 : :get_uint32
-
-      # Look for a null terminating characters; if found, read up to that null (exclusive)
-      (0...max_char_length - terminator_width).each do |i|
-        return read_wide_string(i, Encoding::UTF_8, encode_options) if send(reader_method, (i * 2)) == 0
-      end
-
-      # String is longer than the max; read just to the max
-      read_wide_string(max_char_length, Encoding::UTF_8, encode_options)
+      idx = case null_terminator
+            when :single_null
+              # find index of wide null between 0 and max (exclusive)
+              (0...max_char_length).find do |i|
+                get_uint16(i * 2) == 0
+              end
+            when :double_null
+              # find index of double-wide null between 0 and max - 1 (exclusive)
+              (0...max_char_length - 1).find do |i|
+                get_uint32(i * 2) == 0
+              end
+            else
+              raise _("Unable to read wide strings with %{null_terminator} terminal nulls") % { null_terminator: null_terminator }
+            end
+
+      read_wide_string(idx || max_char_length, Encoding::UTF_8, false, encode_options)
     end
 
     def read_win32_local_pointer(&block)
-      ptr = nil
+      ptr = read_pointer
       begin
-        ptr = read_pointer
         yield ptr
       ensure
-        if ptr && ! ptr.null?
-          if FFI::WIN32::LocalFree(ptr.address) != FFI::Pointer::NULL_HANDLE
-            Puppet.debug "LocalFree memory leak"
-          end
+        if !ptr.null? && FFI::WIN32::LocalFree(ptr.address) != FFI::Pointer::NULL_HANDLE
+          Puppet.debug "LocalFree memory leak"
         end
       end
 
@@ -102,23 +103,35 @@ module Puppet::Util::Windows::APITypes
     end
 
     def read_com_memory_pointer(&block)
-      ptr = nil
+      ptr = read_pointer
       begin
-        ptr = read_pointer
         yield ptr
       ensure
-        FFI::WIN32::CoTaskMemFree(ptr) if ptr && ! ptr.null?
+        FFI::WIN32::CoTaskMemFree(ptr) unless ptr.null?
       end
 
       # ptr has already had CoTaskMemFree called, so nothing to return
       nil
     end
 
-
     alias_method :write_dword, :write_uint32
     alias_method :write_word, :write_uint16
   end
 
+  class FFI::MemoryPointer
+    # Return a MemoryPointer that points to wide string. This is analogous to the
+    # FFI::MemoryPointer.from_string method.
+    def self.from_wide_string(wstr)
+      ptr = FFI::MemoryPointer.new(:uchar, wstr.bytesize + 2)
+      ptr.put_array_of_uchar(0, wstr.bytes.to_a)
+      ptr.put_uint16(wstr.bytesize, 0)
+
+      yield ptr if block_given?
+
+      ptr
+    end
+  end
+
   # FFI Types
   # https://github.com/ffi/ffi/wiki/Types
 

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

@@ -140,12 +140,7 @@ class Puppet::Util::Windows::EventLog
   # @api private
   def from_string_to_wide_string(str, &block)
     str = wide_string(str)
-    FFI::MemoryPointer.new(:uchar, str.bytesize) do |ptr|
-      # uchar here is synonymous with byte
-      ptr.put_array_of_uchar(0, str.bytes.to_a)
-
-      yield ptr
-    end
+    FFI::MemoryPointer.from_wide_string(str) { |ptr| yield ptr }
 
     # ptr has already had free called, so nothing to return
     nil

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

@@ -41,6 +41,7 @@ module Puppet::Util::Windows::SID
     # = 8 + max sub identifiers (15) * 4
     MAXIMUM_SID_BYTE_LENGTH = 68
 
+    ERROR_INVALID_PARAMETER   = 87
     ERROR_INSUFFICIENT_BUFFER = 122
 
     def self.lookup_account_name(system_name = nil, account_name)
@@ -48,9 +49,7 @@ module Puppet::Util::Windows::SID
       begin
         if system_name
           system_name_wide = Puppet::Util::Windows::String.wide_string(system_name)
-          # uchar here is synonymous with byte
-          system_name_ptr = FFI::MemoryPointer.new(:byte, system_name_wide.bytesize)
-          system_name_ptr.put_array_of_uchar(0, system_name_wide.bytes.to_a)
+          system_name_ptr = FFI::MemoryPointer.from_wide_string(system_name_wide)
         end
 
         FFI::MemoryPointer.from_string_to_wide_string(account_name) do |account_name_ptr|
@@ -101,9 +100,7 @@ module Puppet::Util::Windows::SID
       begin
         if system_name
           system_name_wide = Puppet::Util::Windows::String.wide_string(system_name)
-          # uchar here is synonymous with byte
-          system_name_ptr = FFI::MemoryPointer.new(:byte, system_name_wide.bytesize)
-          system_name_ptr.put_array_of_uchar(0, system_name_wide.bytes.to_a)
+          system_name_ptr = FFI::MemoryPointer.from_wide_string(system_name_wide)
         end
 
         FFI::MemoryPointer.new(:byte, sid_bytes.length) do |sid_ptr|
@@ -112,6 +109,11 @@ module Puppet::Util::Windows::SID
               FFI::MemoryPointer.new(:uint32, 1) do |name_use_enum_ptr|
 
                 sid_ptr.write_array_of_uchar(sid_bytes)
+
+                if Puppet::Util::Windows::SID.IsValidSid(sid_ptr) == FFI::WIN32_FALSE
+                  raise Puppet::Util::Windows::Error.new(_('Byte array for lookup_account_sid is invalid: %{sid_bytes}') % { sid_bytes: sid_bytes }, ERROR_INVALID_PARAMETER)
+                end
+
                 success = LookupAccountSidW(system_name_ptr, sid_ptr, FFI::Pointer::NULL, name_length_ptr,
                   FFI::Pointer::NULL, domain_length_ptr, name_use_enum_ptr)
                 last_error = FFI.errno

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

@@ -124,26 +124,27 @@ module Puppet::Util::Windows::Process
   def get_process_image_name_by_pid(pid)
     image_name = ""
 
-     open_process(PROCESS_QUERY_INFORMATION, false, pid) do |phandle|
-
-       FFI::MemoryPointer.new(:dword, 1) do |exe_name_length_ptr|
-        # UTF is 2 bytes/char:
-        max_chars = MAX_PATH_LENGTH + 1
-        exe_name_length_ptr.write_dword(max_chars)
-        FFI::MemoryPointer.new(:wchar, max_chars) do |exe_name_ptr|
-          use_win32_path_format = 0
-          result = QueryFullProcessImageNameW(phandle, use_win32_path_format, exe_name_ptr, exe_name_length_ptr)
-          if result == FFI::WIN32_FALSE
-            raise Puppet::Util::Windows::Error.new(
-              "QueryFullProcessImageNameW(phandle, #{use_win32_path_format}, " +
-              "exe_name_ptr, #{max_chars}")
+    Puppet::Util::Windows::Security.with_privilege(Puppet::Util::Windows::Security::SE_DEBUG_NAME) do
+      open_process(PROCESS_QUERY_INFORMATION, false, pid) do |phandle|
+        FFI::MemoryPointer.new(:dword, 1) do |exe_name_length_ptr|
+          # UTF is 2 bytes/char:
+          max_chars = MAX_PATH_LENGTH + 1
+          exe_name_length_ptr.write_dword(max_chars)
+          FFI::MemoryPointer.new(:wchar, max_chars) do |exe_name_ptr|
+            use_win32_path_format = 0
+            result = QueryFullProcessImageNameW(phandle, use_win32_path_format, exe_name_ptr, exe_name_length_ptr)
+            if result == FFI::WIN32_FALSE
+              raise Puppet::Util::Windows::Error.new(
+                      "QueryFullProcessImageNameW(phandle, #{use_win32_path_format}, " +
+                      "exe_name_ptr, #{max_chars}")
+            end
+            image_name = exe_name_ptr.read_wide_string(exe_name_length_ptr.read_dword)
           end
-          image_name = exe_name_ptr.read_wide_string(exe_name_length_ptr.read_dword)
         end
       end
     end
 
-     image_name
+    image_name
   end
   module_function :get_process_image_name_by_pid
 

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

@@ -46,11 +46,12 @@ module Puppet::Util::Windows
 
       subkey_max_len, _ = reg_query_info_key_max_lengths(key)
 
-      begin
+      loop do
         subkey, filetime = reg_enum_key(key, index, subkey_max_len)
         yield subkey, filetime if !subkey.nil?
         index += 1
-      end while !subkey.nil?
+        break if subkey.nil?
+      end
 
       index
     end
@@ -93,11 +94,12 @@ module Puppet::Util::Windows
 
       _, value_max_len = reg_query_info_key_max_lengths(key)
 
-      begin
+      loop do
         subkey, type, data = reg_enum_value(key, index, value_max_len)
         yield subkey, type, data if !subkey.nil?
         index += 1
-      end while !subkey.nil?
+        break if subkey.nil?
+      end
 
       index
     end
@@ -108,13 +110,16 @@ module Puppet::Util::Windows
 
     private
 
-    def reg_enum_key(key, index, max_key_length = Win32::Registry::Constants::MAX_KEY_LENGTH)
+    # max number of wide characters including NULL terminator
+    MAX_KEY_CHAR_LENGTH = 255 + 1
+
+    def reg_enum_key(key, index, max_key_char_length = MAX_KEY_CHAR_LENGTH)
       subkey, filetime = nil, nil
 
       FFI::MemoryPointer.new(:dword) do |subkey_length_ptr|
         FFI::MemoryPointer.new(FFI::WIN32::FILETIME.size) do |filetime_ptr|
-          FFI::MemoryPointer.new(:wchar, max_key_length) do |subkey_ptr|
-            subkey_length_ptr.write_dword(max_key_length)
+          FFI::MemoryPointer.new(:wchar, max_key_char_length) do |subkey_ptr|
+            subkey_length_ptr.write_dword(max_key_char_length)
 
             # RegEnumKeyEx cannot be called twice to properly size the buffer
             result = RegEnumKeyExW(key.hkey, index,
@@ -139,7 +144,10 @@ module Puppet::Util::Windows
       [subkey, filetime]
     end
 
-    def reg_enum_value(key, index, max_value_length = Win32::Registry::Constants::MAX_VALUE_LENGTH)
+    # max number of wide characters including NULL terminator
+    MAX_VALUE_CHAR_LENGTH = 16383 + 1
+
+    def reg_enum_value(key, index, max_value_length = MAX_VALUE_CHAR_LENGTH)
       subkey, type, data = nil, nil, nil
 
       FFI::MemoryPointer.new(:dword) do |subkey_length_ptr|
@@ -232,7 +240,7 @@ module Puppet::Util::Windows
         begin
           case type
             when Win32::Registry::REG_SZ, Win32::Registry::REG_EXPAND_SZ
-              result = [ type, sanitize(data_ptr.read_wide_string(string_length)) ]
+              result = [ type, data_ptr.read_wide_string(string_length, Encoding::UTF_8, true) ]
             when Win32::Registry::REG_MULTI_SZ
               result = [ type, data_ptr.read_wide_string(string_length).split(/\0/) ]
             when Win32::Registry::REG_BINARY
@@ -312,12 +320,6 @@ module Puppet::Util::Windows
       result
     end
 
-    def sanitize(value)
-      # Replace null bytes with a space
-      value.gsub!("\x00", ' ')
-      value
-    end
-
     ffi_convention :stdcall
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/ms724862(v=vs.85).aspx

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

@@ -97,6 +97,7 @@ module Puppet::Util::Windows::Security
   FILE = Puppet::Util::Windows::File
 
   SE_BACKUP_NAME              = 'SeBackupPrivilege'
+  SE_DEBUG_NAME               = 'SeDebugPrivilege'
   SE_RESTORE_NAME             = 'SeRestorePrivilege'
 
   DELETE                      = 0x00010000

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

@@ -64,7 +64,7 @@ module Puppet::Util::Windows
     # 'BUILTIN\Administrators', or 'S-1-5-32-544', and will return the
     # SID object. Returns nil if the account doesn't exist.
     # This method returns a SID::Principal with the account, domain, SID, etc
-    def name_to_principal(name)
+    def name_to_principal(name, allow_unresolved = false)
       # Apparently, we accept a symbol..
       name = name.to_s.strip if name
 
@@ -79,7 +79,7 @@ module Puppet::Util::Windows
 
       raw_sid_bytes ? Principal.lookup_account_sid(raw_sid_bytes) : Principal.lookup_account_name(name)
     rescue
-      nil
+      (allow_unresolved && raw_sid_bytes) ? unresolved_principal(name, raw_sid_bytes) : nil
     end
     module_function :name_to_principal
     class << self; alias name_to_sid_object name_to_principal; end
@@ -236,7 +236,7 @@ module Puppet::Util::Windows
     # @api private
     def self.unresolved_principal(name, sid_bytes)
       Principal.new(
-        name + " (unresolvable)", # account
+        name, # account
         sid_bytes, # sid_bytes
         name, # sid string
         nil, #domain

data/lib/puppet/vendor.rb

@@ -45,7 +45,7 @@ module Puppet
       #
       def load_vendored
         Dir.entries(vendor_dir).each do |entry|
-          if entry.match(/load_(\w+?)\.rb$/)
+          if entry =~ /load_(\w+?)\.rb$/
             load_entry entry
           end
         end

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

data/lib/puppet_pal.rb

@@ -828,8 +828,8 @@ module Pal
           end
         end
 
-      rescue Puppet::ParseErrorWithIssue, Puppet::Error
-        # already logged and handled by the compiler for these two cases
+      rescue Puppet::Error
+        # already logged and handled by the compiler, including Puppet::ParseErrorWithIssue
         raise
 
       rescue => detail

data/locales/puppet.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2019 Puppet, Inc.
+# Copyright (C) 2020 Puppet, Inc.
 # This file is distributed under the same license as the Puppet automation framework package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 5.5.16-90-gc9f7674\n"
+"Project-Id-Version: Puppet automation framework 5.5.21-20-gfdd7102523\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2019-09-27 09:15+0000\n"
-"PO-Revision-Date: 2019-09-27 09:15+0000\n"
+"POT-Creation-Date: 2020-07-29 14:16+0000\n"
+"PO-Revision-Date: 2020-07-29 14:16+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -44,19 +44,19 @@ msgstr ""
 msgid "Please supply a parameter to perform a Hiera lookup"
 msgstr ""
 
-#: ../lib/hiera_puppet.rb:74 ../lib/puppet/indirector/hiera.rb:79
+#: ../lib/hiera_puppet.rb:74 ../lib/puppet/indirector/hiera.rb:85
 msgid "Config file %{hiera_config} not found, using Hiera defaults"
 msgstr ""
 
-#: ../lib/puppet.rb:130
+#: ../lib/puppet.rb:133
 msgid "Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions."
 msgstr ""
 
-#: ../lib/puppet.rb:177
+#: ../lib/puppet.rb:180
 msgid "Creating %{name} via Puppet.newtype is deprecated and will be removed in a future release. Use Puppet::Type.newtype instead."
 msgstr ""
 
-#: ../lib/puppet.rb:196
+#: ../lib/puppet.rb:199
 msgid "The environmentpath setting cannot be empty or nil."
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 msgid "puppet agent: applying configuration"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:127
+#: ../lib/puppet/agent.rb:119
 msgid "Could not create instance of %{client_class}: %{detail}"
 msgstr ""
 
@@ -176,19 +176,19 @@ msgstr ""
 msgid "The puppet agent daemon"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:372
+#: ../lib/puppet/application/agent.rb:374
 msgid "Fingerprint asked but no certificate nor certificate request have yet been issued"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:377
+#: ../lib/puppet/application/agent.rb:379
 msgid "Could not get fingerprint for digest '%{digest}'"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:401
+#: ../lib/puppet/application/agent.rb:403
 msgid "Starting Puppet client version %{version}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:417
+#: ../lib/puppet/application/agent.rb:419
 msgid "The puppet agent command does not take parameters"
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid "You must specify the hosts to apply to; valid values are an array or the symbol :all"
 msgstr ""
 
-#: ../lib/puppet/application/describe.rb:181
+#: ../lib/puppet/application/describe.rb:175
 msgid "Display help about resource types"
 msgstr ""
 
@@ -355,38 +355,38 @@ msgstr ""
 msgid "Store and retrieve files in a filebucket"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:208
+#: ../lib/puppet/application/filebucket.rb:221
 msgid "You must specify a file to back up"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:212
+#: ../lib/puppet/application/filebucket.rb:225
 msgid "%{file}: no such file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:216
+#: ../lib/puppet/application/filebucket.rb:229
 msgid "%{file}: cannot read file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:238 ../lib/puppet/application/filebucket.rb:261
+#: ../lib/puppet/application/filebucket.rb:251 ../lib/puppet/application/filebucket.rb:274
 msgid "Need exactly two arguments: filebucket diff <file_a> <file_b>"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:258
+#: ../lib/puppet/application/filebucket.rb:271
 msgid "Comparing %{checksum_a} %{checksum_b} %{file_a} %{file_b}"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:272
+#: ../lib/puppet/application/filebucket.rb:285
 msgid "Cancelling"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/application/filebucket.rb:293
+#: ../lib/puppet/application/filebucket.rb:306
 msgid "Selected server from first entry of the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
 #. TRANSLATORS 'server' is the name of a setting and should not be translated
 #. TRANSLATORS 'server' is the name of a setting and should not be translated
-#: ../lib/puppet/application/filebucket.rb:300 ../lib/puppet/indirector/request.rb:209
+#: ../lib/puppet/application/filebucket.rb:313 ../lib/puppet/indirector/request.rb:209
 msgid "Selected server from the `server` setting: %{server}"
 msgstr ""
 
@@ -520,85 +520,93 @@ msgstr ""
 msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:96 ../lib/puppet/configurer.rb:173
+#: ../lib/puppet/configurer.rb:96 ../lib/puppet/configurer.rb:171
 msgid "Using cached catalog from environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:166
+#: ../lib/puppet/configurer.rb:164
 msgid "Could not retrieve catalog; skipping run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:184
+#: ../lib/puppet/configurer.rb:180
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:224
+#: ../lib/puppet/configurer.rb:220
 msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:227
+#: ../lib/puppet/configurer.rb:223
 msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:259
+#: ../lib/puppet/configurer.rb:254
 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:304
+#: ../lib/puppet/configurer.rb:299
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:309
+#: ../lib/puppet/configurer.rb:304
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:313
+#: ../lib/puppet/configurer.rb:308
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:337
+#: ../lib/puppet/configurer.rb:332
 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:348
+#: ../lib/puppet/configurer.rb:343
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:350
+#: ../lib/puppet/configurer.rb:345
 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:369
+#: ../lib/puppet/configurer.rb:385
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:393
+#: ../lib/puppet/configurer.rb:417
 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:397
+#: ../lib/puppet/configurer.rb:421
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:409 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:433 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:418
+#: ../lib/puppet/configurer.rb:442
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:430
+#: ../lib/puppet/configurer.rb:462
+msgid "Uploading facts for %{node} to %{server}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:473
+msgid "Failed to submit facts: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:488
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:448
+#: ../lib/puppet/configurer.rb:506
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:468
+#: ../lib/puppet/configurer.rb:526
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -606,7 +614,11 @@ msgstr ""
 msgid "Retrieving %{name}"
 msgstr ""
 
-#: ../lib/puppet/configurer/downloader.rb:20
+#: ../lib/puppet/configurer/downloader.rb:21
+msgid "Failed to retrieve %{name}: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/configurer/downloader.rb:32
 msgid "Could not retrieve %{name}: %{detail}"
 msgstr ""
 
@@ -662,63 +674,63 @@ msgstr ""
 msgid "a data type can only have one implementation"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:126
+#: ../lib/puppet/defaults.rb:130
 msgid "Cannot disable unrecognized warning types %{invalid}."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:127
+#: ../lib/puppet/defaults.rb:131
 msgid "Valid values are %{values}."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:473
+#: ../lib/puppet/defaults.rb:484
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:475
+#: ../lib/puppet/defaults.rb:486
 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:633
+#: ../lib/puppet/defaults.rb:645
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:735
+#: ../lib/puppet/defaults.rb:747
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:976 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:992 ../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 ""
 
-#: ../lib/puppet/defaults.rb:1047
+#: ../lib/puppet/defaults.rb:1063
 msgid "The 'caprivatedir' setting is deprecated and will be removed in Puppet 6."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1074
+#: ../lib/puppet/defaults.rb:1090
 msgid "The 'capass' setting is deprecated and will be removed in Puppet 6."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1314
+#: ../lib/puppet/defaults.rb:1340
 msgid "The 'ca' setting is deprecated and will be removed in Puppet 6."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1814 ../lib/puppet/settings.rb:1212
+#: ../lib/puppet/defaults.rb:1854 ../lib/puppet/settings.rb:1212
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'pluginsync' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:1865
+#: ../lib/puppet/defaults.rb:1904
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/error.rb:69
+#: ../lib/puppet/error.rb:77
 msgid "Could not parse for environment %{environment}: %{message}"
 msgstr ""
 
-#: ../lib/puppet/error.rb:70 ../lib/puppet/parser/compiler.rb:41
+#: ../lib/puppet/error.rb:78 ../lib/puppet/parser/compiler.rb:41
 msgid "%{message} on node %{node}"
 msgstr ""
 
@@ -2356,11 +2368,11 @@ msgid "Got an event from invalid vertex %{source}"
 msgstr ""
 
 #. TRANSLATORS "negative or zero" refers to the count of paths
-#: ../lib/puppet/graph/simple_graph.rb:199
+#: ../lib/puppet/graph/simple_graph.rb:200
 msgid "negative or zero max_paths"
 msgstr ""
 
-#: ../lib/puppet/graph/simple_graph.rb:231
+#: ../lib/puppet/graph/simple_graph.rb:232
 msgid ""
 "Found %{num} dependency cycle:\n"
 msgid_plural ""
@@ -2368,12 +2380,12 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../lib/puppet/graph/simple_graph.rb:240
+#: ../lib/puppet/graph/simple_graph.rb:241
 msgid "Cycle graph written to %{filename}."
 msgstr ""
 
 #. TRANSLATORS '--graph' refers to a command line option and OmniGraffle and GraphViz are program names and should not be translated
-#: ../lib/puppet/graph/simple_graph.rb:243
+#: ../lib/puppet/graph/simple_graph.rb:244
 msgid "Try the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz"
 msgstr ""
 
@@ -2506,7 +2518,7 @@ msgstr ""
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:403
+#: ../lib/puppet/indirector/catalog/compiler.rb:411
 msgid "Could not retrieve fact %{fact}"
 msgstr ""
 
@@ -2718,12 +2730,12 @@ msgid "Could not find filesystem info for file '%{request}' in environment %{env
 msgstr ""
 
 #. TRANSLATORS "Hiera" is the name of a code library and should not be translated
-#: ../lib/puppet/indirector/hiera.rb:8
+#: ../lib/puppet/indirector/hiera.rb:12
 msgid "Hiera terminus not supported without hiera library"
 msgstr ""
 
 #. TRANSLATORS "merge" is a parameter name and should not be translated
-#: ../lib/puppet/indirector/hiera.rb:68
+#: ../lib/puppet/indirector/hiera.rb:72
 msgid "Unrecognized value for request 'merge' parameter: '%{merge}'"
 msgstr ""
 
@@ -2963,7 +2975,7 @@ msgstr ""
 msgid "Could not understand URL %{key}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/resource/ral.rb:61
+#: ../lib/puppet/indirector/resource/ral.rb:59
 msgid "Could not find type %{request_type}"
 msgstr ""
 
@@ -4036,45 +4048,45 @@ msgstr ""
 msgid "No request key specified in %{uri}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:122
+#: ../lib/puppet/network/http/api/indirected_routes.rb:133
 msgid "Could not find %{value0} %{key}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:129
+#: ../lib/puppet/network/http/api/indirected_routes.rb:140
 msgid "Rendered result in %{format}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:135
+#: ../lib/puppet/network/http/api/indirected_routes.rb:146
 msgid "Sent response"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:143
+#: ../lib/puppet/network/http/api/indirected_routes.rb:154
 msgid "Could not find %{indirection} %{key}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:155
+#: ../lib/puppet/network/http/api/indirected_routes.rb:166
 msgid "Could not find instances in %{indirection} with '%{key}'"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:202 ../lib/puppet/network/http/request.rb:60
+#: ../lib/puppet/network/http/api/indirected_routes.rb:213 ../lib/puppet/network/http/request.rb:60
 msgid "No supported formats are acceptable (Accept: %{accepted_formats})"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:227
+#: ../lib/puppet/network/http/api/indirected_routes.rb:238
 msgid "The request body is invalid: %{message}"
 msgstr ""
 
 #. TRANSLATORS "mime-type" is a keyword and should not be translated
 #. TRANSLATORS "mime-type" is a keyword and should not be translated
-#: ../lib/puppet/network/http/api/indirected_routes.rb:233 ../lib/puppet/network/http/request.rb:31
+#: ../lib/puppet/network/http/api/indirected_routes.rb:244 ../lib/puppet/network/http/request.rb:31
 msgid "Client sent a mime-type (%{header}) that doesn't correspond to a format we support"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:239
+#: ../lib/puppet/network/http/api/indirected_routes.rb:250
 msgid "No support for http method %{http_method}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:243
+#: ../lib/puppet/network/http/api/indirected_routes.rb:254
 msgid "No support for plurality %{indirection} for %{http_method} operations"
 msgstr ""
 
@@ -4082,19 +4094,19 @@ msgstr ""
 msgid "Not a valid indirection type"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:11
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:14
 msgid "%{env_name} is not a known environment"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:40
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:43
 msgid "Application %{application} assigns nodes to non-existent components: %{component_list}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:46
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:49
 msgid "Application %{application} has components without assigned nodes: %{component_list}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:55
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:58
 msgid "Application %{app} assigns multiple nodes to component %{comp}"
 msgstr ""
 
@@ -4106,45 +4118,45 @@ msgstr ""
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:210
+#: ../lib/puppet/network/http/connection.rb:214
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr ""
 
 #. TRANSLATORS: Used in the phrase:
 #. "Received a response from the remote server."
-#: ../lib/puppet/network/http/connection.rb:241
+#: ../lib/puppet/network/http/connection.rb:245
 msgid "the remote server"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:245
+#: ../lib/puppet/network/http/connection.rb:249
 msgid "Received a %{status_code} response from %{server_hostname}, but the Retry-After header value of \"%{retry_after}\" could not be converted to an integer or RFC 2822 date."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:256
+#: ../lib/puppet/network/http/connection.rb:260
 msgid "Received a %{status_code} response from %{server_hostname}. Sleeping for %{retry_sleep} seconds before retrying the request."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:318
+#: ../lib/puppet/network/http/connection.rb:321
 msgid "request %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:320
+#: ../lib/puppet/network/http/connection.rb:323
 msgid "request %{uri} timed out after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:322
+#: ../lib/puppet/network/http/connection.rb:325
 msgid "request %{uri} failed: %{msg}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:348 ../lib/puppet/ssl/validator/default_validator.rb:101
+#: ../lib/puppet/network/http/connection.rb:350 ../lib/puppet/ssl/validator/default_validator.rb:101
 msgid "expected one of %{certnames}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:350 ../lib/puppet/ssl/validator/default_validator.rb:103
+#: ../lib/puppet/network/http/connection.rb:352 ../lib/puppet/ssl/validator/default_validator.rb:103
 msgid "expected %{certname}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:353 ../lib/puppet/ssl/validator/default_validator.rb:106
+#: ../lib/puppet/network/http/connection.rb:355 ../lib/puppet/ssl/validator/default_validator.rb:106
 msgid "Server hostname '%{host}' did not match server certificate; %{expected_certnames}"
 msgstr ""
 
@@ -4192,7 +4204,7 @@ msgstr ""
 msgid "Could not resolve %{ip}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/network/http/pool.rb:65
+#: ../lib/puppet/network/http/pool.rb:68
 msgid "Failed to close connection for %{site}: %{detail}"
 msgstr ""
 
@@ -4300,7 +4312,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:570 ../lib/puppet/pops/loaders.rb:298
+#: ../lib/puppet/node/environment.rb:572 ../lib/puppet/pops/loaders.rb:298
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -4390,7 +4402,7 @@ msgid "For more information, see https://puppet.com/docs/puppet/latest/environme
 msgstr ""
 
 #. TRANSLATORS "stage" is a keyword in Puppet and should not be translated
-#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:134
+#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:137
 msgid "Only classes can set 'stage'; normal resources like %{resource} cannot change run stage"
 msgstr ""
 
@@ -4525,11 +4537,11 @@ msgstr ""
 msgid "For initializing compiler"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:17
+#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:19
 msgid "Capability '%{cap}' referenced by '%{param}' is never exported"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:56
+#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:58
 msgid "'%{value}' is exported by both '%{hash}' and '%{resource}'"
 msgstr ""
 
@@ -4541,55 +4553,55 @@ msgstr ""
 msgid "Could not find resource '%{res}' in parameter '%{param}'"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/site_validator.rb:14
+#: ../lib/puppet/parser/compiler/catalog_validator/site_validator.rb:16
 msgid "Only application components can appear inside a site - %{res} is not allowed"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:12
+#: ../lib/puppet/parser/environment_compiler.rb:13
 msgid "%{detail} in environment %{env}"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:59
+#: ../lib/puppet/parser/environment_compiler.rb:62
 msgid "For compiling environment catalog %{env}"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:62
+#: ../lib/puppet/parser/environment_compiler.rb:65
 msgid "Env Compile: Created settings scope"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:64
+#: ../lib/puppet/parser/environment_compiler.rb:67
 msgid "Env Compile: Evaluated main"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:66
+#: ../lib/puppet/parser/environment_compiler.rb:69
 msgid "Env Compile: Evaluated site"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:68
+#: ../lib/puppet/parser/environment_compiler.rb:71
 msgid "Env Compile: Evaluated application instances"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:70
+#: ../lib/puppet/parser/environment_compiler.rb:73
 msgid "Env Compile: Prune"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:72
+#: ../lib/puppet/parser/environment_compiler.rb:75
 msgid "Env Compile: Validate Catalog pre-finish"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:76
+#: ../lib/puppet/parser/environment_compiler.rb:79
 msgid "Env Compile: Finished catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:80
+#: ../lib/puppet/parser/environment_compiler.rb:83
 msgid "Env Compile: Validate Catalog final"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:156
+#: ../lib/puppet/parser/environment_compiler.rb:159
 msgid "Environment Compiler: Could not find a site definition to evaluate"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:162
+#: ../lib/puppet/parser/environment_compiler.rb:165
 msgid "Evaluated application %{resource}"
 msgstr ""
 
@@ -4747,23 +4759,23 @@ msgstr ""
 msgid "Attempt to reassign attribute '%{name}' in '%{resource}' caused by multiple consumed mappings to the same attribute"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:362
+#: ../lib/puppet/parser/resource.rb:363
 msgid "Parameter '%{name}' is already set on %{resource}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:365
+#: ../lib/puppet/parser/resource.rb:366
 msgid "Parameter '%{name}' is already set on %{resource} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:370
+#: ../lib/puppet/parser/resource.rb:371
 msgid "Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:373
+#: ../lib/puppet/parser/resource.rb:374
 msgid "Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:412
+#: ../lib/puppet/parser/resource.rb:413
 msgid "Duplicate parameter '%{param}' for on %{resource}"
 msgstr ""
 
@@ -5785,6 +5797,10 @@ msgstr ""
 msgid "Failed to load: %{type_name}"
 msgstr ""
 
+#: ../lib/puppet/pops/issues.rb:918
+msgid "Use of the application-orchestration %{expr} is deprecated. See https://puppet.com/docs/puppet/5.5/deprecated_language.html"
+msgstr ""
+
 #: ../lib/puppet/pops/label_provider.rb:76
 msgid "<%{string}> does not appear to contain a word"
 msgstr ""
@@ -5978,11 +5994,11 @@ msgstr ""
 msgid "Hiera configuration recreated due to change of scope variables used in interpolation expressions"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:427
+#: ../lib/puppet/pops/lookup/hiera_config.rb:428
 msgid "%{config_path}: Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:527
+#: ../lib/puppet/pops/lookup/hiera_config.rb:528
 msgid "%{config_path}: Use of 'hiera.yaml' version 4 is deprecated. It should be converted to version 5"
 msgstr ""
 
@@ -6118,43 +6134,43 @@ msgstr ""
 msgid "illegal comma separated argument list"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:64
+#: ../lib/puppet/pops/parser/pn_parser.rb:81
 msgid "unexpected end of input"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:66
+#: ../lib/puppet/pops/parser/pn_parser.rb:83
 msgid "unexpected %{value}"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:103
+#: ../lib/puppet/pops/parser/pn_parser.rb:120
 msgid "map key expected"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:114
+#: ../lib/puppet/pops/parser/pn_parser.rb:131
 msgid "expected identifier to follow '('"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:125
+#: ../lib/puppet/pops/parser/pn_parser.rb:142
 msgid "missing '%{token}' to end list"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:186
+#: ../lib/puppet/pops/parser/pn_parser.rb:187
 msgid "expected identifier after ':'"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:225
+#: ../lib/puppet/pops/parser/pn_parser.rb:226
 msgid "unterminated quote"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:251
+#: ../lib/puppet/pops/parser/pn_parser.rb:252
 msgid "malformed octal quote"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/pn_parser.rb:266 ../lib/puppet/pops/parser/pn_parser.rb:271 ../lib/puppet/pops/parser/pn_parser.rb:275
+#: ../lib/puppet/pops/parser/pn_parser.rb:267 ../lib/puppet/pops/parser/pn_parser.rb:272 ../lib/puppet/pops/parser/pn_parser.rb:276
 msgid "digit expected"
 msgstr ""
 
-#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:428
+#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:432
 msgid "you must specify title patterns when there are two or more key attributes"
 msgstr ""
 
@@ -6392,7 +6408,7 @@ msgstr ""
 msgid "Options 'include_containers' and 'include_values' cannot both be false"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_calculator.rb:167
+#: ../lib/puppet/pops/types/type_calculator.rb:191
 msgid "TypeCalculator.enumerable is deprecated. Use iterable"
 msgstr ""
 
@@ -6707,8 +6723,8 @@ msgstr ""
 msgid "Overriding environment setting '%{var}' with '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/provider/exec.rb:91
-msgid "'%{command}' is not qualified and no path was specified. Please qualify the command or specify a path."
+#: ../lib/puppet/provider/exec.rb:95
+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
@@ -6760,7 +6776,7 @@ msgstr ""
 msgid "GID must be an integer"
 msgstr ""
 
-#: ../lib/puppet/provider/group/groupadd.rb:60
+#: ../lib/puppet/provider/group/groupadd.rb:44
 msgid "GID %{resource} already exists, use allowdupe to force group creation"
 msgstr ""
 
@@ -6942,27 +6958,31 @@ msgstr ""
 msgid "Could not perform network device prefetch: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:37
+#: ../lib/puppet/provider/package/aix.rb:46
 msgid "The aix provider can only be used by root"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:79 ../lib/puppet/provider/package/nim.rb:53
+#: ../lib/puppet/provider/package/aix.rb:88 ../lib/puppet/provider/package/nim.rb:53
 msgid "Failed to uninstall package '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:85
+#: ../lib/puppet/provider/package/aix.rb:94
 msgid "A directory is required which will be used to find packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:97
+#: ../lib/puppet/provider/package/aix.rb:106
 msgid "aix package provider is unable to downgrade packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:116
+#: ../lib/puppet/provider/package/aix.rb:111
+msgid "Package '%{name}' is in a %{status} state and requires manual intervention"
+msgstr ""
+
+#: ../lib/puppet/provider/package/aix.rb:131
 msgid "Could not list installed Packages: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:139 ../lib/puppet/provider/package/yum.rb:252
+#: ../lib/puppet/provider/package/aix.rb:154 ../lib/puppet/provider/package/yum.rb:255
 msgid "Tried to get latest on a missing package"
 msgstr ""
 
@@ -6982,19 +7002,19 @@ msgstr ""
 msgid "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:83 ../lib/puppet/provider/package/fink.rb:50
+#: ../lib/puppet/provider/package/apt.rb:88 ../lib/puppet/provider/package/fink.rb:55
 msgid "Could not find latest version"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:93 ../lib/puppet/provider/package/fink.rb:60
+#: ../lib/puppet/provider/package/apt.rb:98 ../lib/puppet/provider/package/fink.rb:65
 msgid "Preseeding %{response} to debconf-set-selections"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:97 ../lib/puppet/provider/package/fink.rb:64
+#: ../lib/puppet/provider/package/apt.rb:102 ../lib/puppet/provider/package/fink.rb:69
 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:93 ../lib/puppet/provider/package/portupgrade.rb:151 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:232 ../lib/puppet/provider/package/zypper.rb:109
+#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:93 ../lib/puppet/provider/package/portupgrade.rb:151 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:235 ../lib/puppet/provider/package/zypper.rb:110
 msgid "Could not find package %{name}"
 msgstr ""
 
@@ -7022,11 +7042,15 @@ msgstr ""
 msgid "Cannot match %{line}"
 msgstr ""
 
+#: ../lib/puppet/provider/package/dnfmodule.rb:30
+msgid "Modules are not supported on DNF versions lower than 3.0.1"
+msgstr ""
+
 #: ../lib/puppet/provider/package/dpkg.rb:82
 msgid "You cannot install dpkg packages without a source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/dpkg.rb:107
+#: ../lib/puppet/provider/package/dpkg.rb:110
 msgid "source doesn't contain named package, but %{name}"
 msgstr ""
 
@@ -7034,27 +7058,27 @@ msgstr ""
 msgid "source is defined but does not have trailing slash, ignoring %{source}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:94
+#: ../lib/puppet/provider/package/gem.rb:96
 msgid "Could not list gems: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:120
+#: ../lib/puppet/provider/package/gem.rb:122
 msgid "Could not match %{desc}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:168
+#: ../lib/puppet/provider/package/gem.rb:170
 msgid "Invalid source '%{uri}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:179
+#: ../lib/puppet/provider/package/gem.rb:181
 msgid "puppet:// URLs are not supported as gem sources"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:195
+#: ../lib/puppet/provider/package/gem.rb:197
 msgid "Could not install: %{output}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:221
+#: ../lib/puppet/provider/package/gem.rb:223
 msgid "Could not uninstall: %{output}"
 msgstr ""
 
@@ -7112,19 +7136,19 @@ msgid ""
 "'%{line}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:49 ../lib/puppet/provider/package/opkg.rb:25
+#: ../lib/puppet/provider/package/openbsd.rb:50 ../lib/puppet/provider/package/opkg.rb:25
 msgid "Failed to match line %{line}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:136
+#: ../lib/puppet/provider/package/openbsd.rb:137
 msgid "No valid installpath found in /etc/pkg.conf and no source was set"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:140
+#: ../lib/puppet/provider/package/openbsd.rb:141
 msgid "You must specify a package source or configure an installpath in /etc/pkg.conf"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:212
+#: ../lib/puppet/provider/package/openbsd.rb:213
 msgid "%{version} is not available for this package"
 msgstr ""
 
@@ -7164,6 +7188,10 @@ msgstr ""
 msgid "Refusing to install package group %{resource_name}, because allow_virtual is false."
 msgstr ""
 
+#: ../lib/puppet/provider/package/pip.rb:55
+msgid "Cannot resolve pip version"
+msgstr ""
+
 #: ../lib/puppet/provider/package/pkg.rb:46 ../lib/puppet/provider/package/pkg.rb:56
 msgid "Unknown format %{resource_name}: %{full_flags}[%{bad_flag}]"
 msgstr ""
@@ -7176,27 +7204,27 @@ msgstr ""
 msgid "Unknown line format %{resource_name}: %{parse_line}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:116
+#: ../lib/puppet/provider/package/pkg.rb:120
 msgid "Unable to unfreeze %{package}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:151
+#: ../lib/puppet/provider/package/pkg.rb:155
 msgid "Implicit version %{should} has %{n} possible matches"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:161
+#: ../lib/puppet/provider/package/pkg.rb:165
 msgid "Selecting version '%{version}' for implicit '%{should}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:166
+#: ../lib/puppet/provider/package/pkg.rb:170
 msgid "No version of %{name} matching %{should} is installable, even though the package is currently installed"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:185
+#: ../lib/puppet/provider/package/pkg.rb:189
 msgid "pkg warning: %{warnings}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pkg.rb:221 ../lib/puppet/provider/package/pkg.rb:241
+#: ../lib/puppet/provider/package/pkg.rb:228 ../lib/puppet/provider/package/pkg.rb:254
 msgid "Unable to update %{package}"
 msgstr ""
 
@@ -7305,31 +7333,31 @@ msgstr ""
 msgid "Don't know how to install '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:29
+#: ../lib/puppet/provider/package/yum.rb:31
 msgid "The yum provider can only be used as root"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:83
+#: ../lib/puppet/provider/package/yum.rb:85
 msgid "Could not check for updates, '%{cmd} check-update' exited with %{status}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:117
+#: ../lib/puppet/provider/package/yum.rb:120
 msgid "Failed to parse package name and architecture from '%{pkgname}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:226
+#: ../lib/puppet/provider/package/yum.rb:229
 msgid "Could not find package %{wanted}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:237
+#: ../lib/puppet/provider/package/yum.rb:240
 msgid "Failed to update to version %{should}, got version %{version} instead"
 msgstr ""
 
-#: ../lib/puppet/provider/package_targetable.rb:55
+#: ../lib/puppet/provider/package_targetable.rb:56
 msgid "Provider %{name} package command is not functional on this host"
 msgstr ""
 
-#: ../lib/puppet/provider/package_targetable.rb:58
+#: ../lib/puppet/provider/package_targetable.rb:59
 msgid "Provider %{name} package command '%{cmd}' does not exist on this host"
 msgstr ""
 
@@ -7357,7 +7385,7 @@ msgstr ""
 msgid "Somehow got told to prefetch with no resource set"
 msgstr ""
 
-#: ../lib/puppet/provider/selmodule/semodule.rb:136
+#: ../lib/puppet/provider/selmodule/semodule.rb:150
 msgid "Could not list policy modules: \"%{selmodule_command}\" failed with \"%{selmod_output}\""
 msgstr ""
 
@@ -7383,7 +7411,7 @@ msgid "Overrides file could not be read, trying again."
 msgstr ""
 
 #. TRANSLATORS 'runsvdir' is a linux service name and should not be translated
-#: ../lib/puppet/provider/service/runit.rb:93
+#: ../lib/puppet/provider/service/runit.rb:87
 msgid "Waiting 5 seconds for runsvdir to discover service %{service}"
 msgstr ""
 
@@ -7450,15 +7478,15 @@ msgid "ruby-shadow doesn't support %{method}"
 msgstr ""
 
 #: ../lib/puppet/provider/user/windows_adsi.rb:128
-msgid "The user account '%s' is disabled; puppet will not reset the password"
+msgid "The user account '%s' is disabled; The password will still be changed"
 msgstr ""
 
 #: ../lib/puppet/provider/user/windows_adsi.rb:130
-msgid "The user account '%s' is locked out; puppet will not reset the password"
+msgid "The user account '%s' is locked out; The password will still be changed"
 msgstr ""
 
 #: ../lib/puppet/provider/user/windows_adsi.rb:132
-msgid "The user account '%s' is expired; puppet will not reset the password"
+msgid "The user account '%s' is expired; The password will still be changed"
 msgstr ""
 
 #: ../lib/puppet/provider/yumrepo/inifile.rb:185
@@ -7477,7 +7505,7 @@ msgstr ""
 msgid "Could not build docs for indirector %{name}, terminus %{terminus}: could not locate terminus."
 msgstr ""
 
-#: ../lib/puppet/reference/metaparameter.rb:30
+#: ../lib/puppet/reference/metaparameter.rb:28
 msgid "incorrect metaparams: %{detail}"
 msgstr ""
 
@@ -7511,11 +7539,11 @@ msgid ""
 "  - Missing features %{values}\n"
 msgstr ""
 
-#: ../lib/puppet/reference/type.rb:80
+#: ../lib/puppet/reference/type.rb:76
 msgid "Could not retrieve property %{sname} on type %{type_name}"
 msgstr ""
 
-#: ../lib/puppet/reference/type.rb:83
+#: ../lib/puppet/reference/type.rb:79
 msgid "No docs for %{type}[%{sname}]"
 msgstr ""
 
@@ -7679,67 +7707,67 @@ msgstr ""
 msgid "Could not evaluate: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:78
+#: ../lib/puppet/resource/type.rb:81
 msgid "Invalid export in %{reference}: %{ex} is not a resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:79
+#: ../lib/puppet/resource/type.rb:82
 msgid "Invalid export in %{reference}: %{ex} is not a capability resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:83
+#: ../lib/puppet/resource/type.rb:86
 msgid "Resource type %{res_type} does not produce %{ex_type}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:143
+#: ../lib/puppet/resource/type.rb:146
 msgid "Invalid resource supertype '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:190
+#: ../lib/puppet/resource/type.rb:197
 msgid "%{name} is not a class; cannot add code to it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:191
+#: ../lib/puppet/resource/type.rb:198
 msgid "%{name} is not a class; cannot add code from it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:195
+#: ../lib/puppet/resource/type.rb:202
 msgid "Cannot have code outside of a class/node/define because 'freeze_main' is enabled"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:199
+#: ../lib/puppet/resource/type.rb:206
 msgid "Cannot merge classes with different parent classes (%{name} => %{parent} vs. %{other_name} => %{other_parent})"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:230
+#: ../lib/puppet/resource/type.rb:237
 msgid "Cannot create resources for defined resource types"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:284
+#: ../lib/puppet/resource/type.rb:292
 msgid "The method Puppet::Resource::Type.assign_parameter_values is deprecated and will be removed in the next major release of Puppet."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:300
+#: ../lib/puppet/resource/type.rb:308
 msgid "Could not find parent resource type '%{parent}' of type %{parent_type} in %{env}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:427
+#: ../lib/puppet/resource/type.rb:435
 msgid "Parameter '%{name}' is given a type, but is not a valid parameter."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:430
+#: ../lib/puppet/resource/type.rb:438
 msgid "Parameter '%{name}' is given a type that is not a Puppet Type, got %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:470
+#: ../lib/puppet/resource/type.rb:478
 msgid "Could not find scope for %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:491
+#: ../lib/puppet/resource/type.rb:499
 msgid "%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:493
+#: ../lib/puppet/resource/type.rb:501
 msgid "%{param} is a metaparameter; please choose another parameter name in the %{name} definition"
 msgstr ""
 
@@ -8091,11 +8119,11 @@ msgstr ""
 msgid "Puppet::SSL::CertificateAuthority#certificate_is_alive? is deprecated. Please use Puppet::SSL::CertificateAuthority#verify or the certificate status API to query certificate information. See https://puppet.com/docs/puppet/latest/http_api/http_certificate_status.html"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_authority.rb:497
+#: ../lib/puppet/ssl/certificate_authority.rb:498
 msgid "Could not find a certificate for %{name}"
 msgstr ""
 
-#: ../lib/puppet/ssl/certificate_authority.rb:506
+#: ../lib/puppet/ssl/certificate_authority.rb:507
 msgid "Could not find a certificate or csr for %{name}"
 msgstr ""
 
@@ -8523,77 +8551,77 @@ msgstr ""
 msgid "audit change: newly-recorded value %s"
 msgstr ""
 
-#: ../lib/puppet/type.rb:503
+#: ../lib/puppet/type.rb:507
 msgid "Options must be a hash, not %{type}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:506
+#: ../lib/puppet/type.rb:510
 msgid "Class %{class_name} already has a property named %{property}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:592
+#: ../lib/puppet/type.rb:596
 msgid "Class %{class_name} has not defined parameters"
 msgstr ""
 
-#: ../lib/puppet/type.rb:676
+#: ../lib/puppet/type.rb:680
 msgid "Parameter %{name} failed on %{ref}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:699
+#: ../lib/puppet/type.rb:703
 msgid "Undefined attribute '%{attribute}' in %{name}"
 msgstr ""
 
 #. TRANSLATORS 'is' is a variable name and should not be translated
 #. TRANSLATORS 'is' is a variable name and should not be translated
-#: ../lib/puppet/type.rb:1022 ../lib/puppet/type.rb:1033
+#: ../lib/puppet/type.rb:1026 ../lib/puppet/type.rb:1037
 msgid "The 'is' value is not in the 'is' array for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1159
+#: ../lib/puppet/type.rb:1163
 msgid "%{name} has no providers and has not overridden 'instances'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1418
+#: ../lib/puppet/type.rb:1422
 msgid "Cannot add aliases without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1497
+#: ../lib/puppet/type.rb:1501
 msgid "Could not find %{description} %{ref} for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1770
+#: ../lib/puppet/type.rb:1776
 msgid "Found multiple default providers for %{name}: %{provider_list}; using %{selected_provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1855
+#: ../lib/puppet/type.rb:1861
 msgid "Could not find parent provider %{parent} of %{name}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1931
+#: ../lib/puppet/type.rb:1935
 msgid "Invalid %{resource} provider '%{provider_class}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2014
+#: ../lib/puppet/type.rb:2018
 msgid "Could not find %{name} provider of %{provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2131
+#: ../lib/puppet/type.rb:2135
 msgid "You cannot add relationships without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2438
+#: ../lib/puppet/type.rb:2442
 msgid "Unable to mark '%{name}' as sensitive: %{name} is a parameter and not a property, and cannot be automatically redacted."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2441
+#: ../lib/puppet/type.rb:2445
 msgid "Unable to mark '%{name}' as sensitive: the property itself was not assigned a value."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2443
+#: ../lib/puppet/type.rb:2447
 msgid "Unable to mark '%{name}' as sensitive: the property itself is not defined on %{type}."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2501
+#: ../lib/puppet/type.rb:2505
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
@@ -8625,59 +8653,59 @@ msgstr ""
 msgid "Command exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:162
+#: ../lib/puppet/type/exec.rb:166
 msgid "[command redacted] returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:164
+#: ../lib/puppet/type/exec.rb:168
 msgid "'%{cmd}' returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:182
+#: ../lib/puppet/type/exec.rb:186
 msgid "Command must be a String, got value of class %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:214
+#: ../lib/puppet/type/exec.rb:218
 msgid "Unable to execute commands as other users on Windows"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:216
+#: ../lib/puppet/type/exec.rb:220
 msgid "Only root can execute commands as other users"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:272
+#: ../lib/puppet/type/exec.rb:276
 msgid "Invalid environment setting '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:285
+#: ../lib/puppet/type/exec.rb:289
 msgid "The umask specification is invalid: %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:301
+#: ../lib/puppet/type/exec.rb:305
 msgid "The timeout must be a number."
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:318
+#: ../lib/puppet/type/exec.rb:322
 msgid "Tries must be an integer"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:322
+#: ../lib/puppet/type/exec.rb:326
 msgid "Tries must be an integer >= 1"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:335
+#: ../lib/puppet/type/exec.rb:339
 msgid "try_sleep must be a number"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:339
+#: ../lib/puppet/type/exec.rb:343
 msgid "try_sleep cannot be a negative number"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:454 ../lib/puppet/type/exec.rb:510
+#: ../lib/puppet/type/exec.rb:458 ../lib/puppet/type/exec.rb:514
 msgid "Check %{value} exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:597
+#: ../lib/puppet/type/exec.rb:601
 msgid "'%{cmd}' won't be executed because of failed check '%{check}'"
 msgstr ""
 
@@ -8685,82 +8713,82 @@ msgstr ""
 msgid "File paths must be fully qualified, not '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:124
+#: ../lib/puppet/type/file.rb:137
 msgid "Invalid backup type %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:168 ../lib/puppet/type/tidy.rb:48
+#: ../lib/puppet/type/file.rb:181 ../lib/puppet/type/tidy.rb:48
 msgid "Invalid recurse value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:200
+#: ../lib/puppet/type/file.rb:213
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:370
+#: ../lib/puppet/type/file.rb:383
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:372
+#: ../lib/puppet/type/file.rb:385
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:374
+#: ../lib/puppet/type/file.rb:387
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:377
+#: ../lib/puppet/type/file.rb:390
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:380
+#: ../lib/puppet/type/file.rb:393
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:388
+#: ../lib/puppet/type/file.rb:401
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:391
+#: ../lib/puppet/type/file.rb:404
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:429
+#: ../lib/puppet/type/file.rb:442
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:433
+#: ../lib/puppet/type/file.rb:446
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:729
+#: ../lib/puppet/type/file.rb:741
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:744
+#: ../lib/puppet/type/file.rb:756
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:755
+#: ../lib/puppet/type/file.rb:767
 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:836 ../lib/puppet/type/k5login.rb:97 ../lib/puppet/type/tidy.rb:345
+#: ../lib/puppet/type/file.rb:848 ../lib/puppet/type/k5login.rb:97 ../lib/puppet/type/tidy.rb:345
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:961
+#: ../lib/puppet/type/file.rb:973
 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:986
+#: ../lib/puppet/type/file.rb:998
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1000
+#: ../lib/puppet/type/file.rb:1012
 msgid "File written to disk did not match checksum; discarding changes (%{content_checksum} vs %{newsum})"
 msgstr ""
 
@@ -8914,18 +8942,38 @@ msgstr ""
 msgid "name must not contain whitespace: %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:118 ../lib/puppet/type/package.rb:132
+#: ../lib/puppet/type/package.rb:125 ../lib/puppet/type/package.rb:139
 msgid "Could not update: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:167
+#: ../lib/puppet/type/package.rb:174
 msgid "Could not get latest version: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:267
+#: ../lib/puppet/type/package.rb:274
 msgid "Name must be a String not %{klass}"
 msgstr ""
 
+#: ../lib/puppet/type/package.rb:416
+msgid "Cannot have both `ensure => disabled` and `flavor`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:515
+msgid "Cannot have both `enable_only => true` and `flavor`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:518
+msgid "Cannot have both `ensure => disabled` and `enable_only => true`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:670
+msgid "Invalid hold value %{value}. %{doc}"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:700
+msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\", \"held\"]"
+msgstr ""
+
 #: ../lib/puppet/type/resources.rb:15
 msgid "Could not find resource type '%{name}'"
 msgstr ""
@@ -8990,7 +9038,11 @@ msgstr ""
 msgid "Must be specified using an absolute path."
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:94
+#: ../lib/puppet/type/selboolean.rb:26
+msgid "Invalid value %{value}. %{doc}"
+msgstr ""
+
+#: ../lib/puppet/type/service.rb:88
 msgid "Setting enable to %{value} is only supported on Microsoft Windows."
 msgstr ""
 
@@ -9115,27 +9167,19 @@ msgstr ""
 msgid "Profile names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:703
+#: ../lib/puppet/type/user.rb:705
 msgid "Each entry for purge_ssh_keys must be a string, not a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:706
+#: ../lib/puppet/type/user.rb:708
 msgid "Paths to keyfiles must be absolute, not %{entry}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:710
+#: ../lib/puppet/type/user.rb:712
 msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:722
-msgid "purge_ssh_keys can only be true for users with a defined home directory"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:729
-msgid "purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:743
+#: ../lib/puppet/type/user.rb:739
 msgid "Class name must be provided."
 msgstr ""
 
@@ -9246,11 +9290,11 @@ msgstr ""
 msgid "path may not be nil"
 msgstr ""
 
-#: ../lib/puppet/util.rb:568
+#: ../lib/puppet/util.rb:591
 msgid "replace_file requires a block"
 msgstr ""
 
-#: ../lib/puppet/util.rb:572
+#: ../lib/puppet/util.rb:595
 msgid "replace_file default_mode: %{default_mode} is invalid"
 msgstr ""
 
@@ -9655,7 +9699,7 @@ msgstr ""
 msgid "Could not write crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/http_proxy.rb:220
+#: ../lib/puppet/util/http_proxy.rb:214
 msgid "Too many HTTP redirections for %{uri}"
 msgstr ""
 
@@ -9774,24 +9818,20 @@ msgstr ""
 msgid "Creating log directory %{dir}"
 msgstr ""
 
-#: ../lib/puppet/util/log/destinations.rb:101
-msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
-msgstr ""
-
-#: ../lib/puppet/util/logging.rb:82 ../lib/puppet/util/logging.rb:105
+#: ../lib/puppet/util/logging.rb:80 ../lib/puppet/util/logging.rb:104
 msgid "Wrapped exception:"
 msgstr ""
 
 #. TRANSLATORS the literals ":file", ":line", and ":key" should not be translated
-#: ../lib/puppet/util/logging.rb:149
+#: ../lib/puppet/util/logging.rb:161
 msgid "Need either :file and :line, or :key"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:179
+#: ../lib/puppet/util/logging.rb:191
 msgid "(file & line not available)"
 msgstr ""
 
-#: ../lib/puppet/util/logging.rb:281
+#: ../lib/puppet/util/logging.rb:293
 msgid "(location: %{location})"
 msgstr ""
 
@@ -9889,7 +9929,7 @@ msgstr ""
 msgid "Details: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/plist.rb:145
+#: ../lib/puppet/util/plist.rb:151
 msgid "Unable to write the file %{file_path}. %{error}"
 msgstr ""
 
@@ -9989,7 +10029,7 @@ msgstr ""
 msgid "Could not open SELinux category translation file %{path}."
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:247
+#: ../lib/puppet/util/selinux.rb:249
 msgid "got a relative path in SELinux find_fs: %{path}"
 msgstr ""
 
@@ -10073,63 +10113,63 @@ msgstr ""
 msgid "Invalid tag '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:19
+#: ../lib/puppet/util/windows/adsi.rb:36
 msgid "ADSI connection error: %{e}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:42
+#: ../lib/puppet/util/windows/adsi.rb:59
 msgid "Failed to get computer name"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:80
+#: ../lib/puppet/util/windows/adsi.rb:97
 msgid "Must use a valid SID::Principal"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:137
+#: ../lib/puppet/util/windows/adsi.rb:162
 msgid "Value must be in DOMAIN\\%{object_class} style syntax"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:163
+#: ../lib/puppet/util/windows/adsi.rb:188
 msgid "Could not resolve name: %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:200
+#: ../lib/puppet/util/windows/adsi.rb:230
 msgid "Subclass must implement class-level method 'list_all'!"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:254
+#: ../lib/puppet/util/windows/adsi.rb:284
 msgid "Puppet is not able to create/delete domain %{object_class} objects with the %{object_class} resource."
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:258
+#: ../lib/puppet/util/windows/adsi.rb:288
 msgid "%{object_class} update failed: %{error}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:284
+#: ../lib/puppet/util/windows/adsi.rb:314
 msgid "Cannot create user if group '%{name}' exists."
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:425
+#: ../lib/puppet/util/windows/adsi.rb:455
 msgid "Unrecognized ADS UserFlags: %{unrecognized_flags}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:469
+#: ../lib/puppet/util/windows/adsi.rb:499
 msgid "Failed to get user name"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:506
+#: ../lib/puppet/util/windows/adsi.rb:536
 msgid "Cannot delete user profile for '%{sid}' prior to Vista SP1"
 msgstr ""
 
-#: ../lib/puppet/util/windows/adsi.rb:524
+#: ../lib/puppet/util/windows/adsi.rb:554
 msgid "Cannot create group if user '%{name}' exists."
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:72
+#: ../lib/puppet/util/windows/api_types.rb:85
 msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:203
+#: ../lib/puppet/util/windows/api_types.rb:216
 msgid "Bad GUID format."
 msgstr ""
 
@@ -10184,16 +10224,20 @@ msgstr ""
 msgid "Failed to call GetLongPathName"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:68 ../lib/puppet/util/windows/principal.rb:75
+#: ../lib/puppet/util/windows/principal.rb:67 ../lib/puppet/util/windows/principal.rb:74
 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:98
+#: ../lib/puppet/util/windows/principal.rb:97
 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:120 ../lib/puppet/util/windows/principal.rb:127
+#: ../lib/puppet/util/windows/principal.rb:114
+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
 msgid "Failed to call LookupAccountSidW with bytes: %{sid_bytes}"
 msgstr ""
 
@@ -10201,23 +10245,23 @@ msgstr ""
 msgid "Failed to get child process exit code"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:287
+#: ../lib/puppet/util/windows/process.rb:288
 msgid "GetVersionEx failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:316
+#: ../lib/puppet/util/windows/process.rb:317
 msgid "Discarding environment variable %{string} which contains invalid bytes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:332
+#: ../lib/puppet/util/windows/process.rb:333
 msgid "environment variable name must not be nil or empty"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:337
+#: ../lib/puppet/util/windows/process.rb:338
 msgid "Failed to remove environment variable: %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:342
+#: ../lib/puppet/util/windows/process.rb:343
 msgid "Failed to set environment variable: %{name}"
 msgstr ""
 
@@ -10229,39 +10273,39 @@ msgstr ""
 msgid "Failed to open registry key '%{key}\\%{path}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:128
+#: ../lib/puppet/util/windows/registry.rb:133
 msgid "Failed to enumerate %{key} registry keys at index %{index}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:159
+#: ../lib/puppet/util/windows/registry.rb:167
 msgid "Failed to enumerate %{key} registry values at index %{index}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:189
+#: ../lib/puppet/util/windows/registry.rb:197
 msgid "Failed to query registry %{key} for sizes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:225
+#: ../lib/puppet/util/windows/registry.rb:233
 msgid "Type mismatch (expect %{rtype} but %{type} present)"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:247
+#: ../lib/puppet/util/windows/registry.rb:255
 msgid "Type %{type} is not supported."
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:252
+#: ../lib/puppet/util/windows/registry.rb:260
 msgid "A value in the registry key %{parent_key_name}%{key} is corrupt or invalid"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:274
+#: ../lib/puppet/util/windows/registry.rb:282
 msgid "Failed to read registry value %{value} at %{key}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:292
+#: ../lib/puppet/util/windows/registry.rb:300
 msgid "Failed to delete registry value %{name} at %{key}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:307
+#: ../lib/puppet/util/windows/registry.rb:315
 msgid "Failed to delete registry key %{name} at %{key}"
 msgstr ""
 
@@ -10269,77 +10313,77 @@ msgstr ""
 msgid "Failed to import root certificate: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:173
+#: ../lib/puppet/util/windows/security.rb:174
 msgid "Failed to get volume information"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:339
+#: ../lib/puppet/util/windows/security.rb:340
 msgid "Setting control rights for %{path} owner SYSTEM to less than Full Control rights. Setting SYSTEM rights to less than Full Control may have unintented consequences for operations on this file"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:342
+#: ../lib/puppet/util/windows/security.rb:343
 msgid "%{path} owner and group both set to user SYSTEM, but group is not managed directly: SYSTEM user rights will be set to FullControl by group"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:345
+#: ../lib/puppet/util/windows/security.rb:346
 msgid "An attempt to set mode %{mode} on item %{path} would result in the owner, SYSTEM, to have less than Full Control rights. This attempt has been corrected to Full Control"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:355
+#: ../lib/puppet/util/windows/security.rb:356
 msgid "Setting control rights for %{path} group SYSTEM to less than Full Control rights. Setting SYSTEM rights to less than Full Control may have unintented consequences for operations on this file"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:358
+#: ../lib/puppet/util/windows/security.rb:359
 msgid "%{path} owner and group both set to user SYSTEM, but owner is not managed directly: SYSTEM user rights will be set to FullControl by owner"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:361
+#: ../lib/puppet/util/windows/security.rb:362
 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:432 ../lib/puppet/util/windows/security.rb:449 ../lib/puppet/util/windows/sid.rb:155 ../lib/puppet/util/windows/sid.rb:217 ../lib/puppet/util/windows/user.rb:43
+#: ../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:43
 msgid "Invalid SID"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:436 ../lib/puppet/util/windows/security.rb:453
+#: ../lib/puppet/util/windows/security.rb:437 ../lib/puppet/util/windows/security.rb:454
 msgid "Failed to add access control entry"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:464 ../lib/puppet/util/windows/security.rb:646
+#: ../lib/puppet/util/windows/security.rb:465 ../lib/puppet/util/windows/security.rb:647
 msgid "Invalid DACL"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:487
+#: ../lib/puppet/util/windows/security.rb:488
 msgid "Unsupported access control entry type: 0x%{type}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:521
+#: ../lib/puppet/util/windows/security.rb:522
 msgid "Failed to open '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:568
+#: ../lib/puppet/util/windows/security.rb:569
 msgid "Failed to adjust process privileges"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:598
+#: ../lib/puppet/util/windows/security.rb:599
 msgid "Failed to get security information"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:609
+#: ../lib/puppet/util/windows/security.rb:610
 msgid "Failed to get security descriptor control"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:642
+#: ../lib/puppet/util/windows/security.rb:643
 msgid "Failed to initialize ACL"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:681
+#: ../lib/puppet/util/windows/security.rb:682
 msgid "Failed to set security information"
 msgstr ""