puppet 6.19.1-x64-mingw32 → 6.23.0-x64-mingw32

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

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

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

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

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

@@ -191,7 +191,7 @@ module Puppet::Util::Windows
     SERVICE_CONFIG_PRESHUTDOWN_INFO         = 0x00000007
     SERVICE_CONFIG_TRIGGER_INFO             = 0x00000008
     SERVICE_CONFIG_PREFERRED_NODE           = 0x00000009
-    SERVICE_CONFIG_LAUNCH_PROTECTED         = 0x00000012
+    SERVICE_CONFIG_LAUNCH_PROTECTED         = 0x0000000C
     SERVICE_NO_CHANGE                       = 0xffffffff
     SERVICE_CONFIG_TYPES = {
       SERVICE_CONFIG_DESCRIPTION => :SERVICE_CONFIG_DESCRIPTION,

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

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

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

data/locales/puppet.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2020 Puppet, Inc.
+# Copyright (C) 2021 Puppet, Inc.
 # This file is distributed under the same license as the Puppet automation framework package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.18.0-104-g9f65e07e38\n"
+"Project-Id-Version: Puppet automation framework 6.22.1-63-ga15932f0d4\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2020-10-13 14:34+0000\n"
-"PO-Revision-Date: 2020-10-13 14:34+0000\n"
+"POT-Creation-Date: 2021-05-25 15:33+0000\n"
+"PO-Revision-Date: 2021-05-25 15:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -168,11 +168,11 @@ msgstr ""
 msgid "No valid command or main"
 msgstr ""
 
-#: ../lib/puppet/application.rb:428
+#: ../lib/puppet/application.rb:431
 msgid "Could not set logdest to %{dest}."
 msgstr ""
 
-#: ../lib/puppet/application.rb:504
+#: ../lib/puppet/application.rb:508
 msgid "No help available for puppet %{app_name}"
 msgstr ""
 
@@ -184,19 +184,19 @@ msgstr ""
 msgid "The puppet agent daemon"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:414
+#: ../lib/puppet/application/agent.rb:422
 msgid "Fingerprint asked but neither the certificate, nor the certificate request have been issued"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:419
+#: ../lib/puppet/application/agent.rb:427
 msgid "Failed to generate fingerprint: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:442
+#: ../lib/puppet/application/agent.rb:450
 msgid "Starting Puppet client version %{version}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:458
+#: ../lib/puppet/application/agent.rb:466
 msgid "The puppet agent command does not take parameters"
 msgstr ""
 
@@ -206,35 +206,35 @@ msgstr ""
 
 #. TRANSLATORS "puppet apply" is a program command and should not be translated
 #. TRANSLATORS "puppet apply" is a program command and should not be translated
-#: ../lib/puppet/application/apply.rb:207 ../lib/puppet/application/apply.rb:320
+#: ../lib/puppet/application/apply.rb:209 ../lib/puppet/application/apply.rb:322
 msgid "For puppet apply"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:215
+#: ../lib/puppet/application/apply.rb:217
 msgid "%{file} is not readable"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:286 ../lib/puppet/application/script.rb:239
+#: ../lib/puppet/application/apply.rb:288 ../lib/puppet/application/script.rb:241
 msgid "Exiting"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:330
+#: ../lib/puppet/application/apply.rb:332
 msgid "Could not deserialize catalog from %{format}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:351 ../lib/puppet/application/script.rb:144
+#: ../lib/puppet/application/apply.rb:353 ../lib/puppet/application/script.rb:146
 msgid "Could not find facts for %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:363 ../lib/puppet/application/script.rb:152
+#: ../lib/puppet/application/apply.rb:365 ../lib/puppet/application/script.rb:154
 msgid "Could not find node %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:376 ../lib/puppet/application/script.rb:137
+#: ../lib/puppet/application/apply.rb:378 ../lib/puppet/application/script.rb:139
 msgid "Could not find file %{manifest}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:377
+#: ../lib/puppet/application/apply.rb:379
 msgid "Only one file can be applied per run.  Skipping %{files}"
 msgstr ""
 
@@ -250,47 +250,47 @@ msgstr ""
 msgid "Manage remote network devices"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:230
+#: ../lib/puppet/application/device.rb:232
 msgid "resource command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:233
+#: ../lib/puppet/application/device.rb:235
 msgid "facts command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:236
+#: ../lib/puppet/application/device.rb:238
 msgid "missing argument: --target is required when using --apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:237
+#: ../lib/puppet/application/device.rb:239
 msgid "%{file} does not exist, cannot apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:255
+#: ../lib/puppet/application/device.rb:257
 msgid "Target device / certificate '%{target}' not found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:257
+#: ../lib/puppet/application/device.rb:259
 msgid "No device found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:316
+#: ../lib/puppet/application/device.rb:318
 msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:331
+#: ../lib/puppet/application/device.rb:333
 msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:354
+#: ../lib/puppet/application/device.rb:356
 msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:392 ../lib/puppet/application/resource.rb:196
+#: ../lib/puppet/application/device.rb:394 ../lib/puppet/application/resource.rb:197
 msgid "You must specify the type to display"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:393 ../lib/puppet/application/resource.rb:197
+#: ../lib/puppet/application/device.rb:395 ../lib/puppet/application/resource.rb:198
 msgid "Could not find type %{type}"
 msgstr ""
 
@@ -414,7 +414,7 @@ msgstr ""
 msgid "Unknown rendering format '%{format}'"
 msgstr ""
 
-#: ../lib/puppet/application/lookup.rb:366 ../lib/puppet/face/epp.rb:520
+#: ../lib/puppet/application/lookup.rb:366 ../lib/puppet/face/epp.rb:530
 msgid "Incorrect formatted data in %{fact_file} given via the --facts flag"
 msgstr ""
 
@@ -422,15 +422,15 @@ msgstr ""
 msgid "The resource abstraction layer shell"
 msgstr ""
 
-#: ../lib/puppet/application/resource.rb:140
+#: ../lib/puppet/application/resource.rb:141
 msgid "Editing with Yaml output is not supported"
 msgstr ""
 
-#: ../lib/puppet/application/resource.rb:204
+#: ../lib/puppet/application/resource.rb:205
 msgid "Invalid parameter setting %{setting}"
 msgstr ""
 
-#: ../lib/puppet/application/resource.rb:226
+#: ../lib/puppet/application/resource.rb:227
 msgid "Listing all file instances is not supported.  Please specify a file or directory, e.g. puppet resource file /etc"
 msgstr ""
 
@@ -438,11 +438,11 @@ msgstr ""
 msgid "Run a puppet manifests as a script without compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/application/script.rb:124
+#: ../lib/puppet/application/script.rb:126
 msgid "Bolt must be installed to use the script application"
 msgstr ""
 
-#: ../lib/puppet/application/script.rb:138
+#: ../lib/puppet/application/script.rb:140
 msgid "Only one file can be used per run. Skipping %{files}"
 msgstr ""
 
@@ -450,59 +450,59 @@ msgstr ""
 msgid "Manage SSL keys and certificates for puppet SSL clients"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:103
+#: ../lib/puppet/application/ssl.rb:106
 msgid "An action must be specified."
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:126 ../lib/puppet/application/ssl.rb:133
+#: ../lib/puppet/application/ssl.rb: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/ssl/key.rb:26
+#: ../lib/puppet/application/ssl.rb:168 ../lib/puppet/ssl/key.rb:26
 msgid "Creating a new SSL key for %{name}"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:167
+#: ../lib/puppet/application/ssl.rb: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"
@@ -510,7 +510,7 @@ msgid ""
 "  puppet ssl clean\n"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:262
+#: ../lib/puppet/application/ssl.rb:273
 msgid "Removed %{label} %{path}"
 msgstr ""
 
@@ -550,81 +550,81 @@ msgstr ""
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:228
+#: ../lib/puppet/configurer.rb:227
 msgid "Could not select a functional puppet server from server_list: '%{server_list}'"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:231
+#: ../lib/puppet/configurer.rb:241
 msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:280
+#: ../lib/puppet/configurer.rb:277
 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:325
+#: ../lib/puppet/configurer.rb:322
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:340
+#: ../lib/puppet/configurer.rb:337
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:344
+#: ../lib/puppet/configurer.rb:341
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:372
+#: ../lib/puppet/configurer.rb:369
 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:383
+#: ../lib/puppet/configurer.rb:380
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:385
+#: ../lib/puppet/configurer.rb:382
 msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:426
+#: ../lib/puppet/configurer.rb:436
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:455 ../lib/puppet/http/resolver/server_list.rb:67
+#: ../lib/puppet/configurer.rb:465 ../lib/puppet/http/resolver/server_list.rb:68 ../lib/puppet/http/resolver/server_list.rb:72
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:459 ../lib/puppet/http/resolver/server_list.rb:70
+#: ../lib/puppet/configurer.rb:469 ../lib/puppet/http/resolver/server_list.rb:77 ../lib/puppet/http/resolver/server_list.rb:80
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:470 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:480 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:479
+#: ../lib/puppet/configurer.rb:489
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:498
+#: ../lib/puppet/configurer.rb:508
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:506
+#: ../lib/puppet/configurer.rb:516
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:521
+#: ../lib/puppet/configurer.rb:531
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:539
+#: ../lib/puppet/configurer.rb:549
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:560
+#: ../lib/puppet/configurer.rb:570
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -692,46 +692,50 @@ msgstr ""
 msgid "a data type can only have one implementation"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:178
+#: ../lib/puppet/defaults.rb:191
 msgid "Cannot disable unrecognized warning types '%{invalid}'."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:179
+#: ../lib/puppet/defaults.rb:192
 msgid "Valid values are '%{values}'."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:546
+#: ../lib/puppet/defaults.rb:559
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:548
+#: ../lib/puppet/defaults.rb:561
 msgid "Convert custom terminus to hiera 5 API."
 msgstr ""
 
 #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:771
+#: ../lib/puppet/defaults.rb:774
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:854
+#: ../lib/puppet/defaults.rb:859
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1048
+#: ../lib/puppet/defaults.rb:1054
 msgid "Setting 'ssl_client_ca_auth' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1127 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1141 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
 #. TRANSLATORS 'pluginsync' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:2005
+#: ../lib/puppet/defaults.rb:2017
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
+#: ../lib/puppet/defaults.rb:2252
+msgid "The 'func3x_check' setting is deprecated and will be removed in a future release."
+msgstr ""
+
 #: ../lib/puppet/error.rb:77
 msgid "Could not parse for environment %{environment}: %{message}"
 msgstr ""
@@ -774,7 +778,7 @@ msgstr ""
 msgid "no matching resources found"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:7 ../lib/puppet/face/epp.rb:8 ../lib/puppet/face/facts.rb:6 ../lib/puppet/face/generate.rb:7 ../lib/puppet/face/help.rb:9 ../lib/puppet/face/key.rb:5 ../lib/puppet/face/man.rb:8 ../lib/puppet/face/module.rb:9 ../lib/puppet/face/node.rb:4 ../lib/puppet/face/parser.rb:6 ../lib/puppet/face/plugin.rb:6 ../lib/puppet/face/report.rb:5 ../lib/puppet/face/resource.rb:5 ../lib/puppet/face/status.rb:5
+#: ../lib/puppet/face/config.rb:7 ../lib/puppet/face/epp.rb:8 ../lib/puppet/face/facts.rb:22 ../lib/puppet/face/generate.rb:7 ../lib/puppet/face/help.rb:9 ../lib/puppet/face/key.rb:5 ../lib/puppet/face/man.rb:8 ../lib/puppet/face/module.rb:9 ../lib/puppet/face/node.rb:4 ../lib/puppet/face/parser.rb:6 ../lib/puppet/face/plugin.rb:6 ../lib/puppet/face/report.rb:5 ../lib/puppet/face/resource.rb:5 ../lib/puppet/face/status.rb:5
 msgid "Apache 2 license; see COPYING"
 msgstr ""
 
@@ -840,28 +844,28 @@ msgid ""
 "https://puppet.com/docs/puppet/latest/configuration.html#environment\n"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:176
+#: ../lib/puppet/face/config.rb:186
 msgid "Deleted setting from '%{section_name}': '%{setting_string}', and adding it to 'server' section"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:191
+#: ../lib/puppet/face/config.rb:201
 msgid "Delete a Puppet setting."
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:192
+#: ../lib/puppet/face/config.rb:202
 msgid "<setting>"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:226 ../lib/puppet/face/config.rb:230 ../lib/puppet/face/config.rb:241
+#: ../lib/puppet/face/config.rb:236 ../lib/puppet/face/config.rb:240 ../lib/puppet/face/config.rb:251
 msgid "Deleted setting from '%{section_name}': '%{setting_string}'"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:244
+#: ../lib/puppet/face/config.rb:254
 msgid "No setting found in configuration file for section '%{section_name}' setting name '%{name}'"
 msgstr ""
 
 #. TRANSLATORS the 'puppet.conf' is a specific file and should not be translated
-#: ../lib/puppet/face/config.rb:252
+#: ../lib/puppet/face/config.rb:262
 msgid "The puppet.conf file does not exist %{puppet_conf}"
 msgstr ""
 
@@ -1011,26 +1015,86 @@ msgstr ""
 msgid "--values option must evaluate to a Hash or undef, got: '%{values_class}'"
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:8
+#: ../lib/puppet/face/facts.rb:24
 msgid "Retrieve and store facts."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:16
+#: ../lib/puppet/face/facts.rb:32
 msgid "Retrieve a node's facts."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:17
+#: ../lib/puppet/face/facts.rb:33
 msgid "[<node_certname>]"
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:40
+#: ../lib/puppet/face/facts.rb:56
 msgid "Upload local facts to the puppet master."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:82
+#: ../lib/puppet/face/facts.rb:98
 msgid "Uploading facts for '%{node}' to '%{server}'"
 msgstr ""
 
+#: ../lib/puppet/face/facts.rb:108
+msgid "Compare Facter 3 output with Facter 4 output"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:122
+msgid "Render the different facts as structured."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:125
+msgid "<regex>"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:126
+msgid "Regex used to exclude specific facts from diff."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:151
+msgid "Already using Facter 4. To use `puppet facts diff` remove facterng from the .conf file or run `puppet config set facterng false`."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:167
+msgid "Retrieve current node's facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:168
+msgid "[<facts>]"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:183 ../lib/puppet/face/facts.rb:188 ../lib/puppet/face/facts.rb:193 ../lib/puppet/face/module/changes.rb:21
+msgid "<path>"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:185
+msgid "The location of the config file for Facter."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:190
+msgid "The path to a directory that contains custom facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:195
+msgid "The path to a directory that contains external facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:199
+msgid "Disable fact blocking mechanism."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:203
+msgid "Disable fact caching mechanism."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:207
+msgid "Show legacy facts when querying all facts."
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:211
+msgid "Show only the value when the action is called with a single query"
+msgstr ""
+
 #: ../lib/puppet/face/generate.rb:9
 msgid "Generates Puppet code from Ruby definitions."
 msgstr ""
@@ -1194,10 +1258,6 @@ msgstr ""
 msgid "Array of strings representing paths of modified files."
 msgstr ""
 
-#: ../lib/puppet/face/module/changes.rb:21
-msgid "<path>"
-msgstr ""
-
 #: ../lib/puppet/face/module/changes.rb:27
 msgid "Could not find a valid module at %{path}"
 msgstr ""
@@ -1690,21 +1750,29 @@ msgstr ""
 msgid "Fileset paths must be fully qualified: %{path}"
 msgstr ""
 
-#: ../lib/puppet/file_serving/fileset.rb:50
+#: ../lib/puppet/file_serving/fileset.rb:51
 msgid "Fileset paths must exist"
 msgstr ""
 
 #. TRANSLATORS "recurse" and "recurselimit" are parameter names and should not be translated
-#: ../lib/puppet/file_serving/fileset.rb:52
+#: ../lib/puppet/file_serving/fileset.rb:53
 msgid "Fileset recurse parameter must not be a number anymore, please use recurselimit"
 msgstr ""
 
+#: ../lib/puppet/file_serving/fileset.rb:69
+msgid "The directory '%{path}' contains %{entries} entries, which exceeds the limit of %{munged_max_files} specified by the max_files parameter for this resource. The limit may be increased, but be aware that large number of file resources can result in excessive resource consumption and degraded performance. Consider using an alternate method to manage large directory trees"
+msgstr ""
+
+#: ../lib/puppet/file_serving/fileset.rb:71
+msgid "The directory '%{path}' contains %{entries} entries, which exceeds the default soft limit %{soft_max_files} and may cause excessive resource consumption and degraded performance. To remove this warning set a value for `max_files` parameter or consider using an alternate method to manage large directory trees"
+msgstr ""
+
 #. TRANSLATORS ":links" is a parameter name and should not be translated
-#: ../lib/puppet/file_serving/fileset.rb:80
+#: ../lib/puppet/file_serving/fileset.rb:92
 msgid "Invalid :links value '%{links}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/fileset.rb:93
+#: ../lib/puppet/file_serving/fileset.rb:105
 msgid "Invalid option '%{option}'"
 msgstr ""
 
@@ -1832,11 +1900,11 @@ msgstr ""
 msgid "%{dest} already exists and the :force option was not specified"
 msgstr ""
 
-#: ../lib/puppet/file_system/windows.rb:202
+#: ../lib/puppet/file_system/windows.rb:204
 msgid "This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required."
 msgstr ""
 
-#: ../lib/puppet/file_system/windows.rb:207
+#: ../lib/puppet/file_system/windows.rb:209
 msgid "The current user does not have the necessary permission to manage symlinks."
 msgstr ""
 
@@ -2276,6 +2344,10 @@ msgstr ""
 msgid "Location URI is invalid: %{detail}"
 msgstr ""
 
+#: ../lib/puppet/http/resolver/server_list.rb:70 ../lib/puppet/http/resolver/server_list.rb:78
+msgid "Trying with next server from server_list."
+msgstr ""
+
 #: ../lib/puppet/http/retry_after_handler.rb:83
 msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
 msgstr ""
@@ -2350,87 +2422,87 @@ msgstr ""
 msgid "Inlining file metadata"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:259
+#: ../lib/puppet/indirector/catalog/compiler.rb:260
 msgid "Could not get metadata for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:280
+#: ../lib/puppet/indirector/catalog/compiler.rb:281
 msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:287
+#: ../lib/puppet/indirector/catalog/compiler.rb:288
 msgid "Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:288
+#: ../lib/puppet/indirector/catalog/compiler.rb:289
 msgid "Compiled static catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:290
+#: ../lib/puppet/indirector/catalog/compiler.rb:291
 msgid "Compiled static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:291
+#: ../lib/puppet/indirector/catalog/compiler.rb:292
 msgid "Compiled static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:296
+#: ../lib/puppet/indirector/catalog/compiler.rb:297
 msgid "Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:297
+#: ../lib/puppet/indirector/catalog/compiler.rb:298
 msgid "Compiled catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:299
+#: ../lib/puppet/indirector/catalog/compiler.rb:300
 msgid "Compiled catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:300
+#: ../lib/puppet/indirector/catalog/compiler.rb:301
 msgid "Compiled catalog for %{node}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:322
+#: ../lib/puppet/indirector/catalog/compiler.rb:323
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:324
+#: ../lib/puppet/indirector/catalog/compiler.rb:325
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:327
+#: ../lib/puppet/indirector/catalog/compiler.rb:328
 msgid "Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:329
+#: ../lib/puppet/indirector/catalog/compiler.rb:330
 msgid "Inlined resource metadata into static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:346
+#: ../lib/puppet/indirector/catalog/compiler.rb:347
 msgid "Found node information"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:354
+#: ../lib/puppet/indirector/catalog/compiler.rb:355
 msgid "Failed when searching for node %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:374
+#: ../lib/puppet/indirector/catalog/compiler.rb:375
 msgid "Invalid option use_node for a remote request"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:393
+#: ../lib/puppet/indirector/catalog/compiler.rb:394
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:426
+#: ../lib/puppet/indirector/catalog/compiler.rb:427
 msgid "Could not retrieve fact servername"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:435
+#: ../lib/puppet/indirector/catalog/compiler.rb:436
 msgid "Could not retrieve either serverip or serverip6 fact"
 msgstr ""
 
@@ -2534,7 +2606,11 @@ msgstr ""
 msgid "You cannot save facts to the code store; it is only used for getting facts from Facter"
 msgstr ""
 
-#: ../lib/puppet/indirector/facts/facter.rb:56
+#: ../lib/puppet/indirector/facts/facter.rb:36
+msgid "puppet facts show requires version 4.0.40 or greater of Facter."
+msgstr ""
+
+#: ../lib/puppet/indirector/facts/facter.rb:62
 msgid "Loading facts"
 msgstr ""
 
@@ -2708,11 +2784,11 @@ msgstr ""
 msgid "invalid key"
 msgstr ""
 
-#: ../lib/puppet/indirector/json.rb:58
+#: ../lib/puppet/indirector/json.rb:62
 msgid "Could not read JSON data for %{name} %{key}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/json.rb:64
+#: ../lib/puppet/indirector/json.rb:68
 msgid "Could not parse JSON data for %{name} %{key}: %{detail}"
 msgstr ""
 
@@ -2769,6 +2845,14 @@ msgstr ""
 msgid "Could not load external node results for %{name}: %{detail}"
 msgstr ""
 
+#: ../lib/puppet/indirector/report/json.rb:19 ../lib/puppet/indirector/report/yaml.rb:19
+msgid "replace_file mode: %{mode} is invalid"
+msgstr ""
+
+#: ../lib/puppet/indirector/report/json.rb:31 ../lib/puppet/indirector/report/yaml.rb:31 ../lib/puppet/indirector/yaml.rb:32
+msgid "Could not save %{indirection} %{request}: %{detail}"
+msgstr ""
+
 #: ../lib/puppet/indirector/report/processor.rb:39
 msgid "Report %{report} failed: %{detail}"
 msgstr ""
@@ -2781,14 +2865,6 @@ msgstr ""
 msgid "Server version %{version} does not accept reports in '%{format}', use `preferred_serialization_format=pson`"
 msgstr ""
 
-#: ../lib/puppet/indirector/report/yaml.rb:19
-msgid "replace_file mode: %{mode} is invalid"
-msgstr ""
-
-#: ../lib/puppet/indirector/report/yaml.rb:31 ../lib/puppet/indirector/yaml.rb:32
-msgid "Could not save %{indirection} %{request}: %{detail}"
-msgstr ""
-
 #: ../lib/puppet/indirector/request.rb:103
 msgid "Could not find indirection '%{indirection}'"
 msgstr ""
@@ -2987,8 +3063,8 @@ msgstr ""
 msgid "Option %{option} conflicts with existing option %{conflict} on %{face}"
 msgstr ""
 
-#. TRANSLATORS 'Puppet.settings' should not be translated
 #. TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
+#. TRANSLATORS 'Puppet.settings' 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 ""
@@ -3344,11 +3420,11 @@ msgstr ""
 msgid "Resolving dependencies ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:162
+#: ../lib/puppet/module_tool/applications/installer.rb:208
 msgid "Preparing to install ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:165
+#: ../lib/puppet/module_tool/applications/installer.rb:211
 msgid "Installing -- do not interrupt ..."
 msgstr ""
 
@@ -3392,7 +3468,7 @@ msgstr ""
 msgid "'%{module_name}' (%{version}) requested; '%{module_name}' (%{installed_version}) already installed"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/installer.rb:16 ../lib/puppet/module_tool/errors/installer.rb:54 ../lib/puppet/module_tool/errors/installer.rb:72 ../lib/puppet/module_tool/errors/shared.rb:64 ../lib/puppet/module_tool/errors/shared.rb:106
+#: ../lib/puppet/module_tool/errors/installer.rb:16 ../lib/puppet/module_tool/errors/installer.rb:54 ../lib/puppet/module_tool/errors/installer.rb:72 ../lib/puppet/module_tool/errors/shared.rb:79 ../lib/puppet/module_tool/errors/shared.rb:121
 msgid "Could not install module '%{module_name}' (%{version})"
 msgstr ""
 
@@ -3422,7 +3498,7 @@ msgstr ""
 msgid "Could not install '%{requested_package}'"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/installer.rb:38 ../lib/puppet/module_tool/errors/shared.rb:43
+#: ../lib/puppet/module_tool/errors/installer.rb:38 ../lib/puppet/module_tool/errors/shared.rb:58
 msgid "  No releases are available from %{source}"
 msgstr ""
 
@@ -3467,150 +3543,162 @@ msgstr ""
 msgid "  Package attempted to install file into %{path} under %{directory}."
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:11
+#: ../lib/puppet/module_tool/errors/shared.rb:12
 msgid "Could not %{action} '%{module_name}' (%{version}); no version satisfies all dependencies"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:16 ../lib/puppet/module_tool/errors/shared.rb:171 ../lib/puppet/module_tool/errors/upgrader.rb:58
+#: ../lib/puppet/module_tool/errors/shared.rb:17 ../lib/puppet/module_tool/errors/shared.rb:186 ../lib/puppet/module_tool/errors/upgrader.rb:58
 msgid "Could not %{action} module '%{module_name}' (%{version})"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:17
-msgid "  No version of '%{module_name}' can satisfy all dependencies"
+#: ../lib/puppet/module_tool/errors/shared.rb:20
+msgid "  The requested version cannot satisfy one or more of the following installed modules:"
+msgstr ""
+
+#: ../lib/puppet/module_tool/errors/shared.rb:22
+msgid "    %{name}, installed: %{current_version}, expected: %{constraints}"
+msgstr ""
+
+#: ../lib/puppet/module_tool/errors/shared.rb:25
+msgid "    %{mod}, expects '%{name}': %{range}"
+msgstr ""
+
+#: ../lib/puppet/module_tool/errors/shared.rb:30
+msgid "  The requested version cannot satisfy all dependencies"
 msgstr ""
 
 #. TRANSLATORS `puppet module %{action} --ignore-dependencies` is a command line and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:19
-msgid "    Use `puppet module %{action} --ignore-dependencies` to %{action} only this module"
+#: ../lib/puppet/module_tool/errors/shared.rb:34
+msgid "  Use `puppet module %{action} '%{module_name}' --ignore-dependencies` to %{action} only this module"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:33
+#: ../lib/puppet/module_tool/errors/shared.rb:48
 msgid "Could not %{action} '%{module_name}'; no releases are available from %{source}"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:35
+#: ../lib/puppet/module_tool/errors/shared.rb:50
 msgid "Could not %{action} '%{module_name}'; no releases matching '%{version}' are available from %{source}"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:41
+#: ../lib/puppet/module_tool/errors/shared.rb:56
 msgid "Could not %{action} '%{module_name}' (%{version})"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:44
+#: ../lib/puppet/module_tool/errors/shared.rb:59
 msgid "    Does '%{module_name}' have at least one published release?"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:46
+#: ../lib/puppet/module_tool/errors/shared.rb:61
 msgid "  No releases matching '%{requested_version}' are available from %{source}"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:59
+#: ../lib/puppet/module_tool/errors/shared.rb:74
 msgid "'%{module_name}' (%{version}) requested; installation conflict"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:67
+#: ../lib/puppet/module_tool/errors/shared.rb:82
 msgid "  Dependency '%{name}' (%{version}) would overwrite %{directory}"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:69
+#: ../lib/puppet/module_tool/errors/shared.rb:84
 msgid "  Installation would overwrite %{directory}"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:73
+#: ../lib/puppet/module_tool/errors/shared.rb:88
 msgid "    Currently, '%{current_name}' (%{current_version}) is installed to that directory"
 msgstr ""
 
 #. TRANSLATORS `puppet module install --ignore-dependencies` is a command line and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:78
+#: ../lib/puppet/module_tool/errors/shared.rb:93
 msgid "    Use `puppet module install --ignore-dependencies` to install only this module"
 msgstr ""
 
 #. TRANSLATORS `puppet module install --force` is a command line and should not be translated
 #. TRANSLATORS `puppet module install --force` is a command line and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:81 ../lib/puppet/module_tool/errors/shared.rb:110
+#: ../lib/puppet/module_tool/errors/shared.rb:96 ../lib/puppet/module_tool/errors/shared.rb:125
 msgid "    Use `puppet module install --force` to install this module anyway"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:95
+#: ../lib/puppet/module_tool/errors/shared.rb:110
 msgid "'%{module_name}' (%{version}) requested; Invalid dependency cycle"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:100
+#: ../lib/puppet/module_tool/errors/shared.rb:115
 msgid "You specified '%{name}' (%{version})"
 msgstr ""
 
 #. TRANSLATORS This message repeats as separate lines as a list under the heading "You specified '%{name}' (%{version})\n"
-#: ../lib/puppet/module_tool/errors/shared.rb:103
+#: ../lib/puppet/module_tool/errors/shared.rb:118
 msgid "This depends on '%{name}' (%{version})"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:107
+#: ../lib/puppet/module_tool/errors/shared.rb:122
 msgid "  No version of '%{module_name}' will satisfy dependencies"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:120
+#: ../lib/puppet/module_tool/errors/shared.rb:135
 msgid "Could not %{action} '%{module_name}'; module is not installed"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:125 ../lib/puppet/module_tool/errors/shared.rb:148 ../lib/puppet/module_tool/errors/shared.rb:189
+#: ../lib/puppet/module_tool/errors/shared.rb:140 ../lib/puppet/module_tool/errors/shared.rb:163 ../lib/puppet/module_tool/errors/shared.rb:204
 msgid "Could not %{action} module '%{module_name}'"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:126
+#: ../lib/puppet/module_tool/errors/shared.rb:141
 msgid "  Module '%{module_name}' is not installed"
 msgstr ""
 
 #. TRANSLATORS `puppet module %{action} %{suggestion}` is a command line and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:129
+#: ../lib/puppet/module_tool/errors/shared.rb:144
 msgid "    You may have meant `puppet module %{action} %{suggestion}`"
 msgstr ""
 
 #. TRANSLATORS `puppet module install` is a command line and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:132
+#: ../lib/puppet/module_tool/errors/shared.rb:147
 msgid "    Use `puppet module install` to install this module"
 msgstr ""
 
 #. TRANSLATORS "module path" refers to a set of directories where modules may be installed
-#: ../lib/puppet/module_tool/errors/shared.rb:143
+#: ../lib/puppet/module_tool/errors/shared.rb:158
 msgid "Could not %{action} '%{module_name}'; module appears in multiple places in the module path"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:149
+#: ../lib/puppet/module_tool/errors/shared.rb:164
 msgid "  Module '%{module_name}' appears multiple places in the module path"
 msgstr ""
 
 #. TRANSLATORS This is repeats as separate lines as a list under "Module '%{module_name}' appears multiple places in the module path"
-#: ../lib/puppet/module_tool/errors/shared.rb:152
+#: ../lib/puppet/module_tool/errors/shared.rb:167
 msgid "    '%{module_name}' (%{version}) was found in %{path}"
 msgstr ""
 
 #. TRANSLATORS `--modulepath` is command line option and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:155
+#: ../lib/puppet/module_tool/errors/shared.rb:170
 msgid "    Use the `--modulepath` option to limit the search to specific directories"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:166
+#: ../lib/puppet/module_tool/errors/shared.rb:181
 msgid "Could not %{action} '%{module_name}'; module has had changes made locally"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:172
+#: ../lib/puppet/module_tool/errors/shared.rb:187
 msgid "  Installed module has had changes made locally"
 msgstr ""
 
 #. TRANSLATORS `puppet module %{action} --ignore-changes` is a command line and should not be translated
-#: ../lib/puppet/module_tool/errors/shared.rb:174
+#: ../lib/puppet/module_tool/errors/shared.rb:189
 msgid "    Use `puppet module %{action} --ignore-changes` to %{action} this module anyway"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:184
+#: ../lib/puppet/module_tool/errors/shared.rb:199
 msgid "Could not %{action} '%{module_name}'; %{error}"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:190
+#: ../lib/puppet/module_tool/errors/shared.rb:205
 msgid "  Failure trying to parse metadata"
 msgstr ""
 
-#: ../lib/puppet/module_tool/errors/shared.rb:191
+#: ../lib/puppet/module_tool/errors/shared.rb:206
 msgid "    Original message was: %{message}"
 msgstr ""
 
@@ -4201,54 +4289,54 @@ msgstr ""
 
 #. TRANSLATORS: do not translate the variable names in this error message
 #. TRANSLATORS: do not translate the variable names in this error message
-#: ../lib/puppet/pal/pal_impl.rb:75 ../lib/puppet/pal/pal_impl.rb:173
+#: ../lib/puppet/pal/pal_impl.rb:75 ../lib/puppet/pal/pal_impl.rb:181
 msgid "manifest_file or code_string cannot be given when configured_by_env is true"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:221
+#: ../lib/puppet/pal/pal_impl.rb:237
 msgid "temporary environment name"
 msgstr ""
 
 #. TRANSLATORS: do not translate variable name string in these assertions
-#: ../lib/puppet/pal/pal_impl.rb:226
+#: ../lib/puppet/pal/pal_impl.rb:242
 msgid "A block must be given to 'in_tmp_environment'"
 msgstr ""
 
 #. TRANSLATORS terms in the assertions below are names of terms in code
-#: ../lib/puppet/pal/pal_impl.rb:280
+#: ../lib/puppet/pal/pal_impl.rb:296
 msgid "A block must be given to 'in_environment'"
 msgstr ""
 
 #. TRANSLATORS 'in_environment' is a name, do not translate
-#: ../lib/puppet/pal/pal_impl.rb:285
+#: ../lib/puppet/pal/pal_impl.rb:301
 msgid "The environment directory '%{env_dir}' does not exist"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:308
+#: ../lib/puppet/pal/pal_impl.rb:324
 msgid "No directory found for the environment '%{env_name}' on the path '%{envpath}'"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:362
+#: ../lib/puppet/pal/pal_impl.rb:378
 msgid "Given variables must be a hash, got %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:368
+#: ../lib/puppet/pal/pal_impl.rb:384
 msgid "Given variable '%{varname}' has illegal name"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:372
+#: ../lib/puppet/pal/pal_impl.rb:388
 msgid "Given value for '%{varname}' has illegal type - got: %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:509
+#: ../lib/puppet/pal/pal_impl.rb:562
 msgid "Puppet Pal: %{what}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:523
+#: ../lib/puppet/pal/pal_impl.rb:576
 msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:530
+#: ../lib/puppet/pal/pal_impl.rb:583
 msgid "A block must be given"
 msgstr ""
 
@@ -4961,23 +5049,23 @@ msgstr ""
 msgid "multi var assignment from class"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:742
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:761
 msgid "break() from context where this is illegal"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1222
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1241
 msgid "Can only append Array or Hash to a Hash"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1226
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1245
 msgid "An URI can only be merged with an URI or String"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1229
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1248
 msgid "Can only append Binary to a Binary"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1262
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1281
 msgid "Can only delete from an Array or Hash."
 msgstr ""
 
@@ -6800,26 +6888,30 @@ msgstr ""
 msgid "Mac OS X packages must specify a package source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:81
+#: ../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:163 ../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:174 ../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:178 ../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 ""
@@ -7155,10 +7247,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 ""
@@ -7625,69 +7713,69 @@ msgstr ""
 msgid "Downloaded existing certificate request for %{name} from %{server}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:98
+#: ../lib/puppet/settings.rb:99
 msgid "New environment loaders generated from the requested section."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:300
+#: ../lib/puppet/settings.rb:301
 msgid "Attempting to initialize global default settings more than once!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:500
+#: ../lib/puppet/settings.rb:501
 msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:642
+#: ../lib/puppet/settings.rb:643
 msgid "Could not load %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:748
+#: ../lib/puppet/settings.rb:750
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:903
+#: ../lib/puppet/settings.rb:905
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:966
+#: ../lib/puppet/settings.rb:978
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:971
+#: ../lib/puppet/settings.rb:983
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:977
+#: ../lib/puppet/settings.rb:989
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1241
+#: ../lib/puppet/settings.rb:1253
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
-#: ../lib/puppet/settings.rb:1246
+#: ../lib/puppet/settings.rb:1258
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1417
+#: ../lib/puppet/settings.rb:1445
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1441
+#: ../lib/puppet/settings.rb:1469
 msgid "Could not find value for %{expression}"
 msgstr ""
 
 #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
-#: ../lib/puppet/settings.rb:1451
+#: ../lib/puppet/settings.rb:1479
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1452
+#: ../lib/puppet/settings.rb:1480
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1483
+#: ../lib/puppet/settings.rb:1511
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7700,38 +7788,38 @@ msgid "Invalid autosign value %{value}: must be 'true'/'false' or an absolute pa
 msgstr ""
 
 #. TRANSLATORS ':%{name}', ':call_hook', and ':on_write_only' should not be translated
-#: ../lib/puppet/settings/base_setting.rb:15
+#: ../lib/puppet/settings/base_setting.rb:37
 msgid "Setting :%{name} :call_hook is nil, defaulting to :on_write_only"
 msgstr ""
 
 #. TRANSLATORS 'call_hook' is a Puppet option name and should not be translated
-#: ../lib/puppet/settings/base_setting.rb:20
+#: ../lib/puppet/settings/base_setting.rb:42
 msgid "Invalid option %{value} for call_hook"
 msgstr ""
 
 #. TRANSLATORS ':call_hook' and ':hook' are specific setting names and should not be translated
-#: ../lib/puppet/settings/base_setting.rb:77
+#: ../lib/puppet/settings/base_setting.rb:101
 msgid "Cannot reference :call_hook for :%{name} if no :hook is defined"
 msgstr ""
 
-#: ../lib/puppet/settings/base_setting.rb:83
+#: ../lib/puppet/settings/base_setting.rb:107
 msgid "%{class_name} (setting '%{setting}') does not accept %{parameter}"
 msgstr ""
 
-#: ../lib/puppet/settings/base_setting.rb:90
+#: ../lib/puppet/settings/base_setting.rb:114
 msgid "You must provide a description for the %{class_name} config option"
 msgstr ""
 
-#: ../lib/puppet/settings/base_setting.rb:104
+#: ../lib/puppet/settings/base_setting.rb:128
 msgid "Short names can only be one character."
 msgstr ""
 
 #. TRANSLATORS 'deprecated' is a Puppet setting and ':completely' and ':allowed_on_commandline' are possible values and should not be translated
-#: ../lib/puppet/settings/base_setting.rb:173
+#: ../lib/puppet/settings/base_setting.rb:197
 msgid "Unsupported deprecated value '%{deprecation}'."
 msgstr ""
 
-#: ../lib/puppet/settings/base_setting.rb:174
+#: ../lib/puppet/settings/base_setting.rb:198
 msgid "Supported values for deprecated are ':completely' or ':allowed_on_commandline'"
 msgstr ""
 
@@ -7781,19 +7869,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 ""
 
@@ -8643,74 +8731,74 @@ msgstr ""
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:418
+#: ../lib/puppet/type/file.rb:435
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:420
+#: ../lib/puppet/type/file.rb:437
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:422
+#: ../lib/puppet/type/file.rb:439
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:425
+#: ../lib/puppet/type/file.rb:442
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:428
+#: ../lib/puppet/type/file.rb:445
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:436
+#: ../lib/puppet/type/file.rb:453
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:439
+#: ../lib/puppet/type/file.rb:456
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:477
+#: ../lib/puppet/type/file.rb:494
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:482
+#: ../lib/puppet/type/file.rb:499
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:780
+#: ../lib/puppet/type/file.rb:798
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:795
+#: ../lib/puppet/type/file.rb:813
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:806
+#: ../lib/puppet/type/file.rb:824
 msgid "Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore."
 msgstr ""
 
 #. TRANSLATORS "stat" is a program name and should not be translated
-#: ../lib/puppet/type/file.rb:887 ../lib/puppet/type/tidy.rb:352
+#: ../lib/puppet/type/file.rb:905 ../lib/puppet/type/tidy.rb:371
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:890
+#: ../lib/puppet/type/file.rb:908
 msgid "Could not stat; invalid pathname"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1018
+#: ../lib/puppet/type/file.rb:1036
 msgid "Not removing directory; use 'force' to override"
 msgstr ""
 
 #. TRANSLATORS refers to a file which could not be backed up
-#: ../lib/puppet/type/file.rb:1043
+#: ../lib/puppet/type/file.rb:1061
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1058
+#: ../lib/puppet/type/file.rb:1076
 msgid "File written to disk did not match desired checksum; discarding changes (%{content_checksum} vs %{desired_checksum})"
 msgstr ""
 
@@ -8860,50 +8948,46 @@ msgstr ""
 msgid "%{value} is not a valid day of the week"
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:96
-msgid "Setting enable to %{value} is only supported on Microsoft Windows."
-msgstr ""
-
-#: ../lib/puppet/type/service.rb:166
-msgid "The 'logonaccount' parameter is mandatory when setting 'logonpassword'."
-msgstr ""
-
-#: ../lib/puppet/type/service.rb:167 ../lib/puppet/type/user.rb:271
+#: ../lib/puppet/type/service.rb:151 ../lib/puppet/type/user.rb:271
 msgid "Passwords cannot include ':'"
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:304
+#: ../lib/puppet/type/service.rb:278
 msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:85
+#: ../lib/puppet/type/service.rb:300
+msgid "The 'logonaccount' parameter is mandatory when setting 'logonpassword'."
+msgstr ""
+
+#: ../lib/puppet/type/tidy.rb:101
 msgid "Tidy can't use matches with recurse 0, false, or undef"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:125
+#: ../lib/puppet/type/tidy.rb:141
 msgid "Invalid age unit '%{unit}'"
 msgstr ""
 
 #. TRANSLATORS tidy is the name of a program and should not be translated
-#: ../lib/puppet/type/tidy.rb:145
+#: ../lib/puppet/type/tidy.rb:161
 msgid "Invalid tidy age %{age}"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:167
+#: ../lib/puppet/type/tidy.rb:183
 msgid "Invalid size unit '%{unit}'"
 msgstr ""
 
 #. TRANSLATORS tidy is the name of a program and should not be translated
-#: ../lib/puppet/type/tidy.rb:185
+#: ../lib/puppet/type/tidy.rb:201
 msgid "Invalid tidy size %{age}"
 msgstr ""
 
 #. TRANSLATORS "Tidy" is a program name and should not be translated
-#: ../lib/puppet/type/tidy.rb:275
+#: ../lib/puppet/type/tidy.rb:294
 msgid "Tidying %{count} files"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:348
+#: ../lib/puppet/type/tidy.rb:367
 msgid "File does not exist"
 msgstr ""
 
@@ -9084,7 +9168,7 @@ msgstr ""
 msgid "Could not autoload %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/autoload.rb:184
+#: ../lib/puppet/util/autoload.rb:177
 msgid "Autoload paths cannot be fully qualified"
 msgstr ""
 
@@ -9668,19 +9752,19 @@ msgstr ""
 msgid "Unable to write the file %{file_path}. %{error}"
 msgstr ""
 
-#: ../lib/puppet/util/posix.rb:22
+#: ../lib/puppet/util/posix.rb:29
 msgid "Removing any duplicate group entries"
 msgstr ""
 
-#: ../lib/puppet/util/posix.rb:35
+#: ../lib/puppet/util/posix.rb:75
 msgid "Did not get id from caller"
 msgstr ""
 
-#: ../lib/puppet/util/posix.rb:39 ../lib/puppet/util/posix.rb:64
+#: ../lib/puppet/util/posix.rb:79 ../lib/puppet/util/posix.rb:104
 msgid "Tried to get %{field} field for silly id %{id}"
 msgstr ""
 
-#: ../lib/puppet/util/posix.rb:92 ../lib/puppet/util/posix.rb:102 ../lib/puppet/util/posix.rb:112
+#: ../lib/puppet/util/posix.rb:132 ../lib/puppet/util/posix.rb:142 ../lib/puppet/util/posix.rb:152
 msgid "Can only handle users and groups"
 msgstr ""
 
@@ -9740,31 +9824,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 ""
 
@@ -9888,15 +9972,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 ""
 
@@ -9959,20 +10043,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 ""
 
@@ -10082,7 +10166,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 ""
 
@@ -10238,19 +10322,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 ""