puppet 7.3.0-universal-darwin → 7.7.0-universal-darwin

data/lib/puppet/util/watcher.rb

@@ -1,7 +1,7 @@
 module Puppet::Util::Watcher
-  require 'puppet/util/watcher/timer'
-  require 'puppet/util/watcher/change_watcher'
-  require 'puppet/util/watcher/periodic_watcher'
+  require_relative 'watcher/timer'
+  require_relative 'watcher/change_watcher'
+  require_relative 'watcher/periodic_watcher'
 
   module Common
     def self.file_ctime_change_watcher(filename)

data/lib/puppet/util/windows.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/platform'
+require_relative '../../puppet/util/platform'
 
 module Puppet::Util::Windows
   module ADSI
@@ -25,24 +25,24 @@ module Puppet::Util::Windows
     require 'win32ole' ; WIN32OLE.codepage = WIN32OLE::CP_UTF8
 
     # these reference platform specific gems
-    require 'puppet/ffi/windows'
-    require 'puppet/util/windows/string'
-    require 'puppet/util/windows/error'
-    require 'puppet/util/windows/com'
-    require 'puppet/util/windows/sid'
-    require 'puppet/util/windows/principal'
-    require 'puppet/util/windows/file'
-    require 'puppet/util/windows/security'
-    require 'puppet/util/windows/user'
-    require 'puppet/util/windows/process'
-    require 'puppet/util/windows/root_certs'
-    require 'puppet/util/windows/access_control_entry'
-    require 'puppet/util/windows/access_control_list'
-    require 'puppet/util/windows/security_descriptor'
-    require 'puppet/util/windows/adsi'
-    require 'puppet/util/windows/registry'
-    require 'puppet/util/windows/eventlog'
-    require 'puppet/util/windows/service'
-    require 'puppet/util/windows/monkey_patches/process'
+    require_relative '../../puppet/ffi/windows'
+    require_relative 'windows/string'
+    require_relative 'windows/error'
+    require_relative 'windows/com'
+    require_relative 'windows/sid'
+    require_relative 'windows/principal'
+    require_relative 'windows/file'
+    require_relative 'windows/security'
+    require_relative 'windows/user'
+    require_relative 'windows/process'
+    require_relative 'windows/root_certs'
+    require_relative 'windows/access_control_entry'
+    require_relative 'windows/access_control_list'
+    require_relative 'windows/security_descriptor'
+    require_relative 'windows/adsi'
+    require_relative 'windows/registry'
+    require_relative 'windows/eventlog'
+    require_relative 'windows/service'
+    require_relative 'windows/monkey_patches/process'
   end
 end

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

@@ -6,7 +6,7 @@
 # @see https://msdn.microsoft.com/en-us/library/windows/desktop/aa374868(v=vs.85).aspx
 # @api private
 class Puppet::Util::Windows::AccessControlEntry
-  require 'puppet/util/windows/security'
+  require_relative '../../../puppet/util/windows/security'
   include Puppet::Util::Windows::SID
 
   attr_accessor :sid

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 
 module Puppet::Util::Windows::SID
   class Principal
@@ -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/process.rb

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 
 module Puppet::Util::Windows
   module SID
@@ -74,11 +74,13 @@ 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
+        Puppet.debug("Could not retrieve raw SID bytes from '#{name}': #{e.message}")
       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/util/windows/user.rb

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

data/lib/puppet/vendor.rb

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

data/lib/puppet/version.rb

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

data/lib/puppet/x509.rb

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

data/lib/puppet/x509/cert_provider.rb

@@ -1,4 +1,4 @@
-require 'puppet/x509'
+require_relative '../../puppet/x509'
 
 # Class for loading and saving cert related objects. By default the provider
 # loads and saves based on puppet's default settings, such as `Puppet[:localcacert]`.

data/lib/puppet/x509/pem_store.rb

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

data/lib/puppet_pal.rb

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

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 7.1.0-89-g309d69a162\n"
+"Project-Id-Version: Puppet automation framework 7.6.1-91-g3f8691353f\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2021-01-13 14:37+0000\n"
-"PO-Revision-Date: 2021-01-13 14:37+0000\n"
+"POT-Creation-Date: 2021-05-12 16:37+0000\n"
+"PO-Revision-Date: 2021-05-12 16:37+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -446,59 +446,59 @@ msgstr ""
 msgid "Manage SSL keys and certificates for puppet SSL clients"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:103
+#: ../lib/puppet/application/ssl.rb:106
 msgid "An action must be specified."
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:126 ../lib/puppet/application/ssl.rb:133
+#: ../lib/puppet/application/ssl.rb:129 ../lib/puppet/application/ssl.rb:136
 msgid "The certificate for '%{name}' has not yet been signed"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:144
+#: ../lib/puppet/application/ssl.rb:147
 msgid "Completed SSL initialization"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:146
+#: ../lib/puppet/application/ssl.rb:151
 msgid "Unknown action '%{action}'"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:154 ../lib/puppet/ssl/state_machine.rb:180
+#: ../lib/puppet/application/ssl.rb:165 ../lib/puppet/ssl/state_machine.rb:180
 msgid "Creating a new EC SSL key for %{name} using curve %{curve}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:157
+#: ../lib/puppet/application/ssl.rb:168
 msgid "Creating a new SSL key for %{name}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:167
+#: ../lib/puppet/application/ssl.rb:178
 msgid "Submitted certificate request for '%{name}' to %{url}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:170
+#: ../lib/puppet/application/ssl.rb:181
 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:183 ../lib/puppet/application/ssl.rb:186
 msgid "Failed to submit certificate request: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:183
+#: ../lib/puppet/application/ssl.rb:194
 msgid "Downloading certificate '%{name}' from %{url}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:187
+#: ../lib/puppet/application/ssl.rb:198
 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:211 ../lib/puppet/application/ssl.rb:214
 msgid "Failed to download certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:232 ../lib/puppet/application/ssl.rb:235
+#: ../lib/puppet/application/ssl.rb:243 ../lib/puppet/application/ssl.rb:246
 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:250
 msgid ""
 "The certificate %{certname} must be cleaned from the CA first. To fix this,\n"
 "run the following commands on the CA:\n"
@@ -506,7 +506,7 @@ msgid ""
 "  puppet ssl clean\n"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:262
+#: ../lib/puppet/application/ssl.rb:273
 msgid "Removed %{label} %{path}"
 msgstr ""
 
@@ -583,44 +583,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:424
+#: ../lib/puppet/configurer.rb:434
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:453 ../lib/puppet/http/resolver/server_list.rb:63
+#: ../lib/puppet/configurer.rb:463 ../lib/puppet/http/resolver/server_list.rb:64 ../lib/puppet/http/resolver/server_list.rb:68
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:457 ../lib/puppet/http/resolver/server_list.rb:66
+#: ../lib/puppet/configurer.rb:467 ../lib/puppet/http/resolver/server_list.rb:73 ../lib/puppet/http/resolver/server_list.rb:76
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:468 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:478 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:477
+#: ../lib/puppet/configurer.rb:487
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:496
+#: ../lib/puppet/configurer.rb:506
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:504
+#: ../lib/puppet/configurer.rb:514
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:519
+#: ../lib/puppet/configurer.rb:529
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:537
+#: ../lib/puppet/configurer.rb:547
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:558
+#: ../lib/puppet/configurer.rb:568
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -715,12 +715,12 @@ msgstr ""
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1069 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1077 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
 #. TRANSLATORS 'pluginsync' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:1906
+#: ../lib/puppet/defaults.rb:1914
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
@@ -1063,6 +1063,10 @@ msgstr ""
 msgid "Show only the value when the action is called with a single query"
 msgstr ""
 
+#: ../lib/puppet/face/facts.rb:136
+msgid "Show how much time it took to resolve each fact."
+msgstr ""
+
 #: ../lib/puppet/face/generate.rb:9
 msgid "Generates Puppet code from Ruby definitions."
 msgstr ""
@@ -1609,23 +1613,23 @@ msgstr ""
 msgid "Fileserver configuration file does not use '=' as a separator"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:40 ../lib/puppet/util/network_device/config.rb:101
+#: ../lib/puppet/file_serving/configuration/parser.rb:43 ../lib/puppet/util/network_device/config.rb:101
 msgid "Invalid argument '%{var}' at %{error_location}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:45
+#: ../lib/puppet/file_serving/configuration/parser.rb:48
 msgid "Invalid entry at %{error_location}: '%{file_text}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:70
+#: ../lib/puppet/file_serving/configuration/parser.rb:73
 msgid "%{mount} is already mounted at %{name} at %{error_location}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:95
+#: ../lib/puppet/file_serving/configuration/parser.rb:98
 msgid "Removing mount \"%{mount}\": %{detail}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration/parser.rb:99
+#: ../lib/puppet/file_serving/configuration/parser.rb:102
 msgid "The '%{mount}' module can not have a path. Ignoring attempt to set it"
 msgstr ""
 
@@ -1637,21 +1641,29 @@ msgstr ""
 msgid "Fileset paths must be fully qualified: %{path}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/fileset.rb:50
+#: ../lib/puppet/file_serving/fileset.rb:51
 msgid "Fileset paths must exist"
 msgstr ""
 
 #. TRANSLATORS "recurse" and "recurselimit" are parameter names and should not be translated
-#: ../lib/puppet/file_serving/fileset.rb:52
+#: ../lib/puppet/file_serving/fileset.rb:53
 msgid "Fileset recurse parameter must not be a number anymore, please use recurselimit"
 msgstr ""
 
+#: ../lib/puppet/file_serving/fileset.rb:69
+msgid "The directory '%{path}' contains %{entries} entries, which exceeds the limit of %{munged_max_files} specified by the max_files parameter for this resource. The limit may be increased, but be aware that large number of file resources can result in excessive resource consumption and degraded performance. Consider using an alternate method to manage large directory trees"
+msgstr ""
+
+#: ../lib/puppet/file_serving/fileset.rb:71
+msgid "The directory '%{path}' contains %{entries} entries, which exceeds the default soft limit %{soft_max_files} and may cause excessive resource consumption and degraded performance. To remove this warning set a value for `max_files` parameter or consider using an alternate method to manage large directory trees"
+msgstr ""
+
 #. TRANSLATORS ":links" is a parameter name and should not be translated
-#: ../lib/puppet/file_serving/fileset.rb:80
+#: ../lib/puppet/file_serving/fileset.rb:92
 msgid "Invalid :links value '%{links}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/fileset.rb:93
+#: ../lib/puppet/file_serving/fileset.rb:105
 msgid "Invalid option '%{option}'"
 msgstr ""
 
@@ -1735,7 +1747,7 @@ msgstr ""
 msgid "Timeout waiting for exclusive lock on %{path}"
 msgstr ""
 
-#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:127 ../lib/puppet/util.rb:706
+#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:127 ../lib/puppet/util.rb:715
 msgid "Is a directory: %{directory}"
 msgstr ""
 
@@ -1779,11 +1791,11 @@ msgstr ""
 msgid "%{dest} already exists and the :force option was not specified"
 msgstr ""
 
-#: ../lib/puppet/file_system/windows.rb:202
+#: ../lib/puppet/file_system/windows.rb:204
 msgid "This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required."
 msgstr ""
 
-#: ../lib/puppet/file_system/windows.rb:207
+#: ../lib/puppet/file_system/windows.rb:209
 msgid "The current user does not have the necessary permission to manage symlinks."
 msgstr ""
 
@@ -2227,6 +2239,10 @@ msgstr ""
 msgid "Location URI is invalid: %{detail}"
 msgstr ""
 
+#: ../lib/puppet/http/resolver/server_list.rb:66 ../lib/puppet/http/resolver/server_list.rb:74
+msgid "Trying with next server from server_list."
+msgstr ""
+
 #: ../lib/puppet/http/retry_after_handler.rb:74
 msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
 msgstr ""
@@ -2301,87 +2317,87 @@ msgstr ""
 msgid "Inlining file metadata"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:259
+#: ../lib/puppet/indirector/catalog/compiler.rb:260
 msgid "Could not get metadata for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:280
+#: ../lib/puppet/indirector/catalog/compiler.rb:281
 msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:287
+#: ../lib/puppet/indirector/catalog/compiler.rb:288
 msgid "Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:288
+#: ../lib/puppet/indirector/catalog/compiler.rb:289
 msgid "Compiled static catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:290
+#: ../lib/puppet/indirector/catalog/compiler.rb:291
 msgid "Compiled static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:291
+#: ../lib/puppet/indirector/catalog/compiler.rb:292
 msgid "Compiled static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:296
+#: ../lib/puppet/indirector/catalog/compiler.rb:297
 msgid "Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:297
+#: ../lib/puppet/indirector/catalog/compiler.rb:298
 msgid "Compiled catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:299
+#: ../lib/puppet/indirector/catalog/compiler.rb:300
 msgid "Compiled catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:300
+#: ../lib/puppet/indirector/catalog/compiler.rb:301
 msgid "Compiled catalog for %{node}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:322
+#: ../lib/puppet/indirector/catalog/compiler.rb:323
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:324
+#: ../lib/puppet/indirector/catalog/compiler.rb:325
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:327
+#: ../lib/puppet/indirector/catalog/compiler.rb:328
 msgid "Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:329
+#: ../lib/puppet/indirector/catalog/compiler.rb:330
 msgid "Inlined resource metadata into static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:346
+#: ../lib/puppet/indirector/catalog/compiler.rb:347
 msgid "Found node information"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:354
+#: ../lib/puppet/indirector/catalog/compiler.rb:355
 msgid "Failed when searching for node %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:374
+#: ../lib/puppet/indirector/catalog/compiler.rb:375
 msgid "Invalid option use_node for a remote request"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:393
+#: ../lib/puppet/indirector/catalog/compiler.rb:394
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:426
+#: ../lib/puppet/indirector/catalog/compiler.rb:427
 msgid "Could not retrieve fact servername"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:435
+#: ../lib/puppet/indirector/catalog/compiler.rb:436
 msgid "Could not retrieve either serverip or serverip6 fact"
 msgstr ""
 
@@ -2837,8 +2853,8 @@ msgstr ""
 msgid "Option %{option} conflicts with existing option %{conflict} on %{face}"
 msgstr ""
 
-#. TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
 #. TRANSLATORS 'Puppet.settings' should not be translated
+#. TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
 #: ../lib/puppet/interface/action.rb:315 ../lib/puppet/interface/option_manager.rb:14
 msgid "Global option %{option} does not exist in Puppet.settings"
 msgstr ""
@@ -3063,11 +3079,11 @@ msgid "Loaded puppet/type/%{name} but no class was created"
 msgstr ""
 
 #. TRANSLATORS 'metadata.json' is a specific file name and should not be translated.
-#: ../lib/puppet/module.rb:221
+#: ../lib/puppet/module.rb:222
 msgid "%{name} has an invalid and unparsable metadata.json file. The parse error: %{error}"
 msgstr ""
 
-#: ../lib/puppet/module.rb:467
+#: ../lib/puppet/module.rb:468
 msgid ""
 "        Invalid module name '%{name}'; module names must match either:\n"
 "        An installed module name (ex. modulename) matching the expression /^[a-z][a-z0-9_]*$/ -or-\n"
@@ -3856,7 +3872,7 @@ msgstr ""
 msgid "The 'disable_per_environment_manifest' setting is true, and the '%{env_name}' environment has an environment.conf manifest that conflicts with the 'default_manifest' setting."
 msgstr ""
 
-#: ../lib/puppet/node/environment.rb:568 ../lib/puppet/pops/loaders.rb:301
+#: ../lib/puppet/node/environment.rb:575 ../lib/puppet/pops/loaders.rb:301
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -5311,15 +5327,15 @@ msgstr ""
 msgid "<%{string}> does not appear to contain a word"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/base_loader.rb:124
+#: ../lib/puppet/pops/loader/base_loader.rb:134
 msgid "Originally set %{original}."
 msgstr ""
 
-#: ../lib/puppet/pops/loader/base_loader.rb:124
+#: ../lib/puppet/pops/loader/base_loader.rb:134
 msgid "Set at unknown location"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/base_loader.rb:125
+#: ../lib/puppet/pops/loader/base_loader.rb:135
 msgid "Attempt to redefine entity '%{name}'. %{origin_info}"
 msgstr ""
 
@@ -6342,26 +6358,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 ""
@@ -6697,10 +6717,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 ""
@@ -6733,7 +6749,7 @@ msgstr ""
 msgid "Somehow got told to prefetch with no resource set"
 msgstr ""
 
-#: ../lib/puppet/provider/service/base.rb:121
+#: ../lib/puppet/provider/service/base.rb:123
 msgid "%{name} is not running"
 msgstr ""
 
@@ -6759,15 +6775,15 @@ msgstr ""
 msgid "Waiting 5 seconds for runsvdir to discover service %{service}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/smf.rb:120
+#: ../lib/puppet/provider/service/smf.rb:96
 msgid "Failed to get the FMRI of the %{service} service: The pattern '%{service}' matches multiple FMRIs! These are the FMRIs it matches: %{all_fmris}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/smf.rb:135
+#: ../lib/puppet/provider/service/smf.rb:111
 msgid "Cannot query if the %{service} service is complete: The concept of complete/incomplete services was introduced in Solaris 11.1. You are on a Solaris %{release} machine."
 msgstr ""
 
-#: ../lib/puppet/provider/service/smf.rb:221
+#: ../lib/puppet/provider/service/smf.rb:197
 msgid "The %{service} service is incomplete so its status will be reported as :stopped. See `svcs -xv %{fmri}` for more details."
 msgstr ""
 
@@ -7059,69 +7075,69 @@ msgstr ""
 msgid "Not attempting to load %{type} %{fqname} as this object was missing during a prior compilation"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:102
+#: ../lib/puppet/settings.rb:103
 msgid "New environment loaders generated from the requested section."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:304
+#: ../lib/puppet/settings.rb:305
 msgid "Attempting to initialize global default settings more than once!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:504
+#: ../lib/puppet/settings.rb:505
 msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:646
+#: ../lib/puppet/settings.rb:647
 msgid "Could not load %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:755
+#: ../lib/puppet/settings.rb:756
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:910
+#: ../lib/puppet/settings.rb:911
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:983
+#: ../lib/puppet/settings.rb:984
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:988
+#: ../lib/puppet/settings.rb:989
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:994
+#: ../lib/puppet/settings.rb:995
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1265
+#: ../lib/puppet/settings.rb:1266
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
-#: ../lib/puppet/settings.rb:1270
+#: ../lib/puppet/settings.rb:1271
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1447
+#: ../lib/puppet/settings.rb:1458
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1471
+#: ../lib/puppet/settings.rb:1482
 msgid "Could not find value for %{expression}"
 msgstr ""
 
 #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
-#: ../lib/puppet/settings.rb:1481
+#: ../lib/puppet/settings.rb:1492
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1482
+#: ../lib/puppet/settings.rb:1493
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1513
+#: ../lib/puppet/settings.rb:1524
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7215,19 +7231,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 ""
 
@@ -7584,7 +7600,7 @@ msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
 #. TRANSLATORS: `error` is an untranslated message from openssl describing why a certificate in the server's chain is invalid, and `subject` is the identity/name of the failed certificate
-#: ../lib/puppet/ssl/verifier.rb:130
+#: ../lib/puppet/ssl/verifier.rb:134
 msgid "certificate verify failed [%{error} for %{subject}]"
 msgstr ""
 
@@ -8001,74 +8017,74 @@ msgstr ""
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:416
+#: ../lib/puppet/type/file.rb:433
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:418
+#: ../lib/puppet/type/file.rb:435
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:420
+#: ../lib/puppet/type/file.rb:437
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:423
+#: ../lib/puppet/type/file.rb:440
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:426
+#: ../lib/puppet/type/file.rb:443
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:434
+#: ../lib/puppet/type/file.rb:451
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:437
+#: ../lib/puppet/type/file.rb:454
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:475
+#: ../lib/puppet/type/file.rb:492
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:480
+#: ../lib/puppet/type/file.rb:497
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:778
+#: ../lib/puppet/type/file.rb:796
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:793
+#: ../lib/puppet/type/file.rb:811
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:804
+#: ../lib/puppet/type/file.rb:822
 msgid "Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore."
 msgstr ""
 
 #. TRANSLATORS "stat" is a program name and should not be translated
-#: ../lib/puppet/type/file.rb:885 ../lib/puppet/type/tidy.rb:352
+#: ../lib/puppet/type/file.rb:903 ../lib/puppet/type/tidy.rb:371
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:888
+#: ../lib/puppet/type/file.rb:906
 msgid "Could not stat; invalid pathname"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1016
+#: ../lib/puppet/type/file.rb:1034
 msgid "Not removing directory; use 'force' to override"
 msgstr ""
 
 #. TRANSLATORS refers to a file which could not be backed up
-#: ../lib/puppet/type/file.rb:1041
+#: ../lib/puppet/type/file.rb:1059
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1056
+#: ../lib/puppet/type/file.rb:1074
 msgid "File written to disk did not match desired checksum; discarding changes (%{content_checksum} vs %{desired_checksum})"
 msgstr ""
 
@@ -8222,46 +8238,46 @@ msgstr ""
 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:152 ../lib/puppet/type/user.rb:271
 msgid "Passwords cannot include ':'"
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:304
+#: ../lib/puppet/type/service.rb:279
 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:301
+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 ""
 
@@ -8402,11 +8418,11 @@ msgstr ""
 msgid "path may not be nil"
 msgstr ""
 
-#: ../lib/puppet/util.rb:621
+#: ../lib/puppet/util.rb:630
 msgid "replace_file requires a block"
 msgstr ""
 
-#: ../lib/puppet/util.rb:625
+#: ../lib/puppet/util.rb:634
 msgid "replace_file default_mode: %{default_mode} is invalid"
 msgstr ""
 
@@ -9067,31 +9083,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 ""
 
@@ -9215,15 +9231,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 ""
 
@@ -9278,20 +9294,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 ""
 
@@ -9401,7 +9417,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:157 ../lib/puppet/util/windows/sid.rb:219 ../lib/puppet/util/windows/user.rb:59
 msgid "Invalid SID"
 msgstr ""
 
@@ -9557,19 +9573,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:96
 msgid "Octet string must be an array of bytes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:161
+#: ../lib/puppet/util/windows/sid.rb:163
 msgid "Failed to convert binary SID"
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:166
+#: ../lib/puppet/util/windows/sid.rb:168
 msgid "ConvertSidToStringSidW failed to allocate buffer for sid"
 msgstr ""
 
-#: ../lib/puppet/util/windows/sid.rb:186
+#: ../lib/puppet/util/windows/sid.rb:188
 msgid "Failed to convert string SID: %{string_sid}"
 msgstr ""