puppet 6.6.0 → 6.7.0

data/lib/puppet/util/connection.rb

@@ -29,7 +29,8 @@ module Puppet::Util
         Puppet[setting]
       else
         server = Puppet.lookup(:server) do
-          if primary_server = Puppet.settings[:server_list][0]
+          primary_server = Puppet.settings[:server_list][0]
+          if primary_server
             #TRANSLATORS 'server_list' is the name of a setting and should not be translated
             debug_once _("Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}") % {server: primary_server[0]}
             primary_server[0]
@@ -60,7 +61,8 @@ module Puppet::Util
         Puppet.settings[port_setting].to_i
       else
         port = Puppet.lookup(:serverport) do
-          if primary_server = Puppet.settings[:server_list][0]
+          primary_server = Puppet.settings[:server_list][0]
+          if primary_server
             # Port might not be set, so we want to fallback in that
             # case. We know we don't need to use `setting` here, since
             # the default value of every port setting is `masterport`

data/lib/puppet/util/diff.rb

@@ -6,10 +6,12 @@ module Puppet::Util::Diff
   require 'tempfile'
 
   def diff(old, new)
-    return '' unless diff_cmd = Puppet[:diff] and diff_cmd != ""
+    diff_cmd = Puppet[:diff]
+    return '' unless diff_cmd && diff_cmd != ""
 
     command = [diff_cmd]
-    if args = Puppet[:diff_args] and args != ""
+    args = Puppet[:diff_args]
+    if args && args != ""
       args.split(' ').each do|arg|
         command << arg
       end

data/lib/puppet/util/execution.rb

@@ -216,7 +216,8 @@ module Puppet::Util::Execution
       # We close stdin/stdout/stderr immediately after fork/exec as they're no longer needed by
       # this process. In most cases they could be closed later, but when `stdout` is the "writer"
       # pipe we must close it or we'll never reach eof on the `reader` pipe.
-      if execution_stub = Puppet::Util::ExecutionStub.current_value
+      execution_stub = Puppet::Util::ExecutionStub.current_value
+      if execution_stub
         child_pid = execution_stub.call(*exec_args)
         [stdin, stdout, stderr].each {|io| io.close rescue nil}
         return child_pid
@@ -231,7 +232,8 @@ module Puppet::Util::Execution
             # Use non-blocking read to check for data. After each attempt,
             # check whether the child is done. This is done in case the child
             # forks and inherits stdout, as happens in `foo &`.
-            until results = Process.waitpid2(child_pid, Process::WNOHANG)
+            
+            until results = Process.waitpid2(child_pid, Process::WNOHANG) #rubocop:disable Lint/AssignmentInCondition
 
               # If not done, wait for data to read with a timeout
               # This timeout is selected to keep activity low while waiting on

data/lib/puppet/util/feature.rb

@@ -93,11 +93,14 @@ class Puppet::Util::Feature
       end
       @results[name] = result
       result
-    elsif libs = options[:libs]
-      libs = [libs] unless libs.is_a?(Array)
-      libs.all? { |lib| load_library(lib, name) } ? true : nil
     else
-      true
+      libs = options[:libs]
+      if libs
+        libs = [libs] unless libs.is_a?(Array)
+        libs.all? { |lib| load_library(lib, name) } ? true : nil
+      else
+        true
+      end
     end
   end
 

data/lib/puppet/util/fileparsing.rb

@@ -150,7 +150,8 @@ module Puppet::Util::FileParsing
   end
 
   def fields(type)
-    if record = record_type(type)
+    record = record_type(type)
+    if record
       record.fields.dup
     else
       nil
@@ -171,60 +172,65 @@ module Puppet::Util::FileParsing
   def handle_record_line(line, record)
     ret = nil
     if record.respond_to?(:process)
-      if ret = record.send(:process, line.dup)
+      ret = record.send(:process, line.dup)
+      if ret
         unless ret.is_a?(Hash)
           raise Puppet::DevError, _("Process record type %{record_name} returned non-hash") % { record_name: record.name }
         end
       else
         return nil
       end
-    elsif regex = record.match
-      # In this case, we try to match the whole line and then use the
-      # match captures to get our fields.
-      if match = regex.match(line)
+    else
+      regex = record.match
+      if regex
+        # In this case, we try to match the whole line and then use the
+        # match captures to get our fields.
+        match = regex.match(line)
+        if match
+          ret = {}
+          record.fields.zip(match.captures).each do |field, value|
+            if value == record.absent
+              ret[field] = :absent
+            else
+              ret[field] = value
+            end
+          end
+        else
+          nil
+        end
+      else
         ret = {}
-        record.fields.zip(match.captures).each do |field, value|
-          if value == record.absent
-            ret[field] = :absent
+        sep = record.separator
+  
+        # String "helpfully" replaces ' ' with /\s+/ in splitting, so we
+        # have to work around it.
+        if sep == " "
+          sep = / /
+        end
+        line_fields = line.split(sep)
+        record.fields.each do |param|
+          value = line_fields.shift
+          if value and value != record.absent
+            ret[param] = value
           else
-            ret[field] = value
+            ret[param] = :absent
           end
         end
-      else
-        nil
-      end
-    else
-      ret = {}
-      sep = record.separator
-
-      # String "helpfully" replaces ' ' with /\s+/ in splitting, so we
-      # have to work around it.
-      if sep == " "
-        sep = / /
-      end
-      line_fields = line.split(sep)
-      record.fields.each do |param|
-        value = line_fields.shift
-        if value and value != record.absent
-          ret[param] = value
-        else
-          ret[param] = :absent
+  
+        if record.rollup and ! line_fields.empty?
+          last_field = record.fields[-1]
+          val = ([ret[last_field]] + line_fields).join(record.joiner)
+          ret[last_field] = val
         end
       end
-
-      if record.rollup and ! line_fields.empty?
-        last_field = record.fields[-1]
-        val = ([ret[last_field]] + line_fields).join(record.joiner)
-        ret[last_field] = val
+  
+      if ret
+        ret[:record_type] = record.name
+        return ret
+      else
+        return nil
       end
     end
-
-    if ret
-      ret[:record_type] = record.name
-      return ret
-    else
-      return nil
-    end
   end
 
   def line_separator
@@ -245,7 +251,8 @@ module Puppet::Util::FileParsing
     count = 1
     lines(text).collect do |line|
       count += 1
-      if val = parse_line(line)
+      val = parse_line(line)
+      if val
         val
       else
         error = Puppet::ResourceError.new(_("Could not parse line %{line}") % { line: line.inspect })
@@ -263,7 +270,8 @@ module Puppet::Util::FileParsing
       # These are basically either text or record lines.
       method = "handle_#{record.type}_line"
       if respond_to?(method)
-        if result = send(method, line, record)
+        result = send(method, line, record)
+        if result
           record.send(:post_parse, result) if record.respond_to?(:post_parse)
           return result
         end
@@ -324,7 +332,8 @@ module Puppet::Util::FileParsing
 
   # Convert our parsed record into a text record.
   def to_line(details)
-    unless record = record_type(details[:record_type])
+    record = record_type(details[:record_type])
+    unless record
       raise ArgumentError, _("Invalid record type %{record_type}") % { record_type: details[:record_type].inspect }
     end
 
@@ -340,7 +349,8 @@ module Puppet::Util::FileParsing
 
       line = record.join(details)
 
-      if regex = record.rts
+      regex = record.rts
+      if regex
         # If they say true, then use whitespace; else, use their regex.
         if regex == true
           regex = /\s+$/
@@ -363,7 +373,8 @@ module Puppet::Util::FileParsing
 
   def valid_attr?(type, attr)
     type = type.intern
-    if record = record_type(type) and record.fields.include?(attr.intern)
+    record = record_type(type) 
+    if record && record.fields.include?(attr.intern)
       return true
     else
       if attr.intern == :ensure

data/lib/puppet/util/filetype.rb

@@ -88,7 +88,8 @@ class Puppet::Util::FileType
   # to the target user if the target user and the current user are not
   # the same
   def cronargs
-    if uid = Puppet::Util.uid(@path) and uid == Puppet::Util::SUIDManager.uid
+    uid = Puppet::Util.uid(@path)
+    if uid && uid == Puppet::Util::SUIDManager.uid
       {:failonfail => true, :combine => true}
     else
       {:failonfail => true, :combine => true, :uid => @path}

data/lib/puppet/util/http_proxy.rb

@@ -33,7 +33,8 @@ module Puppet::Util::HttpProxy
   #   .example.com
   # We'll accommodate both here.
   def self.no_proxy?(dest)
-    unless no_proxy_env = ENV["no_proxy"] || ENV["NO_PROXY"]
+    no_proxy_env = ENV["no_proxy"] || ENV["NO_PROXY"]
+    unless no_proxy_env
       return false
     end
 

data/lib/puppet/util/instance_loader.rb

@@ -45,7 +45,8 @@ module Puppet::Util::InstanceLoader
   # Retrieve an already-loaded instance, or attempt to load our instance.
   def loaded_instance(type, name)
     name = name.intern
-    return nil unless instances = instance_hash(type)
+    instances = instance_hash(type)
+    return nil unless instances
     unless instances.include? name
       if instance_loader(type).load(name, Puppet.lookup(:current_environment))
         unless instances.include? name

data/lib/puppet/util/ldap/connection.rb

@@ -17,9 +17,11 @@ class Puppet::Util::Ldap::Connection
 
     options = {}
     options[:ssl] = ssl
-    if user = Puppet.settings[:ldapuser] and user != ""
+    user = Puppet.settings[:ldapuser]
+    if user && user != ""
       options[:user] = user
-      if pass = Puppet.settings[:ldappassword] and pass != ""
+      pass = Puppet.settings[:ldappassword]
+      if pass && pass != ""
         options[:password] = pass
       end
     end

data/lib/puppet/util/ldap/manager.rb

@@ -56,10 +56,12 @@ class Puppet::Util::Ldap::Manager
         ssl = false
       end
       options = {:ssl => ssl}
-      if user = Puppet[:ldapuser] and user != ""
+      user = Puppet[:ldapuser]
+      if user && user != ""
         options[:user] = user
       end
-      if password = Puppet[:ldappassword] and password != ""
+      password = Puppet[:ldappassword]
+      if password && password != ""
         options[:password] = password
       end
       @connection = Puppet::Util::Ldap::Connection.new(Puppet[:ldapserver], Puppet[:ldapport], options)
@@ -138,7 +140,8 @@ class Puppet::Util::Ldap::Manager
       next if values[generator.name]
 
       if generator.source
-        unless value = values[generator.source]
+        value = values[generator.source]
+        unless value
           raise ArgumentError, _("%{source} must be defined to generate %{name}") %
               { source: generator.source, name: generator.name }
         end

data/lib/puppet/util/log.rb

@@ -300,13 +300,15 @@ class Puppet::Util::Log
 
     @time = Time.now
 
-    if tags = args[:tags]
+    tags = args[:tags]
+    if tags
       tags.each { |t| self.tag(t) }
     end
 
     # Don't add these unless defined (preserve 3.x API as much as possible)
     [:file, :line, :pos, :issue_code, :environment, :node, :backtrace].each do |attr|
-      next unless value = args[attr]
+      value = args[attr]
+      next unless value
       send(attr.to_s + '=', value)
     end
 
@@ -324,7 +326,8 @@ class Puppet::Util::Log
     end
     # Don't add these unless defined (preserve 3.x API as much as possible)
     %w(file line pos issue_code environment node backtrace).each do |name|
-      next unless value = data[name]
+      value = data[name]
+      next unless value
       send(name + '=', value)
     end
   end

data/lib/puppet/util/metric.rb

@@ -32,7 +32,8 @@ class Puppet::Util::Metric
 
   # Return a specific value
   def [](name)
-    if value = @values.find { |v| v[0] == name }
+    value = @values.find { |v| v[0] == name }
+    if value
       return value[2]
     else
       return 0

data/lib/puppet/util/posix.rb

@@ -134,11 +134,13 @@ module Puppet::Util::POSIX
       # pass
     end
     if field.is_a?(Integer)
-      return nil unless name = get_posix_field(location, :name, field)
+      name = get_posix_field(location, :name, field)
+      return nil unless name
       id = get_posix_field(location, id_field, name)
       check_value = id
     else
-      return nil unless id = get_posix_field(location, id_field, field)
+      id = get_posix_field(location, id_field, field)
+      return nil unless id
       name = get_posix_field(location, :name, id)
       check_value = name
     end

data/lib/puppet/util/rdoc/code_objects.rb

@@ -64,7 +64,8 @@ module RDoc
     # Adds a module called __nodes__ and adds nodes to it as classes
     #
     def add_node(name,superclass)
-      if cls = @nodes[name]
+      cls = @nodes[name]
+      if cls
         return cls
       end
       @node_container ||= add_module(NormalModule, "__nodes__")

data/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -162,8 +162,10 @@ module Generators
 
       # scan all classes to create the child's references
       @allclasses.values.each do |klass|
-        if superklass = klass.context.superclass
-          if superklass = AllReferences[superklass] and (superklass.is_a?(HTMLPuppetClass) or superklass.is_a?(HTMLPuppetNode))
+        superklass = klass.context.superclass
+        if superklass
+          superklass = AllReferences[superklass]
+          if superklass && (superklass.is_a?(HTMLPuppetClass) || superklass.is_a?(HTMLPuppetNode))
             superklass.context.add_child(klass.context)
           end
         end

data/lib/puppet/util/selinux.rb

@@ -232,7 +232,8 @@ module Puppet::Util::SELinux
   # Internal helper function to return which type of filesystem a given file
   # path resides on
   def find_fs(path)
-    return nil unless mounts = read_mounts
+    mounts = read_mounts
+    return nil unless mounts
 
     # cleanpath eliminates useless parts of the path (like '.', or '..', or
     # multiple slashes), without touching the filesystem, and without

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '6.6.0'
+  PUPPETVERSION = '6.7.0'
 
   ##
   # version is a public API method intended to always provide a fast and
@@ -61,10 +61,7 @@ module Puppet
   def self.version
     version_file = File.join(File.dirname(__FILE__), 'VERSION')
     return @puppet_version if @puppet_version
-    if version = read_version_file(version_file)
-      @puppet_version = version
-    end
-    @puppet_version ||= PUPPETVERSION
+    @puppet_version = read_version_file(version_file) || PUPPETVERSION
   end
 
   # @return [String] containing the puppet version to minor specificity, e.g. "3.0"

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.5.0-67-gdd01573\n"
+"Project-Id-Version: Puppet automation framework 6.6.0-15-gcd8d2d0\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2019-06-21 03:18+0000\n"
-"PO-Revision-Date: 2019-06-21 03:18+0000\n"
+"POT-Creation-Date: 2019-06-28 23:18+0000\n"
+"PO-Revision-Date: 2019-06-28 23: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:46 ../lib/puppet/parser/scope.rb:534
 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:47 ../lib/hiera/scope.rb:49 ../lib/puppet/parser/scope.rb:535 ../lib/puppet/parser/scope.rb:537
 msgid "Undefined variable '%{name}'; %{reason}"
 msgstr ""
 
@@ -44,7 +44,7 @@ msgstr ""
 msgid "Please supply a parameter to perform a Hiera lookup"
 msgstr ""
 
-#: ../lib/hiera_puppet.rb:74 ../lib/puppet/indirector/hiera.rb:79
+#: ../lib/hiera_puppet.rb:75 ../lib/puppet/indirector/hiera.rb:79
 msgid "Config file %{hiera_config} not found, using Hiera defaults"
 msgstr ""
 
@@ -212,7 +212,7 @@ msgstr ""
 msgid "%{file} is not readable"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:293 ../lib/puppet/application/script.rb:241
+#: ../lib/puppet/application/apply.rb:293 ../lib/puppet/application/script.rb:239
 msgid "Exiting"
 msgstr ""
 
@@ -224,15 +224,15 @@ msgstr ""
 msgid "Could not find facts for %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:366 ../lib/puppet/application/script.rb:153
+#: ../lib/puppet/application/apply.rb:365 ../lib/puppet/application/script.rb:152
 msgid "Could not find node %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:379 ../lib/puppet/application/script.rb:137
+#: ../lib/puppet/application/apply.rb:378 ../lib/puppet/application/script.rb:137
 msgid "Could not find file %{manifest}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:380
+#: ../lib/puppet/application/apply.rb:379
 msgid "Only one file can be applied per run.  Skipping %{files}"
 msgstr ""
 
@@ -312,11 +312,11 @@ msgstr ""
 msgid "Could not generate documentation: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/application/doc.rb:159
+#: ../lib/puppet/application/doc.rb:160
 msgid "Could not find reference %{name}"
 msgstr ""
 
-#: ../lib/puppet/application/doc.rb:165
+#: ../lib/puppet/application/doc.rb:166
 msgid "Could not generate reference %{name}: %{detail}"
 msgstr ""
 
@@ -328,25 +328,25 @@ msgstr ""
 msgid "Cancelling Face"
 msgstr ""
 
-#: ../lib/puppet/application/face_base.rb:128
+#: ../lib/puppet/application/face_base.rb:135
 msgid "'%{face}' has no %{action} action.  See `puppet help %{face}`."
 msgstr ""
 
-#: ../lib/puppet/application/face_base.rb:206
+#: ../lib/puppet/application/face_base.rb:213
 msgid "%{face} does not respond to action %{arg}"
 msgstr ""
 
-#: ../lib/puppet/application/face_base.rb:239
+#: ../lib/puppet/application/face_base.rb:246
 msgid "puppet %{face} %{action} takes %{arg_count} argument, but you gave %{given_count}"
 msgid_plural "puppet %{face} %{action} takes %{arg_count} arguments, but you gave %{given_count}"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../lib/puppet/application/face_base.rb:244
+#: ../lib/puppet/application/face_base.rb:251
 msgid "'puppet %{face}' is deprecated and will be removed in a future release"
 msgstr ""
 
-#: ../lib/puppet/application/face_base.rb:263
+#: ../lib/puppet/application/face_base.rb:270
 msgid "Try 'puppet help %{face} %{action}' for usage"
 msgstr ""
 
@@ -385,7 +385,7 @@ 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:215
+#: ../lib/puppet/application/filebucket.rb:300 ../lib/puppet/indirector/request.rb:218
 msgid "Selected server from the `server` setting: %{server}"
 msgstr ""
 
@@ -423,7 +423,7 @@ msgstr ""
 msgid "Unknown rendering format '%{format}'"
 msgstr ""
 
-#: ../lib/puppet/application/lookup.rb:360 ../lib/puppet/face/epp.rb:518
+#: ../lib/puppet/application/lookup.rb:360 ../lib/puppet/face/epp.rb:520
 msgid "Incorrect formatted data in %{fact_file} given via the --facts flag"
 msgstr ""
 
@@ -475,7 +475,7 @@ msgstr ""
 msgid "Unknown action '%{action}'"
 msgstr ""
 
-#: ../lib/puppet/application/ssl.rb:153 ../lib/puppet/ssl/state_machine.rb:166
+#: ../lib/puppet/application/ssl.rb:153 ../lib/puppet/ssl/state_machine.rb:178
 msgid "Creating a new EC SSL key for %{name} using curve %{curve}"
 msgstr ""
 
@@ -535,97 +535,97 @@ msgstr ""
 msgid "Cannot remove %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:73
+#: ../lib/puppet/configurer.rb:74
 msgid "Using cached catalog from environment '%{environment}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:79
+#: ../lib/puppet/configurer.rb:80
 msgid "Not using cache on failed catalog"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:88
+#: ../lib/puppet/configurer.rb:89
 msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:93 ../lib/puppet/configurer.rb:177
+#: ../lib/puppet/configurer.rb:94 ../lib/puppet/configurer.rb:179
 msgid "Using cached catalog from environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:170
+#: ../lib/puppet/configurer.rb:172
 msgid "Could not retrieve catalog; skipping run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:190
+#: ../lib/puppet/configurer.rb:192
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:230
+#: ../lib/puppet/configurer.rb:232
 msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:233
+#: ../lib/puppet/configurer.rb:235
 msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:265
+#: ../lib/puppet/configurer.rb:268
 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:313
 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:318
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:319
+#: ../lib/puppet/configurer.rb:322
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:347
+#: ../lib/puppet/configurer.rb:351
 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:362
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:360
+#: ../lib/puppet/configurer.rb:364
 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:384
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:404
+#: ../lib/puppet/configurer.rb:409
 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:408
+#: ../lib/puppet/configurer.rb:413
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:420 ../lib/puppet/face/report.rb:47
+#: ../lib/puppet/configurer.rb:425 ../lib/puppet/face/report.rb:47
 msgid "Could not send report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:429
+#: ../lib/puppet/configurer.rb:434
 msgid "Could not save last run local report: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:441
+#: ../lib/puppet/configurer.rb:446
 msgid "Could not run command from %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:459
+#: ../lib/puppet/configurer.rb:464
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:479
+#: ../lib/puppet/configurer.rb:484
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -665,11 +665,11 @@ msgstr ""
 msgid "TrustedInformation expected a certificate, but none was given."
 msgstr ""
 
-#: ../lib/puppet/daemon.rb:82
+#: ../lib/puppet/daemon.rb:83
 msgid "Cannot reexec unless ARGV arguments are set"
 msgstr ""
 
-#: ../lib/puppet/daemon.rb:143
+#: ../lib/puppet/daemon.rb:144
 msgid "Daemons must have an agent, server, or both"
 msgstr ""
 
@@ -716,7 +716,7 @@ msgstr ""
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1002 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1010 ../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 ""
 
@@ -984,19 +984,19 @@ msgstr ""
 msgid "error while rendering epp"
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:413
+#: ../lib/puppet/face/epp.rb:414
 msgid "Only .yaml or .pp can be used as a --values_file"
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:416
+#: ../lib/puppet/face/epp.rb:417
 msgid "Could not load --values_file %{error}"
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:419
+#: ../lib/puppet/face/epp.rb:420
 msgid "--values_file option must evaluate to a Hash or undef/nil, got: '%{template_class}'"
 msgstr ""
 
-#: ../lib/puppet/face/epp.rb:432
+#: ../lib/puppet/face/epp.rb:434
 msgid "--values option must evaluate to a Hash or undef, got: '%{values_class}'"
 msgstr ""
 
@@ -1183,15 +1183,15 @@ msgstr ""
 msgid "<path>"
 msgstr ""
 
-#: ../lib/puppet/face/module/changes.rb:26
+#: ../lib/puppet/face/module/changes.rb:27
 msgid "Could not find a valid module at %{path}"
 msgstr ""
 
-#: ../lib/puppet/face/module/changes.rb:33
+#: ../lib/puppet/face/module/changes.rb:34
 msgid "No modified files"
 msgstr ""
 
-#: ../lib/puppet/face/module/changes.rb:35
+#: ../lib/puppet/face/module/changes.rb:36
 msgid "%{count} files modified"
 msgstr ""
 
@@ -1570,15 +1570,15 @@ msgstr ""
 msgid "Failed to diff files"
 msgstr ""
 
-#: ../lib/puppet/file_bucket/dipper.rb:110 ../lib/puppet/file_bucket/dipper.rb:164
+#: ../lib/puppet/file_bucket/dipper.rb:110 ../lib/puppet/file_bucket/dipper.rb:165
 msgid "File not found"
 msgstr ""
 
-#: ../lib/puppet/file_bucket/dipper.rb:144
+#: ../lib/puppet/file_bucket/dipper.rb:145
 msgid "Could not find file with checksum %{sum}"
 msgstr ""
 
-#: ../lib/puppet/file_bucket/dipper.rb:155 ../lib/puppet/indirector/file_bucket_file/file.rb:43
+#: ../lib/puppet/file_bucket/dipper.rb:156 ../lib/puppet/indirector/file_bucket_file/file.rb:43
 msgid "Listing remote file buckets is not allowed"
 msgstr ""
 
@@ -1619,7 +1619,7 @@ msgstr ""
 msgid "Cannot find file: Invalid relative path '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/configuration.rb:108
+#: ../lib/puppet/file_serving/configuration.rb:109
 msgid "Error parsing fileserver configuration: %{detail}; using old configuration"
 msgstr ""
 
@@ -1721,7 +1721,7 @@ msgstr ""
 msgid "Invalid mount name format '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/file_serving/mount/file.rb:18 ../lib/puppet/file_serving/mount/file.rb:70
+#: ../lib/puppet/file_serving/mount/file.rb:18 ../lib/puppet/file_serving/mount/file.rb:71
 msgid "Mounts without paths are not usable"
 msgstr ""
 
@@ -1737,7 +1737,7 @@ msgstr ""
 msgid "%{path} is not readable"
 msgstr ""
 
-#: ../lib/puppet/file_serving/mount/file.rb:92
+#: ../lib/puppet/file_serving/mount/file.rb:93
 msgid "No client; expanding '%{path}' with local host"
 msgstr ""
 
@@ -1769,7 +1769,7 @@ msgstr ""
 msgid "Timeout waiting for exclusive lock on %{path}"
 msgstr ""
 
-#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:126 ../lib/puppet/util.rb:655
+#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:126 ../lib/puppet/util.rb:658
 msgid "Is a directory: %{directory}"
 msgstr ""
 
@@ -1805,7 +1805,7 @@ msgstr ""
 msgid "unexpected prefix_suffix: %{value}"
 msgstr ""
 
-#: ../lib/puppet/file_system/uniquefile.rb:139
+#: ../lib/puppet/file_system/uniquefile.rb:140
 msgid "cannot generate temporary name using `%{basename}' under `%{tmpdir}'"
 msgstr ""
 
@@ -2159,19 +2159,19 @@ msgstr ""
 msgid "Failed to load custom type '%{type_name}' from '%{input}': %{message}"
 msgstr ""
 
-#: ../lib/puppet/generate/type.rb:199
+#: ../lib/puppet/generate/type.rb:200
 msgid "Custom type '%{type_name}' was not defined in '%{input}'."
 msgstr ""
 
-#: ../lib/puppet/generate/type.rb:223
+#: ../lib/puppet/generate/type.rb:224
 msgid "Generating '%{effective_output_path}' using '%{format}' format."
 msgstr ""
 
-#: ../lib/puppet/generate/type.rb:229
+#: ../lib/puppet/generate/type.rb:230
 msgid "Failed to generate '%{effective_output_path}': %{message}"
 msgstr ""
 
-#: ../lib/puppet/generate/type.rb:235
+#: ../lib/puppet/generate/type.rb:236
 msgid "No files were generated because all inputs were up-to-date."
 msgstr ""
 
@@ -2213,128 +2213,128 @@ msgstr ""
 msgid "Already handling indirection for %{current}; cannot also handle %{next}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:23
+#: ../lib/puppet/indirector/catalog/compiler.rb:25
 msgid "Facts but no fact format provided for %{request}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:26
+#: ../lib/puppet/indirector/catalog/compiler.rb:28
 msgid "Found facts"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:31
+#: ../lib/puppet/indirector/catalog/compiler.rb:33
 msgid "Catalog for %{request} was requested with fact definition for the wrong node (%{fact_name})."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:68
+#: ../lib/puppet/indirector/catalog/compiler.rb:70
 msgid "Setup server facts for compiling"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:92
+#: ../lib/puppet/indirector/catalog/compiler.rb:94
 msgid "Unsupported facts format"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:133
+#: ../lib/puppet/indirector/catalog/compiler.rb:135
 msgid "Not inlining absent resource"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:136
+#: ../lib/puppet/indirector/catalog/compiler.rb:138
 msgid "Not inlining resource without sources"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:139
+#: ../lib/puppet/indirector/catalog/compiler.rb:141
 msgid "Not inlining unsupported source scheme"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:161
+#: ../lib/puppet/indirector/catalog/compiler.rb:163
 msgid "Not inlining file outside environment"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:167
+#: ../lib/puppet/indirector/catalog/compiler.rb:169
 msgid "Inlining file metadata"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:253
+#: ../lib/puppet/indirector/catalog/compiler.rb:257
 msgid "Could not get metadata for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:274
+#: ../lib/puppet/indirector/catalog/compiler.rb:278
 msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:281
+#: ../lib/puppet/indirector/catalog/compiler.rb:285
 msgid "Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:282
+#: ../lib/puppet/indirector/catalog/compiler.rb:286
 msgid "Compiled static catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:284
+#: ../lib/puppet/indirector/catalog/compiler.rb:288
 msgid "Compiled static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:285
+#: ../lib/puppet/indirector/catalog/compiler.rb:289
 msgid "Compiled static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:290
+#: ../lib/puppet/indirector/catalog/compiler.rb:294
 msgid "Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:291
+#: ../lib/puppet/indirector/catalog/compiler.rb:295
 msgid "Compiled catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:293
+#: ../lib/puppet/indirector/catalog/compiler.rb:297
 msgid "Compiled catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:294
+#: ../lib/puppet/indirector/catalog/compiler.rb:298
 msgid "Compiled catalog for %{node}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:316
+#: ../lib/puppet/indirector/catalog/compiler.rb:320
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:318
+#: ../lib/puppet/indirector/catalog/compiler.rb:322
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:321
+#: ../lib/puppet/indirector/catalog/compiler.rb:325
 msgid "Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:323
+#: ../lib/puppet/indirector/catalog/compiler.rb:327
 msgid "Inlined resource metadata into static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:340
+#: ../lib/puppet/indirector/catalog/compiler.rb:344
 msgid "Found node information"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:348
+#: ../lib/puppet/indirector/catalog/compiler.rb:352
 msgid "Failed when searching for node %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:367
+#: ../lib/puppet/indirector/catalog/compiler.rb:372
 msgid "Invalid option use_node for a remote request"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:385
+#: ../lib/puppet/indirector/catalog/compiler.rb:391
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:403
+#: ../lib/puppet/indirector/catalog/compiler.rb:410
 msgid "Could not retrieve fact %{fact}"
 msgstr ""
 
@@ -2505,7 +2505,7 @@ msgstr ""
 msgid "Denying %{method} request for %{desc} on fileserver mount '%{mount_name}'. Use of auth directives for 'fileserver.conf' mount points is no longer supported. Remove these directives and use the 'auth.conf' file instead for access control."
 msgstr ""
 
-#: ../lib/puppet/indirector/file_server.rb:47
+#: ../lib/puppet/indirector/file_server.rb:49
 msgid "Could not find filesystem info for file '%{request}' in environment %{env}"
 msgstr ""
 
@@ -2519,68 +2519,68 @@ msgstr ""
 msgid "Unrecognized value for request 'merge' parameter: '%{merge}'"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:38
+#: ../lib/puppet/indirector/indirection.rb:39
 msgid "Tried to cache when no cache class was set"
 msgstr ""
 
 #. TRANSLATORS "TTL" stands for "time to live" and refers to a duration of time
-#: ../lib/puppet/indirector/indirection.rb:62
+#: ../lib/puppet/indirector/indirection.rb:63
 msgid "Indirection TTL must be an integer"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:97
+#: ../lib/puppet/indirector/indirection.rb:98
 msgid "Indirection %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:117
+#: ../lib/puppet/indirector/indirection.rb:118
 msgid "No terminus specified for %{name}; cannot redirect"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:131
+#: ../lib/puppet/indirector/indirection.rb:133
 msgid "No terminus class nor terminus setting was provided for indirection %{name}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:150
+#: ../lib/puppet/indirector/indirection.rb:152
 msgid "Invalid terminus name %{terminus_class}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:153
+#: ../lib/puppet/indirector/indirection.rb:155
 msgid "Could not find terminus %{terminus_class} for indirection %{name}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:168
+#: ../lib/puppet/indirector/indirection.rb:171
 msgid "Expiring the %{cache} cache of %{instance}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:198
+#: ../lib/puppet/indirector/indirection.rb:201
 msgid "Caching %{indirection} for %{request}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:209
+#: ../lib/puppet/indirector/indirection.rb:212
 msgid "Filtered result for %{indirection} %{request}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:238
+#: ../lib/puppet/indirector/indirection.rb:242
 msgid "Not using expired %{indirection} for %{request} from cache; expired at %{expiration}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:245
+#: ../lib/puppet/indirector/indirection.rb:249
 msgid "Cached %{indirection} for %{request} failed: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:270
+#: ../lib/puppet/indirector/indirection.rb:275
 msgid "Search results from terminus %{terminus_name} are not an array"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:307
+#: ../lib/puppet/indirector/indirection.rb:312
 msgid "Not authorized to call %{method} on %{description}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:310
+#: ../lib/puppet/indirector/indirection.rb:315
 msgid "Not authorized to call %{method} on %{description} with %{option}"
 msgstr ""
 
-#: ../lib/puppet/indirector/indirection.rb:336
+#: ../lib/puppet/indirector/indirection.rb:342
 msgid "Could not find terminus %{terminus_class} for indirection %{indirection}"
 msgstr ""
 
@@ -2653,11 +2653,11 @@ msgstr ""
 msgid "none"
 msgstr ""
 
-#: ../lib/puppet/indirector/node/exec.rb:60
+#: ../lib/puppet/indirector/node/exec.rb:61
 msgid "key is a %{klass}, not a string or symbol"
 msgstr ""
 
-#: ../lib/puppet/indirector/node/exec.rb:67
+#: ../lib/puppet/indirector/node/exec.rb:68
 msgid "Could not load external node results for %{name}: %{detail}"
 msgstr ""
 
@@ -2665,7 +2665,7 @@ msgstr ""
 msgid "Report %{report} failed: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/report/processor.rb:55
+#: ../lib/puppet/indirector/report/processor.rb:56
 msgid "No report named '%{name}'"
 msgstr ""
 
@@ -2673,34 +2673,34 @@ msgstr ""
 msgid "Server version %{version} does not accept reports in '%{format}', use `preferred_serialization_format=pson`"
 msgstr ""
 
-#: ../lib/puppet/indirector/request.rb:102
+#: ../lib/puppet/indirector/request.rb:103
 msgid "Could not find indirection '%{indirection}'"
 msgstr ""
 
-#: ../lib/puppet/indirector/request.rb:141
+#: ../lib/puppet/indirector/request.rb:142
 msgid "HTTP REST queries cannot handle values of type '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/indirector/request.rb:200
+#: ../lib/puppet/indirector/request.rb:202
 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:211
+#: ../lib/puppet/indirector/request.rb:214
 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:227
+#: ../lib/puppet/indirector/request.rb:231
 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:231
+#: ../lib/puppet/indirector/request.rb:235
 msgid "Selected port from the `masterport` setting: %{port}"
 msgstr ""
 
-#: ../lib/puppet/indirector/request.rb:262
+#: ../lib/puppet/indirector/request.rb:266
 msgid "Could not understand URL %{key}: %{detail}"
 msgstr ""
 
@@ -2761,35 +2761,35 @@ msgstr ""
 msgid "Automatic downcasing and renaming of ssl files is deprecated; please request the file using its correct case: %{full_file}"
 msgstr ""
 
-#: ../lib/puppet/indirector/ssl_file.rb:149
+#: ../lib/puppet/indirector/ssl_file.rb:150
 msgid "Could not write %{path} to %{setting}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/ssl_file.rb:152
+#: ../lib/puppet/indirector/ssl_file.rb:153
 msgid "You must provide a setting to determine where the files are stored"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:35
+#: ../lib/puppet/indirector/terminus.rb:37
 msgid "Could not find indirection instance %{name} for %{terminus}"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:49
+#: ../lib/puppet/indirector/terminus.rb:52
 msgid "Terminus subclasses must have associated constants"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:74
+#: ../lib/puppet/indirector/terminus.rb:77
 msgid "Could not discern indirection model from class constant"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:132
+#: ../lib/puppet/indirector/terminus.rb:135
 msgid "Cannot create instances of abstract terminus types"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:160
+#: ../lib/puppet/indirector/terminus.rb:163
 msgid "Instance name %{name} does not match requested key %{key}"
 msgstr ""
 
-#: ../lib/puppet/indirector/terminus.rb:166
+#: ../lib/puppet/indirector/terminus.rb:169
 msgid "Invalid instance type %{klass}, expected %{model_type}"
 msgstr ""
 
@@ -2813,11 +2813,11 @@ msgstr ""
 msgid "The file %{f} does not exist"
 msgstr ""
 
-#: ../lib/puppet/info_service/task_information_service.rb:20
+#: ../lib/puppet/info_service/plan_information_service.rb:20 ../lib/puppet/info_service/task_information_service.rb:20
 msgid "Module %{module_name} not found in environment %{environment_name}."
 msgstr ""
 
-#: ../lib/puppet/interface.rb:152
+#: ../lib/puppet/interface.rb:153
 msgid "Cannot create face %{name} with invalid version number '%{version}'!"
 msgstr ""
 
@@ -2854,29 +2854,29 @@ msgstr ""
 msgid "when_invoked requires at least one argument (options) for action %{name}"
 msgstr ""
 
-#: ../lib/puppet/interface/action.rb:281 ../lib/puppet/interface/option_manager.rb:57
+#: ../lib/puppet/interface/action.rb:282 ../lib/puppet/interface/option_manager.rb:58
 msgid "Option %{option} conflicts with existing option %{conflict}"
 msgstr ""
 
-#: ../lib/puppet/interface/action.rb:284
+#: ../lib/puppet/interface/action.rb:287
 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
-#: ../lib/puppet/interface/action.rb:311 ../lib/puppet/interface/option_manager.rb:14
+#: ../lib/puppet/interface/action.rb:315 ../lib/puppet/interface/option_manager.rb:14
 msgid "Global option %{option} does not exist in Puppet.settings"
 msgstr ""
 
-#: ../lib/puppet/interface/action.rb:359
+#: ../lib/puppet/interface/action.rb:364
 msgid "Multiple aliases for the same option passed: %{overlap_list}"
 msgstr ""
 
-#: ../lib/puppet/interface/action.rb:365
+#: ../lib/puppet/interface/action.rb:370
 msgid "Unknown options passed: %{unknown_list}"
 msgstr ""
 
-#: ../lib/puppet/interface/action.rb:383
+#: ../lib/puppet/interface/action.rb:388
 msgid "The following options are required: %{missing_list}"
 msgstr ""
 
@@ -2945,23 +2945,23 @@ msgstr ""
 
 #. TRANSLATORS 'copyright' is an attribute name and should not be translated
 #. TRANSLATORS 'copyright' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:326 ../lib/puppet/interface/documentation.rb:331
+#: ../lib/puppet/interface/documentation.rb:328 ../lib/puppet/interface/documentation.rb:333
 msgid "%{value} is not a good copyright year or range"
 msgstr ""
 
 #. TRANSLATORS 'copyright' is an attribute name and should not be translated
-#: ../lib/puppet/interface/documentation.rb:349
+#: ../lib/puppet/interface/documentation.rb:352
 msgid "%{value} is not a good copyright year, set, or range"
 msgstr ""
 
-#: ../lib/puppet/interface/face_collection.rb:116
+#: ../lib/puppet/interface/face_collection.rb:119
 msgid ""
 "Failed to load face %{name}:\n"
 "%{detail}"
 msgstr ""
 
 #. TRANSLATORS 'face' refers to a programming API in Puppet
-#: ../lib/puppet/interface/face_collection.rb:128
+#: ../lib/puppet/interface/face_collection.rb:131
 msgid "%{name} (%{class_name}) is not a valid face name"
 msgstr ""
 
@@ -2973,54 +2973,54 @@ msgstr ""
 msgid "%{option}: already defined in puppet"
 msgstr ""
 
-#: ../lib/puppet/interface/option.rb:39
+#: ../lib/puppet/interface/option.rb:40
 msgid "%{option}: duplicates existing alias %{duplicate} in %{parent}"
 msgstr ""
 
-#: ../lib/puppet/interface/option.rb:45
+#: ../lib/puppet/interface/option.rb:46
 msgid "%{option} is not valid for an option argument"
 msgstr ""
 
-#: ../lib/puppet/interface/option.rb:50
+#: ../lib/puppet/interface/option.rb:51
 msgid "No option declarations found while building"
 msgstr ""
 
-#: ../lib/puppet/interface/option.rb:63
+#: ../lib/puppet/interface/option.rb:64
 msgid "Option %{name} is inconsistent about taking an argument"
 msgstr ""
 
-#: ../lib/puppet/interface/option.rb:70
+#: ../lib/puppet/interface/option.rb:71
 msgid "Options with optional arguments are not supported"
 msgstr ""
 
-#: ../lib/puppet/interface/option.rb:73
+#: ../lib/puppet/interface/option.rb:74
 msgid "Option %{name} is inconsistent about the argument being optional"
 msgstr ""
 
-#: ../lib/puppet/interface/option.rb:88
+#: ../lib/puppet/interface/option.rb:90
 msgid "Can't find a name in the declaration %{declaration}"
 msgstr ""
 
-#: ../lib/puppet/interface/option.rb:97
+#: ../lib/puppet/interface/option.rb:99
 msgid "%{name} is an invalid option name"
 msgstr ""
 
-#: ../lib/puppet/interface/option.rb:119 ../lib/puppet/interface/option.rb:137
+#: ../lib/puppet/interface/option.rb:121 ../lib/puppet/interface/option.rb:139
 msgid "%{name} can't be optional and have a default value"
 msgstr ""
 
 #. TRANSLATORS 'proc' is a Ruby block of code
-#: ../lib/puppet/interface/option.rb:123
+#: ../lib/puppet/interface/option.rb:125
 msgid "default value for %{name} is a %{class_name}, not a proc"
 msgstr ""
 
 #. TRANSLATORS 'proc' is a Ruby block of code
-#: ../lib/puppet/interface/option.rb:146
+#: ../lib/puppet/interface/option.rb:148
 msgid "before action hook for %{name} is a %{class_name}, not a proc"
 msgstr ""
 
 #. TRANSLATORS 'proc' is a Ruby block of code
-#: ../lib/puppet/interface/option.rb:157
+#: ../lib/puppet/interface/option.rb:159
 msgid "after action hook for %{name} is a %{class_name}, not a proc"
 msgstr ""
 
@@ -3068,7 +3068,7 @@ msgstr ""
 msgid "%{option} default_to block should not take any arguments"
 msgstr ""
 
-#: ../lib/puppet/interface/option_manager.rb:64
+#: ../lib/puppet/interface/option_manager.rb:66
 msgid "Option %{option} conflicts with existing option %{conflict} on %{action}"
 msgstr ""
 
@@ -3088,17 +3088,37 @@ msgid "Loaded puppet/type/%{name} but no class was created"
 msgstr ""
 
 #. TRANSLATORS 'metadata.json' is a specific file name and should not be translated.
-#: ../lib/puppet/module.rb:188
+#: ../lib/puppet/module.rb:222
 msgid "%{name} has an invalid and unparsable metadata.json file. The parse error: %{error}"
 msgstr ""
 
-#: ../lib/puppet/module.rb:434
+#: ../lib/puppet/module.rb:468
 msgid ""
 "        Invalid module name '%{name}'; module names must match either:\n"
 "        An installed module name (ex. modulename) matching the expression /^[a-z][a-z0-9_]*$/ -or-\n"
 "        A namespaced module name (ex. author-modulename) matching the expression /^[a-zA-Z0-9]+[-][a-z][a-z0-9_]*$/\n"
 msgstr ""
 
+#: ../lib/puppet/module/plan.rb:40
+msgid "Plan %{plan_name} not found in module %{module_name}."
+msgstr ""
+
+#: ../lib/puppet/module/plan.rb:64
+msgid "Plan names must start with a lowercase letter and be composed of only lowercase letters, numbers, and underscores"
+msgstr ""
+
+#: ../lib/puppet/module/plan.rb:66
+msgid "Plan name cannot have extension %{ext}, must be .pp or .yaml"
+msgstr ""
+
+#: ../lib/puppet/module/plan.rb:69
+msgid "Plan name cannot be a reserved word, but was '%{name}'"
+msgstr ""
+
+#: ../lib/puppet/module/plan.rb:72
+msgid "Plan name cannot be a Puppet data type, but was '%{name}'"
+msgstr ""
+
 #: ../lib/puppet/module/task.rb:24 ../lib/puppet/module/task.rb:203
 msgid "Task names must start with a lowercase letter and be composed of only lowercase letters, numbers, and underscores"
 msgstr ""
@@ -3151,7 +3171,7 @@ msgstr ""
 msgid "Error reading metadata: %{message}"
 msgstr ""
 
-#: ../lib/puppet/module_tool.rb:37
+#: ../lib/puppet/module_tool.rb:38
 msgid "Not a valid full name: %{full_module_name}"
 msgstr ""
 
@@ -3171,11 +3191,11 @@ msgstr ""
 msgid "A Modulefile was found in the root directory of the module. This file will be ignored and can safely be removed."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/application.rb:74
+#: ../lib/puppet/module_tool/applications/application.rb:75
 msgid "Could not parse filename to obtain the username, module name and version.  (%{release_name})"
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/application.rb:78
+#: ../lib/puppet/module_tool/applications/application.rb:79
 msgid "Invalid version format: %{version} (Semantic Versions are acceptable: http://semver.org)"
 msgstr ""
 
@@ -3187,19 +3207,19 @@ msgstr ""
 msgid "Module install is prohibited in FIPS mode."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:84 ../lib/puppet/module_tool/applications/upgrader.rb:102
+#: ../lib/puppet/module_tool/applications/installer.rb:85 ../lib/puppet/module_tool/applications/upgrader.rb:102
 msgid "Downloading from %{host} ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:130 ../lib/puppet/module_tool/applications/upgrader.rb:140
+#: ../lib/puppet/module_tool/applications/installer.rb:131 ../lib/puppet/module_tool/applications/upgrader.rb:140
 msgid "Resolving dependencies ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:159
+#: ../lib/puppet/module_tool/applications/installer.rb:161
 msgid "Preparing to install ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/installer.rb:162
+#: ../lib/puppet/module_tool/applications/installer.rb:164
 msgid "Installing -- do not interrupt ..."
 msgstr ""
 
@@ -3227,15 +3247,15 @@ msgstr ""
 msgid "Found '%{name}' (%{version}) in %{dir} ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/upgrader.rb:187
+#: ../lib/puppet/module_tool/applications/upgrader.rb:188
 msgid "Preparing to upgrade ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/applications/upgrader.rb:190
+#: ../lib/puppet/module_tool/applications/upgrader.rb:191
 msgid "Upgrading -- do not interrupt ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/contents_description.rb:55
+#: ../lib/puppet/module_tool/contents_description.rb:56
 msgid "Could not find/load type: %{name}"
 msgstr ""
 
@@ -3559,47 +3579,47 @@ msgstr ""
 msgid "Dependency conflict for %{module_name}: Dependency %{name} was given conflicting version requirements %{version_requirement} and %{dup_version}. Verify that there are no duplicates in the metadata.json."
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:176
+#: ../lib/puppet/module_tool/metadata.rb:175
 msgid "the field must be a namespaced module name"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:178
+#: ../lib/puppet/module_tool/metadata.rb:177
 msgid "the module name contains non-alphanumeric (or underscore) characters"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:180
+#: ../lib/puppet/module_tool/metadata.rb:179
 msgid "the module name must begin with a letter"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:182
+#: ../lib/puppet/module_tool/metadata.rb:181
 msgid "the namespace contains non-alphanumeric characters"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:185
+#: ../lib/puppet/module_tool/metadata.rb:184
 msgid "Invalid 'name' field in metadata.json: %{err}"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:192
+#: ../lib/puppet/module_tool/metadata.rb:191
 msgid "version string cannot be parsed as a valid Semantic Version"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:193
+#: ../lib/puppet/module_tool/metadata.rb:192
 msgid "Invalid 'version' field in metadata.json: %{err}"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:205
+#: ../lib/puppet/module_tool/metadata.rb:204
 msgid "field 'data_provider' contains non-alphanumeric characters"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:207
+#: ../lib/puppet/module_tool/metadata.rb:206
 msgid "field 'data_provider' must begin with a letter"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:211
+#: ../lib/puppet/module_tool/metadata.rb:210
 msgid "field 'data_provider' must be a string"
 msgstr ""
 
-#: ../lib/puppet/module_tool/metadata.rb:219
+#: ../lib/puppet/module_tool/metadata.rb:218
 msgid "Invalid 'version_range' field in metadata.json: %{err}"
 msgstr ""
 
@@ -3607,7 +3627,7 @@ msgstr ""
 msgid "Downloading from %{uri} ..."
 msgstr ""
 
-#: ../lib/puppet/module_tool/shared_behaviors.rb:154
+#: ../lib/puppet/module_tool/shared_behaviors.rb:155
 msgid "Could not download module: %{message}"
 msgstr ""
 
@@ -3657,7 +3677,7 @@ msgstr ""
 msgid "Inserting default '%{acl}' (auth %{auth}) ACL"
 msgstr ""
 
-#: ../lib/puppet/network/authconfig.rb:69
+#: ../lib/puppet/network/authconfig.rb:71
 msgid "Denying access: %{authorization_failure_exception}"
 msgstr ""
 
@@ -3665,15 +3685,15 @@ msgstr ""
 msgid "Name and IP must be passed to 'allowed?'"
 msgstr ""
 
-#: ../lib/puppet/network/authstore.rb:36
+#: ../lib/puppet/network/authstore.rb:37
 msgid "defaulting to no access for %{name}"
 msgstr ""
 
-#: ../lib/puppet/network/authstore.rb:189
+#: ../lib/puppet/network/authstore.rb:190
 msgid "Invalid declaration type %{type}"
 msgstr ""
 
-#: ../lib/puppet/network/authstore.rb:257
+#: ../lib/puppet/network/authstore.rb:258
 msgid "Invalid IP pattern %{value}"
 msgstr ""
 
@@ -3762,45 +3782,45 @@ msgstr ""
 msgid "No request key specified in %{uri}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:128
+#: ../lib/puppet/network/http/api/indirected_routes.rb:129
 msgid "Could not find %{value0} %{key}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:135
+#: ../lib/puppet/network/http/api/indirected_routes.rb:136
 msgid "Rendered result in %{format}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:141
+#: ../lib/puppet/network/http/api/indirected_routes.rb:142
 msgid "Sent response"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:149
+#: ../lib/puppet/network/http/api/indirected_routes.rb:150
 msgid "Could not find %{indirection} %{key}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:161
+#: ../lib/puppet/network/http/api/indirected_routes.rb:162
 msgid "Could not find instances in %{indirection} with '%{key}'"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:209 ../lib/puppet/network/http/request.rb:60
+#: ../lib/puppet/network/http/api/indirected_routes.rb:210 ../lib/puppet/network/http/request.rb:61
 msgid "No supported formats are acceptable (Accept: %{accepted_formats})"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:234
+#: ../lib/puppet/network/http/api/indirected_routes.rb:235
 msgid "The request body is invalid: %{message}"
 msgstr ""
 
 #. TRANSLATORS "mime-type" is a keyword and should not be translated
 #. TRANSLATORS "mime-type" is a keyword and should not be translated
-#: ../lib/puppet/network/http/api/indirected_routes.rb:240 ../lib/puppet/network/http/request.rb:31
+#: ../lib/puppet/network/http/api/indirected_routes.rb:241 ../lib/puppet/network/http/request.rb:32
 msgid "Client sent a mime-type (%{header}) that doesn't correspond to a format we support"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:246
+#: ../lib/puppet/network/http/api/indirected_routes.rb:247
 msgid "No support for http method %{http_method}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/indirected_routes.rb:250
+#: ../lib/puppet/network/http/api/indirected_routes.rb:252
 msgid "No support for plurality %{indirection} for %{http_method} operations"
 msgstr ""
 
@@ -3902,11 +3922,11 @@ msgstr ""
 msgid "Processed request %{request_method} %{request_path}"
 msgstr ""
 
-#: ../lib/puppet/network/http/handler.rb:112
+#: ../lib/puppet/network/http/handler.rb:113
 msgid "No route for %{request} %{path}"
 msgstr ""
 
-#: ../lib/puppet/network/http/handler.rb:137
+#: ../lib/puppet/network/http/handler.rb:138
 msgid "Could not resolve %{ip}: %{detail}"
 msgstr ""
 
@@ -3918,11 +3938,11 @@ msgstr ""
 msgid "Unknown arguments: %{args}"
 msgstr ""
 
-#: ../lib/puppet/network/http/request.rb:36
+#: ../lib/puppet/network/http/request.rb:37
 msgid "No Content-Type header was received, it isn't possible to unserialize the request"
 msgstr ""
 
-#: ../lib/puppet/network/http/request.rb:44
+#: ../lib/puppet/network/http/request.rb:45
 msgid "Missing required Accept header"
 msgstr ""
 
@@ -3936,27 +3956,27 @@ msgstr ""
 msgid "An ssl_context is unnecessary when connecting to 'http://%{host}:%{port}' and will be ignored"
 msgstr ""
 
-#: ../lib/puppet/network/rights.rb:58
+#: ../lib/puppet/network/rights.rb:59
 msgid "Forbidden request: %{msg}"
 msgstr ""
 
-#: ../lib/puppet/network/rights.rb:126
+#: ../lib/puppet/network/rights.rb:127
 msgid "Unknown right type '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/network/rights.rb:168
+#: ../lib/puppet/network/rights.rb:169
 msgid "'%{m}' is not an allowed value for method directive"
 msgstr ""
 
-#: ../lib/puppet/network/rights.rb:175
+#: ../lib/puppet/network/rights.rb:176
 msgid "'%{m}' is already in the '%{name}' ACL"
 msgstr ""
 
-#: ../lib/puppet/network/rights.rb:182
+#: ../lib/puppet/network/rights.rb:183
 msgid "'%{env}' is already in the '%{name}' ACL"
 msgstr ""
 
-#: ../lib/puppet/network/rights.rb:194
+#: ../lib/puppet/network/rights.rb:195
 msgid "'%{name}' incorrect authenticated value: %{authentication}"
 msgstr ""
 
@@ -3964,23 +3984,23 @@ msgstr ""
 msgid "No name provided in serialized data"
 msgstr ""
 
-#: ../lib/puppet/node.rb:101
+#: ../lib/puppet/node.rb:102
 msgid "Node names cannot be nil"
 msgstr ""
 
-#: ../lib/puppet/node.rb:137
+#: ../lib/puppet/node.rb:140
 msgid "Could not retrieve facts for %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/node.rb:155
+#: ../lib/puppet/node.rb:158
 msgid "The node parameter '%{param_name}' for node '%{node_name}' was already set to '%{value}'. It could not be set to '%{desired_value}'"
 msgstr ""
 
-#: ../lib/puppet/node.rb:194
+#: ../lib/puppet/node.rb:198
 msgid "Host is missing hostname and/or domain: %{name}"
 msgstr ""
 
-#: ../lib/puppet/node.rb:226
+#: ../lib/puppet/node.rb:230
 msgid "Trusted node data modified for node %{name}"
 msgstr ""
 
@@ -3992,24 +4012,24 @@ msgstr ""
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/pal/compiler.rb:86
+#: ../lib/puppet/pal/compiler.rb:87
 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
+#: ../lib/puppet/pal/compiler.rb:129
 msgid "The given 'ast' does not represent a literal value"
 msgstr ""
 
-#: ../lib/puppet/pal/compiler.rb:140
+#: ../lib/puppet/pal/compiler.rb:141
 msgid "The argument 'code_string' must be a String, got %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/compiler.rb:153
+#: ../lib/puppet/pal/compiler.rb:154
 msgid "The argument 'file' must be a String, got %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/compiler.rb:190
+#: ../lib/puppet/pal/compiler.rb:191
 msgid "Given data_type value is not a data type, got '%{type}'"
 msgstr ""
 
@@ -4071,15 +4091,15 @@ msgstr ""
 msgid "A block must be given"
 msgstr ""
 
-#: ../lib/puppet/parameter.rb:345
+#: ../lib/puppet/parameter.rb:347
 msgid "No resource set for %{name}"
 msgstr ""
 
-#: ../lib/puppet/parameter.rb:433
+#: ../lib/puppet/parameter.rb:435
 msgid "Munging failed for value %{value} in class %{class_name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/parameter.rb:467
+#: ../lib/puppet/parameter.rb:469
 msgid "Validate method failed for class %{class_name}: %{detail}"
 msgstr ""
 
@@ -4132,7 +4152,7 @@ msgstr ""
 msgid "Node inheritance is removed in Puppet 4.0.0. See http://links.puppet.com/puppet-node-inheritance-deprecation"
 msgstr ""
 
-#: ../lib/puppet/parser/ast/pops_bridge.rb:194
+#: ../lib/puppet/parser/ast/pops_bridge.rb:195
 msgid "Instantiating Resource with type checked parameters - scope is missing, skipping type checking."
 msgstr ""
 
@@ -4157,138 +4177,138 @@ msgid "For more information, see https://puppet.com/docs/puppet/latest/environme
 msgstr ""
 
 #. TRANSLATORS "stage" is a keyword in Puppet and should not be translated
-#: ../lib/puppet/parser/compiler.rb:97 ../lib/puppet/parser/environment_compiler.rb:134
+#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:134
 msgid "Only classes can set 'stage'; normal resources like %{resource} cannot change run stage"
 msgstr ""
 
 #. TRANSLATORS "Site" is a puppet keyword and should not be translated
-#: ../lib/puppet/parser/compiler.rb:124
+#: ../lib/puppet/parser/compiler.rb:125
 msgid "Application instances like '%{resource}' can only be contained within a Site"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:154
+#: ../lib/puppet/parser/compiler.rb:155
 msgid "For compiling %{node}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:158
+#: ../lib/puppet/parser/compiler.rb:159
 msgid "Compile: Set node parameters"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:160
+#: ../lib/puppet/parser/compiler.rb:161
 msgid "Compile: Created settings scope"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:162
+#: ../lib/puppet/parser/compiler.rb:163
 msgid "Compile: Evaluated capability mappings"
 msgstr ""
 
 #. TRANSLATORS "main" is a function name and should not be translated
-#: ../lib/puppet/parser/compiler.rb:165
+#: ../lib/puppet/parser/compiler.rb:166
 msgid "Compile: Evaluated main"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:167
+#: ../lib/puppet/parser/compiler.rb:168
 msgid "Compile: Evaluated site"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:169
+#: ../lib/puppet/parser/compiler.rb:170
 msgid "Compile: Evaluated AST node"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:171
+#: ../lib/puppet/parser/compiler.rb:172
 msgid "Compile: Evaluated node classes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:173
+#: ../lib/puppet/parser/compiler.rb:174
 msgid "Compile: Evaluated application instances"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:176
+#: ../lib/puppet/parser/compiler.rb:177
 msgid "Compile: Evaluated site capability mappings"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:178
+#: ../lib/puppet/parser/compiler.rb:179
 msgid "Compile: Evaluated generators"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:180
+#: ../lib/puppet/parser/compiler.rb:181
 msgid "Compile: Validate Catalog pre-finish"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:184
+#: ../lib/puppet/parser/compiler.rb:185
 msgid "Compile: Finished catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:186
+#: ../lib/puppet/parser/compiler.rb:187
 msgid "Compile: Prune"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:190
+#: ../lib/puppet/parser/compiler.rb:191
 msgid "Compile: Validate Catalog final"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:320
+#: ../lib/puppet/parser/compiler.rb:321
 msgid "Invalid node mapping in %{app}: Mapping must be a hash"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:323
+#: ../lib/puppet/parser/compiler.rb:324
 msgid "Invalid node mapping in %{app}: Key %{k} is not a Node"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:326
+#: ../lib/puppet/parser/compiler.rb:327
 msgid "Invalid node mapping in %{app}: Value %{res} is not a resource"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:327
+#: ../lib/puppet/parser/compiler.rb:328
 msgid "Application %{app} maps component %{res} to multiple nodes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:356
+#: ../lib/puppet/parser/compiler.rb:357
 msgid "No source for scope passed to evaluate_classes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:372
+#: ../lib/puppet/parser/compiler.rb:373
 msgid "Could not find class %{name} for %{node}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:474
+#: ../lib/puppet/parser/compiler.rb:475
 msgid "Capability mapping error: %{kind} clause references nonexistent %{component_type} %{component_name}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:500
+#: ../lib/puppet/parser/compiler.rb:502
 msgid "Could not find node statement with name 'default' or '%{names}'"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:521
+#: ../lib/puppet/parser/compiler.rb:523
 msgid "Evaluated collections"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:536
+#: ../lib/puppet/parser/compiler.rb:538
 msgid "Evaluated definitions"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:565
+#: ../lib/puppet/parser/compiler.rb:567
 msgid "Iterated (%{count}) on generators"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:576
+#: ../lib/puppet/parser/compiler.rb:578
 msgid "Somehow looped more than 1000 times while evaluating host catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:608
+#: ../lib/puppet/parser/compiler.rb:610
 msgid "Could not find resource(s) %{resources} for overriding"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:619
+#: ../lib/puppet/parser/compiler.rb:621
 msgid "Failed to realize virtual resources %{resources}"
 msgstr ""
 
 #. TRANSLATORS "main" is a function name and should not be translated
-#: ../lib/puppet/parser/compiler.rb:650
+#: ../lib/puppet/parser/compiler.rb:654
 msgid "Couldn't find main"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:722
+#: ../lib/puppet/parser/compiler.rb:727
 msgid "For initializing compiler"
 msgstr ""
 
@@ -4396,7 +4416,7 @@ msgstr ""
 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:308
+#: ../lib/puppet/parser/functions.rb:309
 msgid "%{name}() can only be called using the 4.x function API. See Scope#call_function"
 msgstr ""
 
@@ -4470,107 +4490,107 @@ msgstr ""
 msgid "Invalid relationship type %{relationship_type}"
 msgstr ""
 
-#: ../lib/puppet/parser/relationship.rb:40
+#: ../lib/puppet/parser/relationship.rb:41
 msgid "Could not find resource '%{source}' for relationship on '%{target}'"
 msgstr ""
 
-#: ../lib/puppet/parser/relationship.rb:43
+#: ../lib/puppet/parser/relationship.rb:44
 msgid "Could not find resource '%{target}' for relationship from '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:60
+#: ../lib/puppet/parser/resource.rb:61
 msgid "Could not find stage %{stage} specified by %{resource}"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:70
+#: ../lib/puppet/parser/resource.rb:71
 msgid "Evaluated resource %{res}"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:124
+#: ../lib/puppet/parser/resource.rb:125
 msgid "Resources require a hash as last argument"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:125
+#: ../lib/puppet/parser/resource.rb:126
 msgid "Resources require a scope"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:167
+#: ../lib/puppet/parser/resource.rb:168
 msgid "Only subclasses can override parameters"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:173
+#: ../lib/puppet/parser/resource.rb:174
 msgid "Attempt to override an already evaluated resource with new values"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:175
+#: ../lib/puppet/parser/resource.rb:176
 msgid "Attempt to override an already evaluated resource, defined at %{error_location}, with new values"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:272
+#: ../lib/puppet/parser/resource.rb:273
 msgid "Invalid consume in %{value0}: %{ref} is not a resource"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:279
+#: ../lib/puppet/parser/resource.rb:280
 msgid "Resource %{ref} could not be found; it might not have been produced yet"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:283
+#: ../lib/puppet/parser/resource.rb:284
 msgid "Invalid consume in %{ref}: %{cap} is not a capability resource"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:292
+#: ../lib/puppet/parser/resource.rb:293
 msgid "Resource %{res} tries to consume %{cns} but no 'consumes' mapping exists for %{resource_type} and %{cns_type}"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:311
+#: ../lib/puppet/parser/resource.rb:313
 msgid "Attempt to reassign attribute '%{name}' in '%{resource}' caused by multiple consumed mappings to the same attribute"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:361
+#: ../lib/puppet/parser/resource.rb:364
 msgid "Parameter '%{name}' is already set on %{resource}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:364
+#: ../lib/puppet/parser/resource.rb:367
 msgid "Parameter '%{name}' is already set on %{resource} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:369
+#: ../lib/puppet/parser/resource.rb:372
 msgid "Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:372
+#: ../lib/puppet/parser/resource.rb:375
 msgid "Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:411
+#: ../lib/puppet/parser/resource.rb:414
 msgid "Duplicate parameter '%{param}' for on %{resource}"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:156
+#: ../lib/puppet/parser/scope.rb:155
 msgid "Numerical variables cannot be changed. Attempt to set $%{name}"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:161
+#: ../lib/puppet/parser/scope.rb:160
 msgid "Numerical variables cannot be deleted: Attempt to delete: $%{name}"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:215
+#: ../lib/puppet/parser/scope.rb:214
 msgid "%{callee}: expects a value for parameter $%{to}"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:216
+#: ../lib/puppet/parser/scope.rb:215
 msgid "%{callee}: default expression for $%{from} tries to illegally access not yet evaluated $%{to}"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:235
+#: ../lib/puppet/parser/scope.rb:234
 msgid "Attempt to assign variable %{name} when evaluating parameters"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:378
+#: ../lib/puppet/parser/scope.rb:377
 msgid "you must pass a compiler instance to a new scope object"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:494
+#: ../lib/puppet/parser/scope.rb:493
 msgid "Scope variable name %{name} is a %{klass}, not a string"
 msgstr ""
 
@@ -4578,83 +4598,83 @@ msgstr ""
 msgid "class %{classname} could not be found"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:656
+#: ../lib/puppet/parser/scope.rb:657
 msgid "class %{classname} has not been evaluated"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:701
+#: ../lib/puppet/parser/scope.rb:702
 msgid "Default already defined for %{type} { %{param} }; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:761
+#: ../lib/puppet/parser/scope.rb:762
 msgid "Cannot assign to a numeric match result variable '$%{name}'"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:764
+#: ../lib/puppet/parser/scope.rb:765
 msgid "Scope variable name %{name} is a %{class_type}, not a string"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:769 ../lib/puppet/parser/scope.rb:774
+#: ../lib/puppet/parser/scope.rb:770 ../lib/puppet/parser/scope.rb:775
 msgid "Attempt to assign to a reserved variable name: '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:779
+#: ../lib/puppet/parser/scope.rb:780
 msgid "Cannot reassign variable '$%{name}'"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:833
+#: ../lib/puppet/parser/scope.rb:834
 msgid "Unsupported data type: '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1009
+#: ../lib/puppet/parser/scope.rb:1011
 msgid "Invalid regex match data. Got a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1017
+#: ../lib/puppet/parser/scope.rb:1019
 msgid "Scope#find_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1022
+#: ../lib/puppet/parser/scope.rb:1024
 msgid "Scope#find_builtin_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1027
+#: ../lib/puppet/parser/scope.rb:1029
 msgid "Scope#find_defined_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1041
+#: ../lib/puppet/parser/scope.rb:1043
 msgid "Function %{name} not defined despite being loaded!"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1048
+#: ../lib/puppet/parser/scope.rb:1050
 msgid "Scope#resolve_type_and_title() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1068
+#: ../lib/puppet/parser/scope.rb:1070
 msgid "Cannot use undef as a class name"
 msgstr ""
 
-#: ../lib/puppet/parser/scope.rb:1070
+#: ../lib/puppet/parser/scope.rb:1072
 msgid "Cannot use empty string as a class name"
 msgstr ""
 
 #. TRANSLATORS "Class" and "Type" are Puppet keywords and should not be translated
-#: ../lib/puppet/parser/scope.rb:1079
+#: ../lib/puppet/parser/scope.rb:1081
 msgid "Cannot use an unspecific Class[] Type"
 msgstr ""
 
 #. TRANSLATORS "Resource" is a class name and should not be translated
-#: ../lib/puppet/parser/scope.rb:1106
+#: ../lib/puppet/parser/scope.rb:1108
 msgid "Cannot use an unspecific Resource[] where a Resource['class', name] is expected"
 msgstr ""
 
 #. TRANSLATORS "Resource" is a class name and should not be translated
-#: ../lib/puppet/parser/scope.rb:1110
+#: ../lib/puppet/parser/scope.rb:1112
 msgid "Cannot use a Resource[%{type_name}] where a Resource['class', name] is expected"
 msgstr ""
 
 #. TRANSLATORS "Resource" is a class name and should not be translated
-#: ../lib/puppet/parser/scope.rb:1114
+#: ../lib/puppet/parser/scope.rb:1116
 msgid "Cannot use an unspecific Resource['class'] where a Resource['class', name] is expected"
 msgstr ""
 
@@ -4667,19 +4687,19 @@ msgstr ""
 msgid "having multiple named scopes is not supported when scripting"
 msgstr ""
 
-#: ../lib/puppet/parser/templatewrapper.rb:65
+#: ../lib/puppet/parser/templatewrapper.rb:66
 msgid "Could not find template '%{filename}'"
 msgstr ""
 
-#: ../lib/puppet/parser/templatewrapper.rb:82
+#: ../lib/puppet/parser/templatewrapper.rb:83
 msgid "Bound template variables for %{template_source} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/parser/templatewrapper.rb:90
+#: ../lib/puppet/parser/templatewrapper.rb:91
 msgid "Interpolated template %{template_source} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/parser/type_loader.rb:101
+#: ../lib/puppet/parser/type_loader.rb:102
 msgid "No file(s) found for import of '%{pattern}'"
 msgstr ""
 
@@ -4704,7 +4724,7 @@ msgstr ""
 msgid "Exported resource try to override without parameters"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/collectors/exported_collector.rb:50
+#: ../lib/puppet/pops/evaluator/collectors/exported_collector.rb:51
 msgid "A duplicate resource was found while collecting exported resources, with the type and title %{title}"
 msgstr ""
 
@@ -4804,7 +4824,7 @@ msgstr ""
 msgid "Can only delete from an Array or Hash."
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/external_syntax_support.rb:22 ../lib/puppet/pops/evaluator/runtime3_support.rb:23 ../lib/puppet/pops/evaluator/runtime3_support.rb:525
+#: ../lib/puppet/pops/evaluator/external_syntax_support.rb:22 ../lib/puppet/pops/evaluator/runtime3_support.rb:23 ../lib/puppet/pops/evaluator/runtime3_support.rb:529
 msgid "Internal Error: Configuration of runtime error handling wrong: should have raised exception"
 msgstr ""
 
@@ -4825,7 +4845,7 @@ msgstr ""
 msgid "Internal error - attempt to create a local scope without a hash"
 msgstr ""
 
-#: ../lib/puppet/pops/evaluator/runtime3_support.rb:286
+#: ../lib/puppet/pops/evaluator/runtime3_support.rb:288
 msgid "Unknown function '%{name}'"
 msgstr ""
 
@@ -5576,23 +5596,23 @@ msgstr ""
 msgid "<%{string}> does not appear to contain a word"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/base_loader.rb:122
+#: ../lib/puppet/pops/loader/base_loader.rb:124
 msgid "Originally set %{original}."
 msgstr ""
 
-#: ../lib/puppet/pops/loader/base_loader.rb:122
+#: ../lib/puppet/pops/loader/base_loader.rb:124
 msgid "Set at unknown location"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/base_loader.rb:123
+#: ../lib/puppet/pops/loader/base_loader.rb:125
 msgid "Attempt to redefine entity '%{name}'. %{origin_info}"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/gem_support.rb:30
+#: ../lib/puppet/pops/loader/gem_support.rb:31
 msgid "Gem not found %{uri}"
 msgstr ""
 
-#: ../lib/puppet/pops/loader/gem_support.rb:45
+#: ../lib/puppet/pops/loader/gem_support.rb:47
 msgid "Gem not found '%{gem_name}'"
 msgstr ""
 
@@ -5906,11 +5926,11 @@ 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:849
 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:1166
 msgid "can only concatenate strings, got %{class_name}"
 msgstr ""
 
@@ -6218,23 +6238,23 @@ msgstr ""
 msgid "Everything is now reported using present tense"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:427
+#: ../lib/puppet/pops/types/type_parser.rb:429
 msgid "Enum parameters must be identifiers or strings"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:663
+#: ../lib/puppet/pops/types/type_parser.rb:665
 msgid "The expression <%{expression}> is not a valid type specification."
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:668
+#: ../lib/puppet/pops/types/type_parser.rb:670
 msgid "Invalid number of type parameters specified: %{type} requires %{required}, %{given} provided"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:673
+#: ../lib/puppet/pops/types/type_parser.rb:675
 msgid "Not a parameterized type <%{type}>"
 msgstr ""
 
-#: ../lib/puppet/pops/types/type_parser.rb:677
+#: ../lib/puppet/pops/types/type_parser.rb:679
 msgid "Unknown type <%{type}>"
 msgstr ""
 
@@ -6325,25 +6345,25 @@ msgstr ""
 msgid "Supported values for Property#array_matching are 'first' and 'all'"
 msgstr ""
 
-#: ../lib/puppet/property.rb:171
+#: ../lib/puppet/property.rb:169
 msgid "Attempt to redefine method %{method} with block"
 msgstr ""
 
-#: ../lib/puppet/property.rb:215
+#: ../lib/puppet/property.rb:213
 msgid "Could not convert change '%{name}' to string: %{detail}"
 msgstr ""
 
 #. TRANSLATORS 'insync_values?' should not be translated
-#: ../lib/puppet/property.rb:372
+#: ../lib/puppet/property.rb:370
 msgid "Unknown failure using insync_values? on type: %{type} / property: %{name} to compare values %{should} and %{is}"
 msgstr ""
 
-#: ../lib/puppet/property.rb:495
+#: ../lib/puppet/property.rb:494
 msgid "Could not set '%{value}' on %{class_name}: %{detail}"
 msgstr ""
 
 #. TRANSLATORS 'Provider' refers to a Puppet provider class
-#: ../lib/puppet/property.rb:593
+#: ../lib/puppet/property.rb:596
 msgid "Provider %{provider} must have features '%{needed_features}' to set '%{property}' to '%{value}'"
 msgstr ""
 
@@ -6363,23 +6383,23 @@ msgstr ""
 msgid "Could not convert change %{name} to string: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/property/ensure.rb:85
+#: ../lib/puppet/property/ensure.rb:86
 msgid "No ability to determine if %{name} exists"
 msgstr ""
 
-#: ../lib/puppet/property/keyvalue.rb:131
+#: ../lib/puppet/property/keyvalue.rb:132
 msgid "The %{name} property must be specified as a hash or an array of key/value pairs (strings)!"
 msgstr ""
 
-#: ../lib/puppet/property/keyvalue.rb:137
+#: ../lib/puppet/property/keyvalue.rb:138
 msgid "Key/value pairs must be separated by '%{separator}'"
 msgstr ""
 
-#: ../lib/puppet/provider.rb:146
+#: ../lib/puppet/provider.rb:145
 msgid "No command %{command} defined for provider %{provider}"
 msgstr ""
 
-#: ../lib/puppet/provider.rb:398
+#: ../lib/puppet/provider.rb:397
 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"
 msgstr ""
 
@@ -6387,7 +6407,7 @@ msgstr ""
 msgid "'%{parameter_name}' is not a valid parameter for %{resource_type}"
 msgstr ""
 
-#: ../lib/puppet/provider.rb:554
+#: ../lib/puppet/provider.rb:556
 msgid "No resource and no name in property hash in %{class_name} instance"
 msgstr ""
 
@@ -6411,11 +6431,11 @@ msgstr ""
 msgid "aix.object_info(): Could not find %{resource}[%{name}]"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:469 ../lib/puppet/provider/nameservice.rb:180 ../lib/puppet/provider/nameservice/directoryservice.rb:421
+#: ../lib/puppet/provider/aix_object.rb:469 ../lib/puppet/provider/nameservice.rb:181 ../lib/puppet/provider/nameservice/directoryservice.rb:425
 msgid "Could not create %{resource} %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/aix_object.rb:481 ../lib/puppet/provider/nameservice.rb:194
+#: ../lib/puppet/provider/aix_object.rb:481 ../lib/puppet/provider/nameservice.rb:195
 msgid "Could not delete %{resource} %{name}: %{detail}"
 msgstr ""
 
@@ -6435,7 +6455,7 @@ msgstr ""
 msgid "Empty environment setting '%{var}'"
 msgstr ""
 
-#: ../lib/puppet/provider/exec.rb:96
+#: ../lib/puppet/provider/exec.rb:99
 msgid "'%{command}' is not qualified and no path was specified. Please qualify the command or specify a path."
 msgstr ""
 
@@ -6451,23 +6471,23 @@ msgstr ""
 msgid "'%{exe}' is not executable"
 msgstr ""
 
-#: ../lib/puppet/provider/file/posix.rb:66
+#: ../lib/puppet/provider/file/posix.rb:67
 msgid "Apparently using negative UID (%{currentvalue}) on a platform that does not consistently handle them"
 msgstr ""
 
-#: ../lib/puppet/provider/file/posix.rb:84 ../lib/puppet/provider/file/windows.rb:46
+#: ../lib/puppet/provider/file/posix.rb:85 ../lib/puppet/provider/file/windows.rb:46
 msgid "Failed to set owner to '%{should}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/file/posix.rb:97
+#: ../lib/puppet/provider/file/posix.rb:99
 msgid "Apparently using negative GID (%{currentvalue}) on a platform that does not consistently handle them"
 msgstr ""
 
-#: ../lib/puppet/provider/file/posix.rb:115 ../lib/puppet/provider/file/windows.rb:59
+#: ../lib/puppet/provider/file/posix.rb:117 ../lib/puppet/provider/file/windows.rb:59
 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:134 ../lib/puppet/provider/file/windows.rb:78
 msgid "failed to set mode %{mode} on %{path}: %{message}"
 msgstr ""
 
@@ -6492,11 +6512,11 @@ msgstr ""
 msgid "GID %{resource} already exists, use allowdupe to force group creation"
 msgstr ""
 
-#: ../lib/puppet/provider/ldap.rb:77
+#: ../lib/puppet/provider/ldap.rb:80
 msgid "No LDAP Configuration defined for %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/provider/ldap.rb:78
+#: ../lib/puppet/provider/ldap.rb:81
 msgid "Invalid LDAP Configuration defined for %{class_name}"
 msgstr ""
 
@@ -6513,23 +6533,23 @@ msgid "Invalid value %{value}: %{error}"
 msgstr ""
 
 #. TRANSLATORS "autogen_id()" is a method name and should not be translated
-#: ../lib/puppet/provider/nameservice.rb:147
+#: ../lib/puppet/provider/nameservice.rb:148
 msgid "autogen_id() does not support auto generation of id for resource type %{resource_type}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:169 ../lib/puppet/provider/nameservice/directoryservice.rb:376
+#: ../lib/puppet/provider/nameservice.rb:170 ../lib/puppet/provider/nameservice/directoryservice.rb:379
 msgid "already exists"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:186
+#: ../lib/puppet/provider/nameservice.rb:187
 msgid "already absent"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:278
+#: ../lib/puppet/provider/nameservice.rb:281
 msgid "Nameservice command must be an array"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice.rb:282 ../lib/puppet/provider/nameservice/directoryservice.rb:337 ../lib/puppet/provider/nameservice/directoryservice.rb:366
+#: ../lib/puppet/provider/nameservice.rb:285 ../lib/puppet/provider/nameservice/directoryservice.rb:340 ../lib/puppet/provider/nameservice/directoryservice.rb:369
 msgid "Could not set %{param} on %{resource}[%{name}]: %{detail}"
 msgstr ""
 
@@ -6554,20 +6574,20 @@ msgstr ""
 msgid "Invalid id_type %{id_type}. Only 'uid' and 'gid' supported"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice/directoryservice.rb:393
+#: ../lib/puppet/provider/nameservice/directoryservice.rb:396
 msgid "Could not set GeneratedUID for %{resource} %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice/directoryservice.rb:441
+#: ../lib/puppet/provider/nameservice/directoryservice.rb:445
 msgid "Could not remove %{member} from group: %{resource}, %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/nameservice/directoryservice.rb:455
+#: ../lib/puppet/provider/nameservice/directoryservice.rb:459
 msgid "Could not add %{new_member} to group: %{name}, %{detail}"
 msgstr ""
 
 #. TRANSLATORS "prefetch" is a program name and should not be translated
-#: ../lib/puppet/provider/network_device.rb:26
+#: ../lib/puppet/provider/network_device.rb:27
 msgid "Could not perform network device prefetch: %{detail}"
 msgstr ""
 
@@ -6579,31 +6599,31 @@ msgstr ""
 msgid "Failed to uninstall package '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:85
+#: ../lib/puppet/provider/package/aix.rb:86
 msgid "A directory is required which will be used to find packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:97
+#: ../lib/puppet/provider/package/aix.rb:98
 msgid "aix package provider is unable to downgrade packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:116
+#: ../lib/puppet/provider/package/aix.rb:118
 msgid "Could not list installed Packages: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:139 ../lib/puppet/provider/package/yum.rb:248
+#: ../lib/puppet/provider/package/aix.rb:141 ../lib/puppet/provider/package/yum.rb:248
 msgid "Tried to get latest on a missing package"
 msgstr ""
 
-#: ../lib/puppet/provider/package/appdmg.rb:102 ../lib/puppet/provider/package/pkgdmg.rb:144
+#: ../lib/puppet/provider/package/appdmg.rb:103 ../lib/puppet/provider/package/pkgdmg.rb:145
 msgid "Mac OS X PKG DMGs must specify a package source."
 msgstr ""
 
-#: ../lib/puppet/provider/package/appdmg.rb:105 ../lib/puppet/provider/package/pkgdmg.rb:147
+#: ../lib/puppet/provider/package/appdmg.rb:107 ../lib/puppet/provider/package/pkgdmg.rb:149
 msgid "Mac OS X PKG DMGs must specify a package name."
 msgstr ""
 
-#: ../lib/puppet/provider/package/apple.rb:41
+#: ../lib/puppet/provider/package/apple.rb:42
 msgid "Mac OS X packages must specify a package source"
 msgstr ""
 
@@ -6611,19 +6631,19 @@ msgstr ""
 msgid "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:83 ../lib/puppet/provider/package/fink.rb:50
+#: ../lib/puppet/provider/package/apt.rb:84 ../lib/puppet/provider/package/fink.rb:50
 msgid "Could not find latest version"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:93 ../lib/puppet/provider/package/fink.rb:60
+#: ../lib/puppet/provider/package/apt.rb:95 ../lib/puppet/provider/package/fink.rb:61
 msgid "Preseeding %{response} to debconf-set-selections"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:97 ../lib/puppet/provider/package/fink.rb:64
+#: ../lib/puppet/provider/package/apt.rb:99 ../lib/puppet/provider/package/fink.rb:65
 msgid "No responsefile specified or non existent, not preseeding anything"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:93 ../lib/puppet/provider/package/portupgrade.rb:151 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:229 ../lib/puppet/provider/package/zypper.rb:109
+#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:94 ../lib/puppet/provider/package/portupgrade.rb:152 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:229 ../lib/puppet/provider/package/zypper.rb:109
 msgid "Could not find package %{name}"
 msgstr ""
 
@@ -6651,11 +6671,11 @@ msgstr ""
 msgid "Cannot match %{line}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/dpkg.rb:82
+#: ../lib/puppet/provider/package/dpkg.rb:85
 msgid "You cannot install dpkg packages without a source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/dpkg.rb:107
+#: ../lib/puppet/provider/package/dpkg.rb:110
 msgid "source doesn't contain named package, but %{name}"
 msgstr ""
 
@@ -6663,27 +6683,27 @@ msgstr ""
 msgid "source is defined but does not have trailing slash, ignoring %{source}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:94
+#: ../lib/puppet/provider/package/gem.rb:95
 msgid "Could not list gems: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:120
+#: ../lib/puppet/provider/package/gem.rb:121
 msgid "Could not match %{desc}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:168
+#: ../lib/puppet/provider/package/gem.rb:170
 msgid "Invalid source '%{uri}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:179
+#: ../lib/puppet/provider/package/gem.rb:181
 msgid "puppet:// URLs are not supported as gem sources"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:195
+#: ../lib/puppet/provider/package/gem.rb:197
 msgid "Could not install: %{output}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:221
+#: ../lib/puppet/provider/package/gem.rb:223
 msgid "Could not uninstall: %{output}"
 msgstr ""
 
@@ -6695,65 +6715,65 @@ msgstr ""
 msgid "Unrecognized AIX package type identifier: '%{pkg_type}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:59
+#: ../lib/puppet/provider/package/nim.rb:60
 msgid "An LPP source location is required in 'source'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:102
+#: ../lib/puppet/provider/package/nim.rb:103
 msgid "Unable to find package '%{package}' with version '%{version}' on lpp_source '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:105
+#: ../lib/puppet/provider/package/nim.rb:106
 msgid "Unable to find package '%{package}' on lpp_source '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:138 ../lib/puppet/provider/package/nim.rb:142
+#: ../lib/puppet/provider/package/nim.rb:139 ../lib/puppet/provider/package/nim.rb:143
 msgid "NIM package provider is unable to downgrade packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:211
+#: ../lib/puppet/provider/package/nim.rb:212
 msgid ""
 "Unable to parse output from nimclient showres: line does not match expected package header format:\n"
 "'%{line}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:217
+#: ../lib/puppet/provider/package/nim.rb:219
 msgid ""
 "Unable to parse output from nimclient showres: package string does not match expected installp package string format:\n"
 "'%{package_string}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:226
+#: ../lib/puppet/provider/package/nim.rb:229
 msgid ""
 "Unable to parse output from nimclient showres: package string does not match expected rpm package string format:\n"
 "'%{package_string}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:235
+#: ../lib/puppet/provider/package/nim.rb:239
 msgid ""
 "Unable to parse output from nimclient showres: line does not match expected package line format:\n"
 "'%{line}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/nim.rb:247
+#: ../lib/puppet/provider/package/nim.rb:251
 msgid ""
 "Unrecognized package type specifier: '%{package_type_flag}' in package line:\n"
 "'%{line}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:49 ../lib/puppet/provider/package/opkg.rb:25
+#: ../lib/puppet/provider/package/openbsd.rb:50 ../lib/puppet/provider/package/opkg.rb:26
 msgid "Failed to match line %{line}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:136
+#: ../lib/puppet/provider/package/openbsd.rb:141
 msgid "No valid installpath found in /etc/pkg.conf and no source was set"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:140
+#: ../lib/puppet/provider/package/openbsd.rb:145
 msgid "You must specify a package source or configure an installpath in /etc/pkg.conf"
 msgstr ""
 
-#: ../lib/puppet/provider/package/openbsd.rb:212
+#: ../lib/puppet/provider/package/openbsd.rb:218
 msgid "%{version} is not available for this package"
 msgstr ""
 
@@ -6761,35 +6781,35 @@ msgstr ""
 msgid "Could not find package '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:84
+#: ../lib/puppet/provider/package/pacman.rb:85
 msgid "Failed to match line '%{line}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:90
+#: ../lib/puppet/provider/package/pacman.rb:91
 msgid "Error getting installed packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:175
+#: ../lib/puppet/provider/package/pacman.rb:176
 msgid "%{resource_name} is a group, but allow_virtual is false."
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:202
+#: ../lib/puppet/provider/package/pacman.rb:203
 msgid "Refusing to uninstall package group %{resource_name}, because allow_virtual is false."
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:232
+#: ../lib/puppet/provider/package/pacman.rb:233
 msgid "Invalid source '%{source}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:241
+#: ../lib/puppet/provider/package/pacman.rb:242
 msgid "puppet:// URL is not supported by pacman"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:243
+#: ../lib/puppet/provider/package/pacman.rb:244
 msgid "Source %{source} is not supported by pacman"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:253
+#: ../lib/puppet/provider/package/pacman.rb:254
 msgid "Refusing to install package group %{resource_name}, because allow_virtual is false."
 msgstr ""
 
@@ -6877,11 +6897,11 @@ msgstr ""
 msgid "Could not match version info '%{info}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/portupgrade.rb:154
+#: ../lib/puppet/provider/package/portupgrade.rb:155
 msgid "Unexpected output from portversion: %{output}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/portupgrade.rb:163
+#: ../lib/puppet/provider/package/portupgrade.rb:164
 msgid "portversion.latest() - fatal error with portversion: %{output}"
 msgstr ""
 
@@ -6889,7 +6909,7 @@ msgstr ""
 msgid "Failed to list packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/rpm.rb:130 ../lib/puppet/provider/package/rpm.rb:142
+#: ../lib/puppet/provider/package/rpm.rb:131 ../lib/puppet/provider/package/rpm.rb:144
 msgid "RPMs must specify a package source"
 msgstr ""
 
@@ -6922,15 +6942,15 @@ msgstr ""
 msgid "The source parameter cannot be empty when using the Windows provider."
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows/package.rb:61
+#: ../lib/puppet/provider/package/windows/package.rb:62
 msgid "The source parameter is required when using the Windows provider."
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows/package.rb:69
+#: ../lib/puppet/provider/package/windows/package.rb:70
 msgid "The source does not exist: '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/windows/package.rb:72
+#: ../lib/puppet/provider/package/windows/package.rb:73
 msgid "Don't know how to install '%{source}'"
 msgstr ""
 
@@ -6954,56 +6974,56 @@ msgstr ""
 msgid "Failed to update to version %{should}, got version %{version} instead"
 msgstr ""
 
-#: ../lib/puppet/provider/package_targetable.rb:53
+#: ../lib/puppet/provider/package_targetable.rb:55
 msgid "Provider %{name} package command is not functional on this host"
 msgstr ""
 
-#: ../lib/puppet/provider/package_targetable.rb:56
+#: ../lib/puppet/provider/package_targetable.rb:58
 msgid "Provider %{name} package command '%{cmd}' does not exist on this host"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:52
+#: ../lib/puppet/provider/parsedfile.rb:54
 msgid "Invalid filetype %{type}"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:99
+#: ../lib/puppet/provider/parsedfile.rb:102
 msgid "Failed to read %{target}'s records when prefetching them. Reason: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:287
+#: ../lib/puppet/provider/parsedfile.rb:291
 msgid "Could not prefetch %{resource} provider '%{name}' target '%{target}': %{detail}. Treating as empty"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:301
+#: ../lib/puppet/provider/parsedfile.rb:305
 msgid "Prefetching %{target} for provider %{name} returned nil"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:374
+#: ../lib/puppet/provider/parsedfile.rb:378
 msgid "Parsed Providers must define a default target"
 msgstr ""
 
-#: ../lib/puppet/provider/parsedfile.rb:463
+#: ../lib/puppet/provider/parsedfile.rb:469
 msgid "Somehow got told to prefetch with no resource set"
 msgstr ""
 
-#: ../lib/puppet/provider/service/base.rb:118
+#: ../lib/puppet/provider/service/base.rb:121
 msgid "%{name} is not running"
 msgstr ""
 
 #. TRANSLATORS 'plist' and label' should not be translated
-#: ../lib/puppet/provider/service/launchd.rb:144
+#: ../lib/puppet/provider/service/launchd.rb:145
 msgid "The %{file} plist does not contain a 'label' key; Puppet is skipping it"
 msgstr ""
 
-#: ../lib/puppet/provider/service/launchd.rb:204
+#: ../lib/puppet/provider/service/launchd.rb:205
 msgid "Reading overrides plist, attempt %{i}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/launchd.rb:207
+#: ../lib/puppet/provider/service/launchd.rb:208
 msgid "Unable to read overrides plist, too many attempts"
 msgstr ""
 
-#: ../lib/puppet/provider/service/launchd.rb:208
+#: ../lib/puppet/provider/service/launchd.rb:209
 msgid "Overrides file could not be read, trying again."
 msgstr ""
 
@@ -7066,7 +7086,7 @@ msgid "Could not reset the groups property back to %{cur_groups} after setting t
 msgstr ""
 
 #. TRANSLATORS 'ruby-shadow' is a Ruby gem library
-#: ../lib/puppet/provider/user/openbsd.rb:50
+#: ../lib/puppet/provider/user/openbsd.rb:51
 msgid "ruby-shadow doesn't support %{method}"
 msgstr ""
 
@@ -7090,46 +7110,46 @@ msgstr ""
 msgid "incorrect metaparams: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/reference/providers.rb:59
+#: ../lib/puppet/reference/providers.rb:58
 msgid ""
 "  - Missing files %{files}\n"
 msgstr ""
 
-#: ../lib/puppet/reference/providers.rb:63
+#: ../lib/puppet/reference/providers.rb:62
 msgid ""
 "  - Setting %{name} (currently %{value}) not in list %{facts}\n"
 msgstr ""
 
-#: ../lib/puppet/reference/providers.rb:65
+#: ../lib/puppet/reference/providers.rb:64
 msgid ""
 "  - Fact %{name} (currently %{value}) not in list %{facts}\n"
 msgstr ""
 
-#: ../lib/puppet/reference/providers.rb:69
+#: ../lib/puppet/reference/providers.rb:68
 msgid ""
 "  - Got %{values} true tests that should have been false\n"
 msgstr ""
 
-#: ../lib/puppet/reference/providers.rb:71
+#: ../lib/puppet/reference/providers.rb:70
 msgid ""
 "  - Got %{values} false tests that should have been true\n"
 msgstr ""
 
-#: ../lib/puppet/reference/providers.rb:73
+#: ../lib/puppet/reference/providers.rb:72
 msgid ""
 "  - Missing features %{values}\n"
 msgstr ""
 
-#: ../lib/puppet/reference/type.rb:80
+#: ../lib/puppet/reference/type.rb:81
 msgid "Could not retrieve property %{sname} on type %{type_name}"
 msgstr ""
 
-#: ../lib/puppet/reference/type.rb:83
+#: ../lib/puppet/reference/type.rb:85
 msgid "No docs for %{type}[%{sname}]"
 msgstr ""
 
 #. TRANSLATORS 'NONE' should not be translated
-#: ../lib/puppet/relationship.rb:34
+#: ../lib/puppet/relationship.rb:30
 msgid "You must pass a callback for non-NONE events"
 msgstr ""
 
@@ -7141,60 +7161,60 @@ msgstr ""
 msgid "Invalid node name %{host}"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:47
+#: ../lib/puppet/resource.rb:48
 msgid "No resource type provided in serialized data"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:48
+#: ../lib/puppet/resource.rb:50
 msgid "No resource title provided in serialized data"
 msgstr ""
 
 #. TRANSLATORS 'Puppet::Resource.new' should not be translated
-#: ../lib/puppet/resource.rb:272
+#: ../lib/puppet/resource.rb:277
 msgid "Puppet::Resource.new does not take a hash as the first argument."
 msgstr ""
 
-#: ../lib/puppet/resource.rb:273
+#: ../lib/puppet/resource.rb:278
 msgid "Did you mean (%{type}, %{title}) ?"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:310
+#: ../lib/puppet/resource.rb:315
 msgid "Could not find declared class %{title}"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:312
+#: ../lib/puppet/resource.rb:317
 msgid "Invalid resource type %{type}"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:499
+#: ../lib/puppet/resource.rb:504
 msgid "The method Puppet::Resource.set_default_parameters is deprecated and will be removed in the next major release of Puppet."
 msgstr ""
 
-#: ../lib/puppet/resource.rb:504
+#: ../lib/puppet/resource.rb:509
 msgid "Cannot evaluate default parameters for %{resource} - not a parser resource"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:544
+#: ../lib/puppet/resource.rb:549
 msgid "The method Puppet::Resource.validate_complete is deprecated and will be removed in the next major release of Puppet."
 msgstr ""
 
-#: ../lib/puppet/resource.rb:550
+#: ../lib/puppet/resource.rb:555
 msgid "Must pass %{param} to %{resource}"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:561
+#: ../lib/puppet/resource.rb:567
 msgid "Expected parameter '%{name}' of '%{value0}' to have type %{value1}, got %{value2}"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:567
+#: ../lib/puppet/resource.rb:573
 msgid "no parameter named '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:611
+#: ../lib/puppet/resource.rb:617
 msgid "No title provided and %{type} is not a valid resource reference"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:684
+#: ../lib/puppet/resource.rb:691
 msgid "No set of title patterns matched the title \"%{title}\"."
 msgstr ""
 
@@ -7202,29 +7222,29 @@ msgstr ""
 msgid "PuppetDB is not available"
 msgstr ""
 
-#: ../lib/puppet/resource/capability_finder.rb:45
+#: ../lib/puppet/resource/capability_finder.rb:47
 msgid "Unexpected response from PuppetDB when looking up %{capability}:"
 msgstr ""
 
-#: ../lib/puppet/resource/capability_finder.rb:46
+#: ../lib/puppet/resource/capability_finder.rb:48
 msgid "expected exactly one resource but got %{count};"
 msgstr ""
 
-#: ../lib/puppet/resource/capability_finder.rb:47
+#: ../lib/puppet/resource/capability_finder.rb:49
 msgid ""
 "returned data is:\n"
 "%{resources}"
 msgstr ""
 
-#: ../lib/puppet/resource/capability_finder.rb:78
+#: ../lib/puppet/resource/capability_finder.rb:81
 msgid "Looking up capability %{capability} in PuppetDB: %{query_terms}"
 msgstr ""
 
-#: ../lib/puppet/resource/capability_finder.rb:102
+#: ../lib/puppet/resource/capability_finder.rb:105
 msgid "Unexpected response from PuppetDB when looking up %{capability}: expected an Array but got %{result}"
 msgstr ""
 
-#: ../lib/puppet/resource/capability_finder.rb:109
+#: ../lib/puppet/resource/capability_finder.rb:112
 msgid ""
 "Invalid JSON from PuppetDB when looking up %{capability}\n"
 "%{detail}"
@@ -7239,44 +7259,44 @@ msgid "Cannot add resource %{resource_1} after %{resource_2} because %{resource_
 msgstr ""
 
 #. TRANSLATORS 'alias' should not be translated
-#: ../lib/puppet/resource/catalog.rb:205
+#: ../lib/puppet/resource/catalog.rb:206
 msgid "Cannot alias %{resource} to %{key}; resource %{newref} already declared"
 msgstr ""
 
 #. TRANSLATORS 'alias' should not be translated
-#: ../lib/puppet/resource/catalog.rb:209
+#: ../lib/puppet/resource/catalog.rb:210
 msgid "Cannot alias %{resource} to %{key} at %{resource_declaration}; resource %{newref} already declared"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:290
+#: ../lib/puppet/resource/catalog.rb:292
 msgid "Unknown resource type %{type}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:451
+#: ../lib/puppet/resource/catalog.rb:446
 msgid "Could not intern from data: Could not find relationship source %{source} for %{target}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:457
+#: ../lib/puppet/resource/catalog.rb:453
 msgid "Could not intern from data: Could not find relationship target %{target} for %{source}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:550
+#: ../lib/puppet/resource/catalog.rb:543
 msgid "Could not create class file %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:566
+#: ../lib/puppet/resource/catalog.rb:559
 msgid "Could not create resource file %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:600
+#: ../lib/puppet/resource/catalog.rb:594
 msgid "Duplicate declaration: %{resource} is already declared; cannot redeclare"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:602
+#: ../lib/puppet/resource/catalog.rb:596
 msgid "Duplicate declaration: %{resource} is already declared at %{error_location}; cannot redeclare"
 msgstr ""
 
-#: ../lib/puppet/resource/catalog.rb:650 ../lib/puppet/resource/catalog.rb:654
+#: ../lib/puppet/resource/catalog.rb:645 ../lib/puppet/resource/catalog.rb:650
 msgid "Could not find resource %{resource} when converting %{message} resources"
 msgstr ""
 
@@ -7296,55 +7316,55 @@ msgstr ""
 msgid "Resource type %{res_type} does not produce %{ex_type}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:143
+#: ../lib/puppet/resource/type.rb:144
 msgid "Invalid resource supertype '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:190
+#: ../lib/puppet/resource/type.rb:192
 msgid "%{name} is not a class; cannot add code to it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:191
+#: ../lib/puppet/resource/type.rb:193
 msgid "%{name} is not a class; cannot add code from it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:195
+#: ../lib/puppet/resource/type.rb:197
 msgid "Cannot have code outside of a class/node/define because 'freeze_main' is enabled"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:199
+#: ../lib/puppet/resource/type.rb:201
 msgid "Cannot merge classes with different parent classes (%{name} => %{parent} vs. %{other_name} => %{other_parent})"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:230
+#: ../lib/puppet/resource/type.rb:232
 msgid "Cannot create resources for defined resource types"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:284
+#: ../lib/puppet/resource/type.rb:286
 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:300
+#: ../lib/puppet/resource/type.rb:302
 msgid "Could not find parent resource type '%{parent}' of type %{parent_type} in %{env}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:427
+#: ../lib/puppet/resource/type.rb:429
 msgid "Parameter '%{name}' is given a type, but is not a valid parameter."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:430
+#: ../lib/puppet/resource/type.rb:432
 msgid "Parameter '%{name}' is given a type that is not a Puppet Type, got %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:470
+#: ../lib/puppet/resource/type.rb:474
 msgid "Could not find scope for %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:491
+#: ../lib/puppet/resource/type.rb:495
 msgid "%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:493
+#: ../lib/puppet/resource/type.rb:497
 msgid "%{param} is a metaparameter; please choose another parameter name in the %{name} definition"
 msgstr ""
 
@@ -7368,35 +7388,35 @@ msgstr ""
 msgid "Site is already defined%{error}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:147
+#: ../lib/puppet/resource/type_collection.rb:148
 msgid "'%{name}' is already defined%{error} as a class; cannot redefine as a definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:148
+#: ../lib/puppet/resource/type_collection.rb:149
 msgid "Definition '%{name}' is already defined%{error}; cannot be redefined"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:149 ../lib/puppet/resource/type_collection.rb:165
+#: ../lib/puppet/resource/type_collection.rb:150 ../lib/puppet/resource/type_collection.rb:166
 msgid "'%{name}' is already defined%{error} as an application; cannot be redefined"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:154
+#: ../lib/puppet/resource/type_collection.rb:155
 msgid "'%{name}' is already defined%{error} as a class; cannot redefine as a mapping"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:163
+#: ../lib/puppet/resource/type_collection.rb:164
 msgid "'%{name}' is already defined%{error} as a class; cannot redefine as an application"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:164
+#: ../lib/puppet/resource/type_collection.rb:165
 msgid "'%{name}' is already defined%{error} as a definition; cannot redefine as an application"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:217
+#: ../lib/puppet/resource/type_collection.rb:218
 msgid "Execution of config_version command `%{cmd}` failed: %{message}"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:237
+#: ../lib/puppet/resource/type_collection.rb:238
 msgid "Not attempting to load %{type} %{fqname} as this object was missing during a prior compilation"
 msgstr ""
 
@@ -7420,61 +7440,61 @@ msgstr ""
 msgid "Attempting to initialize global default settings more than once!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:457
+#: ../lib/puppet/settings.rb:459
 msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:599
+#: ../lib/puppet/settings.rb:601
 msgid "Could not load %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:700
+#: ../lib/puppet/settings.rb:706
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:844
+#: ../lib/puppet/settings.rb:852
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:906
+#: ../lib/puppet/settings.rb:915
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:911
+#: ../lib/puppet/settings.rb:920
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:915
+#: ../lib/puppet/settings.rb:926
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1172
+#: ../lib/puppet/settings.rb:1185
 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:1190
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1344
+#: ../lib/puppet/settings.rb:1359
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1368
+#: ../lib/puppet/settings.rb:1383
 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:1393
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1379
+#: ../lib/puppet/settings.rb:1394
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1410
+#: ../lib/puppet/settings.rb:1425
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
@@ -7497,28 +7517,28 @@ 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:76
+#: ../lib/puppet/settings/base_setting.rb:77
 msgid "Cannot reference :call_hook for :%{name} if no :hook is defined"
 msgstr ""
 
-#: ../lib/puppet/settings/base_setting.rb:82
+#: ../lib/puppet/settings/base_setting.rb:83
 msgid "%{class_name} (setting '%{setting}') does not accept %{parameter}"
 msgstr ""
 
-#: ../lib/puppet/settings/base_setting.rb:89
+#: ../lib/puppet/settings/base_setting.rb:90
 msgid "You must provide a description for the %{class_name} config option"
 msgstr ""
 
-#: ../lib/puppet/settings/base_setting.rb:103
+#: ../lib/puppet/settings/base_setting.rb:104
 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:172
+#: ../lib/puppet/settings/base_setting.rb:173
 msgid "Unsupported deprecated value '%{deprecation}'."
 msgstr ""
 
-#: ../lib/puppet/settings/base_setting.rb:173
+#: ../lib/puppet/settings/base_setting.rb:174
 msgid "Supported values for deprecated are ':completely' or ':allowed_on_commandline'"
 msgstr ""
 
@@ -7551,15 +7571,15 @@ msgstr ""
 msgid "(See https://puppet.com/docs/puppet/latest/environments_about.html)"
 msgstr ""
 
-#: ../lib/puppet/settings/config_file.rb:137
+#: ../lib/puppet/settings/config_file.rb:138
 msgid "Invalid file option '%{parameter}'"
 msgstr ""
 
-#: ../lib/puppet/settings/config_file.rb:141
+#: ../lib/puppet/settings/config_file.rb:142
 msgid "File modes must be numbers"
 msgstr ""
 
-#: ../lib/puppet/settings/config_file.rb:144
+#: ../lib/puppet/settings/config_file.rb:145
 msgid "Could not parse '%{string}'"
 msgstr ""
 
@@ -7584,11 +7604,11 @@ msgstr ""
 msgid "Invalid settings in environment.conf at '%{path_to_conf_file}'. The following unknown setting(s) are being ignored: %{ignored_settings}"
 msgstr ""
 
-#: ../lib/puppet/settings/file_setting.rb:182
+#: ../lib/puppet/settings/file_setting.rb:183
 msgid "Settings parameter '%{name}' is undefined"
 msgstr ""
 
-#: ../lib/puppet/settings/file_setting.rb:218
+#: ../lib/puppet/settings/file_setting.rb:219
 msgid "The %{parameter} parameter for the setting '%{name}' must be either 'root' or 'service', not '%{value}'"
 msgstr ""
 
@@ -7632,7 +7652,7 @@ msgstr ""
 msgid "Name must be supplied if it cannot be determined from the instance"
 msgstr ""
 
-#: ../lib/puppet/ssl/base.rb:141
+#: ../lib/puppet/ssl/base.rb:142
 msgid "Unknown signature algorithm '%{ln}'"
 msgstr ""
 
@@ -7736,7 +7756,7 @@ msgid ""
 "  2. puppet %{puppet_params}\n"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:206
+#: ../lib/puppet/ssl/host.rb:210
 msgid ""
 "The CSR retrieved from the master does not match the agent's public key.\n"
 "CSR fingerprint: %{fingerprint}\n"
@@ -7750,53 +7770,53 @@ msgid ""
 "  2. puppet %{puppet_params}\n"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:260 ../lib/puppet/ssl/host.rb:281
+#: ../lib/puppet/ssl/host.rb:264 ../lib/puppet/ssl/host.rb:285
 msgid "Could not request certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:262
+#: ../lib/puppet/ssl/host.rb:266
 msgid "Exiting; failed to retrieve certificate and waitforcert is disabled"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:271
+#: ../lib/puppet/ssl/host.rb:275
 msgid "Exiting; no certificate found and waitforcert is disabled"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:279
+#: ../lib/puppet/ssl/host.rb:283
 msgid "Did not receive certificate"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:319
+#: ../lib/puppet/ssl/host.rb:323
 msgid "Response from the CA did not contain a valid certificate request: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:325
+#: ../lib/puppet/ssl/host.rb:329
 msgid "Could not download certificate request: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:352
+#: ../lib/puppet/ssl/host.rb:356
 msgid ""
 "Failed attempting to load CRL from %{crl_path}! The CRL below caused the error '%{error}':\n"
 "%{crl}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:384 ../lib/puppet/ssl/state_machine.rb:107
+#: ../lib/puppet/ssl/host.rb:388 ../lib/puppet/ssl/state_machine.rb:119
 msgid "Could not download CRLs: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:414
+#: ../lib/puppet/ssl/host.rb:422
 msgid "The certificate at %{file_path} is invalid. Could not load."
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:435
+#: ../lib/puppet/ssl/host.rb:443
 msgid "Response from the CA did not contain a valid certificate for %{cert_name}."
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:439
+#: ../lib/puppet/ssl/host.rb:447
 msgid "No certificate for %{cert_name} on CA"
 msgstr ""
 
-#: ../lib/puppet/ssl/host.rb:442
+#: ../lib/puppet/ssl/host.rb:450
 msgid "Could not download host certificate: %{message}"
 msgstr ""
 
@@ -7896,87 +7916,95 @@ msgstr ""
 msgid "Certificate '%{subject}' failed verification (%{err}): %{err_utf8}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:59
+#: ../lib/puppet/ssl/state_machine.rb:52
+msgid "Verified CA bundle with digest (%{digest_type}) %{actual_digest}"
+msgstr ""
+
+#: ../lib/puppet/ssl/state_machine.rb:55
+msgid "CA bundle with digest (%{digest_type}) %{actual_digest} did not match expected digest %{expected_digest}"
+msgstr ""
+
+#: ../lib/puppet/ssl/state_machine.rb:71
 msgid "CA certificate is missing from the server"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:61
+#: ../lib/puppet/ssl/state_machine.rb:73
 msgid "Could not download CA certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:105
+#: ../lib/puppet/ssl/state_machine.rb:117
 msgid "CRL is missing from the server"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:114
+#: ../lib/puppet/ssl/state_machine.rb:126
 msgid "Refreshing CRL"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:120
+#: ../lib/puppet/ssl/state_machine.rb:132
 msgid "CRL is unmodified, using existing CRL"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:122 ../lib/puppet/ssl/state_machine.rb:128
+#: ../lib/puppet/ssl/state_machine.rb:134 ../lib/puppet/ssl/state_machine.rb:140
 msgid "Failed to refresh CRL, using existing CRL: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:152
+#: ../lib/puppet/ssl/state_machine.rb:164
 msgid "Loading/generating private key"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:169
+#: ../lib/puppet/ssl/state_machine.rb:181
 msgid "Creating a new RSA SSL key for %{name}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:199
+#: ../lib/puppet/ssl/state_machine.rb:211
 msgid "Generating and submitting a CSR"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:209
+#: ../lib/puppet/ssl/state_machine.rb:221
 msgid "Failed to submit the CSR, HTTP response was %{code}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:218
+#: ../lib/puppet/ssl/state_machine.rb:230
 msgid "Downloading client certificate"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:233
+#: ../lib/puppet/ssl/state_machine.rb:245
 msgid "Failed to parse certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:236
+#: ../lib/puppet/ssl/state_machine.rb:248
 msgid "Certificate for %{certname} has not been signed yet"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:237
+#: ../lib/puppet/ssl/state_machine.rb:249
 msgid "Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name})."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:240
+#: ../lib/puppet/ssl/state_machine.rb:252
 msgid "Failed to retrieve certificate for %{certname}: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:256
+#: ../lib/puppet/ssl/state_machine.rb:268
 msgid "Exiting now because the waitforcert setting is set to 0."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:259
+#: ../lib/puppet/ssl/state_machine.rb:271
 msgid "Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name}). Exiting now because the maxwaitforcert timeout has been exceeded."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:262
+#: ../lib/puppet/ssl/state_machine.rb:274
 msgid "Will try again in %{time} seconds."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:352
+#: ../lib/puppet/ssl/state_machine.rb:371
 msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:354
+#: ../lib/puppet/ssl/state_machine.rb:373
 msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:394
+#: ../lib/puppet/ssl/state_machine.rb:413
 msgid "Another puppet instance is already running; exiting"
 msgstr ""
 
@@ -8127,33 +8155,33 @@ msgstr ""
 msgid "Failed to generate additional resources using 'eval_generate': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event.rb:123
+#: ../lib/puppet/transaction/event.rb:124
 msgid "Event status can only be %{statuses}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event_manager.rb:87
+#: ../lib/puppet/transaction/event_manager.rb:88
 msgid "Unscheduling all events on %{target}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event_manager.rb:93
+#: ../lib/puppet/transaction/event_manager.rb:94
 msgid "Unscheduling %{callback} on %{target}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event_manager.rb:108
+#: ../lib/puppet/transaction/event_manager.rb:109
 msgid "Scheduling %{callback} of %{target}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event_manager.rb:150
+#: ../lib/puppet/transaction/event_manager.rb:152
 msgid "Triggered '%{callback}' from %{count} event"
 msgid_plural "Triggered '%{callback}' from %{count} events"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../lib/puppet/transaction/event_manager.rb:157
+#: ../lib/puppet/transaction/event_manager.rb:159
 msgid "Failed to call %{callback}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/transaction/event_manager.rb:172
+#: ../lib/puppet/transaction/event_manager.rb:174
 msgid "Would have triggered '%{callback}' from %{count} event"
 msgid_plural "Would have triggered '%{callback}' from %{count} events"
 msgstr[0] ""
@@ -8183,39 +8211,39 @@ msgstr ""
 msgid "Transaction store file %{filename} is valid YAML but not returning a hash. Check the file for corruption, or remove it before continuing."
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:50
+#: ../lib/puppet/transaction/resource_harness.rb:51
 msgid "Cannot schedule without a schedule-containing catalog"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:55
+#: ../lib/puppet/transaction/resource_harness.rb:57
 msgid "Could not find schedule %{name}"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:147 ../lib/puppet/transaction/resource_harness.rb:155
+#: ../lib/puppet/transaction/resource_harness.rb:149 ../lib/puppet/transaction/resource_harness.rb:157
 msgid "change from %s to %s failed: "
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:162
+#: ../lib/puppet/transaction/resource_harness.rb:164
 msgid "could not create change error message for %{name}"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:215
+#: ../lib/puppet/transaction/resource_harness.rb:217
 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:227
 msgid " (previously recorded value was %s)"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:232
+#: ../lib/puppet/transaction/resource_harness.rb:234
 msgid "current_value %s, should be %s (noop)"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:241
+#: ../lib/puppet/transaction/resource_harness.rb:243
 msgid "changed %s to %s"
 msgstr ""
 
-#: ../lib/puppet/transaction/resource_harness.rb:264
+#: ../lib/puppet/transaction/resource_harness.rb:266
 msgid "audit change: newly-recorded value %s"
 msgstr ""
 
@@ -8227,69 +8255,69 @@ msgstr ""
 msgid "Class %{class_name} already has a property named %{property}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:598
+#: ../lib/puppet/type.rb:599
 msgid "Class %{class_name} has not defined parameters"
 msgstr ""
 
-#: ../lib/puppet/type.rb:682
+#: ../lib/puppet/type.rb:686
 msgid "Parameter %{name} failed on %{ref}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:705
+#: ../lib/puppet/type.rb:709
 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:1029 ../lib/puppet/type.rb:1040
+#: ../lib/puppet/type.rb:1052 ../lib/puppet/type.rb:1063
 msgid "The 'is' value is not in the 'is' array for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1166
+#: ../lib/puppet/type.rb:1194
 msgid "%{name} has no providers and has not overridden 'instances'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1425
+#: ../lib/puppet/type.rb:1456
 msgid "Cannot add aliases without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1504
+#: ../lib/puppet/type.rb:1536
 msgid "Could not find %{description} %{ref} for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1777
+#: ../lib/puppet/type.rb:1811
 msgid "Found multiple default providers for %{name}: %{provider_list}; using %{selected_provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1862
+#: ../lib/puppet/type.rb:1898
 msgid "Could not find parent provider %{parent} of %{name}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1938
+#: ../lib/puppet/type.rb:1974
 msgid "Invalid %{resource} provider '%{provider_class}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2021
+#: ../lib/puppet/type.rb:2059
 msgid "Could not find %{name} provider of %{provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2138
+#: ../lib/puppet/type.rb:2177
 msgid "You cannot add relationships without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2445
+#: ../lib/puppet/type.rb:2482
 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:2448
+#: ../lib/puppet/type.rb:2485
 msgid "Unable to mark '%{name}' as sensitive: the property itself was not assigned a value."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2450
+#: ../lib/puppet/type.rb:2487
 msgid "Unable to mark '%{name}' as sensitive: the property itself is not defined on %{type}."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2508
+#: ../lib/puppet/type.rb:2545
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
@@ -8301,64 +8329,64 @@ msgstr ""
 msgid "Command exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:165
+#: ../lib/puppet/type/exec.rb:166
 msgid "[command redacted] returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:167
+#: ../lib/puppet/type/exec.rb:168
 msgid "'%{cmd}' returned %{status} instead of one of [%{expected}]"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:188
+#: ../lib/puppet/type/exec.rb:189
 msgid "Command must be a String, got value of class %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:220
+#: ../lib/puppet/type/exec.rb:221
 msgid "Unable to execute commands as other users on Windows"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:222
+#: ../lib/puppet/type/exec.rb:223
 msgid "Only root can execute commands as other users"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:278
+#: ../lib/puppet/type/exec.rb:279
 msgid "Invalid environment setting '%{value}'"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:291
+#: ../lib/puppet/type/exec.rb:292
 msgid "The umask specification is invalid: %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:307
+#: ../lib/puppet/type/exec.rb:308
 msgid "The timeout must be a number."
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:324
+#: ../lib/puppet/type/exec.rb:325
 msgid "Tries must be an integer"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:328
+#: ../lib/puppet/type/exec.rb:329
 msgid "Tries must be an integer >= 1"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:341
+#: ../lib/puppet/type/exec.rb:342
 msgid "try_sleep must be a number"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:345
+#: ../lib/puppet/type/exec.rb:346
 msgid "try_sleep cannot be a negative number"
 msgstr ""
 
 #. TRANSLATORS 'creates' is a parameter name and should not be translated
-#: ../lib/puppet/type/exec.rb:417
+#: ../lib/puppet/type/exec.rb:418
 msgid "Checking that 'creates' path '%{creates_path}' exists"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:462 ../lib/puppet/type/exec.rb:514
+#: ../lib/puppet/type/exec.rb:463 ../lib/puppet/type/exec.rb:515
 msgid "Check %{value} exceeded timeout"
 msgstr ""
 
-#: ../lib/puppet/type/exec.rb:597
+#: ../lib/puppet/type/exec.rb:600
 msgid "'%{cmd}' won't be executed because of failed check '%{check}'"
 msgstr ""
 
@@ -8378,74 +8406,74 @@ msgstr ""
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:399
+#: ../lib/puppet/type/file.rb:401
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:401
+#: ../lib/puppet/type/file.rb:403
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:403
+#: ../lib/puppet/type/file.rb:405
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:406
+#: ../lib/puppet/type/file.rb:408
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:409
+#: ../lib/puppet/type/file.rb:411
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:417
+#: ../lib/puppet/type/file.rb:419
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:420
+#: ../lib/puppet/type/file.rb:422
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:458
+#: ../lib/puppet/type/file.rb:460
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:462
+#: ../lib/puppet/type/file.rb:465
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:758
+#: ../lib/puppet/type/file.rb:764
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:773
+#: ../lib/puppet/type/file.rb:779
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:784
+#: ../lib/puppet/type/file.rb:790
 msgid "Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore."
 msgstr ""
 
 #. TRANSLATORS "stat" is a program name and should not be translated
-#: ../lib/puppet/type/file.rb:865 ../lib/puppet/type/tidy.rb:345
+#: ../lib/puppet/type/file.rb:871 ../lib/puppet/type/tidy.rb:352
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:868
+#: ../lib/puppet/type/file.rb:874
 msgid "Could not stat; invalid pathname"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:996
+#: ../lib/puppet/type/file.rb:1002
 msgid "Not removing directory; use 'force' to override"
 msgstr ""
 
 #. TRANSLATORS refers to a file which could not be backed up
-#: ../lib/puppet/type/file.rb:1021
+#: ../lib/puppet/type/file.rb:1027
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1035
+#: ../lib/puppet/type/file.rb:1041
 msgid "File written to disk did not match checksum; discarding changes (%{content_checksum} vs %{newsum})"
 msgstr ""
 
@@ -8482,7 +8510,7 @@ 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
+#: ../lib/puppet/type/file/mode.rb:126
 msgid "Not managing symlink mode"
 msgstr ""
 
@@ -8491,7 +8519,7 @@ 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:363
+#: ../lib/puppet/type/file/source.rb:362
 msgid "The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`."
 msgstr ""
 
@@ -8547,7 +8575,7 @@ msgstr ""
 msgid "The 'ensure' attribute on %{name} resources does not accept 'absent' as a value"
 msgstr ""
 
-#: ../lib/puppet/type/resources.rb:136
+#: ../lib/puppet/type/resources.rb:137
 msgid "Could not find resource type"
 msgstr ""
 
@@ -8583,7 +8611,7 @@ msgstr ""
 msgid "Setting enable to manual is only supported on Microsoft Windows."
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:247
+#: ../lib/puppet/type/service.rb:248
 msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
 msgstr ""
 
@@ -8591,120 +8619,120 @@ msgstr ""
 msgid "Tidy can't use matches with recurse 0, false, or undef"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:124
+#: ../lib/puppet/type/tidy.rb:125
 msgid "Invalid age unit '%{unit}'"
 msgstr ""
 
 #. TRANSLATORS tidy is the name of a program and should not be translated
-#: ../lib/puppet/type/tidy.rb:144
+#: ../lib/puppet/type/tidy.rb:145
 msgid "Invalid tidy age %{age}"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:165
+#: ../lib/puppet/type/tidy.rb:167
 msgid "Invalid size unit '%{unit}'"
 msgstr ""
 
 #. TRANSLATORS tidy is the name of a program and should not be translated
-#: ../lib/puppet/type/tidy.rb:183
+#: ../lib/puppet/type/tidy.rb:185
 msgid "Invalid tidy size %{age}"
 msgstr ""
 
 #. TRANSLATORS "Tidy" is a program name and should not be translated
-#: ../lib/puppet/type/tidy.rb:272
+#: ../lib/puppet/type/tidy.rb:275
 msgid "Tidying %{count} files"
 msgstr ""
 
-#: ../lib/puppet/type/tidy.rb:341
+#: ../lib/puppet/type/tidy.rb:348
 msgid "File does not exist"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:166
+#: ../lib/puppet/type/user.rb:167
 msgid "Could not find group(s) %{groups}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:255
+#: ../lib/puppet/type/user.rb:256
 msgid "Passwords cannot include ':'"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:275
+#: ../lib/puppet/type/user.rb:276
 msgid "Password minimum age must be provided as a number."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:294
+#: ../lib/puppet/type/user.rb:295
 msgid "Password maximum age must be provided as a number."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:325
+#: ../lib/puppet/type/user.rb:326
 msgid "Group names must be provided, not GID numbers."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:327
+#: ../lib/puppet/type/user.rb:328
 msgid "Group names must be provided as an array, not a comma-separated list."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:328
+#: ../lib/puppet/type/user.rb:329
 msgid "Group names must not be empty. If you want to specify \"no groups\" pass an empty array"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:421
+#: ../lib/puppet/type/user.rb:422
 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:438
+#: ../lib/puppet/type/user.rb:439
 msgid "Expiry dates must be YYYY-MM-DD or the string \"absent\""
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:515
+#: ../lib/puppet/type/user.rb:525
 msgid "Role names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:517
+#: ../lib/puppet/type/user.rb:527
 msgid "Role names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:552
+#: ../lib/puppet/type/user.rb:564
 msgid "Auth names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:554
+#: ../lib/puppet/type/user.rb:566
 msgid "Auth names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:578
+#: ../lib/puppet/type/user.rb:590
 msgid "Profile names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:580
+#: ../lib/puppet/type/user.rb:592
 msgid "Profile names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:688
+#: ../lib/puppet/type/user.rb:700
 msgid "Ssh_authorized_key type is not available. Cannot purge SSH keys."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:726
+#: ../lib/puppet/type/user.rb:738
 msgid "Each entry for purge_ssh_keys must be a string, not a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:729
+#: ../lib/puppet/type/user.rb:741
 msgid "Paths to keyfiles must be absolute, not %{entry}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:733
+#: ../lib/puppet/type/user.rb:745
 msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:745
+#: ../lib/puppet/type/user.rb:757
 msgid "purge_ssh_keys can only be true for users with a defined home directory"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:752
+#: ../lib/puppet/type/user.rb:764
 msgid "purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:767
+#: ../lib/puppet/type/user.rb:779
 msgid "Class name must be provided."
 msgstr ""
 
@@ -8724,54 +8752,54 @@ msgstr ""
 msgid "Unable to merge given values into the current environment for mode %{mode}"
 msgstr ""
 
-#: ../lib/puppet/util.rb:155
+#: ../lib/puppet/util.rb:156
 msgid "could not change to group %{group}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util.rb:156
+#: ../lib/puppet/util.rb:157
 msgid "could not change to group %{group}"
 msgstr ""
 
-#: ../lib/puppet/util.rb:168
+#: ../lib/puppet/util.rb:170
 msgid "Could not change to user %{user}: %{detail}"
 msgstr ""
 
 #. TRANSLATORS 'benchmark' is a method name and should not be translated
-#: ../lib/puppet/util.rb:222
+#: ../lib/puppet/util.rb:224
 msgid "Failed to provide level to benchmark"
 msgstr ""
 
-#: ../lib/puppet/util.rb:225
+#: ../lib/puppet/util.rb:227
 msgid "Benchmarked object does not respond to %{value}"
 msgstr ""
 
 #. TRANSLATORS PATH and HOME are environment variables and should not be translated
-#: ../lib/puppet/util.rb:265
+#: ../lib/puppet/util.rb:267
 msgid "PATH contains a ~ character, and HOME is not set; ignoring PATH element '%{dir}'."
 msgstr ""
 
 #. TRANSLATORS PATH is an environment variable and should not be translated
-#: ../lib/puppet/util.rb:269
+#: ../lib/puppet/util.rb:271
 msgid "Couldn't expand PATH containing a ~ character; ignoring PATH element '%{dir}'."
 msgstr ""
 
-#: ../lib/puppet/util.rb:311
+#: ../lib/puppet/util.rb:313
 msgid "unknown platform %{platform} in absolute_path"
 msgstr ""
 
-#: ../lib/puppet/util.rb:345
+#: ../lib/puppet/util.rb:348
 msgid "Failed to convert '%{path}' to URI: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util.rb:445
+#: ../lib/puppet/util.rb:448
 msgid "path may not be nil"
 msgstr ""
 
-#: ../lib/puppet/util.rb:570
+#: ../lib/puppet/util.rb:573
 msgid "replace_file requires a block"
 msgstr ""
 
-#: ../lib/puppet/util.rb:574
+#: ../lib/puppet/util.rb:577
 msgid "replace_file default_mode: %{default_mode} is invalid"
 msgstr ""
 
@@ -8847,15 +8875,15 @@ msgstr ""
 msgid "%{value} is not valid UTF-8 and result of overriding encoding would be invalid."
 msgstr ""
 
-#: ../lib/puppet/util/classgen.rb:154
+#: ../lib/puppet/util/classgen.rb:156
 msgid "Redefining %{name} in %{klass}"
 msgstr ""
 
-#: ../lib/puppet/util/classgen.rb:158
+#: ../lib/puppet/util/classgen.rb:160
 msgid "Class %{const} is already defined in %{klass}"
 msgstr ""
 
-#: ../lib/puppet/util/classgen.rb:203 ../lib/puppet/util/classgen.rb:215
+#: ../lib/puppet/util/classgen.rb:208 ../lib/puppet/util/classgen.rb:221
 msgid "Already a generated class named %{klassname}"
 msgstr ""
 
@@ -8863,15 +8891,15 @@ msgstr ""
 msgid "Could not initialize global default settings"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:169
+#: ../lib/puppet/util/command_line.rb:173
 msgid "Error: Could not parse application options: invalid option: %{opt}"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:172
+#: ../lib/puppet/util/command_line.rb:176
 msgid "See 'puppet help' for help on available puppet subcommands"
 msgstr ""
 
-#: ../lib/puppet/util/command_line.rb:185
+#: ../lib/puppet/util/command_line.rb:189
 msgid "Error: Unknown Puppet subcommand '%{cmd}'"
 msgstr ""
 
@@ -9025,33 +9053,33 @@ 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:34
+#: ../lib/puppet/util/connection.rb:35
 msgid "Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}"
 msgstr ""
 
-#: ../lib/puppet/util/connection.rb:38
+#: ../lib/puppet/util/connection.rb:39
 msgid "Dynamically-bound server lookup failed, falling back to %{setting} setting: %{server}"
 msgstr ""
 
-#: ../lib/puppet/util/connection.rb:59
+#: ../lib/puppet/util/connection.rb:60
 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:69
+#: ../lib/puppet/util/connection.rb:71
 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:73
+#: ../lib/puppet/util/connection.rb:75
 msgid "Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}"
 msgstr ""
 
-#: ../lib/puppet/util/connection.rb:78
+#: ../lib/puppet/util/connection.rb:80
 msgid "Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}"
 msgstr ""
 
-#: ../lib/puppet/util/diff.rb:28
+#: ../lib/puppet/util/diff.rb:30
 msgid "Cannot provide diff without the diff/lcs Ruby library"
 msgstr ""
 
@@ -9087,19 +9115,19 @@ msgstr ""
 msgid "Working directory %{cwd} does not exist!"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:285
+#: ../lib/puppet/util/execution.rb:287
 msgid "Could not get output"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:294
+#: ../lib/puppet/util/execution.rb:296
 msgid "Execution of '%{str}' returned %{exit_status}: %{output}"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:371
+#: ../lib/puppet/util/execution.rb:373
 msgid "Could not execute posix command: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/execution.rb:419
+#: ../lib/puppet/util/execution.rb:421
 msgid "Waiting for output; will sleep %{time_to_sleep} seconds"
 msgstr ""
 
@@ -9107,15 +9135,15 @@ msgstr ""
 msgid "Failed to load feature test for %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/feature.rb:107
+#: ../lib/puppet/util/feature.rb:110
 msgid "Libraries must be passed as strings not %{klass}"
 msgstr ""
 
-#: ../lib/puppet/util/feature.rb:117
+#: ../lib/puppet/util/feature.rb:120
 msgid "Could not find library '%{lib}' required to enable feature '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/util/feature.rb:121
+#: ../lib/puppet/util/feature.rb:124
 msgid "Exception occurred while loading library '%{lib}' required to enable feature '%{name}': %{detail}"
 msgstr ""
 
@@ -9123,7 +9151,7 @@ msgstr ""
 msgid "Cannot have fields named %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/fileparsing.rb:63 ../lib/puppet/util/fileparsing.rb:328
+#: ../lib/puppet/util/fileparsing.rb:63 ../lib/puppet/util/fileparsing.rb:337
 msgid "Invalid record type %{record_type}"
 msgstr ""
 
@@ -9131,31 +9159,31 @@ msgstr ""
 msgid "Field '%{field}' is required"
 msgstr ""
 
-#: ../lib/puppet/util/fileparsing.rb:176
+#: ../lib/puppet/util/fileparsing.rb:178
 msgid "Process record type %{record_name} returned non-hash"
 msgstr ""
 
-#: ../lib/puppet/util/fileparsing.rb:251
+#: ../lib/puppet/util/fileparsing.rb:258
 msgid "Could not parse line %{line}"
 msgstr ""
 
-#: ../lib/puppet/util/fileparsing.rb:260
+#: ../lib/puppet/util/fileparsing.rb:267
 msgid "No record types defined; cannot parse lines"
 msgstr ""
 
-#: ../lib/puppet/util/fileparsing.rb:271
+#: ../lib/puppet/util/fileparsing.rb:279
 msgid "Somehow got invalid line type %{record_type}"
 msgstr ""
 
-#: ../lib/puppet/util/fileparsing.rb:293
+#: ../lib/puppet/util/fileparsing.rb:301
 msgid "Must include a list of fields"
 msgstr ""
 
-#: ../lib/puppet/util/fileparsing.rb:308
+#: ../lib/puppet/util/fileparsing.rb:316
 msgid "You must provide a :match regex for text lines"
 msgstr ""
 
-#: ../lib/puppet/util/fileparsing.rb:384
+#: ../lib/puppet/util/fileparsing.rb:395
 msgid "Line type %{name} is already defined"
 msgstr ""
 
@@ -9171,47 +9199,47 @@ msgstr ""
 msgid "Path is nil"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:151
+#: ../lib/puppet/util/filetype.rb:152
 msgid "Reading %{path} from RAM"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:157
+#: ../lib/puppet/util/filetype.rb:158
 msgid "Removing %{path} from RAM"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:163
+#: ../lib/puppet/util/filetype.rb:164
 msgid "Writing %{path} to RAM"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:184
+#: ../lib/puppet/util/filetype.rb:185
 msgid "Could not retrieve user %{user}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:195 ../lib/puppet/util/filetype.rb:260 ../lib/puppet/util/filetype.rb:311
+#: ../lib/puppet/util/filetype.rb:196 ../lib/puppet/util/filetype.rb:261 ../lib/puppet/util/filetype.rb:312
 msgid "The %{path} user does not exist. Treating their crontab file as empty in case Puppet creates them in the middle of the run."
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:206 ../lib/puppet/util/filetype.rb:271 ../lib/puppet/util/filetype.rb:322
+#: ../lib/puppet/util/filetype.rb:207 ../lib/puppet/util/filetype.rb:272 ../lib/puppet/util/filetype.rb:323
 msgid "The %{path} user is not authorized to use cron. Their crontab file is treated as empty in case Puppet authorizes them in the middle of the run (by, for example, modifying the cron.deny or cron.allow files)."
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:210 ../lib/puppet/util/filetype.rb:275 ../lib/puppet/util/filetype.rb:326
+#: ../lib/puppet/util/filetype.rb:211 ../lib/puppet/util/filetype.rb:276 ../lib/puppet/util/filetype.rb:327
 msgid "Could not read crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:232
+#: ../lib/puppet/util/filetype.rb:233
 msgid "Cannot write the %{path} user's crontab: The user does not exist"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:283 ../lib/puppet/util/filetype.rb:334
+#: ../lib/puppet/util/filetype.rb:284 ../lib/puppet/util/filetype.rb:335
 msgid "Could not remove crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/filetype.rb:298 ../lib/puppet/util/filetype.rb:350
+#: ../lib/puppet/util/filetype.rb:299 ../lib/puppet/util/filetype.rb:351
 msgid "Could not write crontab for %{path}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/http_proxy.rb:206
+#: ../lib/puppet/util/http_proxy.rb:207
 msgid "Too many HTTP redirections for %{uri}"
 msgstr ""
 
@@ -9231,7 +9259,7 @@ msgstr ""
 msgid "Section %{name} is already defined, cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/util/instance_loader.rb:52
+#: ../lib/puppet/util/instance_loader.rb:53
 msgid "Loaded %{type} file for %{name} but %{type} was not defined"
 msgstr ""
 
@@ -9239,11 +9267,11 @@ msgstr ""
 msgid "Unable to read lockfile data from %{path}: not in JSON"
 msgstr ""
 
-#: ../lib/puppet/util/ldap/connection.rb:35
+#: ../lib/puppet/util/ldap/connection.rb:37
 msgid "Could not set up LDAP Connection: Missing ruby/ldap libraries"
 msgstr ""
 
-#: ../lib/puppet/util/ldap/connection.rb:69
+#: ../lib/puppet/util/ldap/connection.rb:71
 msgid "Could not connect to LDAP: %{detail}"
 msgstr ""
 
@@ -9252,19 +9280,19 @@ msgstr ""
 msgid "You must pass a block to #connect"
 msgstr ""
 
-#: ../lib/puppet/util/ldap/manager.rb:90
+#: ../lib/puppet/util/ldap/manager.rb:92
 msgid "Could not get dn from ldap entry"
 msgstr ""
 
-#: ../lib/puppet/util/ldap/manager.rb:142
+#: ../lib/puppet/util/ldap/manager.rb:145
 msgid "%{source} must be defined to generate %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/ldap/manager.rb:219
+#: ../lib/puppet/util/ldap/manager.rb:222
 msgid "Removing %{name} from ldap"
 msgstr ""
 
-#: ../lib/puppet/util/ldap/manager.rb:226
+#: ../lib/puppet/util/ldap/manager.rb:229
 msgid "Creating %{name} in ldap"
 msgstr ""
 
@@ -9281,7 +9309,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:378 ../lib/puppet/util/windows/eventlog.rb:99
 msgid "Invalid log level %{level}"
 msgstr ""
 
@@ -9308,25 +9336,25 @@ 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:368
 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:374
 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:376
 msgid "Puppet::Util::Log requires a symbol or string"
 msgstr ""
 
-#: ../lib/puppet/util/log.rb:404
+#: ../lib/puppet/util/log.rb:407
 msgid "Could not parse for environment %{environment}: %{msg}"
 msgstr ""
 
-#: ../lib/puppet/util/log.rb:406
+#: ../lib/puppet/util/log.rb:409
 msgid "%{msg} on node %{node}"
 msgstr ""
 
@@ -9487,7 +9515,7 @@ msgstr ""
 msgid "Could not open SELinux category translation file %{path}."
 msgstr ""
 
-#: ../lib/puppet/util/selinux.rb:243
+#: ../lib/puppet/util/selinux.rb:244
 msgid "got a relative path in SELinux find_fs: %{path}"
 msgstr ""