puppet 6.18.0-x86-mingw32 → 6.21.1-x86-mingw32

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.17.0-93-gddd91ef701\n"
+"Project-Id-Version: Puppet automation framework 6.19.1-133-gcc65fe8151\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2020-07-30 16:49+0000\n"
-"PO-Revision-Date: 2020-07-30 16:49+0000\n"
+"POT-Creation-Date: 2021-01-14 12:33+0000\n"
+"PO-Revision-Date: 2021-01-14 12:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -120,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 ""
@@ -178,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 ""
 
@@ -194,19 +184,19 @@ msgstr ""
 msgid "The puppet agent daemon"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:409
+#: ../lib/puppet/application/agent.rb:415
 msgid "Fingerprint asked but neither the certificate, nor the certificate request have been issued"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:414
+#: ../lib/puppet/application/agent.rb:420
 msgid "Failed to generate fingerprint: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:437
+#: ../lib/puppet/application/agent.rb:443
 msgid "Starting Puppet client version %{version}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:453
+#: ../lib/puppet/application/agent.rb:459
 msgid "The puppet agent command does not take parameters"
 msgstr ""
 
@@ -216,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:208 ../lib/puppet/application/apply.rb:321
 msgid "For puppet apply"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:215
+#: ../lib/puppet/application/apply.rb:216
 msgid "%{file} is not readable"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:286 ../lib/puppet/application/script.rb:239
+#: ../lib/puppet/application/apply.rb:287 ../lib/puppet/application/script.rb:240
 msgid "Exiting"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:330
+#: ../lib/puppet/application/apply.rb:331
 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:352 ../lib/puppet/application/script.rb:145
 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:364 ../lib/puppet/application/script.rb:153
 msgid "Could not find node %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:376 ../lib/puppet/application/script.rb:137
+#: ../lib/puppet/application/apply.rb:377 ../lib/puppet/application/script.rb:138
 msgid "Could not find file %{manifest}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:377
+#: ../lib/puppet/application/apply.rb:378
 msgid "Only one file can be applied per run.  Skipping %{files}"
 msgstr ""
 
@@ -260,47 +250,47 @@ msgstr ""
 msgid "Manage remote network devices"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:230
+#: ../lib/puppet/application/device.rb:231
 msgid "resource command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:233
+#: ../lib/puppet/application/device.rb:234
 msgid "facts command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:236
+#: ../lib/puppet/application/device.rb:237
 msgid "missing argument: --target is required when using --apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:237
+#: ../lib/puppet/application/device.rb:238
 msgid "%{file} does not exist, cannot apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:255
+#: ../lib/puppet/application/device.rb:256
 msgid "Target device / certificate '%{target}' not found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:257
+#: ../lib/puppet/application/device.rb:258
 msgid "No device found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:316
+#: ../lib/puppet/application/device.rb:317
 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:332
 msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:354
+#: ../lib/puppet/application/device.rb:355
 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:393 ../lib/puppet/application/resource.rb:196
 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:394 ../lib/puppet/application/resource.rb:197
 msgid "Could not find type %{type}"
 msgstr ""
 
@@ -400,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:530
 msgid "Incorrect formatted data in %{fact_file} given via the --facts flag"
 msgstr ""
 
@@ -448,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:125
 msgid "Bolt must be installed to use the script application"
 msgstr ""
 
-#: ../lib/puppet/application/script.rb:138
+#: ../lib/puppet/application/script.rb:139
 msgid "Only one file can be used per run. Skipping %{files}"
 msgstr ""
 
@@ -536,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:227
+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:241
+msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
+msgstr ""
+
+#: ../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:301
+#: ../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:316
+#: ../lib/puppet/configurer.rb:337
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:320
+#: ../lib/puppet/configurer.rb:341
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:348
+#: ../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:359
+#: ../lib/puppet/configurer.rb:380
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:361
+#: ../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:402
+#: ../lib/puppet/configurer.rb:426
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:431 ../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:435 ../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:446 ../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:455
+#: ../lib/puppet/configurer.rb:479
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:474
+#: ../lib/puppet/configurer.rb:498
 msgid "Uploading facts for %{node} to %{server}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:482
+#: ../lib/puppet/configurer.rb:506
 msgid "Failed to submit facts: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:497
+#: ../lib/puppet/configurer.rb:521
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:515
+#: ../lib/puppet/configurer.rb:539
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:536
+#: ../lib/puppet/configurer.rb:560
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -698,46 +692,50 @@ msgstr ""
 msgid "a data type can only have one implementation"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:178
+#: ../lib/puppet/defaults.rb:179
 msgid "Cannot disable unrecognized warning types '%{invalid}'."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:179
+#: ../lib/puppet/defaults.rb:180
 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:547
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:548
+#: ../lib/puppet/defaults.rb:549
 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:747
+#: ../lib/puppet/defaults.rb:762
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:830
+#: ../lib/puppet/defaults.rb:847
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1024
+#: ../lib/puppet/defaults.rb:1042
 msgid "Setting 'ssl_client_ca_auth' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1103 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1121 ../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:1969
+#: ../lib/puppet/defaults.rb:1995
 msgid "Setting 'pluginsync' is deprecated."
 msgstr ""
 
+#: ../lib/puppet/defaults.rb:2230
+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 ""
@@ -780,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:30 ../lib/puppet/face/generate.rb:7 ../lib/puppet/face/help.rb:9 ../lib/puppet/face/key.rb:5 ../lib/puppet/face/man.rb:8 ../lib/puppet/face/module.rb:9 ../lib/puppet/face/node.rb:4 ../lib/puppet/face/parser.rb:6 ../lib/puppet/face/plugin.rb:6 ../lib/puppet/face/report.rb:5 ../lib/puppet/face/resource.rb:5 ../lib/puppet/face/status.rb:5
 msgid "Apache 2 license; see COPYING"
 msgstr ""
 
@@ -836,7 +834,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"
@@ -846,25 +844,28 @@ msgid ""
 "https://puppet.com/docs/puppet/latest/configuration.html#environment\n"
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:174
+#: ../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:201
 msgid "Delete a Puppet setting."
 msgstr ""
 
-#: ../lib/puppet/face/config.rb:175
+#: ../lib/puppet/face/config.rb:202
 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: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:215
+#: ../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:222
+#: ../lib/puppet/face/config.rb:262
 msgid "The puppet.conf file does not exist %{puppet_conf}"
 msgstr ""
 
@@ -1014,26 +1015,34 @@ 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:32
 msgid "Retrieve and store facts."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:16
+#: ../lib/puppet/face/facts.rb:40
 msgid "Retrieve a node's facts."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:17
+#: ../lib/puppet/face/facts.rb:41
 msgid "[<node_certname>]"
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:40
+#: ../lib/puppet/face/facts.rb:64
 msgid "Upload local facts to the puppet master."
 msgstr ""
 
-#: ../lib/puppet/face/facts.rb:82
+#: ../lib/puppet/face/facts.rb:106
 msgid "Uploading facts for '%{node}' to '%{server}'"
 msgstr ""
 
+#: ../lib/puppet/face/facts.rb:116
+msgid "Compare Facter 3 output with Facter 4 output"
+msgstr ""
+
+#: ../lib/puppet/face/facts.rb:145
+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/generate.rb:9
 msgid "Generates Puppet code from Ruby definitions."
 msgstr ""
@@ -2283,15 +2292,15 @@ 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:288
+#: ../lib/puppet/http/service.rb:147 ../lib/puppet/indirector/rest.rb:288
 msgid "No content type in http response; cannot parse"
 msgstr ""
 
@@ -2604,7 +2613,7 @@ msgstr ""
 msgid "Puppet::Indirector::FileContent::Http is deprecated. Use Puppet::HTTP::Client instead."
 msgstr ""
 
-#: ../lib/puppet/indirector/file_metadata/http.rb:31
+#: ../lib/puppet/indirector/file_metadata/http.rb:32
 msgid "cannot lookup multiple files"
 msgstr ""
 
@@ -2711,11 +2720,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 ""
 
@@ -2772,6 +2781,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 ""
@@ -2784,14 +2801,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 ""
@@ -2815,9 +2824,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
@@ -2990,8 +2999,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 ""
@@ -3347,11 +3356,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 ""
 
@@ -3395,7 +3404,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 ""
 
@@ -3425,7 +3434,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 ""
 
@@ -3470,150 +3479,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 ""
 
@@ -4172,7 +4193,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:562 ../lib/puppet/pops/loaders.rb:301
+#: ../lib/puppet/node/environment.rb:568 ../lib/puppet/pops/loaders.rb:301
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -4204,54 +4225,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:181
 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:237
 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: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:278
+#: ../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:283
+#: ../lib/puppet/pal/pal_impl.rb:301
 msgid "The environment directory '%{env_dir}' does not exist"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:306
+#: ../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:360
+#: ../lib/puppet/pal/pal_impl.rb:378
 msgid "Given variables must be a hash, got %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:366
+#: ../lib/puppet/pal/pal_impl.rb:384
 msgid "Given variable '%{varname}' has illegal name"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:370
+#: ../lib/puppet/pal/pal_impl.rb:388
 msgid "Given value for '%{varname}' has illegal type - got: %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:485
+#: ../lib/puppet/pal/pal_impl.rb:562
 msgid "Puppet Pal: %{what}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:499
+#: ../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:506
+#: ../lib/puppet/pal/pal_impl.rb:583
 msgid "A block must be given"
 msgstr ""
 
@@ -4556,31 +4577,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 ""
 
@@ -4964,23 +4985,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 ""
 
@@ -5958,23 +5979,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 ""
 
@@ -6787,7 +6808,7 @@ msgstr ""
 msgid "Could not list installed Packages: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:156 ../lib/puppet/provider/package/yum.rb:332
+#: ../lib/puppet/provider/package/aix.rb:156 ../lib/puppet/provider/package/yum.rb:333
 msgid "Tried to get latest on a missing package"
 msgstr ""
 
@@ -6803,19 +6824,19 @@ 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:85
 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:167 ../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:178 ../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:182 ../lib/puppet/provider/package/fink.rb:70
 msgid "No responsefile specified or non existent, not preseeding anything"
 msgstr ""
 
@@ -6867,7 +6888,7 @@ msgstr ""
 msgid "source is defined but does not have trailing slash, ignoring %{source}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:102
+#: ../lib/puppet/provider/package/gem.rb:102 ../lib/puppet/provider/package/puppetserver_gem.rb:61
 msgid "Could not list gems: %{detail}"
 msgstr ""
 
@@ -6875,19 +6896,19 @@ msgstr ""
 msgid "Could not match %{desc}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:206
+#: ../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:217
+#: ../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:233
+#: ../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:259
+#: ../lib/puppet/provider/package/gem.rb:259 ../lib/puppet/provider/package/puppetserver_gem.rb:125
 msgid "Could not uninstall: %{output}"
 msgstr ""
 
@@ -7282,15 +7303,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 ""
 
@@ -7496,67 +7517,67 @@ msgstr ""
 msgid "Could not evaluate: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:81
+#: ../lib/puppet/resource/type.rb:82
 msgid "Invalid export in %{reference}: %{ex} is not a resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:82
+#: ../lib/puppet/resource/type.rb:83
 msgid "Invalid export in %{reference}: %{ex} is not a capability resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:86
+#: ../lib/puppet/resource/type.rb:87
 msgid "Resource type %{res_type} does not produce %{ex_type}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:147
+#: ../lib/puppet/resource/type.rb:148
 msgid "Invalid resource supertype '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:199
+#: ../lib/puppet/resource/type.rb:200
 msgid "%{name} is not a class; cannot add code to it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:200
+#: ../lib/puppet/resource/type.rb:201
 msgid "%{name} is not a class; cannot add code from it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:204
+#: ../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:208
+#: ../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:239
+#: ../lib/puppet/resource/type.rb:240
 msgid "Cannot create resources for defined resource types"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:294
+#: ../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:310
+#: ../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:437
+#: ../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:440
+#: ../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:482
+#: ../lib/puppet/resource/type.rb:483
 msgid "Could not find scope for %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:503
+#: ../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:505
+#: ../lib/puppet/resource/type.rb:506
 msgid "%{param} is a metaparameter; please choose another parameter name in the %{name} definition"
 msgstr ""
 
@@ -7628,69 +7649,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:894
+#: ../lib/puppet/settings.rb:905
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:957
+#: ../lib/puppet/settings.rb:978
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:962
+#: ../lib/puppet/settings.rb:983
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:968
+#: ../lib/puppet/settings.rb:989
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1227
+#: ../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:1232
+#: ../lib/puppet/settings.rb:1258
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1403
+#: ../lib/puppet/settings.rb:1435
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1427
+#: ../lib/puppet/settings.rb:1459
 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:1469
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1438
+#: ../lib/puppet/settings.rb:1470
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1469
+#: ../lib/puppet/settings.rb:1501
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7703,38 +7724,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 ""
 
@@ -8755,7 +8776,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:368
+#: ../lib/puppet/type/file/source.rb:373
 msgid "The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`."
 msgstr ""
 
@@ -8867,15 +8888,15 @@ msgstr ""
 msgid "Setting enable to %{value} is only supported on Microsoft Windows."
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:162
+#: ../lib/puppet/type/service.rb:166
 msgid "The 'logonaccount' parameter is mandatory when setting 'logonpassword'."
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:163 ../lib/puppet/type/user.rb:256
+#: ../lib/puppet/type/service.rb:167 ../lib/puppet/type/user.rb:271
 msgid "Passwords cannot include ':'"
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:300
+#: ../lib/puppet/type/service.rb:304
 msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
 msgstr ""
 
@@ -8910,81 +8931,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: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:757
+#: ../lib/puppet/type/user.rb:772
 msgid "Class name must be provided."
 msgstr ""
 
@@ -9083,11 +9104,11 @@ msgstr ""
 msgid "Failed to abandon a child process contract"
 msgstr ""
 
-#: ../lib/puppet/util/autoload.rb:75
+#: ../lib/puppet/util/autoload.rb:83
 msgid "Could not autoload %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/autoload.rb:182
+#: ../lib/puppet/util/autoload.rb:177
 msgid "Autoload paths cannot be fully qualified"
 msgstr ""
 
@@ -9322,9 +9343,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
@@ -9671,19 +9692,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 ""
 
@@ -9907,7 +9928,7 @@ msgstr ""
 msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:216
+#: ../lib/puppet/util/windows/api_types.rb:230
 msgid "Bad GUID format."
 msgstr ""