puppet 6.15.0-x86-mingw32 → 6.19.1-x86-mingw32

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

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.14.0-210-g48e54bcd2c\n"
+"Project-Id-Version: Puppet automation framework 6.18.0-104-g9f65e07e38\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2020-04-21 01:04+0000\n"
-"PO-Revision-Date: 2020-04-21 01:04+0000\n"
+"POT-Creation-Date: 2020-10-13 14:34+0000\n"
+"PO-Revision-Date: 2020-10-13 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -44,25 +44,25 @@ msgstr ""
 msgid "Please supply a parameter to perform a Hiera lookup"
 msgstr ""
 
-#: ../lib/hiera_puppet.rb:75 ../lib/puppet/indirector/hiera.rb:81
+#: ../lib/hiera_puppet.rb:75 ../lib/puppet/indirector/hiera.rb:85
 msgid "Config file %{hiera_config} not found, using Hiera defaults"
 msgstr ""
 
-#: ../lib/puppet.rb:141
+#: ../lib/puppet.rb:144
 msgid "Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions."
 msgstr ""
 
-#: ../lib/puppet.rb:203
+#: ../lib/puppet.rb:230
 msgid "The environmentpath setting cannot be empty or nil."
 msgstr ""
 
 #. TRANSLATORS: `message` is an already translated string of why SSL failed to initialize
-#: ../lib/puppet.rb:233
+#: ../lib/puppet.rb:257
 msgid "Failed to initialize SSL: %{message}"
 msgstr ""
 
 #. TRANSLATORS: `puppet agent -t` is a command and should not be translated
-#: ../lib/puppet.rb:235
+#: ../lib/puppet.rb:259
 msgid "Run `puppet agent -t`"
 msgstr ""
 
@@ -72,27 +72,39 @@ msgid ""
 "Use 'puppet agent --enable' to re-enable."
 msgstr ""
 
-#: ../lib/puppet/agent.rb:63
+#: ../lib/puppet/agent.rb:68
 msgid "Run of %{client_class} already in progress; skipping  (%{lockfile_path} exists)"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:66
+#: ../lib/puppet/agent.rb:71
+msgid "Exiting now because the maxwaitforlock timeout has been exceeded."
+msgstr ""
+
+#: ../lib/puppet/agent.rb:74
+msgid "Another puppet instance is already running; --waitforlock flag used, waiting for running instance to finish."
+msgstr ""
+
+#: ../lib/puppet/agent.rb:75 ../lib/puppet/ssl/state_machine.rb:279 ../lib/puppet/ssl/state_machine.rb:310
+msgid "Will try again in %{time} seconds."
+msgstr ""
+
+#: ../lib/puppet/agent.rb:80
 msgid "Execution of %{client_class} did not complete within %{runtimeout} seconds and was terminated."
 msgstr ""
 
-#: ../lib/puppet/agent.rb:71
+#: ../lib/puppet/agent.rb:85
 msgid "Could not run %{client_class}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:78
+#: ../lib/puppet/agent.rb:92
 msgid "Shutdown/restart in progress (%{status}); skipping run"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:96
+#: ../lib/puppet/agent.rb:110
 msgid "puppet agent: applying configuration"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:119
+#: ../lib/puppet/agent.rb:133
 msgid "Could not create instance of %{client_class}: %{detail}"
 msgstr ""
 
@@ -108,16 +120,6 @@ msgstr ""
 msgid "Failed to acquire lock"
 msgstr ""
 
-#. TRANSLATORS 'Puppet::Agent::Locker.running?' is a method name and should not be translated
-#: ../lib/puppet/agent/locker.rb:33
-msgid "Puppet::Agent::Locker.running? is deprecated as it is inherently unsafe."
-msgstr ""
-
-#. TRANSLATORS 'LockError' should not be translated
-#: ../lib/puppet/agent/locker.rb:35
-msgid "The only safe way to know if the lock is locked is to try lock and perform some action and then handle the LockError that may result."
-msgstr ""
-
 #: ../lib/puppet/application.rb:238
 msgid "Unable to find application '%{application_name}'. %{error}"
 msgstr ""
@@ -182,19 +184,19 @@ msgstr ""
 msgid "The puppet agent daemon"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:398
+#: ../lib/puppet/application/agent.rb:414
 msgid "Fingerprint asked but neither the certificate, nor the certificate request have been issued"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:403
+#: ../lib/puppet/application/agent.rb:419
 msgid "Failed to generate fingerprint: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:426
+#: ../lib/puppet/application/agent.rb:442
 msgid "Starting Puppet client version %{version}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:442
+#: ../lib/puppet/application/agent.rb:458
 msgid "The puppet agent command does not take parameters"
 msgstr ""
 
@@ -204,7 +206,7 @@ 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:322
+#: ../lib/puppet/application/apply.rb:207 ../lib/puppet/application/apply.rb:320
 msgid "For puppet apply"
 msgstr ""
 
@@ -212,27 +214,27 @@ msgstr ""
 msgid "%{file} is not readable"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:293 ../lib/puppet/application/script.rb:239
+#: ../lib/puppet/application/apply.rb:286 ../lib/puppet/application/script.rb:239
 msgid "Exiting"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:332
+#: ../lib/puppet/application/apply.rb:330
 msgid "Could not deserialize catalog from %{format}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:353 ../lib/puppet/application/script.rb:144
+#: ../lib/puppet/application/apply.rb:351 ../lib/puppet/application/script.rb:144
 msgid "Could not find facts for %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:365 ../lib/puppet/application/script.rb:152
+#: ../lib/puppet/application/apply.rb:363 ../lib/puppet/application/script.rb:152
 msgid "Could not find node %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:378 ../lib/puppet/application/script.rb:137
+#: ../lib/puppet/application/apply.rb:376 ../lib/puppet/application/script.rb:137
 msgid "Could not find file %{manifest}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:379
+#: ../lib/puppet/application/apply.rb:377
 msgid "Only one file can be applied per run.  Skipping %{files}"
 msgstr ""
 
@@ -388,31 +390,31 @@ msgid ""
 "%{run_help}"
 msgstr ""
 
-#: ../lib/puppet/application/lookup.rb:99
+#: ../lib/puppet/application/lookup.rb:105
 msgid "Interactive Hiera lookup"
 msgstr ""
 
-#: ../lib/puppet/application/lookup.rb:266
+#: ../lib/puppet/application/lookup.rb:272
 msgid ""
 "The options %{deep_merge_opts} are only available with '--merge deep'\n"
 "%{run_help}"
 msgstr ""
 
-#: ../lib/puppet/application/lookup.rb:277
+#: ../lib/puppet/application/lookup.rb:283
 msgid ""
 "The --merge option only accepts %{strategies}, or %{last_strategy}\n"
 "%{run_help}"
 msgstr ""
 
-#: ../lib/puppet/application/lookup.rb:302
+#: ../lib/puppet/application/lookup.rb:308
 msgid "No keys were given to lookup."
 msgstr ""
 
-#: ../lib/puppet/application/lookup.rb:310
+#: ../lib/puppet/application/lookup.rb:316
 msgid "Unknown rendering format '%{format}'"
 msgstr ""
 
-#: ../lib/puppet/application/lookup.rb:360 ../lib/puppet/face/epp.rb:520
+#: ../lib/puppet/application/lookup.rb:366 ../lib/puppet/face/epp.rb:520
 msgid "Incorrect formatted data in %{fact_file} given via the --facts flag"
 msgstr ""
 
@@ -524,101 +526,105 @@ msgstr ""
 msgid "Cannot remove %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:72
+#: ../lib/puppet/configurer.rb:80
 msgid "Using cached catalog from environment '%{environment}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:78
+#: ../lib/puppet/configurer.rb:86
 msgid "Not using cache on failed catalog"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:87
+#: ../lib/puppet/configurer.rb:95
 msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:92 ../lib/puppet/configurer.rb:174
+#: ../lib/puppet/configurer.rb:100 ../lib/puppet/configurer.rb:182
 msgid "Using cached catalog from environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:167
+#: ../lib/puppet/configurer.rb:175
 msgid "Could not retrieve catalog; skipping run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:183
+#: ../lib/puppet/configurer.rb:191
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:219 ../lib/puppet/http/resolver/server_list.rb:68
-msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
+#: ../lib/puppet/configurer.rb:228
+msgid "Could not select a functional puppet server from server_list: '%{server_list}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:256
+#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
+#: ../lib/puppet/configurer.rb:231
+msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
+msgstr ""
+
+#: ../lib/puppet/configurer.rb:280
 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:301
+#: ../lib/puppet/configurer.rb:325
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:307
+#: ../lib/puppet/configurer.rb:340
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:311
+#: ../lib/puppet/configurer.rb:344
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:340
+#: ../lib/puppet/configurer.rb:372
 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:351
+#: ../lib/puppet/configurer.rb:383
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:353
+#: ../lib/puppet/configurer.rb:385
 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:394
+#: ../lib/puppet/configurer.rb:426
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:423 ../lib/puppet/http/resolver/server_list.rb:89
+#: ../lib/puppet/configurer.rb:455 ../lib/puppet/http/resolver/server_list.rb:67
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:427 ../lib/puppet/http/resolver/server_list.rb:95
+#: ../lib/puppet/configurer.rb:459 ../lib/puppet/http/resolver/server_list.rb:70
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:438 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:470 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:447
+#: ../lib/puppet/configurer.rb:479
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:466
+#: ../lib/puppet/configurer.rb:498
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:474
+#: ../lib/puppet/configurer.rb:506
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:489
+#: ../lib/puppet/configurer.rb:521
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:507
+#: ../lib/puppet/configurer.rb:539
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:528
+#: ../lib/puppet/configurer.rb:560
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -626,7 +632,11 @@ msgstr ""
 msgid "Retrieving %{name}"
 msgstr ""
 
-#: ../lib/puppet/configurer/downloader.rb:20
+#: ../lib/puppet/configurer/downloader.rb:21
+msgid "Failed to retrieve %{name}: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/configurer/downloader.rb:32
 msgid "Could not retrieve %{name}: %{detail}"
 msgstr ""
 
@@ -650,20 +660,20 @@ msgstr ""
 msgid "Attempted to pop, but already at root of the context stack."
 msgstr ""
 
-#: ../lib/puppet/context/trusted_information.rb:58
+#: ../lib/puppet/context/trusted_information.rb:53
 msgid "TrustedInformation expected a certificate, but none was given."
 msgstr ""
 
-#: ../lib/puppet/context/trusted_information.rb:98 ../lib/puppet/parser/scope.rb:835
+#: ../lib/puppet/context/trusted_information.rb:104 ../lib/puppet/parser/scope.rb:835
 msgid "Unsupported data type: '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/daemon.rb:83
-msgid "Cannot reexec unless ARGV arguments are set"
+#: ../lib/puppet/daemon.rb:26
+msgid "Daemons must have an agent"
 msgstr ""
 
-#: ../lib/puppet/daemon.rb:144
-msgid "Daemons must have an agent, server, or both"
+#: ../lib/puppet/daemon.rb:81
+msgid "Cannot reexec unless ARGV arguments are set"
 msgstr ""
 
 #: ../lib/puppet/datatypes.rb:133
@@ -691,32 +701,37 @@ msgid "Valid values are '%{values}'."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:547
+#: ../lib/puppet/defaults.rb:546
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:549
+#: ../lib/puppet/defaults.rb:548
 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:739
+#: ../lib/puppet/defaults.rb:771
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:820
+#: ../lib/puppet/defaults.rb:854
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1005
+#: ../lib/puppet/defaults.rb:1048
 msgid "Setting 'ssl_client_ca_auth' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1084 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1127 ../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
+msgid "Setting 'pluginsync' is deprecated."
+msgstr ""
+
 #: ../lib/puppet/error.rb:77
 msgid "Could not parse for environment %{environment}: %{message}"
 msgstr ""
@@ -815,7 +830,7 @@ msgstr ""
 
 #: ../lib/puppet/face/config.rb:146
 msgid ""
-"The environment should be set in either the `[user]`, `[agent]`, or `[master]`\n"
+"The environment should be set in either the `[user]`, `[agent]`, or `[server]`\n"
 "section. Variables set in the `[agent]` section are used when running\n"
 "`puppet agent`. Variables set in the `[user]` section are used when running\n"
 "various other puppet subcommands, like `puppet apply` and `puppet module`; these\n"
@@ -825,25 +840,28 @@ msgid ""
 "https://puppet.com/docs/puppet/latest/configuration.html#environment\n"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:174
+#: ../lib/puppet/face/config.rb:176
+msgid "Deleted setting from '%{section_name}': '%{setting_string}', and adding it to 'server' section"
+msgstr ""
+
+#: ../lib/puppet/face/config.rb:191
 msgid "Delete a Puppet setting."
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:175
+#: ../lib/puppet/face/config.rb:192
 msgid "<setting>"
 msgstr ""
 
-#. TRANSLATORS 'main' is a specific section name and should not be translated
-#: ../lib/puppet/face/config.rb:212
+#: ../lib/puppet/face/config.rb:226 ../lib/puppet/face/config.rb:230 ../lib/puppet/face/config.rb:241
 msgid "Deleted setting from '%{section_name}': '%{setting_string}'"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:215
+#: ../lib/puppet/face/config.rb:244
 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:222
+#: ../lib/puppet/face/config.rb:252
 msgid "The puppet.conf file does not exist %{puppet_conf}"
 msgstr ""
 
@@ -1072,49 +1090,53 @@ msgstr ""
 msgid "The version of the subcommand for which to show help."
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:28
+msgid "Whether to render the help text in ronn format."
+msgstr ""
+
 #. TRANSLATORS 'puppet help' is a command line and should not be translated
-#: ../lib/puppet/face/help.rb:37
+#: ../lib/puppet/face/help.rb:44
 msgid "The 'puppet help' command takes two (optional) arguments: a subcommand and an action"
 msgstr ""
 
 #. TRANSLATORS '--version' is a command line option and should not be translated
-#: ../lib/puppet/face/help.rb:47
+#: ../lib/puppet/face/help.rb:54
 msgid "Supplying a '--version' only makes sense when a Faces subcommand is given"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:55
+#: ../lib/puppet/face/help.rb:62
 msgid "The legacy subcommand '%{sub_command}' does not support supplying an action"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:76
+#: ../lib/puppet/face/help.rb:102
 msgid "Could not load help for the application %{application_name}."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:77 ../lib/puppet/face/help.rb:89
+#: ../lib/puppet/face/help.rb:103 ../lib/puppet/face/help.rb:115
 msgid "Please check the error logs for more information."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:79 ../lib/puppet/face/help.rb:91
+#: ../lib/puppet/face/help.rb:105 ../lib/puppet/face/help.rb:117
 msgid "Detail: \"%{detail}\""
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:88
+#: ../lib/puppet/face/help.rb:114
 msgid "Could not load help for the face %{face_name}."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:100
+#: ../lib/puppet/face/help.rb:126
 msgid "Unable to load action %{actionname} from %{face}"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:144
+#: ../lib/puppet/face/help.rb:170
 msgid "(Deprecated)"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:147 ../lib/puppet/face/help.rb:159
+#: ../lib/puppet/face/help.rb:173 ../lib/puppet/face/help.rb:185
 msgid "!%{sub_command}! Subcommand unavailable due to error."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:148 ../lib/puppet/face/help.rb:160
+#: ../lib/puppet/face/help.rb:174 ../lib/puppet/face/help.rb:186
 msgid "Check error logs."
 msgstr ""
 
@@ -1271,15 +1293,19 @@ msgstr ""
 msgid "Search the Puppet Forge for a module."
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:12
+#: ../lib/puppet/face/module/search.rb:14
 msgid "Array of module metadata hashes"
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:22
+#: ../lib/puppet/face/module/search.rb:24
 msgid "<search_term>"
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:34
+#: ../lib/puppet/face/module/search.rb:27
+msgid "This action has been deprecated. Please use the Puppet Forge to search for modules."
+msgstr ""
+
+#: ../lib/puppet/face/module/search.rb:37
 msgid "No results found for '%{term}'."
 msgstr ""
 
@@ -1742,7 +1768,7 @@ msgstr ""
 msgid "No task specified"
 msgstr ""
 
-#: ../lib/puppet/file_serving/terminus_selector.rb:29
+#: ../lib/puppet/file_serving/terminus_selector.rb:28
 msgid "URI protocol '%{protocol}' is not currently supported for file serving"
 msgstr ""
 
@@ -1762,7 +1788,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:681
+#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:127 ../lib/puppet/util.rb:706
 msgid "Is a directory: %{directory}"
 msgstr ""
 
@@ -1798,7 +1824,7 @@ msgstr ""
 msgid "unexpected prefix_suffix: %{value}"
 msgstr ""
 
-#: ../lib/puppet/file_system/uniquefile.rb:140
+#: ../lib/puppet/file_system/uniquefile.rb:136
 msgid "cannot generate temporary name using `%{basename}' under `%{tmpdir}'"
 msgstr ""
 
@@ -2226,11 +2252,11 @@ msgstr ""
 msgid "Request to %{uri} failed after %{elapsed} seconds: %{message}"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:310
+#: ../lib/puppet/http/client.rb:326
 msgid "Sleeping for %{interval} seconds before retrying the request"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:353 ../lib/puppet/indirector/request.rb:142
+#: ../lib/puppet/http/client.rb:369 ../lib/puppet/indirector/request.rb:142
 msgid "HTTP REST queries cannot handle values of type '%{klass}'"
 msgstr ""
 
@@ -2242,11 +2268,11 @@ msgstr ""
 msgid "Too many HTTP retries for %{addr}"
 msgstr ""
 
-#: ../lib/puppet/http/redirector.rb:76
+#: ../lib/puppet/http/redirector.rb:78
 msgid "Location response header is missing"
 msgstr ""
 
-#: ../lib/puppet/http/redirector.rb:80
+#: ../lib/puppet/http/redirector.rb:82
 msgid "Location URI is invalid: %{detail}"
 msgstr ""
 
@@ -2254,20 +2280,20 @@ msgstr ""
 msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
 msgstr ""
 
-#: ../lib/puppet/http/service.rb:119
+#: ../lib/puppet/http/service.rb:121
 msgid "Ignoring extra header \"%{name}\" as it was previously set."
 msgstr ""
 
-#: ../lib/puppet/http/service.rb:122
+#: ../lib/puppet/http/service.rb:124
 msgid "Ignoring extra header \"%{name}\" as it has no value."
 msgstr ""
 
-#: ../lib/puppet/http/service.rb:145 ../lib/puppet/indirector/rest.rb:282
+#: ../lib/puppet/http/service.rb:147 ../lib/puppet/indirector/rest.rb:288
 msgid "No content type in http response; cannot parse"
 msgstr ""
 
 #. TRANSLATORS "pson", "preferred_serialization_format", and "puppetserver" should not be translated
-#: ../lib/puppet/http/service/report.rb:63
+#: ../lib/puppet/http/service/report.rb:61
 msgid "To submit reports to a server running puppetserver %{server_version}, set preferred_serialization_format to pson"
 msgstr ""
 
@@ -2416,7 +2442,7 @@ msgstr ""
 msgid "Unable to serialize catalog to json, retrying with pson"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/rest.rb:34 ../lib/puppet/indirector/facts/rest.rb:22 ../lib/puppet/indirector/file_content/rest.rb:33 ../lib/puppet/indirector/file_metadata/rest.rb:30 ../lib/puppet/indirector/node/rest.rb:25 ../lib/puppet/indirector/rest.rb:144 ../lib/puppet/indirector/status/rest.rb:21
+#: ../lib/puppet/indirector/catalog/rest.rb:34 ../lib/puppet/indirector/facts/rest.rb:22 ../lib/puppet/indirector/file_content/rest.rb:33 ../lib/puppet/indirector/file_metadata/rest.rb:30 ../lib/puppet/indirector/node/rest.rb:25 ../lib/puppet/indirector/rest.rb:146 ../lib/puppet/indirector/status/rest.rb:21
 msgid "Find %{uri} resulted in 404 with the message: %{body}"
 msgstr ""
 
@@ -2520,7 +2546,7 @@ msgstr ""
 msgid "You cannot save facts to the code store; it is only used for getting facts from a remote device"
 msgstr ""
 
-#: ../lib/puppet/indirector/facts/rest.rb:30 ../lib/puppet/indirector/rest.rb:192
+#: ../lib/puppet/indirector/facts/rest.rb:30 ../lib/puppet/indirector/rest.rb:198
 msgid "PUT does not accept options"
 msgstr ""
 
@@ -2571,7 +2597,11 @@ msgstr ""
 msgid "Invalid checksum %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/indirector/file_metadata/http.rb:25
+#: ../lib/puppet/indirector/file_content/http.rb:14
+msgid "Puppet::Indirector::FileContent::Http is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/file_metadata/http.rb:32
 msgid "cannot lookup multiple files"
 msgstr ""
 
@@ -2584,12 +2614,12 @@ msgid "Could not find filesystem info for file '%{request}' in environment %{env
 msgstr ""
 
 #. TRANSLATORS "Hiera" is the name of a code library and should not be translated
-#: ../lib/puppet/indirector/hiera.rb:8
+#: ../lib/puppet/indirector/hiera.rb:12
 msgid "Hiera terminus not supported without hiera library"
 msgstr ""
 
 #. TRANSLATORS "merge" is a parameter name and should not be translated
-#: ../lib/puppet/indirector/hiera.rb:68
+#: ../lib/puppet/indirector/hiera.rb:72
 msgid "Unrecognized value for request 'merge' parameter: '%{merge}'"
 msgstr ""
 
@@ -2782,9 +2812,9 @@ msgstr ""
 msgid "Selected port from the first entry of the `server_list` setting: %{port}"
 msgstr ""
 
-#. TRANSLATORS 'masterport' is the name of a setting and should not be translated
+#. TRANSLATORS 'serverport' is the name of a setting and should not be translated
 #: ../lib/puppet/indirector/request.rb:235
-msgid "Selected port from the `masterport` setting: %{port}"
+msgid "Selected port from the `serverport` setting: %{port}"
 msgstr ""
 
 #: ../lib/puppet/indirector/request.rb:266
@@ -2799,16 +2829,36 @@ msgstr ""
 msgid "Resource instance does not match request key"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:177
+#: ../lib/puppet/indirector/rest.rb:115
+msgid "Puppet::Indirector::Rest#find is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:154
+msgid "Puppet::Indirector::Rest#head is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:167
+msgid "Puppet::Indirector::Rest#search is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:181
+msgid "Puppet::Indirector::Rest#destroy is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:182
 msgid "DELETE does not accept options"
 msgstr ""
 
+#: ../lib/puppet/indirector/rest.rb:197
+msgid "Puppet::Indirector::Rest#save is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
 #. TRANSLATORS "PSON" should not be translated
-#: ../lib/puppet/indirector/rest.rb:229
+#: ../lib/puppet/indirector/rest.rb:235
 msgid "Downgrading to PSON for future requests"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:271 ../lib/puppet/rest/response.rb:31
+#: ../lib/puppet/indirector/rest.rb:277 ../lib/puppet/rest/response.rb:31
 msgid "Error %{code} on SERVER: %{returned_message}"
 msgstr ""
 
@@ -3163,11 +3213,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:222
+#: ../lib/puppet/module.rb:221
 msgid "%{name} has an invalid and unparsable metadata.json file. The parse error: %{error}"
 msgstr ""
 
-#: ../lib/puppet/module.rb:468
+#: ../lib/puppet/module.rb:467
 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"
@@ -3907,26 +3957,50 @@ msgstr ""
 msgid "Not a valid indirection type"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:11
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:14
 msgid "%{env_name} is not a known environment"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:40
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:43
 msgid "Application %{application} assigns nodes to non-existent components: %{component_list}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:46
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:49
 msgid "Application %{application} has components without assigned nodes: %{component_list}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:55
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:58
 msgid "Application %{app} assigns multiple nodes to component %{comp}"
 msgstr ""
 
-#: ../lib/puppet/network/http/compression.rb:30 ../lib/puppet/network/http/compression.rb:43
+#: ../lib/puppet/network/http/compression.rb:23 ../lib/puppet/network/http/compression.rb:27
+msgid "Puppet::Network::HTTP::Compression::Active#uncompress_body is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:32 ../lib/puppet/network/http/compression.rb:46
 msgid "Unknown content encoding - %{encoding}"
 msgstr ""
 
+#: ../lib/puppet/network/http/compression.rb:37
+msgid "Puppet::Network::HTTP::Compression::Active#uncompress is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:77
+msgid "Puppet::Network::HTTP::Compression::ZlibAdapter#uncompress is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:104
+msgid "Puppet::Network::HTTP::Compression::None#uncompress_body is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:113
+msgid "Puppet::Network::HTTP::Compression::None#uncompress is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:120
+msgid "Puppet::Network::HTTP::Compression::IdentityAdapter#uncompress is deprecated."
+msgstr ""
+
 #: ../lib/puppet/network/http/connection.rb:56
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
@@ -3935,7 +4009,7 @@ msgstr ""
 msgid "Expected an instance of Puppet::SSL::Verifier but was passed a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:229
+#: ../lib/puppet/network/http/connection.rb:229 ../lib/puppet/network/http/connection_adapter.rb:174
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr ""
 
@@ -3965,6 +4039,10 @@ msgstr ""
 msgid "request %{uri} failed: %{msg}"
 msgstr ""
 
+#: ../lib/puppet/network/http/connection.rb:346
+msgid "Puppet::Network::HTTP::Connection is deprecated. Please use Puppet::Network::HTTP::ConnectionAdapter instead."
+msgstr ""
+
 #: ../lib/puppet/network/http/error.rb:23
 msgid "Not Acceptable: %{message}"
 msgstr ""
@@ -4009,7 +4087,11 @@ msgstr ""
 msgid "Could not resolve %{ip}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/network/http/pool.rb:68
+#: ../lib/puppet/network/http/nocache_pool.rb:6
+msgid "Puppet::Network::HTTP::NoCachePool is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/pool.rb:66
 msgid "Failed to close connection for %{site}: %{detail}"
 msgstr ""
 
@@ -4087,7 +4169,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:561 ../lib/puppet/pops/loaders.rb:300
+#: ../lib/puppet/node/environment.rb:568 ../lib/puppet/pops/loaders.rb:301
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -4119,54 +4201,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:73 ../lib/puppet/pal/pal_impl.rb:171
+#: ../lib/puppet/pal/pal_impl.rb:75 ../lib/puppet/pal/pal_impl.rb:173
 msgid "manifest_file or code_string cannot be given when configured_by_env is true"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:219
+#: ../lib/puppet/pal/pal_impl.rb:221
 msgid "temporary environment name"
 msgstr ""
 
 #. TRANSLATORS: do not translate variable name string in these assertions
-#: ../lib/puppet/pal/pal_impl.rb:224
+#: ../lib/puppet/pal/pal_impl.rb:226
 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:278
+#: ../lib/puppet/pal/pal_impl.rb:280
 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:283
+#: ../lib/puppet/pal/pal_impl.rb:285
 msgid "The environment directory '%{env_dir}' does not exist"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:306
+#: ../lib/puppet/pal/pal_impl.rb:308
 msgid "No directory found for the environment '%{env_name}' on the path '%{envpath}'"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:360
+#: ../lib/puppet/pal/pal_impl.rb:362
 msgid "Given variables must be a hash, got %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:366
+#: ../lib/puppet/pal/pal_impl.rb:368
 msgid "Given variable '%{varname}' has illegal name"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:370
+#: ../lib/puppet/pal/pal_impl.rb:372
 msgid "Given value for '%{varname}' has illegal type - got: %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:482
+#: ../lib/puppet/pal/pal_impl.rb:509
 msgid "Puppet Pal: %{what}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:496
+#: ../lib/puppet/pal/pal_impl.rb:523
 msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:503
+#: ../lib/puppet/pal/pal_impl.rb:530
 msgid "A block must be given"
 msgstr ""
 
@@ -4231,7 +4313,7 @@ msgstr ""
 msgid "Node inheritance is removed in Puppet 4.0.0. See http://links.puppet.com/puppet-node-inheritance-deprecation"
 msgstr ""
 
-#: ../lib/puppet/parser/ast/pops_bridge.rb:190
+#: ../lib/puppet/parser/ast/pops_bridge.rb:186
 msgid "Instantiating Resource with type checked parameters - scope is missing, skipping type checking."
 msgstr ""
 
@@ -4256,7 +4338,7 @@ msgid "For more information, see https://puppet.com/docs/puppet/latest/environme
 msgstr ""
 
 #. TRANSLATORS "stage" is a keyword in Puppet and should not be translated
-#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:134
+#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:137
 msgid "Only classes can set 'stage'; normal resources like %{resource} cannot change run stage"
 msgstr ""
 
@@ -4342,60 +4424,60 @@ msgstr ""
 msgid "Application %{app} maps component %{res} to multiple nodes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:357
+#: ../lib/puppet/parser/compiler.rb:367
+msgid "Could not find node statement with name 'default' or '%{names}'"
+msgstr ""
+
+#: ../lib/puppet/parser/compiler.rb:385
 msgid "No source for scope passed to evaluate_classes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:373
+#: ../lib/puppet/parser/compiler.rb:401
 msgid "Could not find class %{name} for %{node}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:475
+#: ../lib/puppet/parser/compiler.rb:503
 msgid "Capability mapping error: %{kind} clause references nonexistent %{component_type} %{component_name}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:502
-msgid "Could not find node statement with name 'default' or '%{names}'"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:523
+#: ../lib/puppet/parser/compiler.rb:526
 msgid "Evaluated collections"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:538
+#: ../lib/puppet/parser/compiler.rb:541
 msgid "Evaluated definitions"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:567
+#: ../lib/puppet/parser/compiler.rb:570
 msgid "Iterated (%{count}) on generators"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:578
+#: ../lib/puppet/parser/compiler.rb:581
 msgid "Somehow looped more than 1000 times while evaluating host catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:610
+#: ../lib/puppet/parser/compiler.rb:613
 msgid "Could not find resource(s) %{resources} for overriding"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:621
+#: ../lib/puppet/parser/compiler.rb:624
 msgid "Failed to realize virtual resources %{resources}"
 msgstr ""
 
 #. TRANSLATORS "main" is a function name and should not be translated
-#: ../lib/puppet/parser/compiler.rb:654
+#: ../lib/puppet/parser/compiler.rb:657
 msgid "Couldn't find main"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:727
+#: ../lib/puppet/parser/compiler.rb:730
 msgid "For initializing compiler"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:17
+#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:19
 msgid "Capability '%{cap}' referenced by '%{param}' is never exported"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:56
+#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:58
 msgid "'%{value}' is exported by both '%{hash}' and '%{resource}'"
 msgstr ""
 
@@ -4407,55 +4489,55 @@ msgstr ""
 msgid "Could not find resource '%{res}' in parameter '%{param}'"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/site_validator.rb:14
+#: ../lib/puppet/parser/compiler/catalog_validator/site_validator.rb:16
 msgid "Only application components can appear inside a site - %{res} is not allowed"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:12
+#: ../lib/puppet/parser/environment_compiler.rb:13
 msgid "%{detail} in environment %{env}"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:59
+#: ../lib/puppet/parser/environment_compiler.rb:62
 msgid "For compiling environment catalog %{env}"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:62
+#: ../lib/puppet/parser/environment_compiler.rb:65
 msgid "Env Compile: Created settings scope"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:64
+#: ../lib/puppet/parser/environment_compiler.rb:67
 msgid "Env Compile: Evaluated main"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:66
+#: ../lib/puppet/parser/environment_compiler.rb:69
 msgid "Env Compile: Evaluated site"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:68
+#: ../lib/puppet/parser/environment_compiler.rb:71
 msgid "Env Compile: Evaluated application instances"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:70
+#: ../lib/puppet/parser/environment_compiler.rb:73
 msgid "Env Compile: Prune"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:72
+#: ../lib/puppet/parser/environment_compiler.rb:75
 msgid "Env Compile: Validate Catalog pre-finish"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:76
+#: ../lib/puppet/parser/environment_compiler.rb:79
 msgid "Env Compile: Finished catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:80
+#: ../lib/puppet/parser/environment_compiler.rb:83
 msgid "Env Compile: Validate Catalog final"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:156
+#: ../lib/puppet/parser/environment_compiler.rb:159
 msgid "Environment Compiler: Could not find a site definition to evaluate"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:162
+#: ../lib/puppet/parser/environment_compiler.rb:165
 msgid "Evaluated application %{resource}"
 msgstr ""
 
@@ -4471,31 +4553,31 @@ msgstr ""
 msgid "The method 'Puppet::Parser::Functions.autoloader#loaded?(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'."
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:186
+#: ../lib/puppet/parser/functions.rb:190
 msgid "Overwriting previous definition for function %{name}"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:192
+#: ../lib/puppet/parser/functions.rb:196
 msgid "Invalid statement type %{type}"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:204
+#: ../lib/puppet/parser/functions.rb:208
 msgid "Called %{name}"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:207
+#: ../lib/puppet/parser/functions.rb:211
 msgid "%{name}(): Wrong number of arguments given (%{arg_count} for %{arity})"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:209
+#: ../lib/puppet/parser/functions.rb:213
 msgid "%{name}(): Wrong number of arguments given (%{arg_count} for minimum %{min_arg_count})"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:215
+#: ../lib/puppet/parser/functions.rb:219
 msgid "custom functions must be called with a single array that contains the arguments. For example, function_example([1]) instead of function_example(1)"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:314
+#: ../lib/puppet/parser/functions.rb:318
 msgid "%{name}() can only be called using the 4.x function API. See Scope#call_function"
 msgstr ""
 
@@ -4503,15 +4585,15 @@ msgstr ""
 msgid "Calling function_contain via the Scope class is deprecated. Use Scope#call_function instead"
 msgstr ""
 
-#: ../lib/puppet/parser/functions/create_resources.rb:56
+#: ../lib/puppet/parser/functions/create_resources.rb:60
 msgid "create_resources(): wrong number of arguments (%{count}; must be 2 or 3)"
 msgstr ""
 
-#: ../lib/puppet/parser/functions/create_resources.rb:57
+#: ../lib/puppet/parser/functions/create_resources.rb:61
 msgid "create_resources(): second argument must be a hash"
 msgstr ""
 
-#: ../lib/puppet/parser/functions/create_resources.rb:59
+#: ../lib/puppet/parser/functions/create_resources.rb:63
 msgid "create_resources(): third argument, if provided, must be a hash"
 msgstr ""
 
@@ -4625,23 +4707,23 @@ msgstr ""
 msgid "Attempt to reassign attribute '%{name}' in '%{resource}' caused by multiple consumed mappings to the same attribute"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:364
+#: ../lib/puppet/parser/resource.rb:365
 msgid "Parameter '%{name}' is already set on %{resource}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:367
+#: ../lib/puppet/parser/resource.rb:368
 msgid "Parameter '%{name}' is already set on %{resource} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:372
+#: ../lib/puppet/parser/resource.rb:373
 msgid "Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:375
+#: ../lib/puppet/parser/resource.rb:376
 msgid "Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:414
+#: ../lib/puppet/parser/resource.rb:415
 msgid "Duplicate parameter '%{param}' for on %{resource}"
 msgstr ""
 
@@ -5667,6 +5749,10 @@ msgstr ""
 msgid "Failed to load: %{type_name}"
 msgstr ""
 
+#: ../lib/puppet/pops/issues.rb:925
+msgid "Use of the application-orchestration %{expr} is deprecated. See https://puppet.com/docs/puppet/5.5/deprecated_language.html"
+msgstr ""
+
 #: ../lib/puppet/pops/label_provider.rb:76
 msgid "<%{string}> does not appear to contain a word"
 msgstr ""
@@ -5838,19 +5924,19 @@ msgstr ""
 msgid "Attempt to redefine already initialized loaders for environment"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:176
+#: ../lib/puppet/pops/loaders.rb:177
 msgid "Internal Error: Puppet Context ':loaders' missing"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:190
+#: ../lib/puppet/pops/loaders.rb:191
 msgid "Unable to find loader named '%{loader_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:211
+#: ../lib/puppet/pops/loaders.rb:212
 msgid "Internal Error: did not find public loader for module: '%{module_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:257
+#: ../lib/puppet/pops/loaders.rb:258
 msgid "Internal Error: Attempt to redefine loader named '%{name}'"
 msgstr ""
 
@@ -5869,23 +5955,23 @@ msgstr ""
 msgid "Unknown Explain type %{qualifier_type}"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:85
+#: ../lib/puppet/pops/lookup/hiera_config.rb:86
 msgid "Using of legacy data provider function '%{function_name}'. Please convert to a 'data_hash' function"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:142
+#: ../lib/puppet/pops/lookup/hiera_config.rb:143
 msgid "%{config_path}: File exists but does not contain a valid YAML hash. Falling back to Hiera version 3 default config"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:200
+#: ../lib/puppet/pops/lookup/hiera_config.rb:201
 msgid "Hiera configuration recreated due to change of scope variables used in interpolation expressions"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:428
+#: ../lib/puppet/pops/lookup/hiera_config.rb:429
 msgid "%{config_path}: Use of 'hiera.yaml' version 3 is deprecated. It should be converted to version 5"
 msgstr ""
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:528
+#: ../lib/puppet/pops/lookup/hiera_config.rb:529
 msgid "%{config_path}: Use of 'hiera.yaml' version 4 is deprecated. It should be converted to version 5"
 msgstr ""
 
@@ -6057,7 +6143,7 @@ msgstr ""
 msgid "digit expected"
 msgstr ""
 
-#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:440
+#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:444
 msgid "you must specify title patterns when there are two or more key attributes"
 msgstr ""
 
@@ -6674,27 +6760,31 @@ msgstr ""
 msgid "Could not perform network device prefetch: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:37
+#: ../lib/puppet/provider/package/aix.rb:46
 msgid "The aix provider can only be used by root"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:79 ../lib/puppet/provider/package/nim.rb:53
+#: ../lib/puppet/provider/package/aix.rb:88 ../lib/puppet/provider/package/nim.rb:53
 msgid "Failed to uninstall package '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:86
+#: ../lib/puppet/provider/package/aix.rb:95
 msgid "A directory is required which will be used to find packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:98
+#: ../lib/puppet/provider/package/aix.rb:107
 msgid "aix package provider is unable to downgrade packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:118
+#: ../lib/puppet/provider/package/aix.rb:112
+msgid "Package '%{name}' is in a %{status} state and requires manual intervention"
+msgstr ""
+
+#: ../lib/puppet/provider/package/aix.rb:133
 msgid "Could not list installed Packages: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:141 ../lib/puppet/provider/package/yum.rb:316
+#: ../lib/puppet/provider/package/aix.rb:156 ../lib/puppet/provider/package/yum.rb:333
 msgid "Tried to get latest on a missing package"
 msgstr ""
 
@@ -6710,23 +6800,23 @@ msgstr ""
 msgid "Mac OS X packages must specify a package source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:47
+#: ../lib/puppet/provider/package/apt.rb:81
 msgid "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:126 ../lib/puppet/provider/package/fink.rb:55
+#: ../lib/puppet/provider/package/apt.rb:163 ../lib/puppet/provider/package/fink.rb:55
 msgid "Could not find latest version"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:137 ../lib/puppet/provider/package/fink.rb:66
+#: ../lib/puppet/provider/package/apt.rb:174 ../lib/puppet/provider/package/fink.rb:66
 msgid "Preseeding %{response} to debconf-set-selections"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:141 ../lib/puppet/provider/package/fink.rb:70
+#: ../lib/puppet/provider/package/apt.rb:178 ../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:296 ../lib/puppet/provider/package/zypper.rb:109
+#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb: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 ""
 
@@ -6774,27 +6864,27 @@ msgstr ""
 msgid "source is defined but does not have trailing slash, ignoring %{source}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:100
+#: ../lib/puppet/provider/package/gem.rb:102 ../lib/puppet/provider/package/puppetserver_gem.rb:61
 msgid "Could not list gems: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:126
+#: ../lib/puppet/provider/package/gem.rb:128
 msgid "Could not match %{desc}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:204
+#: ../lib/puppet/provider/package/gem.rb:206 ../lib/puppet/provider/package/puppetserver_gem.rb:93
 msgid "Invalid source '%{uri}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:215
+#: ../lib/puppet/provider/package/gem.rb:217 ../lib/puppet/provider/package/puppetserver_gem.rb:104
 msgid "puppet:// URLs are not supported as gem sources"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:231
+#: ../lib/puppet/provider/package/gem.rb:233 ../lib/puppet/provider/package/puppetserver_gem.rb:115
 msgid "Could not install: %{output}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:257
+#: ../lib/puppet/provider/package/gem.rb:259 ../lib/puppet/provider/package/puppetserver_gem.rb:125
 msgid "Could not uninstall: %{output}"
 msgstr ""
 
@@ -7049,23 +7139,23 @@ msgstr ""
 msgid "Don't know how to install '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:64
+#: ../lib/puppet/provider/package/yum.rb:69
 msgid "The yum provider can only be used as root"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:118
+#: ../lib/puppet/provider/package/yum.rb:123
 msgid "Could not check for updates, '%{cmd} check-update' exited with %{status}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:152
+#: ../lib/puppet/provider/package/yum.rb:158
 msgid "Failed to parse package name and architecture from '%{pkgname}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:290
+#: ../lib/puppet/provider/package/yum.rb:306
 msgid "Could not find package %{wanted}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:301
+#: ../lib/puppet/provider/package/yum.rb:317
 msgid "Failed to update to version %{should}, got version %{version} instead"
 msgstr ""
 
@@ -7139,35 +7229,35 @@ msgstr ""
 msgid "The %{service} service is incomplete so its status will be reported as :stopped. See `svcs -xv %{fmri}` for more details."
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:23
+#: ../lib/puppet/provider/service/windows.rb:22
 msgid "Cannot enable %{resource_name}, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:29
+#: ../lib/puppet/provider/service/windows.rb:28
 msgid "Cannot disable %{resource_name}, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:35
+#: ../lib/puppet/provider/service/windows.rb:34
 msgid "Cannot enable %{resource_name} for manual start, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:41
+#: ../lib/puppet/provider/service/windows.rb:40
 msgid "Cannot enable %{resource_name} for delayed start, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:61
+#: ../lib/puppet/provider/service/windows.rb:60
 msgid "Unknown start type: %{start_type}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:64
+#: ../lib/puppet/provider/service/windows.rb:63
 msgid "Cannot get start type %{resource_name}, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:78
+#: ../lib/puppet/provider/service/windows.rb:77
 msgid "Will not start disabled service %{resource_name} without managing enable. Specify 'enable => false' to override."
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:110
+#: ../lib/puppet/provider/service/windows.rb:109
 msgid "Unknown service state '%{current_state}' for service '%{resource_name}'"
 msgstr ""
 
@@ -7189,15 +7279,15 @@ msgstr ""
 msgid "ruby-shadow doesn't support %{method}"
 msgstr ""
 
-#: ../lib/puppet/provider/user/windows_adsi.rb:128
+#: ../lib/puppet/provider/user/windows_adsi.rb:145
 msgid "The user account '%s' is disabled; The password will still be changed"
 msgstr ""
 
-#: ../lib/puppet/provider/user/windows_adsi.rb:130
+#: ../lib/puppet/provider/user/windows_adsi.rb:147
 msgid "The user account '%s' is locked out; The password will still be changed"
 msgstr ""
 
-#: ../lib/puppet/provider/user/windows_adsi.rb:132
+#: ../lib/puppet/provider/user/windows_adsi.rb:149
 msgid "The user account '%s' is expired; The password will still be changed"
 msgstr ""
 
@@ -7252,7 +7342,7 @@ msgstr ""
 msgid "You must pass a callback for non-NONE events"
 msgstr ""
 
-#: ../lib/puppet/reports/http.rb:37
+#: ../lib/puppet/reports/http.rb:40
 msgid "Unable to submit report to %{url} [%{code}] %{message}"
 msgstr ""
 
@@ -7309,11 +7399,11 @@ msgstr ""
 msgid "no parameter named '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:634
+#: ../lib/puppet/resource.rb:635
 msgid "No title provided and %{type} is not a valid resource reference"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:708
+#: ../lib/puppet/resource.rb:709
 msgid "No set of title patterns matched the title \"%{title}\"."
 msgstr ""
 
@@ -7403,67 +7493,67 @@ msgstr ""
 msgid "Could not evaluate: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:78
+#: ../lib/puppet/resource/type.rb:82
 msgid "Invalid export in %{reference}: %{ex} is not a resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:79
+#: ../lib/puppet/resource/type.rb:83
 msgid "Invalid export in %{reference}: %{ex} is not a capability resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:83
+#: ../lib/puppet/resource/type.rb:87
 msgid "Resource type %{res_type} does not produce %{ex_type}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:144
+#: ../lib/puppet/resource/type.rb:148
 msgid "Invalid resource supertype '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:192
+#: ../lib/puppet/resource/type.rb:200
 msgid "%{name} is not a class; cannot add code to it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:193
+#: ../lib/puppet/resource/type.rb:201
 msgid "%{name} is not a class; cannot add code from it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:197
+#: ../lib/puppet/resource/type.rb:205
 msgid "Cannot have code outside of a class/node/define because 'freeze_main' is enabled"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:201
+#: ../lib/puppet/resource/type.rb:209
 msgid "Cannot merge classes with different parent classes (%{name} => %{parent} vs. %{other_name} => %{other_parent})"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:232
+#: ../lib/puppet/resource/type.rb:240
 msgid "Cannot create resources for defined resource types"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:286
+#: ../lib/puppet/resource/type.rb:295
 msgid "The method Puppet::Resource::Type.assign_parameter_values is deprecated and will be removed in the next major release of Puppet."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:302
+#: ../lib/puppet/resource/type.rb:311
 msgid "Could not find parent resource type '%{parent}' of type %{parent_type} in %{env}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:429
+#: ../lib/puppet/resource/type.rb:438
 msgid "Parameter '%{name}' is given a type, but is not a valid parameter."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:432
+#: ../lib/puppet/resource/type.rb:441
 msgid "Parameter '%{name}' is given a type that is not a Puppet Type, got %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:474
+#: ../lib/puppet/resource/type.rb:483
 msgid "Could not find scope for %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:495
+#: ../lib/puppet/resource/type.rb:504
 msgid "%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:497
+#: ../lib/puppet/resource/type.rb:506
 msgid "%{param} is a metaparameter; please choose another parameter name in the %{name} definition"
 msgstr ""
 
@@ -7555,49 +7645,49 @@ msgstr ""
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:894
+#: ../lib/puppet/settings.rb:903
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:957
+#: ../lib/puppet/settings.rb:966
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:962
+#: ../lib/puppet/settings.rb:971
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:968
+#: ../lib/puppet/settings.rb:977
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1227
+#: ../lib/puppet/settings.rb:1241
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
-#: ../lib/puppet/settings.rb:1232
+#: ../lib/puppet/settings.rb:1246
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1403
+#: ../lib/puppet/settings.rb:1417
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1427
+#: ../lib/puppet/settings.rb:1441
 msgid "Could not find value for %{expression}"
 msgstr ""
 
 #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
-#: ../lib/puppet/settings.rb:1437
+#: ../lib/puppet/settings.rb:1451
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1438
+#: ../lib/puppet/settings.rb:1452
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1469
+#: ../lib/puppet/settings.rb:1483
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7951,79 +8041,87 @@ msgstr ""
 msgid "Error registering ssl custom OIDs mapping from file '%{custom_oid_file}': %{err}"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:85
+#: ../lib/puppet/ssl/ssl_provider.rb:66
+msgid "Failed to add '%{path}' as a trusted CA file: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/ssl/ssl_provider.rb:70
+msgid "The 'ssl_trust_store' setting does not refer to a file and will be ignored: '%{path}'"
+msgstr ""
+
+#: ../lib/puppet/ssl/ssl_provider.rb:104
 msgid "CA certs are missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:86
+#: ../lib/puppet/ssl/ssl_provider.rb:105
 msgid "CRLs are missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:87
+#: ../lib/puppet/ssl/ssl_provider.rb:106
 msgid "Private key is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:88
+#: ../lib/puppet/ssl/ssl_provider.rb:107
 msgid "Client cert is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:94
+#: ../lib/puppet/ssl/ssl_provider.rb:113
 msgid "Unsupported key '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:98
+#: ../lib/puppet/ssl/ssl_provider.rb:117
 msgid "The certificate for '%{name}' does not match its private key"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:137
+#: ../lib/puppet/ssl/ssl_provider.rb:156
 msgid "Failed to load private key for host '%{name}': %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:151
+#: ../lib/puppet/ssl/ssl_provider.rb:170
 msgid "The CSR for host '%{name}' does not match the public key"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:215
+#: ../lib/puppet/ssl/ssl_provider.rb:234
 msgid "The issuer '%{issuer}' of certificate '%{subject}' cannot be found locally"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:231
+#: ../lib/puppet/ssl/ssl_provider.rb:250
 msgid "The certificate '%{subject}' is not yet valid, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:233
+#: ../lib/puppet/ssl/ssl_provider.rb:252
 msgid "The certificate '%{subject}' has expired, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:235
+#: ../lib/puppet/ssl/ssl_provider.rb:254
 msgid "The CRL issued by '%{issuer}' is not yet valid, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:237
+#: ../lib/puppet/ssl/ssl_provider.rb:256
 msgid "The CRL issued by '%{issuer}' has expired, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:239
+#: ../lib/puppet/ssl/ssl_provider.rb:258
 msgid "Invalid signature for certificate '%{subject}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:241
+#: ../lib/puppet/ssl/ssl_provider.rb:260
 msgid "Invalid signature for CRL issued by '%{issuer}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:243
+#: ../lib/puppet/ssl/ssl_provider.rb:262
 msgid "The issuer '%{issuer}' of certificate '%{subject}' is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:246
+#: ../lib/puppet/ssl/ssl_provider.rb:265
 msgid "The CRL issued by '%{issuer}' is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:248
+#: ../lib/puppet/ssl/ssl_provider.rb:267
 msgid "Certificate '%{subject}' is revoked"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:252
+#: ../lib/puppet/ssl/ssl_provider.rb:271
 msgid "Certificate '%{subject}' failed verification (%{err}): %{err_utf8}"
 msgstr ""
 
@@ -8107,20 +8205,24 @@ msgstr ""
 msgid "Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name}). Exiting now because the maxwaitforcert timeout has been exceeded."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:279
-msgid "Will try again in %{time} seconds."
+#: ../lib/puppet/ssl/state_machine.rb:305
+msgid "Another puppet instance is already running and the waitforlock setting is set to 0; exiting"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:402
-msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
+#: ../lib/puppet/ssl/state_machine.rb:307
+msgid "Another puppet instance is already running and the maxwaitforlock timeout has been exceeded; exiting"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:404
-msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
+#: ../lib/puppet/ssl/state_machine.rb:309
+msgid "Another puppet instance is already running; waiting for it to finish"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:430
-msgid "Another puppet instance is already running; exiting"
+#: ../lib/puppet/ssl/state_machine.rb:427
+msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
+msgstr ""
+
+#: ../lib/puppet/ssl/state_machine.rb:429
+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
@@ -8370,77 +8472,89 @@ msgstr ""
 msgid "audit change: newly-recorded value %s"
 msgstr ""
 
-#: ../lib/puppet/type.rb:515
+#: ../lib/puppet/trusted_external.rb:6
+msgid "Retrieving trusted external data from %{command}"
+msgstr ""
+
+#: ../lib/puppet/trusted_external.rb:20
+msgid "Skipping non-executable file %{file}"
+msgstr ""
+
+#: ../lib/puppet/trusted_external.rb:25
+msgid "There is more than one '%{basename}' script in %{dir}"
+msgstr ""
+
+#: ../lib/puppet/type.rb:519
 msgid "Options must be a hash, not %{type}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:518
+#: ../lib/puppet/type.rb:522
 msgid "Class %{class_name} already has a property named %{property}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:605
+#: ../lib/puppet/type.rb:609
 msgid "Class %{class_name} has not defined parameters"
 msgstr ""
 
-#: ../lib/puppet/type.rb:692
+#: ../lib/puppet/type.rb:696
 msgid "Parameter %{name} failed on %{ref}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:715
+#: ../lib/puppet/type.rb:719
 msgid "Undefined attribute '%{attribute}' in %{name}"
 msgstr ""
 
 #. TRANSLATORS 'is' is a variable name and should not be translated
 #. TRANSLATORS 'is' is a variable name and should not be translated
-#: ../lib/puppet/type.rb:1058 ../lib/puppet/type.rb:1069
+#: ../lib/puppet/type.rb:1062 ../lib/puppet/type.rb:1073
 msgid "The 'is' value is not in the 'is' array for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1200
+#: ../lib/puppet/type.rb:1204
 msgid "%{name} has no providers and has not overridden 'instances'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1462
+#: ../lib/puppet/type.rb:1468
 msgid "Cannot add aliases without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1542
+#: ../lib/puppet/type.rb:1548
 msgid "Could not find %{description} %{ref} for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1817
+#: ../lib/puppet/type.rb:1825
 msgid "Found multiple default providers for %{name}: %{provider_list}; using %{selected_provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1904
+#: ../lib/puppet/type.rb:1912
 msgid "Could not find parent provider %{parent} of %{name}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1978
+#: ../lib/puppet/type.rb:1986
 msgid "Invalid %{resource} provider '%{provider_class}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2063
+#: ../lib/puppet/type.rb:2071
 msgid "Could not find %{name} provider of %{provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2181
+#: ../lib/puppet/type.rb:2189
 msgid "You cannot add relationships without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2484
+#: ../lib/puppet/type.rb:2492
 msgid "Unable to mark '%{name}' as sensitive: %{name} is a parameter and not a property, and cannot be automatically redacted."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2487
+#: ../lib/puppet/type.rb:2495
 msgid "Unable to mark '%{name}' as sensitive: the property itself was not assigned a value."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2489
+#: ../lib/puppet/type.rb:2497
 msgid "Unable to mark '%{name}' as sensitive: the property itself is not defined on %{type}."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2547
+#: ../lib/puppet/type.rb:2555
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
@@ -8529,75 +8643,75 @@ msgstr ""
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:414
+#: ../lib/puppet/type/file.rb:418
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:416
+#: ../lib/puppet/type/file.rb:420
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:418
+#: ../lib/puppet/type/file.rb:422
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:421
+#: ../lib/puppet/type/file.rb:425
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:424
+#: ../lib/puppet/type/file.rb:428
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:432
+#: ../lib/puppet/type/file.rb:436
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:435
+#: ../lib/puppet/type/file.rb:439
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:473
+#: ../lib/puppet/type/file.rb:477
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:478
+#: ../lib/puppet/type/file.rb:482
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:776
+#: ../lib/puppet/type/file.rb:780
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:791
+#: ../lib/puppet/type/file.rb:795
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:802
+#: ../lib/puppet/type/file.rb:806
 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:883 ../lib/puppet/type/tidy.rb:352
+#: ../lib/puppet/type/file.rb:887 ../lib/puppet/type/tidy.rb:352
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:886
+#: ../lib/puppet/type/file.rb:890
 msgid "Could not stat; invalid pathname"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1014
+#: ../lib/puppet/type/file.rb:1018
 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:1039
+#: ../lib/puppet/type/file.rb:1043
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1053
-msgid "File written to disk did not match checksum; discarding changes (%{content_checksum} vs %{newsum})"
+#: ../lib/puppet/type/file.rb:1058
+msgid "File written to disk did not match desired checksum; discarding changes (%{content_checksum} vs %{desired_checksum})"
 msgstr ""
 
 #: ../lib/puppet/type/file/checksum.rb:20
@@ -8638,7 +8752,7 @@ msgid "Not managing symlink mode"
 msgstr ""
 
 #. TRANSLATORS "source_permissions" is a parameter name and should not be translated
-#: ../lib/puppet/type/file/source.rb:353
+#: ../lib/puppet/type/file/source.rb:373
 msgid "The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`."
 msgstr ""
 
@@ -8662,27 +8776,35 @@ msgstr ""
 msgid "Invalid GID %{gid}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:121 ../lib/puppet/type/package.rb:135
+#: ../lib/puppet/type/package.rb:128 ../lib/puppet/type/package.rb:142
 msgid "Could not update: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:170
+#: ../lib/puppet/type/package.rb:177
 msgid "Could not get latest version: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:270
+#: ../lib/puppet/type/package.rb:277
 msgid "Name must be a String not %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:510
+#: ../lib/puppet/type/package.rb:423
+msgid "Cannot have both `ensure => disabled` and `flavor`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:522
 msgid "Cannot have both `enable_only => true` and `flavor`"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:672
+#: ../lib/puppet/type/package.rb:525
+msgid "Cannot have both `ensure => disabled` and `enable_only => true`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:687
 msgid "Invalid hold value %{value}. %{doc}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:702
+#: ../lib/puppet/type/package.rb:717
 msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\", \"held\"]"
 msgstr ""
 
@@ -8742,7 +8864,15 @@ msgstr ""
 msgid "Setting enable to %{value} is only supported on Microsoft Windows."
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:253
+#: ../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
+msgid "Passwords cannot include ':'"
+msgstr ""
+
+#: ../lib/puppet/type/service.rb:304
 msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
 msgstr ""
 
@@ -8777,93 +8907,81 @@ msgstr ""
 msgid "File does not exist"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:167
+#: ../lib/puppet/type/user.rb:182
 msgid "Could not find group(s) %{groups}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:256
-msgid "Passwords cannot include ':'"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:276
+#: ../lib/puppet/type/user.rb:291
 msgid "Password minimum age must be provided as a number."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:295
+#: ../lib/puppet/type/user.rb:310
 msgid "Password maximum age must be provided as a number."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:326
+#: ../lib/puppet/type/user.rb:341
 msgid "Group names must be provided, not GID numbers."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:328
+#: ../lib/puppet/type/user.rb:343
 msgid "Group names must be provided as an array, not a comma-separated list."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:329
+#: ../lib/puppet/type/user.rb:344
 msgid "Group names must not be empty. If you want to specify \"no groups\" pass an empty array"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:422
+#: ../lib/puppet/type/user.rb:437
 msgid "User provider %{name} can not manage home directories"
 msgstr ""
 
 #. TRANSLATORS YYYY-MM-DD represents a date with a four-digit year, a two-digit month, and a two-digit day,
 #. TRANSLATORS separated by dashes.
-#: ../lib/puppet/type/user.rb:439
+#: ../lib/puppet/type/user.rb:454
 msgid "Expiry dates must be YYYY-MM-DD or the string \"absent\""
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:506
+#: ../lib/puppet/type/user.rb:521
 msgid "Role names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:508
+#: ../lib/puppet/type/user.rb:523
 msgid "Role names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:545
+#: ../lib/puppet/type/user.rb:560
 msgid "Auth names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:547
+#: ../lib/puppet/type/user.rb:562
 msgid "Auth names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:571
+#: ../lib/puppet/type/user.rb:586
 msgid "Profile names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:573
+#: ../lib/puppet/type/user.rb:588
 msgid "Profile names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:684
+#: ../lib/puppet/type/user.rb:699
 msgid "Ssh_authorized_key type is not available. Cannot purge SSH keys."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:722
+#: ../lib/puppet/type/user.rb:737
 msgid "Each entry for purge_ssh_keys must be a string, not a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:725
+#: ../lib/puppet/type/user.rb:740
 msgid "Paths to keyfiles must be absolute, not %{entry}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:729
+#: ../lib/puppet/type/user.rb:744
 msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:741
-msgid "purge_ssh_keys can only be true for users with a defined home directory"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:748
-msgid "purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:763
+#: ../lib/puppet/type/user.rb:772
 msgid "Class name must be provided."
 msgstr ""
 
@@ -8914,23 +9032,23 @@ msgstr ""
 msgid "Couldn't expand PATH containing a ~ character; ignoring PATH element '%{dir}'."
 msgstr ""
 
-#: ../lib/puppet/util.rb:313
+#: ../lib/puppet/util.rb:318
 msgid "unknown platform %{platform} in absolute_path"
 msgstr ""
 
-#: ../lib/puppet/util.rb:348
+#: ../lib/puppet/util.rb:353
 msgid "Failed to convert '%{path}' to URI: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util.rb:448
+#: ../lib/puppet/util.rb:453
 msgid "path may not be nil"
 msgstr ""
 
-#: ../lib/puppet/util.rb:596
+#: ../lib/puppet/util.rb:621
 msgid "replace_file requires a block"
 msgstr ""
 
-#: ../lib/puppet/util.rb:600
+#: ../lib/puppet/util.rb:625
 msgid "replace_file default_mode: %{default_mode} is invalid"
 msgstr ""
 
@@ -8962,11 +9080,11 @@ msgstr ""
 msgid "Failed to abandon a child process contract"
 msgstr ""
 
-#: ../lib/puppet/util/autoload.rb:74
+#: ../lib/puppet/util/autoload.rb:83
 msgid "Could not autoload %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/autoload.rb:199
+#: ../lib/puppet/util/autoload.rb:184
 msgid "Autoload paths cannot be fully qualified"
 msgstr ""
 
@@ -8994,15 +9112,15 @@ msgstr ""
 msgid "Filebucketed %{f} to %{filebucket} with sum %{sum}"
 msgstr ""
 
-#: ../lib/puppet/util/character_encoding.rb:22
+#: ../lib/puppet/util/character_encoding.rb:23
 msgid "%{value} is already labeled as UTF-8 but this encoding is invalid. It cannot be transcoded by Puppet."
 msgstr ""
 
-#: ../lib/puppet/util/character_encoding.rb:43
+#: ../lib/puppet/util/character_encoding.rb:45
 msgid "%{error}: %{value} cannot be transcoded by Puppet."
 msgstr ""
 
-#: ../lib/puppet/util/character_encoding.rb:70
+#: ../lib/puppet/util/character_encoding.rb:73
 msgid "%{value} is not valid UTF-8 and result of overriding encoding would be invalid."
 msgstr ""
 
@@ -9201,9 +9319,9 @@ msgstr ""
 msgid "Dynamically-bound port lookup failed; using first entry from the `server_list` setting: %{port}"
 msgstr ""
 
-#. TRANSLATORS 'masterport' is the name of a setting and should not be translated
+#. TRANSLATORS 'serverport' is the name of a setting and should not be translated
 #: ../lib/puppet/util/connection.rb:75
-msgid "Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}"
+msgid "Dynamically-bound port lookup failed; falling back to `serverport` setting: %{port}"
 msgstr ""
 
 #: ../lib/puppet/util/connection.rb:80
@@ -9497,10 +9615,6 @@ msgstr ""
 msgid "Creating log directory %{dir}"
 msgstr ""
 
-#: ../lib/puppet/util/log/destinations.rb:102
-msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
-msgstr ""
-
 #: ../lib/puppet/util/logging.rb:81 ../lib/puppet/util/logging.rb:105
 msgid "Wrapped exception:"
 msgstr ""
@@ -9538,7 +9652,7 @@ msgstr ""
 msgid "%{value} is an invalid url"
 msgstr ""
 
-#: ../lib/puppet/util/package/version/rpm.rb:47
+#: ../lib/puppet/util/package/version/rpm.rb:40
 msgid "Cannot compare, as %{other} is not a Rpm Version"
 msgstr ""
 
@@ -9786,11 +9900,11 @@ msgstr ""
 msgid "Cannot create group if user '%{name}' exists."
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:72
+#: ../lib/puppet/util/windows/api_types.rb:85
 msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:203
+#: ../lib/puppet/util/windows/api_types.rb:230
 msgid "Bad GUID format."
 msgstr ""
 
@@ -9845,16 +9959,20 @@ msgstr ""
 msgid "Failed to call GetLongPathName"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:68 ../lib/puppet/util/windows/principal.rb:75
+#: ../lib/puppet/util/windows/principal.rb:67 ../lib/puppet/util/windows/principal.rb:74
 msgid "Failed to call LookupAccountNameW with account: %{account_name}"
 msgstr ""
 
 #. TRANSLATORS `lookup_account_sid` is a variable name and should not be translated
-#: ../lib/puppet/util/windows/principal.rb:98
+#: ../lib/puppet/util/windows/principal.rb:97
 msgid "Byte array for lookup_account_sid must not be nil and must be at least 1 byte long"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:120 ../lib/puppet/util/windows/principal.rb:127
+#: ../lib/puppet/util/windows/principal.rb:114
+msgid "Byte array for lookup_account_sid is invalid: %{sid_bytes}"
+msgstr ""
+
+#: ../lib/puppet/util/windows/principal.rb:122 ../lib/puppet/util/windows/principal.rb:129
 msgid "Failed to call LookupAccountSidW with bytes: %{sid_bytes}"
 msgstr ""
 
@@ -9890,39 +10008,39 @@ msgstr ""
 msgid "Failed to open registry key '%{key}\\%{path}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:130
+#: ../lib/puppet/util/windows/registry.rb:133
 msgid "Failed to enumerate %{key} registry keys at index %{index}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:161
+#: ../lib/puppet/util/windows/registry.rb:167
 msgid "Failed to enumerate %{key} registry values at index %{index}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:191
+#: ../lib/puppet/util/windows/registry.rb:197
 msgid "Failed to query registry %{key} for sizes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:227
+#: ../lib/puppet/util/windows/registry.rb:233
 msgid "Type mismatch (expect %{rtype} but %{type} present)"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:249
+#: ../lib/puppet/util/windows/registry.rb:255
 msgid "Type %{type} is not supported."
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:254
+#: ../lib/puppet/util/windows/registry.rb:260
 msgid "A value in the registry key %{parent_key_name}%{key} is corrupt or invalid"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:276
+#: ../lib/puppet/util/windows/registry.rb:282
 msgid "Failed to read registry value %{value} at %{key}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:294
+#: ../lib/puppet/util/windows/registry.rb:300
 msgid "Failed to delete registry value %{name} at %{key}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:309
+#: ../lib/puppet/util/windows/registry.rb:315
 msgid "Failed to delete registry key %{name} at %{key}"
 msgstr ""
 
@@ -9964,7 +10082,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:43
+#: ../lib/puppet/util/windows/security.rb:433 ../lib/puppet/util/windows/security.rb:450 ../lib/puppet/util/windows/sid.rb:155 ../lib/puppet/util/windows/sid.rb:217 ../lib/puppet/util/windows/user.rb:59
 msgid "Invalid SID"
 msgstr ""
 
@@ -10040,87 +10158,83 @@ msgstr ""
 msgid "Unknown start type '%{start_type}' for '%{service_name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:453
-msgid "Unknown start type %{start_type}"
-msgstr ""
-
-#: ../lib/puppet/util/windows/service.rb:474
+#: ../lib/puppet/util/windows/service.rb:487
 msgid "Failed to update service configuration"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:535
+#: ../lib/puppet/util/windows/service.rb:552
 msgid "Failed to fetch services"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:584
+#: ../lib/puppet/util/windows/service.rb:601
 msgid "Failed to open a handle to the service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:601
+#: ../lib/puppet/util/windows/service.rb:618
 msgid "Failed to open a handle to the service control manager"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:624
+#: ../lib/puppet/util/windows/service.rb:641
 msgid "The service is already in the %{final_state} state. No further work needs to be done."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:636
+#: ../lib/puppet/util/windows/service.rb:653
 msgid "The service must be in one of the %{valid_initial_states} states to perform this transition. It is currently in the %{current_state} state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:647
+#: ../lib/puppet/util/windows/service.rb:664
 msgid "There is already a pending transition to the %{final_state} state for the %{service_name} service."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:663
+#: ../lib/puppet/util/windows/service.rb:680
 msgid "The service is in the %{pending_state} state, which is an unsafe pending state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:668
+#: ../lib/puppet/util/windows/service.rb:685
 msgid "Transitioning the %{service_name} service from %{initial_state} to %{final_state}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:672
+#: ../lib/puppet/util/windows/service.rb:689
 msgid "Waiting for the transition to finish"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:677
+#: ../lib/puppet/util/windows/service.rb:694
 msgid "Failed to transition the %{service_name} service to the %{final_state} state. Detail: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:716 ../lib/puppet/util/windows/service.rb:752
+#: ../lib/puppet/util/windows/service.rb:733 ../lib/puppet/util/windows/service.rb:769
 msgid "Service query failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:795
+#: ../lib/puppet/util/windows/service.rb:812
 msgid "Service query for %{parameter_name} failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:818
+#: ../lib/puppet/util/windows/service.rb:835
 msgid "Failed to update service %{change} configuration"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:845
+#: ../lib/puppet/util/windows/service.rb:862
 msgid "Failed to send the %{control_signal} signal to the service. Its current state is %{current_state}. Reason for failure:"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:880
+#: ../lib/puppet/util/windows/service.rb:897
 msgid "The service transitioned to the %{pending_state} state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:894
+#: ../lib/puppet/util/windows/service.rb:911
 msgid "Timed out while waiting for the service to transition from %{initial_state} to %{final_state} OR from %{initial_state} to %{pending_state} to %{final_state}. The service's current state is %{current_state}."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:909
+#: ../lib/puppet/util/windows/service.rb:926
 msgid "Waiting for the pending transition to the %{final_state} state to finish."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:923
+#: ../lib/puppet/util/windows/service.rb:940
 msgid "Unexpected transition to the %{current_state} state while waiting for the pending transition from %{pending_state} to %{final_state} to finish."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:937
+#: ../lib/puppet/util/windows/service.rb:954
 msgid "Timed out while waiting for the pending transition from %{pending_state} to %{final_state} to finish. The current state is %{current_state}."
 msgstr ""
 
@@ -10140,23 +10254,23 @@ msgstr ""
 msgid "Failed to convert string SID: %{string_sid}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:38
+#: ../lib/puppet/util/windows/user.rb:54
 msgid "Failed to create administrators SID"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:48
+#: ../lib/puppet/util/windows/user.rb:64
 msgid "Failed to check membership"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:88
+#: ../lib/puppet/util/windows/user.rb:104
 msgid "Failed to logon user %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:120
+#: ../lib/puppet/util/windows/user.rb:135
 msgid "Failed to load user profile %{user}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:126
+#: ../lib/puppet/util/windows/user.rb:141
 msgid "Failed to unload user profile %{user}"
 msgstr ""