puppet 6.0.10-x86-mingw32 → 6.1.0-x86-mingw32

data/locales/puppet.pot

@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2019 Puppet, Inc.
+# Copyright (C) 2018 Puppet, Inc.
 # This file is distributed under the same license as the Puppet automation framework package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.0.9-65-gc4f22cb\n"
+"Project-Id-Version: Puppet automation framework 6.0.4-203-g3db83f5\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2019-05-28 23:50+0000\n"
-"PO-Revision-Date: 2019-05-28 23:50+0000\n"
+"POT-Creation-Date: 2018-12-07 19:18+0000\n"
+"PO-Revision-Date: 2018-12-07 19:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "See https://puppet.com/docs/puppet/%{minor_version}/deprecated_language.html"
 msgstr ""
 
-#: ../lib/hiera/scope.rb:46 ../lib/puppet/parser/scope.rb:535
+#: ../lib/hiera/scope.rb:43 ../lib/puppet/parser/scope.rb:535
 msgid "Variable: %{name}"
 msgstr ""
 
-#: ../lib/hiera/scope.rb:47 ../lib/hiera/scope.rb:49 ../lib/puppet/parser/scope.rb:536 ../lib/puppet/parser/scope.rb:538
+#: ../lib/hiera/scope.rb:44 ../lib/hiera/scope.rb:46 ../lib/puppet/parser/scope.rb:536 ../lib/puppet/parser/scope.rb:538
 msgid "Undefined variable '%{name}'; %{reason}"
 msgstr ""
 
@@ -48,6 +48,10 @@ msgstr ""
 msgid "Config file %{hiera_config} not found, using Hiera defaults"
 msgstr ""
 
+#: ../lib/puppet.rb:4
+msgid "Puppet %{version} requires ruby 2.3.0 or greater."
+msgstr ""
+
 #: ../lib/puppet.rb:130
 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 ""
@@ -156,15 +160,11 @@ msgstr ""
 msgid "No valid command or main"
 msgstr ""
 
-#: ../lib/puppet/application.rb:428
-msgid "Could not set logdest to %{dest}."
-msgstr ""
-
 #: ../lib/puppet/application.rb:504
 msgid "No help available for puppet %{app_name}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:24 ../lib/puppet/application/device.rb:23
+#: ../lib/puppet/application/agent.rb:24 ../lib/puppet/application/device.rb:22
 msgid "Cancelling startup"
 msgstr ""
 
@@ -234,51 +234,51 @@ msgstr ""
 msgid "Display help about resource types"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:82
+#: ../lib/puppet/application/device.rb:77
 msgid "Manage remote network devices"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:226
+#: ../lib/puppet/application/device.rb:216
 msgid "resource command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:229
+#: ../lib/puppet/application/device.rb:219
 msgid "facts command requires target"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:232
+#: ../lib/puppet/application/device.rb:222
 msgid "missing argument: --target is required when using --apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:233
+#: ../lib/puppet/application/device.rb:223
 msgid "%{file} does not exist, cannot apply"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:250
+#: ../lib/puppet/application/device.rb:239
 msgid "Target device / certificate '%{target}' not found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:252
+#: ../lib/puppet/application/device.rb:241
 msgid "No device found in %{config}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:304
+#: ../lib/puppet/application/device.rb:263
 msgid "retrieving resource: %{resource} from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:319
+#: ../lib/puppet/application/device.rb:278
 msgid "retrieving facts from %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:342
+#: ../lib/puppet/application/device.rb:303
 msgid "starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:380 ../lib/puppet/application/resource.rb:196
+#: ../lib/puppet/application/device.rb:340 ../lib/puppet/application/resource.rb:196
 msgid "You must specify the type to display"
 msgstr ""
 
-#: ../lib/puppet/application/device.rb:381 ../lib/puppet/application/resource.rb:197
+#: ../lib/puppet/application/device.rb:341 ../lib/puppet/application/resource.rb:197
 msgid "Could not find type %{type}"
 msgstr ""
 
@@ -344,41 +344,30 @@ msgstr ""
 msgid "Store and retrieve files in a filebucket"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:208
+#: ../lib/puppet/application/filebucket.rb:203
 msgid "You must specify a file to back up"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:212
+#: ../lib/puppet/application/filebucket.rb:207
 msgid "%{file}: no such file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:216
+#: ../lib/puppet/application/filebucket.rb:211
 msgid "%{file}: cannot read file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:238 ../lib/puppet/application/filebucket.rb:261
+#: ../lib/puppet/application/filebucket.rb:233 ../lib/puppet/application/filebucket.rb:256
 msgid "Need exactly two arguments: filebucket diff <file_a> <file_b>"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:258
+#: ../lib/puppet/application/filebucket.rb:253
 msgid "Comparing %{checksum_a} %{checksum_b} %{file_a} %{file_b}"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:272
+#: ../lib/puppet/application/filebucket.rb:267
 msgid "Cancelling"
 msgstr ""
 
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/application/filebucket.rb:293
-msgid "Selected server from first entry of the `server_list` setting: %{server}:%{port}"
-msgstr ""
-
-#. TRANSLATORS 'server' is the name of a setting and should not be translated
-#. TRANSLATORS 'server' is the name of a setting and should not be translated
-#: ../lib/puppet/application/filebucket.rb:300 ../lib/puppet/indirector/request.rb:213
-msgid "Selected server from the `server` setting: %{server}"
-msgstr ""
-
 #: ../lib/puppet/application/lookup.rb:8
 msgid "Run 'puppet lookup --help' for more details"
 msgstr ""
@@ -517,7 +506,7 @@ msgid ""
 "  puppet ssl clean\n"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:213
+#: ../lib/puppet/application/ssl.rb:214
 msgid "Removed %{label} %{path}"
 msgstr ""
 
@@ -557,73 +546,71 @@ msgstr ""
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:230
-msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
+#: ../lib/puppet/configurer.rb:231
+msgid "Selected puppet server: %{server}:%{port}"
 msgstr ""
 
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:233
-msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
+#: ../lib/puppet/configurer.rb:234
+msgid "Could not select a functional puppet server"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:265
+#: ../lib/puppet/configurer.rb:264
 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:310
+#: ../lib/puppet/configurer.rb:309
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:315
+#: ../lib/puppet/configurer.rb:314
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:319
+#: ../lib/puppet/configurer.rb:318
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:347
+#: ../lib/puppet/configurer.rb:346
 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:358
+#: ../lib/puppet/configurer.rb:357
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:360
+#: ../lib/puppet/configurer.rb:359
 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:379
+#: ../lib/puppet/configurer.rb:378
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:403
+#: ../lib/puppet/configurer.rb:402
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:407
-msgid "Unable to connect to server from server_list setting: %{detail}"
+#: ../lib/puppet/configurer.rb:406
+msgid "Puppet server %{host}:%{port} is unreachable"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:419 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:418 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:428
+#: ../lib/puppet/configurer.rb:427
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:440
+#: ../lib/puppet/configurer.rb:439
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:458
+#: ../lib/puppet/configurer.rb:457
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:478
+#: ../lib/puppet/configurer.rb:477
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -706,18 +693,26 @@ 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:670
+#: ../lib/puppet/defaults.rb:650
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:751
+#: ../lib/puppet/defaults.rb:731
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:982 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:961 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
+#: ../lib/puppet/defaults.rb:1458 ../lib/puppet/defaults.rb:1473
+msgid "Attempted to set both server and server_list."
+msgstr ""
+
+#: ../lib/puppet/defaults.rb:1459 ../lib/puppet/defaults.rb:1474
+msgid "Server setting will not be used."
+msgstr ""
+
 #: ../lib/puppet/error.rb:69
 msgid "Could not parse for environment %{environment}: %{message}"
 msgstr ""
@@ -1803,23 +1798,23 @@ msgstr ""
 msgid "The current user does not have the necessary permission to manage symlinks."
 msgstr ""
 
-#: ../lib/puppet/forge.rb:139
+#: ../lib/puppet/forge.rb:136
 msgid "Malformed dependency: %{name}."
 msgstr ""
 
-#: ../lib/puppet/forge.rb:140
+#: ../lib/puppet/forge.rb:137
 msgid "Exception was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/forge.rb:206
+#: ../lib/puppet/forge.rb:203
 msgid "Downloaded release for %{name} did not match expected checksum"
 msgstr ""
 
-#: ../lib/puppet/forge.rb:214 ../lib/puppet/module_tool/applications/unpacker.rb:58 ../lib/puppet/module_tool/local_tarball.rb:86
+#: ../lib/puppet/forge.rb:211 ../lib/puppet/module_tool/applications/unpacker.rb:58 ../lib/puppet/module_tool/local_tarball.rb:86
 msgid "Could not extract contents of module archive: %{message}"
 msgstr ""
 
-#: ../lib/puppet/forge.rb:231
+#: ../lib/puppet/forge.rb:228
 msgid "Cannot consider release %{name}-%{version}: %{error}"
 msgstr ""
 
@@ -2667,22 +2662,7 @@ msgstr ""
 msgid "Error connecting to %{srv_server}:%{srv_port}: %{message}"
 msgstr ""
 
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/indirector/request.rb:209
-msgid "Selected server from first entry of the `server_list` setting: %{server}"
-msgstr ""
-
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/indirector/request.rb:225
-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
-#: ../lib/puppet/indirector/request.rb:229
-msgid "Selected port from the `masterport` setting: %{port}"
-msgstr ""
-
-#: ../lib/puppet/indirector/request.rb:260
+#: ../lib/puppet/indirector/request.rb:249
 msgid "Could not understand URL %{key}: %{detail}"
 msgstr ""
 
@@ -3814,36 +3794,28 @@ msgstr ""
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:209
+#: ../lib/puppet/network/http/connection.rb:203
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr ""
 
 #. TRANSLATORS: Used in the phrase:
 #. "Received a response from the remote server."
-#: ../lib/puppet/network/http/connection.rb:239
+#: ../lib/puppet/network/http/connection.rb:233
 msgid "the remote server"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:243
+#: ../lib/puppet/network/http/connection.rb:237
 msgid "Received a %{status_code} response from %{server_hostname}, but the Retry-After header value of \"%{retry_after}\" could not be converted to an integer or RFC 2822 date."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:254
+#: ../lib/puppet/network/http/connection.rb:248
 msgid "Received a %{status_code} response from %{server_hostname}. Sleeping for %{retry_sleep} seconds before retrying the request."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:316
+#: ../lib/puppet/network/http/connection.rb:304
 msgid "request %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:318
-msgid "request %{uri} timed out after %{elapsed} seconds"
-msgstr ""
-
-#: ../lib/puppet/network/http/connection.rb:320
-msgid "request %{uri} failed: %{msg}"
-msgstr ""
-
 #: ../lib/puppet/network/http/error.rb:23
 msgid "Not Acceptable: %{message}"
 msgstr ""
@@ -3960,6 +3932,85 @@ msgstr ""
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
+#: ../lib/puppet/pal/compiler.rb:86
+msgid "The argument 'puppet_code' must be a String, got %{type}"
+msgstr ""
+
+#. TRANSLATORS, the 'ast' is the name of a parameter, do not translate
+#: ../lib/puppet/pal/compiler.rb:128
+msgid "The given 'ast' does not represent a literal value"
+msgstr ""
+
+#: ../lib/puppet/pal/compiler.rb:140
+msgid "The argument 'code_string' must be a String, got %{type}"
+msgstr ""
+
+#: ../lib/puppet/pal/compiler.rb:153
+msgid "The argument 'file' must be a String, got %{type}"
+msgstr ""
+
+#: ../lib/puppet/pal/compiler.rb:190
+msgid "Given data_type value is not a data type, got '%{type}'"
+msgstr ""
+
+#. TRANSLATORS 'type' and 'title' are internal parameter names - do not translate
+#: ../lib/puppet/pal/json_catalog_encoder.rb:52
+msgid "Both type and title must be given"
+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:166
+msgid "manifest_file or code_string cannot be given when configured_by_env is true"
+msgstr ""
+
+#: ../lib/puppet/pal/pal_impl.rb:206
+msgid "temporary environment name"
+msgstr ""
+
+#. TRANSLATORS: do not translate variable name string in these assertions
+#: ../lib/puppet/pal/pal_impl.rb:211
+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:265
+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:270
+msgid "The environment directory '%{env_dir}' does not exist"
+msgstr ""
+
+#: ../lib/puppet/pal/pal_impl.rb:293
+msgid "No directory found for the environment '%{env_name}' on the path '%{envpath}'"
+msgstr ""
+
+#: ../lib/puppet/pal/pal_impl.rb:347
+msgid "Given variables must be a hash, got %{type}"
+msgstr ""
+
+#: ../lib/puppet/pal/pal_impl.rb:353
+msgid "Given variable '%{varname}' has illegal name"
+msgstr ""
+
+#: ../lib/puppet/pal/pal_impl.rb:357
+msgid "Given value for '%{varname}' has illegal type - got: %{type}"
+msgstr ""
+
+#: ../lib/puppet/pal/pal_impl.rb:497
+msgid "Puppet Pal: %{what}"
+msgstr ""
+
+#: ../lib/puppet/pal/pal_impl.rb:511
+msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
+msgstr ""
+
+#: ../lib/puppet/pal/pal_impl.rb:518
+msgid "A block must be given"
+msgstr ""
+
 #: ../lib/puppet/parameter.rb:345
 msgid "No resource set for %{name}"
 msgstr ""
@@ -4310,19 +4361,19 @@ msgid "Could not find any files from %{values}"
 msgstr ""
 
 #. TRANSLATORS "fully qualified" refers to a fully qualified file system path
-#: ../lib/puppet/parser/functions/generate.rb:15
+#: ../lib/puppet/parser/functions/generate.rb:16
 msgid "Generators must be fully qualified"
 msgstr ""
 
-#: ../lib/puppet/parser/functions/generate.rb:24
+#: ../lib/puppet/parser/functions/generate.rb:25
 msgid "Generators can only contain alphanumerics, file separators, and dashes"
 msgstr ""
 
-#: ../lib/puppet/parser/functions/generate.rb:28
+#: ../lib/puppet/parser/functions/generate.rb:29
 msgid "Can not use generators with '..' in them."
 msgstr ""
 
-#: ../lib/puppet/parser/functions/generate.rb:34
+#: ../lib/puppet/parser/functions/generate.rb:35
 msgid "Failed to execute generator %{generator}: %{detail}"
 msgstr ""
 
@@ -4677,19 +4728,19 @@ msgstr ""
 msgid "break() from context where this is illegal"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1218
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1222
 msgid "Can only append Array or Hash to a Hash"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1222
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1226
 msgid "An URI can only be merged with an URI or String"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1225
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1229
 msgid "Can only append Binary to a Binary"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1258
+#: ../lib/puppet/pops/evaluator/evaluator_impl.rb:1262
 msgid "Can only delete from an Array or Hash."
 msgstr ""
 
@@ -5314,154 +5365,150 @@ msgid "An escape char for @() may only appear once. Got '%{escapes}'"
 msgstr ""
 
 #: ../lib/puppet/pops/issues.rb:764
-msgid "Heredoc with text in the margin is not allowed (line %{heredoc_line} in this heredoc)"
-msgstr ""
-
-#: ../lib/puppet/pops/issues.rb:768
 msgid "Illegal %{format} Byte Order mark at beginning of input: %{bom} - remove these from the puppet source"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:772
+#: ../lib/puppet/pops/issues.rb:768
 msgid "No such file or directory: %{file}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:776
+#: ../lib/puppet/pops/issues.rb:772
 msgid "%{file} is not a file"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:781
+#: ../lib/puppet/pops/issues.rb:777
 msgid "%{expression} resulted in a value outside of Puppet Integer max range, got '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:783
+#: ../lib/puppet/pops/issues.rb:779
 msgid "%{expression} resulted in a value outside of Puppet Integer min range, got '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:788
+#: ../lib/puppet/pops/issues.rb:784
 msgid "This runtime does not support hiera.yaml version %{version}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:792
+#: ../lib/puppet/pops/issues.rb:788
 msgid "hiera.yaml version 3 cannot be used in %{location}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:796
+#: ../lib/puppet/pops/issues.rb:792
 msgid "hiera.yaml version 4 cannot be used in the global layer"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:800
+#: ../lib/puppet/pops/issues.rb:796
 msgid "Undefined variable '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:804
+#: ../lib/puppet/pops/issues.rb:800
 msgid "Backend '%{name}' is defined more than once."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:807 ../lib/puppet/pops/issues.rb:820
+#: ../lib/puppet/pops/issues.rb:803 ../lib/puppet/pops/issues.rb:816
 msgid "First defined at %{error_location}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:813
+#: ../lib/puppet/pops/issues.rb:809
 msgid "No data provider is registered for backend '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:817
+#: ../lib/puppet/pops/issues.rb:813
 msgid "Hierarchy name '%{name}' defined more than once."
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:826
+#: ../lib/puppet/pops/issues.rb:822
 msgid "'hiera3_backend' is only allowed in the global layer"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:830
+#: ../lib/puppet/pops/issues.rb:826
 msgid "'default_hierarchy' is only allowed in the module layer"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:834
+#: ../lib/puppet/pops/issues.rb:830
 msgid "Use \"data_hash: %{function_name}_data\" instead of \"hiera3_backend: %{function_name}\""
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:838
+#: ../lib/puppet/pops/issues.rb:834
 msgid "One of %{keys} must be defined in hierarchy '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:842 ../lib/puppet/pops/issues.rb:850
+#: ../lib/puppet/pops/issues.rb:838 ../lib/puppet/pops/issues.rb:846
 msgid "Only one of %{keys} can be defined in hierarchy '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:846
+#: ../lib/puppet/pops/issues.rb:842
 msgid "Only one of %{keys} can be defined in defaults"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:854
+#: ../lib/puppet/pops/issues.rb:850
 msgid "Option key '%{key}' used in hierarchy '%{name}' is reserved by Puppet"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:858
+#: ../lib/puppet/pops/issues.rb:854
 msgid "Option key '%{key}' used in defaults is reserved by Puppet"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:862
+#: ../lib/puppet/pops/issues.rb:858
 msgid "Unable to find '%{function_type}' function named '%{function_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:866
+#: ../lib/puppet/pops/issues.rb:862
 msgid "'alias' interpolation is only permitted if the expression is equal to the entire string"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:870
+#: ../lib/puppet/pops/issues.rb:866
 msgid "Unknown interpolation method '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:874
+#: ../lib/puppet/pops/issues.rb:870
 msgid "Interpolation using method syntax is not allowed in this context"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:878
+#: ../lib/puppet/pops/issues.rb:874
 msgid "Endless recursion detected when attempting to serialize value of class %{type_name}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:882
+#: ../lib/puppet/pops/issues.rb:878
 msgid "%{path} contains the special value default. It will be converted to the String 'default'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:886
+#: ../lib/puppet/pops/issues.rb:882
 msgid "%{path} contains %{klass} value. It will be converted to the String '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:890
+#: ../lib/puppet/pops/issues.rb:886
 msgid "%{path} contains a hash with %{klass} key. It will be converted to the String '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:894
+#: ../lib/puppet/pops/issues.rb:890
 msgid "The feature '%{feature}' is only available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:898
+#: ../lib/puppet/pops/issues.rb:894
 msgid "The catalog operation '%{operation}' is only available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:902
+#: ../lib/puppet/pops/issues.rb:898
 msgid "%{expr} is only available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:906
+#: ../lib/puppet/pops/issues.rb:902
 msgid "The task operation '%{operation}' is not available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:910
+#: ../lib/puppet/pops/issues.rb:906
 msgid "%{expr} is not available when compiling a catalog"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:914
+#: ../lib/puppet/pops/issues.rb:910
 msgid "The 'bolt' library is required to %{action}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:918
+#: ../lib/puppet/pops/issues.rb:914
 msgid "Task not found: %{type_name}"
 msgstr ""
 
-#: ../lib/puppet/pops/issues.rb:922
+#: ../lib/puppet/pops/issues.rb:918
 msgid "Failed to load: %{type_name}"
 msgstr ""
 
@@ -5579,23 +5626,19 @@ msgstr ""
 msgid "The code loaded from %{source_ref} did not produce a Function class when evaluated. Got '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:24
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:17
 msgid "The code loaded from %{source_ref} does not seem to be a Puppet 3x API function - no 'newfunction' call."
 msgstr ""
 
-#. TRANSLATORS - the word 'newfunction' should not be translated as it is a method name.
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:46
+#. TRANSLATORS - the word 'newfunction' shoud not be translated as it is a method name.
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:37
 msgid "Illegal legacy function definition! The code loaded from %{source_ref} did not return the result of calling 'newfunction'. Got '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:49
+#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:40
 msgid "The code loaded from %{source_ref} produced mis-matched name, expected 'function_%{type_name}', got '%{created_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb:92
-msgid "Illegal method definition of method '%{method_name}' on line %{line}' in legacy function. See %{url} for more information"
-msgstr ""
-
 #: ../lib/puppet/pops/loader/task_instantiator.rb:27
 msgid "Failed to load metadata for task %{name}: %{reason}"
 msgstr ""
@@ -5791,19 +5834,19 @@ msgid "Unacceptable transform - found an Object without a rule: %{klass}"
 msgstr ""
 
 #. TRANSLATORS 'NUMBER' refers to a method name and the 'name_or_numeric' was the passed in value and should not be translated
-#: ../lib/puppet/pops/model/factory.rb:848
+#: ../lib/puppet/pops/model/factory.rb:814
 msgid "Internal Error, NUMBER token does not contain a valid number, %{name_or_numeric}"
 msgstr ""
 
-#: ../lib/puppet/pops/model/factory.rb:1164
+#: ../lib/puppet/pops/model/factory.rb:1130
 msgid "can only concatenate strings, got %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/parser_support.rb:204
+#: ../lib/puppet/pops/parser/parser_support.rb:195
 msgid "attempt to pass argument list to the function '%{name}' which cannot be called without parentheses"
 msgstr ""
 
-#: ../lib/puppet/pops/parser/parser_support.rb:206
+#: ../lib/puppet/pops/parser/parser_support.rb:197
 msgid "illegal comma separated argument list"
 msgstr ""
 
@@ -5843,7 +5886,7 @@ msgstr ""
 msgid "digit expected"
 msgstr ""
 
-#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:428
+#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:434
 msgid "you must specify title patterns when there are two or more key attributes"
 msgstr ""
 
@@ -6123,65 +6166,65 @@ msgstr ""
 msgid "Unknown type <%{type}>"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:930
+#: ../lib/puppet/pops/types/types.rb:928
 msgid "The string '%{str}' cannot be converted to Numeric"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:933
+#: ../lib/puppet/pops/types/types.rb:931
 msgid "Value of type %{type} cannot be converted to Numeric"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1171
+#: ../lib/puppet/pops/types/types.rb:1169
 msgid "The string '%{str}' cannot be converted to Integer"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1174
+#: ../lib/puppet/pops/types/types.rb:1172
 msgid "Value of type %{type} cannot be converted to Integer"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1182
+#: ../lib/puppet/pops/types/types.rb:1180
 msgid "Illegal radix: %{radix}, expected 2, 8, 10, 16, or default"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1295
+#: ../lib/puppet/pops/types/types.rb:1293
 msgid "The string '%{str}' cannot be converted to Float"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1298
+#: ../lib/puppet/pops/types/types.rb:1296
 msgid "Value of type %{type} cannot be converted to Float"
 msgstr ""
 
 #. TRANSLATORS 'PStringType#initialize' is a class and method name and should not be translated
-#: ../lib/puppet/pops/types/types.rb:1515
+#: ../lib/puppet/pops/types/types.rb:1513
 msgid "Passing more than one argument to PStringType#initialize is deprecated"
 msgstr ""
 
 #. TRANSLATORS 'PStringType#values' and '#value' are classes and method names and should not be translated
-#: ../lib/puppet/pops/types/types.rb:1569
+#: ../lib/puppet/pops/types/types.rb:1567
 msgid "Method PStringType#values is deprecated. Use #value instead"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1894
+#: ../lib/puppet/pops/types/types.rb:1892
 msgid "The string '%{str}' cannot be converted to Boolean"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:1897
+#: ../lib/puppet/pops/types/types.rb:1895
 msgid "Value of type %{type} cannot be converted to Boolean"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:2625
+#: ../lib/puppet/pops/types/types.rb:2623
 msgid "Value of type %{type} cannot be converted to Array"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:2695
+#: ../lib/puppet/pops/types/types.rb:2693
 msgid "Puppet::Pops::Types::PHashType#element_type is deprecated, use #value_type instead"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:2832
+#: ../lib/puppet/pops/types/types.rb:2830
 msgid "odd number of arguments for Hash"
 msgstr ""
 
-#: ../lib/puppet/pops/types/types.rb:2843
+#: ../lib/puppet/pops/types/types.rb:2841
 msgid "Value of type %{type} cannot be converted to Hash"
 msgstr ""
 
@@ -6265,7 +6308,7 @@ msgid "No command %{command} defined for provider %{provider}"
 msgstr ""
 
 #: ../lib/puppet/provider.rb:398
-msgid "To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api"
+msgid "Provider %{provider} has not defined the 'instances' class method"
 msgstr ""
 
 #: ../lib/puppet/provider.rb:470
@@ -6316,7 +6359,11 @@ msgstr ""
 msgid "Overriding environment setting '%{var}' with '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/provider/exec.rb:91
+#: ../lib/puppet/provider/exec.rb:30
+msgid "Empty environment setting '%{var}'"
+msgstr ""
+
+#: ../lib/puppet/provider/exec.rb:96
 msgid "'%{command}' is not qualified and no path was specified. Please qualify the command or specify a path."
 msgstr ""
 
@@ -6348,19 +6395,14 @@ msgstr ""
 msgid "Failed to set group to '%{should}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/file/posix.rb:131 ../lib/puppet/provider/file/windows.rb:78
+#: ../lib/puppet/provider/file/posix.rb:131 ../lib/puppet/provider/file/windows.rb:76
 msgid "failed to set mode %{mode} on %{path}: %{message}"
 msgstr ""
 
-#: ../lib/puppet/provider/file/windows.rb:87
+#: ../lib/puppet/provider/file/windows.rb:85
 msgid "Can only manage owner, group, and mode on filesystems that support Windows ACLs, such as NTFS"
 msgstr ""
 
-#. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/provider/file/windows.rb:129
-msgid "%{resource_name}: %{mode_part_type} set to SYSTEM. SYSTEM permissions cannot be set below FullControl ('7')"
-msgstr ""
-
 #: ../lib/puppet/provider/group/aix.rb:47
 msgid "No AIX group exists with a group name or gid of %{group}!"
 msgstr ""
@@ -6536,7 +6578,7 @@ msgstr ""
 msgid "You cannot install dpkg packages without a source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/dpkg.rb:107
+#: ../lib/puppet/provider/package/dpkg.rb:108
 msgid "source doesn't contain named package, but %{name}"
 msgstr ""
 
@@ -6544,27 +6586,27 @@ msgstr ""
 msgid "source is defined but does not have trailing slash, ignoring %{source}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:84
+#: ../lib/puppet/provider/package/gem.rb:42
 msgid "Could not list gems: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:110
+#: ../lib/puppet/provider/package/gem.rb:68
 msgid "Could not match %{desc}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:158
+#: ../lib/puppet/provider/package/gem.rb:109
 msgid "Invalid source '%{uri}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:169
+#: ../lib/puppet/provider/package/gem.rb:120
 msgid "puppet:// URLs are not supported as gem sources"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:185
+#: ../lib/puppet/provider/package/gem.rb:136
 msgid "Could not install: %{output}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:211
+#: ../lib/puppet/provider/package/gem.rb:161
 msgid "Could not uninstall: %{output}"
 msgstr ""
 
@@ -6787,19 +6829,19 @@ msgstr ""
 msgid "Package %{name} was not present after trying to install it"
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows.rb:97
+#: ../lib/puppet/provider/package/windows.rb:93
 msgid "The package %{operation}ed successfully and the system is rebooting now."
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows.rb:99
+#: ../lib/puppet/provider/package/windows.rb:95
 msgid "The package %{operation}ed successfully, but the system must be rebooted."
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows.rb:101
+#: ../lib/puppet/provider/package/windows.rb:97
 msgid "Failed to %{operation}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows.rb:107
+#: ../lib/puppet/provider/package/windows.rb:103
 msgid "The source parameter cannot be empty when using the Windows provider."
 msgstr ""
 
@@ -6835,14 +6877,6 @@ msgstr ""
 msgid "Failed to update to version %{should}, got version %{version} instead"
 msgstr ""
 
-#: ../lib/puppet/provider/package_targetable.rb:53
-msgid "Provider %{name} package command is not functional on this host"
-msgstr ""
-
-#: ../lib/puppet/provider/package_targetable.rb:56
-msgid "Provider %{name} package command '%{cmd}' does not exist on this host"
-msgstr ""
-
 #: ../lib/puppet/provider/parsedfile.rb:52
 msgid "Invalid filetype %{type}"
 msgstr ""
@@ -6905,31 +6939,31 @@ 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:22
+#: ../lib/puppet/provider/service/windows.rb:23
 msgid "Cannot enable %{resource_name}, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:28
+#: ../lib/puppet/provider/service/windows.rb:29
 msgid "Cannot disable %{resource_name}, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:34
+#: ../lib/puppet/provider/service/windows.rb:35
 msgid "Cannot enable %{resource_name} for manual start, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:52
+#: ../lib/puppet/provider/service/windows.rb:53
 msgid "Unknown start type: %{start_type}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:55
+#: ../lib/puppet/provider/service/windows.rb:56
 msgid "Cannot get start type %{resource_name}, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:69
+#: ../lib/puppet/provider/service/windows.rb:70
 msgid "Will not start disabled service %{resource_name} without managing enable. Specify 'enable => false' to override."
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:101
+#: ../lib/puppet/provider/service/windows.rb:102
 msgid "Unknown service state '%{current_state}' for service '%{resource_name}'"
 msgstr ""
 
@@ -7071,11 +7105,11 @@ msgstr ""
 msgid "no parameter named '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:609
+#: ../lib/puppet/resource.rb:611
 msgid "No title provided and %{type} is not a valid resource reference"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:682
+#: ../lib/puppet/resource.rb:684
 msgid "No set of title patterns matched the title \"%{title}\"."
 msgstr ""
 
@@ -7161,7 +7195,7 @@ msgstr ""
 msgid "Could not find resource %{resource} when converting %{message} resources"
 msgstr ""
 
-#: ../lib/puppet/resource/status.rb:139 ../lib/puppet/transaction.rb:266
+#: ../lib/puppet/resource/status.rb:139 ../lib/puppet/transaction.rb:264
 msgid "Could not evaluate: %{detail}"
 msgstr ""
 
@@ -7305,57 +7339,53 @@ msgstr ""
 msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:599
-msgid "Could not load %{file}: %{detail}"
-msgstr ""
-
-#: ../lib/puppet/settings.rb:700
+#: ../lib/puppet/settings.rb:695
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:844
+#: ../lib/puppet/settings.rb:839
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:906
+#: ../lib/puppet/settings.rb:901
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:911
+#: ../lib/puppet/settings.rb:906
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:915
+#: ../lib/puppet/settings.rb:910
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1172
+#: ../lib/puppet/settings.rb:1167
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
-#: ../lib/puppet/settings.rb:1177
+#: ../lib/puppet/settings.rb:1172
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1344
+#: ../lib/puppet/settings.rb:1339
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1368
+#: ../lib/puppet/settings.rb:1363
 msgid "Could not find value for %{expression}"
 msgstr ""
 
 #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
-#: ../lib/puppet/settings.rb:1378
+#: ../lib/puppet/settings.rb:1373
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1379
+#: ../lib/puppet/settings.rb:1374
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1410
+#: ../lib/puppet/settings.rb:1405
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7477,7 +7507,7 @@ msgstr ""
 msgid "Invalid priority format '%{value}' for parameter: %{name}"
 msgstr ""
 
-#: ../lib/puppet/settings/server_list_setting.rb:25
+#: ../lib/puppet/settings/server_list_setting.rb:16
 msgid "Expected an Array of String, got a %{klass}"
 msgstr ""
 
@@ -7585,15 +7615,15 @@ msgstr ""
 msgid "unexpected attributes %{keys} in %{path}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:154
+#: ../lib/puppet/ssl/host.rb:165
 msgid "No certificate to validate."
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:155
+#: ../lib/puppet/ssl/host.rb:166
 msgid "No private key with which to validate certificate with fingerprint: %{fingerprint}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:157
+#: ../lib/puppet/ssl/host.rb:168
 msgid ""
 "The certificate retrieved from the master does not match the agent's private key. Did you forget to run as root?\n"
 "Certificate fingerprint: %{fingerprint}\n"
@@ -7605,7 +7635,7 @@ msgid ""
 "  2. puppet %{puppet_params}\n"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:239
+#: ../lib/puppet/ssl/host.rb:250
 msgid ""
 "The local CSR does not match the agent's public key.\n"
 "CSR fingerprint: %{fingerprint}\n"
@@ -7617,7 +7647,7 @@ msgid ""
 "  2. puppet %{puppet_params}\n"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:255
+#: ../lib/puppet/ssl/host.rb:266
 msgid ""
 "The CSR retrieved from the master does not match the agent's public key.\n"
 "CSR fingerprint: %{fingerprint}\n"
@@ -7631,73 +7661,73 @@ msgid ""
 "  2. puppet %{puppet_params}\n"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:309 ../lib/puppet/ssl/host.rb:330
+#: ../lib/puppet/ssl/host.rb:320 ../lib/puppet/ssl/host.rb:341
 msgid "Could not request certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:311
+#: ../lib/puppet/ssl/host.rb:322
 msgid "Exiting; failed to retrieve certificate and waitforcert is disabled"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:320
+#: ../lib/puppet/ssl/host.rb:331
 msgid "Exiting; no certificate found and waitforcert is disabled"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:328
+#: ../lib/puppet/ssl/host.rb:339
 msgid "Did not receive certificate"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:368
+#: ../lib/puppet/ssl/host.rb:379
 msgid "Response from the CA did not contain a valid certificate request: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:374
+#: ../lib/puppet/ssl/host.rb:385
 msgid "Could not download certificate request: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:401
+#: ../lib/puppet/ssl/host.rb:412
 msgid ""
 "Failed attempting to load CRL from %{crl_path}! The CRL below caused the error '%{error}':\n"
 "%{crl}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:429
+#: ../lib/puppet/ssl/host.rb:440
 msgid "The CA certificate at %{file_path} is invalid: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:453
+#: ../lib/puppet/ssl/host.rb:464
 msgid "No valid PEM-encoded certificates."
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:460
+#: ../lib/puppet/ssl/host.rb:471
 msgid "Could not parse certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:483
+#: ../lib/puppet/ssl/host.rb:494
 msgid "Could not download CRLs: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:502
+#: ../lib/puppet/ssl/host.rb:513
 msgid "Response from the CA did not contain a valid CA certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:505
+#: ../lib/puppet/ssl/host.rb:516
 msgid "Could not download CA certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:545
+#: ../lib/puppet/ssl/host.rb:556
 msgid "The certificate at %{file_path} is invalid. Could not load."
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:566
+#: ../lib/puppet/ssl/host.rb:577
 msgid "Response from the CA did not contain a valid certificate for %{cert_name}."
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:570
+#: ../lib/puppet/ssl/host.rb:581
 msgid "No certificate for %{cert_name} on CA"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:573
+#: ../lib/puppet/ssl/host.rb:584
 msgid "Could not download host certificate: %{message}"
 msgstr ""
 
@@ -7725,18 +7755,6 @@ msgstr ""
 msgid "Error registering ssl custom OIDs mapping from file '%{custom_oid_file}': %{err}"
 msgstr ""
 
-#: ../lib/puppet/ssl/validator/default_validator.rb:95 ../lib/puppet/util/ssl.rb:81
-msgid "expected one of %{certnames}"
-msgstr ""
-
-#: ../lib/puppet/ssl/validator/default_validator.rb:97 ../lib/puppet/util/ssl.rb:83
-msgid "expected %{certname}"
-msgstr ""
-
-#: ../lib/puppet/ssl/validator/default_validator.rb:100 ../lib/puppet/util/ssl.rb:86
-msgid "Server hostname '%{host}' did not match server certificate; %{expected_certnames}"
-msgstr ""
-
 #: ../lib/puppet/syntax_checkers/base64.rb:18
 msgid "Base64 syntax checker: the text to check must be a String."
 msgstr ""
@@ -7757,6 +7775,22 @@ msgstr ""
 msgid "Base64 syntax checker: Cannot parse invalid Base64 string - contains letters outside strict base 64 range (or whitespace)"
 msgstr ""
 
+#: ../lib/puppet/syntax_checkers/epp.rb:17
+msgid "EPP syntax checker: the text to check must be a String."
+msgstr ""
+
+#: ../lib/puppet/syntax_checkers/epp.rb:18
+msgid "EPP syntax checker: the syntax identifier must be a String, e.g. pp"
+msgstr ""
+
+#: ../lib/puppet/syntax_checkers/epp.rb:19
+msgid "EPP syntax checker: invalid Acceptor, got: '%{klass}'."
+msgstr ""
+
+#: ../lib/puppet/syntax_checkers/epp.rb:25
+msgid "EPP syntax checker: \"%{message}\""
+msgstr ""
+
 #: ../lib/puppet/syntax_checkers/json.rb:17
 msgid "Json syntax checker: the text to check must be a String."
 msgstr ""
@@ -7773,64 +7807,80 @@ msgstr ""
 msgid "JSON syntax checker: Cannot parse invalid JSON string. \"%{message}\""
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:86
+#: ../lib/puppet/syntax_checkers/pp.rb:17
+msgid "PP syntax checker: the text to check must be a String."
+msgstr ""
+
+#: ../lib/puppet/syntax_checkers/pp.rb:18
+msgid "PP syntax checker: the syntax identifier must be a String, e.g. pp"
+msgstr ""
+
+#: ../lib/puppet/syntax_checkers/pp.rb:19
+msgid "PP syntax checker: invalid Acceptor, got: '%{klass}'."
+msgstr ""
+
+#: ../lib/puppet/syntax_checkers/pp.rb:25
+msgid "PP syntax checker: \"%{message}\""
+msgstr ""
+
+#: ../lib/puppet/transaction.rb:84
 msgid "Some pre-run checks failed"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:102
+#: ../lib/puppet/transaction.rb:100
 msgid "Applying configuration version '%{version}'"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:125
+#: ../lib/puppet/transaction.rb:123
 msgid "Provider %{name} is not functional on this host"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:141
+#: ../lib/puppet/transaction.rb:139
 msgid "Could not find a suitable provider for %{type}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:148
+#: ../lib/puppet/transaction.rb:146
 msgid "post_resource_eval failed for provider %{provider}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:165
+#: ../lib/puppet/transaction.rb:163
 msgid "resource is part of a dependency cycle"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:167
+#: ../lib/puppet/transaction.rb:165
 msgid "One or more resource dependency cycles detected in graph"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:180
+#: ../lib/puppet/transaction.rb:178
 msgid "Somehow left a component in the relationship graph"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:182
+#: ../lib/puppet/transaction.rb:180
 msgid "Starting to evaluate the resource"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:184
+#: ../lib/puppet/transaction.rb:182
 msgid "Evaluated in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:297
+#: ../lib/puppet/transaction.rb:295
 msgid "Dependency %{dep} has failures: %{status}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:318
+#: ../lib/puppet/transaction.rb:315
 msgid "Prefetch failed for %{type_name} provider '%{name}'"
 msgstr ""
 
 #. TRANSLATORS `prefetch` is a function name and should not be translated
-#: ../lib/puppet/transaction.rb:363 ../lib/puppet/transaction.rb:366
+#: ../lib/puppet/transaction.rb:365
 msgid "Could not prefetch %{type_name} provider '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:399
+#: ../lib/puppet/transaction.rb:394
 msgid "Skipping because of failed dependencies"
 msgstr ""
 
-#: ../lib/puppet/transaction.rb:404
+#: ../lib/puppet/transaction.rb:399
 msgid "Skipping because provider prefetch failed"
 msgstr ""
 
@@ -7869,11 +7919,11 @@ msgid_plural "Triggered '%{callback}' from %{count} events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../lib/puppet/transaction/event_manager.rb:157
+#: ../lib/puppet/transaction/event_manager.rb:154
 msgid "Failed to call %{callback}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event_manager.rb:172
+#: ../lib/puppet/transaction/event_manager.rb:164
 msgid "Would have triggered '%{callback}' from %{count} event"
 msgid_plural "Would have triggered '%{callback}' from %{count} events"
 msgstr[0] ""
@@ -7919,97 +7969,97 @@ msgstr ""
 msgid "could not create change error message for %{name}"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:215
+#: ../lib/puppet/transaction/resource_harness.rb:214
 msgid "audit change: previously recorded value %s has been changed to %s"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:225
+#: ../lib/puppet/transaction/resource_harness.rb:224
 msgid " (previously recorded value was %s)"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:232
+#: ../lib/puppet/transaction/resource_harness.rb:231
 msgid "current_value %s, should be %s (noop)"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:241
+#: ../lib/puppet/transaction/resource_harness.rb:240
 msgid "changed %s to %s"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:264
+#: ../lib/puppet/transaction/resource_harness.rb:263
 msgid "audit change: newly-recorded value %s"
 msgstr ""
 
-#: ../lib/puppet/type.rb:503
+#: ../lib/puppet/type.rb:509
 msgid "Options must be a hash, not %{type}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:506
+#: ../lib/puppet/type.rb:512
 msgid "Class %{class_name} already has a property named %{property}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:592
+#: ../lib/puppet/type.rb:598
 msgid "Class %{class_name} has not defined parameters"
 msgstr ""
 
-#: ../lib/puppet/type.rb:676
+#: ../lib/puppet/type.rb:682
 msgid "Parameter %{name} failed on %{ref}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:699
+#: ../lib/puppet/type.rb:705
 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:1023 ../lib/puppet/type.rb:1034
+#: ../lib/puppet/type.rb:1029 ../lib/puppet/type.rb:1040
 msgid "The 'is' value is not in the 'is' array for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1160
+#: ../lib/puppet/type.rb:1166
 msgid "%{name} has no providers and has not overridden 'instances'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1419
+#: ../lib/puppet/type.rb:1425
 msgid "Cannot add aliases without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1498
+#: ../lib/puppet/type.rb:1504
 msgid "Could not find %{description} %{ref} for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1771
+#: ../lib/puppet/type.rb:1777
 msgid "Found multiple default providers for %{name}: %{provider_list}; using %{selected_provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1856
+#: ../lib/puppet/type.rb:1862
 msgid "Could not find parent provider %{parent} of %{name}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1932
+#: ../lib/puppet/type.rb:1938
 msgid "Invalid %{resource} provider '%{provider_class}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2015
+#: ../lib/puppet/type.rb:2021
 msgid "Could not find %{name} provider of %{provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2132
+#: ../lib/puppet/type.rb:2138
 msgid "You cannot add relationships without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2439
+#: ../lib/puppet/type.rb:2445
 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:2442
+#: ../lib/puppet/type.rb:2448
 msgid "Unable to mark '%{name}' as sensitive: the property itself was not assigned a value."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2444
+#: ../lib/puppet/type.rb:2450
 msgid "Unable to mark '%{name}' as sensitive: the property itself is not defined on %{type}."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2502
+#: ../lib/puppet/type.rb:2508
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
@@ -8073,10 +8123,6 @@ msgstr ""
 msgid "Check %{value} exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:589
-msgid "'%{cmd}' won't be executed because of failed check '%{check}'"
-msgstr ""
-
 #: ../lib/puppet/type/file.rb:56
 msgid "File paths must be fully qualified, not '%{path}'"
 msgstr ""
@@ -8197,28 +8243,24 @@ msgstr ""
 msgid "Ensure set to :present but file type is %{file_type} so no content will be synced"
 msgstr ""
 
-#: ../lib/puppet/type/file/mode.rb:125
-msgid "Not managing symlink mode"
-msgstr ""
-
 #: ../lib/puppet/type/file/source.rb:135
 msgid "No source for content was stored with the metadata"
 msgstr ""
 
 #. TRANSLATORS "source_permissions" is a parameter name and should not be translated
-#: ../lib/puppet/type/file/source.rb:362
+#: ../lib/puppet/type/file/source.rb:363
 msgid "The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`."
 msgstr ""
 
-#: ../lib/puppet/type/filebucket.rb:73
+#: ../lib/puppet/type/filebucket.rb:69
 msgid "You can only have one filebucket path"
 msgstr ""
 
-#: ../lib/puppet/type/filebucket.rb:77
+#: ../lib/puppet/type/filebucket.rb:73
 msgid "Filebucket paths must be absolute"
 msgstr ""
 
-#: ../lib/puppet/type/filebucket.rb:113
+#: ../lib/puppet/type/filebucket.rb:109
 msgid "Could not create %{type} filebucket: %{detail}"
 msgstr ""
 
@@ -8230,15 +8272,15 @@ msgstr ""
 msgid "Invalid GID %{gid}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:116 ../lib/puppet/type/package.rb:130
+#: ../lib/puppet/type/package.rb:114 ../lib/puppet/type/package.rb:128
 msgid "Could not update: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:165
+#: ../lib/puppet/type/package.rb:163
 msgid "Could not get latest version: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:265
+#: ../lib/puppet/type/package.rb:263
 msgid "Name must be a String not %{klass}"
 msgstr ""
 
@@ -8282,22 +8324,26 @@ msgstr ""
 msgid "Invalid minute '%{n}'"
 msgstr ""
 
-#: ../lib/puppet/type/schedule.rb:282
+#: ../lib/puppet/type/schedule.rb:278
 msgid "Repeat must be a number"
 msgstr ""
 
-#: ../lib/puppet/type/schedule.rb:291
+#: ../lib/puppet/type/schedule.rb:287
 msgid "Repeat must be 1 unless periodmatch is 'distance', not '%{period}'"
 msgstr ""
 
-#: ../lib/puppet/type/schedule.rb:335
+#: ../lib/puppet/type/schedule.rb:331
 msgid "%{value} is not a valid day of the week"
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:89
+#: ../lib/puppet/type/service.rb:91
 msgid "Setting enable to manual is only supported on Microsoft Windows."
 msgstr ""
 
+#: ../lib/puppet/type/service.rb:247
+msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
+msgstr ""
+
 #: ../lib/puppet/type/tidy.rb:85
 msgid "Tidy can't use matches with recurse 0, false, or undef"
 msgstr ""
@@ -8574,19 +8620,19 @@ msgstr ""
 msgid "Already a generated class named %{klassname}"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:71
+#: ../lib/puppet/util/command_line.rb:67
 msgid "Could not initialize global default settings"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:169
+#: ../lib/puppet/util/command_line.rb:166
 msgid "Error: Could not parse application options: invalid option: %{opt}"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:172
+#: ../lib/puppet/util/command_line.rb:169
 msgid "See 'puppet help' for help on available puppet subcommands"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:185
+#: ../lib/puppet/util/command_line.rb:182
 msgid "Error: Unknown Puppet subcommand '%{cmd}'"
 msgstr ""
 
@@ -8735,37 +8781,6 @@ msgstr ""
 msgid "Trollop::die can only be called after Trollop::options"
 msgstr ""
 
-#: ../lib/puppet/util/connection.rb:25
-msgid "Selected server from the %{setting} setting: %{server}"
-msgstr ""
-
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/util/connection.rb:31
-msgid "Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}"
-msgstr ""
-
-#: ../lib/puppet/util/connection.rb:35
-msgid "Dynamically-bound server lookup failed, falling back to %{setting} setting: %{server}"
-msgstr ""
-
-#: ../lib/puppet/util/connection.rb:56
-msgid "Selected port from the %{setting} setting: %{port}"
-msgstr ""
-
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/util/connection.rb:66
-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
-#: ../lib/puppet/util/connection.rb:70
-msgid "Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}"
-msgstr ""
-
-#: ../lib/puppet/util/connection.rb:75
-msgid "Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}"
-msgstr ""
-
 #: ../lib/puppet/util/diff.rb:28
 msgid "Cannot provide diff without the diff/lcs Ruby library"
 msgstr ""
@@ -8922,7 +8937,7 @@ msgstr ""
 msgid "Could not write crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/http_proxy.rb:206
+#: ../lib/puppet/util/http_proxy.rb:205
 msgid "Too many HTTP redirections for %{uri}"
 msgstr ""
 
@@ -8992,7 +9007,7 @@ msgstr ""
 msgid "Logs require a level"
 msgstr ""
 
-#: ../lib/puppet/util/log.rb:87 ../lib/puppet/util/log.rb:375 ../lib/puppet/util/windows/eventlog.rb:99
+#: ../lib/puppet/util/log.rb:87 ../lib/puppet/util/log.rb:370 ../lib/puppet/util/windows/eventlog.rb:99
 msgid "Invalid log level %{level}"
 msgstr ""
 
@@ -9004,40 +9019,40 @@ msgstr ""
 msgid "Unknown destination type %{dest}"
 msgstr ""
 
-#: ../lib/puppet/util/log.rb:176
+#: ../lib/puppet/util/log.rb:171
 msgid "Received a Log attribute with invalid encoding:%{log_message}"
 msgstr ""
 
-#: ../lib/puppet/util/log.rb:178
+#: ../lib/puppet/util/log.rb:173
 msgid ""
 "Backtrace:\n"
 "%{backtrace}"
 msgstr ""
 
-#: ../lib/puppet/util/log.rb:232
+#: ../lib/puppet/util/log.rb:227
 msgid "Reopening log files"
 msgstr ""
 
 #. TRANSLATORS 'Puppet::Util::Log' refers to a Puppet source code class
-#: ../lib/puppet/util/log.rb:365
+#: ../lib/puppet/util/log.rb:360
 msgid "Puppet::Util::Log requires a message"
 msgstr ""
 
 #. TRANSLATORS 'Puppet::Util::Log' refers to a Puppet source code class
-#: ../lib/puppet/util/log.rb:371
+#: ../lib/puppet/util/log.rb:366
 msgid "Puppet::Util::Log requires a log level"
 msgstr ""
 
 #. TRANSLATORS 'Puppet::Util::Log' refers to a Puppet source code class
-#: ../lib/puppet/util/log.rb:373
+#: ../lib/puppet/util/log.rb:368
 msgid "Puppet::Util::Log requires a symbol or string"
 msgstr ""
 
-#: ../lib/puppet/util/log.rb:404
+#: ../lib/puppet/util/log.rb:399
 msgid "Could not parse for environment %{environment}: %{msg}"
 msgstr ""
 
-#: ../lib/puppet/util/log.rb:406
+#: ../lib/puppet/util/log.rb:401
 msgid "%{msg} on node %{node}"
 msgstr ""
 
@@ -9206,6 +9221,18 @@ msgstr ""
 msgid "Sleeping for %{time} seconds (splay is enabled)"
 msgstr ""
 
+#: ../lib/puppet/util/ssl.rb:81
+msgid "expected one of %{certnames}"
+msgstr ""
+
+#: ../lib/puppet/util/ssl.rb:83
+msgid "expected %{certname}"
+msgstr ""
+
+#: ../lib/puppet/util/ssl.rb:86
+msgid "Server hostname '%{host}' did not match server certificate; %{expected_certnames}"
+msgstr ""
+
 #: ../lib/puppet/util/storage.rb:53
 msgid "Checksumfile %{filename} is not a file, ignoring"
 msgstr ""
@@ -9406,27 +9433,27 @@ msgstr ""
 msgid "Failed to call LookupAccountSidW with bytes: %{sid_bytes}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:46
+#: ../lib/puppet/util/windows/process.rb:44
 msgid "Failed to get child process exit code"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:285
+#: ../lib/puppet/util/windows/process.rb:237
 msgid "GetVersionEx failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:314
+#: ../lib/puppet/util/windows/process.rb:266
 msgid "Discarding environment variable %{string} which contains invalid bytes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:330
+#: ../lib/puppet/util/windows/process.rb:282
 msgid "environment variable name must not be nil or empty"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:335
+#: ../lib/puppet/util/windows/process.rb:287
 msgid "Failed to remove environment variable: %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:340
+#: ../lib/puppet/util/windows/process.rb:292
 msgid "Failed to set environment variable: %{name}"
 msgstr ""
 
@@ -9483,172 +9510,152 @@ msgid "Failed to get volume information"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:337
-msgid "Setting control rights for %{path} owner SYSTEM to less than Full Control rights. Setting SYSTEM rights to less than Full Control may have unintented consequences for operations on this file"
-msgstr ""
-
-#. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:340
-msgid "%{path} owner and group both set to user SYSTEM, but group is not managed directly: SYSTEM user rights will be set to FullControl by group"
-msgstr ""
-
-#. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:343
+#: ../lib/puppet/util/windows/security.rb:332
 msgid "An attempt to set mode %{mode} on item %{path} would result in the owner, SYSTEM, to have less than Full Control rights. This attempt has been corrected to Full Control"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:353
-msgid "Setting control rights for %{path} group SYSTEM to less than Full Control rights. Setting SYSTEM rights to less than Full Control may have unintented consequences for operations on this file"
-msgstr ""
-
-#. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:356
-msgid "%{path} owner and group both set to user SYSTEM, but owner is not managed directly: SYSTEM user rights will be set to FullControl by owner"
-msgstr ""
-
-#. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:359
+#: ../lib/puppet/util/windows/security.rb:338
 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:430 ../lib/puppet/util/windows/security.rb:447 ../lib/puppet/util/windows/sid.rb:154 ../lib/puppet/util/windows/sid.rb:216 ../lib/puppet/util/windows/user.rb:43
+#: ../lib/puppet/util/windows/security.rb:409 ../lib/puppet/util/windows/security.rb:426 ../lib/puppet/util/windows/sid.rb:154 ../lib/puppet/util/windows/sid.rb:216 ../lib/puppet/util/windows/user.rb:43
 msgid "Invalid SID"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:434 ../lib/puppet/util/windows/security.rb:451
+#: ../lib/puppet/util/windows/security.rb:413 ../lib/puppet/util/windows/security.rb:430
 msgid "Failed to add access control entry"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:462 ../lib/puppet/util/windows/security.rb:644
+#: ../lib/puppet/util/windows/security.rb:441 ../lib/puppet/util/windows/security.rb:623
 msgid "Invalid DACL"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:485
+#: ../lib/puppet/util/windows/security.rb:464
 msgid "Unsupported access control entry type: 0x%{type}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:519
+#: ../lib/puppet/util/windows/security.rb:498
 msgid "Failed to open '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:566
+#: ../lib/puppet/util/windows/security.rb:545
 msgid "Failed to adjust process privileges"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:596
+#: ../lib/puppet/util/windows/security.rb:575
 msgid "Failed to get security information"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:607
+#: ../lib/puppet/util/windows/security.rb:586
 msgid "Failed to get security descriptor control"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:640
+#: ../lib/puppet/util/windows/security.rb:619
 msgid "Failed to initialize ACL"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:679
+#: ../lib/puppet/util/windows/security.rb:658
 msgid "Failed to set security information"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:300
-msgid "Starting the %{service_name} service"
+#: ../lib/puppet/util/windows/service.rb:301
+msgid "Starting the %{service_name} service. Timeout set to: %{timeout} seconds"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:310
+#: ../lib/puppet/util/windows/service.rb:311
 msgid "Failed to start the service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:314
+#: ../lib/puppet/util/windows/service.rb:315
 msgid "Successfully started the %{service_name} service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:322
-msgid "Stopping the %{service_name} service"
+#: ../lib/puppet/util/windows/service.rb:324
+msgid "Stopping the %{service_name} service. Timeout set to: %{timeout} seconds"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:330
+#: ../lib/puppet/util/windows/service.rb:332
 msgid "Successfully stopped the %{service_name} service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:338
-msgid "Resuming the %{service_name} service"
+#: ../lib/puppet/util/windows/service.rb:341
+msgid "Resuming the %{service_name} service. Timeout set to: %{timeout} seconds"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:354
+#: ../lib/puppet/util/windows/service.rb:357
 msgid "Successfully resumed the %{service_name} service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:370
+#: ../lib/puppet/util/windows/service.rb:372
 msgid "Unknown Service state '%{current_state}' for '%{service_name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:388
+#: ../lib/puppet/util/windows/service.rb:389
 msgid "Unknown start type '%{start_type}' for '%{service_name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:403
+#: ../lib/puppet/util/windows/service.rb:404
 msgid "Unknown start type %{start_type}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:424
+#: ../lib/puppet/util/windows/service.rb:425
 msgid "Failed to update service configuration"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:484
+#: ../lib/puppet/util/windows/service.rb:485
 msgid "Failed to fetch services"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:533
+#: ../lib/puppet/util/windows/service.rb:534
 msgid "Failed to open a handle to the service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:550
+#: ../lib/puppet/util/windows/service.rb:551
 msgid "Failed to open a handle to the service control manager"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:572
+#: ../lib/puppet/util/windows/service.rb:575
 msgid "The service is already in the %{final_state} state. No further work needs to be done."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:584
+#: ../lib/puppet/util/windows/service.rb:587
 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:595
+#: ../lib/puppet/util/windows/service.rb:598
 msgid "There is already a pending transition to the %{final_state} state for the %{service_name} service."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:611
+#: ../lib/puppet/util/windows/service.rb:614
 msgid "The service is in the %{pending_state} state, which is an unsafe pending state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:616
+#: ../lib/puppet/util/windows/service.rb:619
 msgid "Transitioning the %{service_name} service from %{initial_state} to %{final_state}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:620
+#: ../lib/puppet/util/windows/service.rb:623
 msgid "Waiting for the transition to finish"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:625
+#: ../lib/puppet/util/windows/service.rb:627
 msgid "Failed to transition the %{service_name} service to the %{final_state} state. Detail: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:664 ../lib/puppet/util/windows/service.rb:700
+#: ../lib/puppet/util/windows/service.rb:666 ../lib/puppet/util/windows/service.rb:702
 msgid "Service query failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:717
+#: ../lib/puppet/util/windows/service.rb:719
 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:751
+#: ../lib/puppet/util/windows/service.rb:754
 msgid "The service transitioned to the %{pending_state} state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:765
+#: ../lib/puppet/util/windows/service.rb:764
 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 ""
 
@@ -9656,11 +9663,11 @@ msgstr ""
 msgid "Waiting for the pending transition to the %{final_state} state to finish."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:793
+#: ../lib/puppet/util/windows/service.rb:792
 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:807
+#: ../lib/puppet/util/windows/service.rb:806
 msgid "Timed out while waiting for the pending transition from %{pending_state} to %{final_state} to finish. The current state is %{current_state}."
 msgstr ""
 
@@ -9703,82 +9710,3 @@ msgstr ""
 #: ../lib/puppet/util/yaml.rb:47
 msgid "Puppet::Util::Yaml.load_file is deprecated. Use safe_load_file instead."
 msgstr ""
-
-#: ../lib/puppet_pal.rb:112
-msgid "The argument 'puppet_code' must be a String, got %{type}"
-msgstr ""
-
-#. TRANSLATORS, the 'ast' is the name of a parameter, do not translate
-#: ../lib/puppet_pal.rb:154
-msgid "The given 'ast' does not represent a literal value"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:166
-msgid "The argument 'code_string' must be a String, got %{type}"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:179
-msgid "The argument 'file' must be a String, got %{type}"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:216
-msgid "Given data_type value is not a data type, got '%{type}'"
-msgstr ""
-
-#. TRANSLATORS 'type' and 'title' are internal parameter names - do not translate
-#: ../lib/puppet_pal.rb:455
-msgid "Both type and title must be given"
-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.rb:684 ../lib/puppet_pal.rb:777
-msgid "manifest_file or code_string cannot be given when configured_by_env is true"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:817
-msgid "temporary environment name"
-msgstr ""
-
-#. TRANSLATORS: do not translate variable name string in these assertions
-#: ../lib/puppet_pal.rb:822
-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.rb:876
-msgid "A block must be given to 'in_environment'"
-msgstr ""
-
-#. TRANSLATORS 'in_environment' is a name, do not translate
-#: ../lib/puppet_pal.rb:881
-msgid "The environment directory '%{env_dir}' does not exist"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:904
-msgid "No directory found for the environment '%{env_name}' on the path '%{envpath}'"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:958
-msgid "Given variables must be a hash, got %{type}"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:964
-msgid "Given variable '%{varname}' has illegal name"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:968
-msgid "Given value for '%{varname}' has illegal type - got: %{type}"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:1108
-msgid "Puppet Pal: %{what}"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:1122
-msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
-msgstr ""
-
-#: ../lib/puppet_pal.rb:1129
-msgid "A block must be given"
-msgstr ""