puppet 5.3.2-x86-mingw32 → 5.3.3-x86-mingw32

data/lib/puppet/pops/types/ruby_generator.rb

@@ -3,6 +3,43 @@ module Types
 
 # @api private
 class RubyGenerator < TypeFormatter
+
+  RUBY_RESERVED_WORDS = {
+    'alias' => '_alias',
+    'begin' => '_begin',
+    'break' => '_break',
+    'def' => '_def',
+    'do' => '_do',
+    'end' => '_end',
+    'ensure' => '_ensure',
+    'for' => '_for',
+    'module' => '_module',
+    'next' => '_next',
+    'nil' => '_nil',
+    'not' => '_not',
+    'redo' => '_redo',
+    'rescue' => '_rescue',
+    'retry' => '_retry',
+    'return' => '_return',
+    'self' => '_self',
+    'super' => '_super',
+    'then' => '_then',
+    'until' => '_until',
+    'when' => '_when',
+    'while' => '_while',
+    'yield' => '_yield',
+  }
+
+  RUBY_RESERVED_WORDS_REVERSED = Hash[RUBY_RESERVED_WORDS.map { |k, v| [v, k] }]
+
+  def self.protect_reserved_name(name)
+    RUBY_RESERVED_WORDS[name] || name
+  end
+
+  def self.unprotect_reserved_name(name)
+    RUBY_RESERVED_WORDS_REVERSED[name] || name
+  end
+
   def remove_common_namespace(namespace_segments, name)
     segments = name.split(TypeFormatter::NAME_SEGMENT_SEPARATOR)
     namespace_segments.size.times do |idx|
@@ -174,8 +211,8 @@ class RubyGenerator < TypeFormatter
     constants, others = obj.attributes(true).values.partition { |a| a.kind == PObjectType::ATTRIBUTE_KIND_CONSTANT }
     constants = constants.select { |ca| ca.container.equal?(obj) }
     unless constants.empty?
-      constants.each { |ca| bld << "\n  def self." << ca.name << "\n    _pcore_type['" << ca.name << "'].value\n  end\n" }
-      constants.each { |ca| bld << "\n  def " << ca.name << "\n    self.class." << ca.name << "\n  end\n" }
+      constants.each { |ca| bld << "\n  def self." << rname(ca.name) << "\n    _pcore_type['" << ca.name << "'].value\n  end\n" }
+      constants.each { |ca| bld << "\n  def " << rname(ca.name) << "\n    self.class." << ca.name << "\n  end\n" }
     end
 
     init_params = others.reject { |a| a.kind == PObjectType::ATTRIBUTE_KIND_DERIVED }
@@ -217,9 +254,9 @@ class RubyGenerator < TypeFormatter
         bld << "\n    new"
       else
         bld << '('
-        non_opt.each { |ip| bld << ip.name << ', ' }
+        non_opt.each { |ip| bld << rname(ip.name) << ', ' }
         opt.each do |ip|
-          bld << ip.name << ' = '
+          bld << rname(ip.name) << ' = '
           default_string(bld, ip)
           bld << ', '
         end
@@ -229,11 +266,11 @@ class RubyGenerator < TypeFormatter
         bld << "    attrs = _pcore_type.attributes(true)\n"
         init_params.each do |a|
           bld << "    ta.assert_instance_of('" << a.container.name << '[' << a.name << ']'
-          bld << "', attrs['" << a.name << "'].type, " << a.name << ")\n"
+          bld << "', attrs['" << a.name << "'].type, " << rname(a.name) << ")\n"
         end
         bld << '    new('
-        non_opt.each { |a| bld << a.name << ', ' }
-        opt.each { |a| bld << a.name << ', ' }
+        non_opt.each { |a| bld << rname(a.name) << ', ' }
+        opt.each { |a| bld << rname(a.name) << ', ' }
         bld.chomp!(', ')
         bld << ')'
       end
@@ -242,13 +279,13 @@ class RubyGenerator < TypeFormatter
       # Output attr_readers
       unless obj_attrs.empty?
         bld << "\n"
-        obj_attrs.each { |a| bld << '  attr_reader :' << a.name << "\n" }
+        obj_attrs.each { |a| bld << '  attr_reader :' << rname(a.name) << "\n" }
       end
 
       bld << "  attr_reader :hash\n" if obj.parent.nil?
 
       derived_attrs.each do |a|
-        bld << "\n  def " << a.name << "\n"
+        bld << "\n  def " << rname(a.name) << "\n"
         code_annotation = RubyMethod.annotate(a)
         ruby_body = code_annotation.nil? ? nil: code_annotation.body
         if ruby_body.nil?
@@ -265,9 +302,9 @@ class RubyGenerator < TypeFormatter
         # Output initializer
         bld << "\n  def initialize"
         bld << '('
-        non_opt.each { |ip| bld << ip.name << ', ' }
+        non_opt.each { |ip| bld << rname(ip.name) << ', ' }
         opt.each do |ip|
-          bld << ip.name << ' = '
+          bld << rname(ip.name) << ' = '
           default_string(bld, ip)
           bld << ', '
         end
@@ -282,18 +319,18 @@ class RubyGenerator < TypeFormatter
           bld << "\n    super("
           super_args = (non_opt + opt).select { |ip| !ip.container.equal?(obj) }
           unless super_args.empty?
-            super_args.each { |ip| bld << ip.name << ', ' }
+            super_args.each { |ip| bld << rname(ip.name) << ', ' }
             bld.chomp!(', ')
           end
           bld << ")\n"
           bld << '    @hash = @hash ^ ' unless hash_participants.empty?
         end
         unless hash_participants.empty?
-          hash_participants.each { |a| bld << a.name << '.hash ^ ' if a.container.equal?(obj) }
+          hash_participants.each { |a| bld << rname(a.name) << '.hash ^ ' if a.container.equal?(obj) }
           bld.chomp!(' ^ ')
           bld << "\n"
         end
-        init_params.each { |a| bld << '    @' << a.name << ' = ' << a.name << "\n" if a.container.equal?(obj) }
+        init_params.each { |a| bld << '    @' << rname(a.name) << ' = ' << rname(a.name) << "\n" if a.container.equal?(obj) }
         bld << "  end\n"
       end
     end
@@ -306,7 +343,7 @@ class RubyGenerator < TypeFormatter
       bld << (obj.parent.nil? ? '{}' : 'super')
       bld << "\n"
       obj_attrs.each do |a|
-        bld << "    result['" << a.name << "'] = @" << a.name
+        bld << "    result['" << a.name << "'] = @" << rname(a.name)
         if a.value?
           bld << ' unless '
           equals_default_string(bld, a)
@@ -326,21 +363,21 @@ class RubyGenerator < TypeFormatter
       bld << "\n  def _pcore_contents\n"
       content_participants.each do |cp|
         if array_type?(cp.type)
-          bld << '    @' << cp.name << ".each { |value| yield(value) }\n"
+          bld << '    @' << rname(cp.name) << ".each { |value| yield(value) }\n"
         else
-          bld << '    yield(@' << cp.name << ') unless @' << cp.name  << ".nil?\n"
+          bld << '    yield(@' << rname(cp.name) << ') unless @' << rname(cp.name)  << ".nil?\n"
         end
       end
       bld << "  end\n\n  def _pcore_all_contents(path, &block)\n    path << self\n"
       content_participants.each do |cp|
         if array_type?(cp.type)
-          bld << '    @' << cp.name << ".each do |value|\n"
+          bld << '    @' << rname(cp.name) << ".each do |value|\n"
           bld << "      block.call(value, path)\n"
           bld << "      value._pcore_all_contents(path, &block)\n"
         else
-          bld << '    unless @' << cp.name << ".nil?\n"
-          bld << '      block.call(@' << cp.name << ", path)\n"
-          bld << '      @' << cp.name << "._pcore_all_contents(path, &block)\n"
+          bld << '    unless @' << rname(cp.name) << ".nil?\n"
+          bld << '      block.call(@' << rname(cp.name) << ", path)\n"
+          bld << '      @' << rname(cp.name) << "._pcore_all_contents(path, &block)\n"
         end
         bld << "    end\n"
       end
@@ -359,13 +396,13 @@ class RubyGenerator < TypeFormatter
       if code_annotation
         body = code_annotation.body
         params = code_annotation.parameters
-        bld << "\n  def " << func.name
+        bld << "\n  def " << rname(func.name)
         unless params.nil? || params.empty?
           bld << '(' << params << ')'
         end
         bld << "\n    " << body << "\n"
       else
-        bld << "\n  def " << func.name << "(*args)\n"
+        bld << "\n  def " << rname(func.name) << "(*args)\n"
         bld << "    # Placeholder for #{func.type}\n"
         bld << "    raise Puppet::Error, \"no method is implemented for #{func.label}\"\n"
       end
@@ -376,7 +413,7 @@ class RubyGenerator < TypeFormatter
       bld << "\n  def eql?(o)\n"
       bld << "    super &&\n" unless obj.parent.nil?
       bld << "    o.instance_of?(self.class) &&\n" if include_type
-      eq_names.each { |eqn| bld << '    @' << eqn << '.eql?(o.' <<  eqn << ") &&\n" }
+      eq_names.each { |eqn| bld << '    @' << rname(eqn) << '.eql?(o.' <<  rname(eqn) << ") &&\n" }
       bld.chomp!(" &&\n")
       bld << "\n  end\n  alias == eql?\n"
     end
@@ -435,6 +472,10 @@ class RubyGenerator < TypeFormatter
       bld << "_pcore_type['" << a.name << "'].default_value?(@" << a.name << ')'
     end
   end
+
+  def rname(name)
+    RUBY_RESERVED_WORDS[name] || name
+  end
 end
 end
 end

data/lib/puppet/provider/service/base.rb

@@ -32,15 +32,28 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
     @resource.fail "Either stop/status commands or a pattern must be specified" unless @resource[:pattern]
     regex = Regexp.new(@resource[:pattern])
     ps = getps
+
     self.debug "Executing '#{ps}'"
-    IO.popen(ps) { |table|
-      table.each_line { |line|
-        if regex.match(line)
-          self.debug "Process matched: #{line}"
-          ary = line.sub(/^\s+/, '').split(/\s+/)
-          return ary[1]
-        end
-      }
+    table = Puppet::Util::Execution.execute(ps)
+
+    # The output of the PS command can be a mashup of several different
+    # encodings depending on which processes are running and what
+    # arbitrary data has been used to set their name in the process table.
+    #
+    # First, try a polite conversion to in order to match the UTF-8 encoding
+    # of our regular expression.
+    table = Puppet::Util::CharacterEncoding.convert_to_utf_8(table)
+    # If that fails, force to UTF-8 and then scrub as most uses are scanning
+    # for ACII-compatible program names.
+    table.force_encoding(Encoding::UTF_8) unless table.encoding == Encoding::UTF_8
+    table = Puppet::Util::CharacterEncoding.scrub(table) unless table.valid_encoding?
+
+    table.each_line { |line|
+      if regex.match(line)
+        self.debug "Process matched: #{line}"
+        ary = line.sub(/^[[:space:]]+/u, '').split(/[[:space:]]+/u)
+        return ary[1]
+      end
     }
 
     nil

data/lib/puppet/provider/zfs/zfs.rb

@@ -15,7 +15,11 @@ Puppet::Type.type(:zfs).provide(:zfs) do
     Puppet::Type.type(:zfs).validproperties.each do |property|
       next if property == :ensure
       if value = @resource[property] and value != ""
-        properties << "-o" << "#{property}=#{value}"
+        if property == :volsize
+          properties << "-V" << "#{value}"
+        else
+          properties << "-o" << "#{property}=#{value}"
+        end
       end
     end
     properties

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

@@ -179,9 +179,23 @@ module Puppet::Util::Windows::File
 
   def self.get_reparse_point_data(handle, &block)
     # must be multiple of 1024, min 10240
-    FFI::MemoryPointer.new(REPARSE_DATA_BUFFER.size) do |reparse_data_buffer_ptr|
+    FFI::MemoryPointer.new(MAXIMUM_REPARSE_DATA_BUFFER_SIZE) do |reparse_data_buffer_ptr|
       device_io_control(handle, FSCTL_GET_REPARSE_POINT, nil, reparse_data_buffer_ptr)
-      yield REPARSE_DATA_BUFFER.new(reparse_data_buffer_ptr)
+
+      reparse_tag = reparse_data_buffer_ptr.read_win32_ulong
+      buffer_type = case reparse_tag
+      when 0xA000000C
+        SYMLINK_REPARSE_DATA_BUFFER
+      when 0xA0000003
+        MOUNT_POINT_REPARSE_DATA_BUFFER
+      when 0x80000014
+        raise Puppet::Util::Windows::Error.new("Retrieving NFS reparse point data is unsupported")
+      else
+        raise Puppet::Util::Windows::Error.new("DeviceIoControl(#{handle}, " +
+          "FSCTL_GET_REPARSE_POINT) returned unknown tag 0x#{reparse_tag.to_s(16).upcase}")
+      end
+
+      yield buffer_type.new(reparse_data_buffer_ptr)
     end
 
     # underlying struct MemoryPointer has been cleaned up by this point, nothing to return
@@ -448,11 +462,11 @@ module Puppet::Util::Windows::File
 
   MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
 
-  # REPARSE_DATA_BUFFER
+  # SYMLINK_REPARSE_DATA_BUFFER
   # https://msdn.microsoft.com/en-us/library/cc232006.aspx
   # https://msdn.microsoft.com/en-us/library/windows/hardware/ff552012(v=vs.85).aspx
   # struct is always MAXIMUM_REPARSE_DATA_BUFFER_SIZE bytes
-  class REPARSE_DATA_BUFFER < FFI::Struct
+  class SYMLINK_REPARSE_DATA_BUFFER < FFI::Struct
     layout :ReparseTag, :win32_ulong,
            :ReparseDataLength, :ushort,
            :Reserved, :ushort,
@@ -466,6 +480,23 @@ module Puppet::Util::Windows::File
            :PathBuffer, [:byte, MAXIMUM_REPARSE_DATA_BUFFER_SIZE - 20]
   end
 
+  # MOUNT_POINT_REPARSE_DATA_BUFFER
+  # https://msdn.microsoft.com/en-us/library/cc232007.aspx
+  # https://msdn.microsoft.com/en-us/library/windows/hardware/ff552012(v=vs.85).aspx
+  # struct is always MAXIMUM_REPARSE_DATA_BUFFER_SIZE bytes
+  class MOUNT_POINT_REPARSE_DATA_BUFFER < FFI::Struct
+    layout :ReparseTag, :win32_ulong,
+           :ReparseDataLength, :ushort,
+           :Reserved, :ushort,
+           :SubstituteNameOffset, :ushort,
+           :SubstituteNameLength, :ushort,
+           :PrintNameOffset, :ushort,
+           :PrintNameLength, :ushort,
+           # max less above fields dword / uint 4 bytes, ushort 2 bytes
+           # technically a WCHAR buffer, but we care about size in bytes here
+           :PathBuffer, [:byte, MAXIMUM_REPARSE_DATA_BUFFER_SIZE - 16]
+  end
+
   # https://msdn.microsoft.com/en-us/library/windows/desktop/aa364980(v=vs.85).aspx
   # DWORD WINAPI GetLongPathName(
   #   _In_  LPCTSTR lpszShortPath,

data/lib/puppet/vendor/semantic_puppet/lib/semantic_puppet.rb

@@ -1,5 +1,5 @@
 module SemanticPuppet
-  Puppet::GettextConfig.initialize(File.absolute_path('../locales', File.dirname(__FILE__)), :po)
+  Puppet::GettextConfig.load_translations('semantic_puppet', File.absolute_path('../locales', File.dirname(__FILE__)), :po)
 
   autoload :Version, 'semantic_puppet/version'
   autoload :VersionRange, 'semantic_puppet/version_range'

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

data/locales/ja/puppet.po

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 5.1.0-138-g2088f82\n"
+"Project-Id-Version: Puppet automation framework 5.3.2-73-g035eee5\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2017-09-06 15:11+0000\n"
-"PO-Revision-Date: 2017-09-06 15:11+0000\n"
+"POT-Creation-Date: 2017-10-25 23:09+0000\n"
+"PO-Revision-Date: 2017-10-25 23:09+0000\n"
 "Last-Translator: sayaka inagaki <sayaka-inagaki@to-in.co.jp>, 2017\n"
 "Language-Team: Japanese (Japan) (https://www.transifex.com/puppet/teams/29089/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Puppet %{version} requires ruby 1.9.3 or greater."
 msgstr "Puppet %{version}ではruby 1.9.3以上が必要です。"
 
-#: ../lib/puppet.rb:134
+#: ../lib/puppet.rb:133
 msgid ""
 "Support for ruby version %{version} is deprecated and will be removed in a "
 "future release. See "
@@ -32,14 +32,14 @@ msgid ""
 msgstr ""
 "rubyバージョン%{version}のサポートは廃止予定であり、今後のリリースで廃止されます。サポートされているrubyのバージョンについては、https://docs.puppet.com/puppet/latest/system_requirements.html#rubyを参照してください。"
 
-#: ../lib/puppet.rb:181
+#: ../lib/puppet.rb:180
 msgid ""
 "Creating %{name} via Puppet.newtype is deprecated and will be removed in a "
 "future release. Use Puppet::Type.newtype instead."
 msgstr ""
 "Puppet.newtypeによる%{name}の作成は廃止予定であり、今後のリリースで廃止されます。代わりにPuppet::Type.newtypeを使用してください。"
 
-#: ../lib/puppet.rb:200
+#: ../lib/puppet.rb:199
 msgid "The environmentpath setting cannot be empty or nil."
 msgstr "environmentpath設定は空やゼロにはできません。"
 
@@ -229,15 +229,15 @@ msgstr "リソース型に関するヘルプを表示"
 msgid "Manage remote network devices"
 msgstr "リモートネットワークデバイスを管理"
 
-#: ../lib/puppet/application/device.rb:197
+#: ../lib/puppet/application/device.rb:204
 msgid "Target device / certificate '%{target}' not found in %{config}"
 msgstr "ターゲットのデバイス/証明書'%{target}'が%{config}で見つかりません。"
 
-#: ../lib/puppet/application/device.rb:199
+#: ../lib/puppet/application/device.rb:206
 msgid "No device found in %{config}"
 msgstr "デバイスが%{config}で見つかりません。"
 
-#: ../lib/puppet/application/device.rb:209
+#: ../lib/puppet/application/device.rb:216
 msgid ""
 "starting applying configuration to %{target} at "
 "%{scheme}%{url_host}%{port}%{url_path}"
@@ -2303,44 +2303,49 @@ msgid ""
 "master '%{master_type}'."
 msgstr "agent '%{agent_type}'と'%{master_type}'に共通するチェックサムタイプが見つかりません。"
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:273
-msgid "Compiled %s for "
-msgstr "コンパイルしました%s"
+#: ../lib/puppet/indirector/catalog/compiler.rb:275
+msgid "Compiled static catalog for %{node} in environment %{environment}"
+msgstr "Environment%{environment}で%{node}の静的なカタログをコンパイルしました。"
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:273
-msgid "static catalog"
-msgstr "静的カタログ"
+#: ../lib/puppet/indirector/catalog/compiler.rb:277
+msgid "Compiled static catalog for %{node}"
+msgstr "ノード%{node}の静的なカタログをコンパイルしました。"
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:273
-msgid "catalog"
-msgstr "カタログ"
+#: ../lib/puppet/indirector/catalog/compiler.rb:281
+msgid "Compiled catalog for %{node} in environment %{environment}"
+msgstr "Environment%{environment}で%{node}のカタログをコンパイルしました。"
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:275
-#: ../lib/puppet/indirector/catalog/compiler.rb:292
-msgid " in environment %{env}"
-msgstr "環境%{env}内"
+#: ../lib/puppet/indirector/catalog/compiler.rb:283
+msgid "Compiled catalog for %{node}"
+msgstr "ノード%{node}のカタログをコンパイルしました。"
+
+#: ../lib/puppet/indirector/catalog/compiler.rb:302
+msgid ""
+"Inlined resource metadata into static catalog for %{node} in environment "
+"%{environment}"
+msgstr "Environment%{environment}で%{node}の静的なカタログにリソースメタデータを追加しました。"
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:291
+#: ../lib/puppet/indirector/catalog/compiler.rb:304
 msgid "Inlined resource metadata into static catalog for %{node}"
 msgstr "リソースメタデータを%{node}の静的カタログにインライン展開しました。"
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:308
+#: ../lib/puppet/indirector/catalog/compiler.rb:321
 msgid "Found node information"
 msgstr "ノード情報が見つかりました。"
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:316
+#: ../lib/puppet/indirector/catalog/compiler.rb:329
 msgid "Failed when searching for node %{name}: %{detail}"
 msgstr "ノード%{name}の検索中に不具合が生じました: %{detail}"
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:335
+#: ../lib/puppet/indirector/catalog/compiler.rb:348
 msgid "Invalid option use_node for a remote request"
 msgstr "リモートリクエストの無効なオプションuse_node "
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:353
+#: ../lib/puppet/indirector/catalog/compiler.rb:366
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr "ノード'%{name}'が見つかりませんでした; コンパイルできません。"
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:371
+#: ../lib/puppet/indirector/catalog/compiler.rb:384
 msgid "Could not retrieve fact %{fact}"
 msgstr "fact %{fact}を取得できませんでした。"
 
@@ -3621,22 +3626,49 @@ msgstr "アプリケーション%{app}が複数のノードをコンポーネン
 msgid "Unknown content encoding - %{encoding}"
 msgstr "不明なコンテンツエンコーディング - %{encoding}"
 
-#: ../lib/puppet/network/http/connection.rb:54
+#: ../lib/puppet/network/http/connection.rb:55
 msgid "Unrecognized option(s): %{opts}"
 msgstr "認識されていないオプション: %{opts}"
 
-#: ../lib/puppet/network/http/connection.rb:200
+#: ../lib/puppet/network/http/connection.rb:203
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr "%{host}のHTTPリダイレクションが多すぎます:%{port}"
 
-#: ../lib/puppet/network/http/connection.rb:227
-msgid "one of %{certnames}"
-msgstr "%{certnames}の1つ"
+#. TRANSLATORS: Used in the phrase:
+#. "Received a response from the remote server."
+#: ../lib/puppet/network/http/connection.rb:234
+msgid "the remote server"
+msgstr "リモートサーバー"
 
-#: ../lib/puppet/network/http/connection.rb:228
+#: ../lib/puppet/network/http/connection.rb:238
 msgid ""
-"Server hostname '%{host}' did not match server certificate; expected %{msg}"
-msgstr "サーバホスト名'%{host}'がサーバ証明書と一致しませんでした; %{msg}が予期されています。"
+"Received a %{status_code} response from %{server_hostname}, but the Retry-"
+"After header value of \"%{retry_after}\" could not be converted to an "
+"integer or RFC 2822 date."
+msgstr ""
+"%{server_hostname}から%{status_code}応答を受信しましたが、\"%{retry_after}\"のRetry-"
+"Afterヘッダ値を整数またはRFC 2822日付に変換できませんでした。"
+
+#: ../lib/puppet/network/http/connection.rb:249
+msgid ""
+"Received a %{status_code} response from %{server_hostname}. Sleeping for "
+"%{retry_sleep} seconds before retrying the request."
+msgstr ""
+"%{server_hostname}から%{status_code}応答を受信しました。リクエストを再試行する前に%{retry_sleep}秒間スリープ中です。"
+
+#: ../lib/puppet/network/http/connection.rb:320
+msgid "expected one of %{certnames}"
+msgstr "想定される%{certnames}の1つ"
+
+#: ../lib/puppet/network/http/connection.rb:322
+msgid "expected %{certname}"
+msgstr "想定される%{certname}"
+
+#: ../lib/puppet/network/http/connection.rb:325
+msgid ""
+"Server hostname '%{host}' did not match server certificate; "
+"%{expected_certnames}"
+msgstr "サーバーホスト名'%{host}'がサーバー証明書; %{expected_certnames}と一致しませんでした"
 
 #: ../lib/puppet/network/http/error.rb:23
 msgid "Not Acceptable: "
@@ -3938,10 +3970,6 @@ msgstr "%{app}の無効なノードマッピング: マッピングはハッシ
 msgid "Invalid node mapping in %{app}: Key %{k} is not a Node"
 msgstr "%{app}で無効なノードマッピング: キー%{k}はノードではありません。"
 
-#: ../lib/puppet/parser/compiler.rb:322
-msgid "Node"
-msgstr "ノード"
-
 #: ../lib/puppet/parser/compiler.rb:325
 msgid "Invalid node mapping in %{app}: Value %{res} is not a resource"
 msgstr "%{app}で無効なノードマッピング: 値%{res}はリソースではありません。"
@@ -4030,11 +4058,11 @@ msgstr "環境コンパイル: mainが検証されました。"
 
 #: ../lib/puppet/parser/environment_compiler.rb:66
 msgid "Env Compile: Evaluated site"
-msgstr "環境コンパイル: siteを検証"
+msgstr "環境コンパイル: siteが検証されました。"
 
 #: ../lib/puppet/parser/environment_compiler.rb:68
 msgid "Env Compile: Evaluated application instances"
-msgstr "環境コンパイル: アプリケーションインスタンスを検証"
+msgstr "環境コンパイル: アプリケーションインスタンスが検証されました。"
 
 #: ../lib/puppet/parser/environment_compiler.rb:70
 msgid "Env Compile: Prune"
@@ -4058,7 +4086,7 @@ msgstr "環境コンパイラ: 検証するsite定義が見つかりませんで
 
 #: ../lib/puppet/parser/environment_compiler.rb:162
 msgid "Evaluated application %{resource}"
-msgstr "検証されたアプリケーション%{resource}"
+msgstr "アプリケーション%{resource}が検証されました。"
 
 #: ../lib/puppet/parser/functions.rb:149
 msgid "Overwriting previous definition for function %{name}"
@@ -4170,7 +4198,7 @@ msgstr "%{resource}により指定されたステージ%{stage}が見つかり
 
 #: ../lib/puppet/parser/resource.rb:71
 msgid "Evaluated resource %{res}"
-msgstr "検証されたリソース%{res}"
+msgstr "Resource%{res}が検証されました。"
 
 #: ../lib/puppet/parser/resource.rb:125
 msgid "Resources require a hash as last argument"
@@ -5296,10 +5324,6 @@ msgid ""
 "'%{type_name}' - it is empty"
 msgstr "%{source_ref}からロードしたコードでは、リソースタイプ'%{type_name}'は作成されません - 空です。"
 
-#: ../lib/puppet/pops/loader/puppet_resource_type_impl_instantiator.rb:44
-msgid "new"
-msgstr "新規"
-
 #: ../lib/puppet/pops/loader/puppet_resource_type_impl_instantiator.rb:49
 msgid ""
 "The code loaded from %{source_ref} does not create the resource type "
@@ -5435,10 +5459,6 @@ msgid ""
 "converted to version 5"
 msgstr "%{config_path}: 'hiera.yaml'バージョン4の使用は廃止予定です。バージョン5に変換する必要があります。"
 
-#: ../lib/puppet/pops/lookup/hiera_config.rb:588
-msgid "data"
-msgstr "データ"
-
 #: ../lib/puppet/pops/lookup/invocation.rb:84
 msgid "Recursive lookup detected in [%{name_stack}]"
 msgstr "[%{name_stack}]で再帰検索が検出されました。"
@@ -5682,7 +5702,7 @@ msgstr "%{klass}をタイムスタンプから引くことはできません。"
 msgid "Enumeration.enumerator is deprecated. Use Iterable.on instead"
 msgstr "Enumeration.enumeratorは廃止予定です。代わりにIterable.onを使用してください。"
 
-#: ../lib/puppet/pops/types/p_binary_type.rb:70
+#: ../lib/puppet/pops/types/p_binary_type.rb:77
 msgid ""
 "The given string in encoding '%{enc}' is invalid. Cannot create a Binary "
 "UTF-8 representation"
@@ -5703,7 +5723,7 @@ msgid ""
 "%{subject}.new()"
 msgstr "タイプ'%{type}'は、%{subject}.new()の有効なパラメータセットを表していません。"
 
-#: ../lib/puppet/pops/types/p_object_type.rb:604
+#: ../lib/puppet/pops/types/p_object_type.rb:610
 msgid "reference to unresolved type '%{name}'"
 msgstr "unresolved type '%{name}'への参照"
 
@@ -6804,6 +6824,12 @@ msgstr "無効なautosign値%{value}: 'true'/'false'または絶対パスでな
 msgid "Invalid value '%{value}' for boolean parameter: %{name}"
 msgstr "ブーリアンパラメータに関して無効な値'%{value}': %{name}"
 
+#: ../lib/puppet/settings/certificate_revocation_setting.rb:18
+msgid ""
+"Invalid certificate revocation value %{value}: must be one of 'true', "
+"'chain', 'leaf', or 'false'"
+msgstr "無効な証明書失効値%{value}です: 'true'、'chain'、'leaf'、または'false'のいずれかである必要があります"
+
 #: ../lib/puppet/settings/config_file.rb:38
 msgid "Could not match line %{text}"
 msgstr "行%{text}が一致しませんでした。"
@@ -7149,10 +7175,6 @@ msgstr "%{path}に予期せぬ属性%{keys}"
 msgid "Creating a new certificate revocation list"
 msgstr "新しい証明書撤回リストを作成しています。"
 
-#: ../lib/puppet/ssl/certificate_revocation_list.rb:42
-msgid "crl"
-msgstr "crl"
-
 #: ../lib/puppet/ssl/certificate_revocation_list.rb:49
 msgid "Revoked certificate with serial %{serial}"
 msgstr "シリアル%{serial}の証明書を撤回しました。"
@@ -7219,22 +7241,28 @@ msgstr ""
 "  1b. Windows: del \"%{cert_dir}\\\\%{cert_name}.pem\" /f\n"
 "  2. puppet agent -t\n"
 
-#: ../lib/puppet/ssl/host.rb:347 ../lib/puppet/ssl/host.rb:368
+#: ../lib/puppet/ssl/host.rb:333 ../lib/puppet/ssl/host.rb:354
 msgid "Could not request certificate: %{message}"
 msgstr "証明書をリクエストできませんでした: %{message}"
 
-#: ../lib/puppet/ssl/host.rb:349
+#: ../lib/puppet/ssl/host.rb:335
 msgid "Exiting; failed to retrieve certificate and waitforcert is disabled"
 msgstr "終了しています; 証明書の取得に失敗し、waitforcertが無効になっています。"
 
-#: ../lib/puppet/ssl/host.rb:358
+#: ../lib/puppet/ssl/host.rb:344
 msgid "Exiting; no certificate found and waitforcert is disabled"
 msgstr "終了しています; 証明書が見つからず、waitforcertが無効になっています。"
 
-#: ../lib/puppet/ssl/host.rb:366
+#: ../lib/puppet/ssl/host.rb:352
 msgid "Did not receive certificate"
 msgstr "証明書を受信していません。"
 
+#: ../lib/puppet/ssl/host.rb:393
+msgid ""
+"Certificate revocation checking is enabled but a CRL cannot be found; CRL "
+"checking will not be performed."
+msgstr "証明書失効チェックが有効化されていますがCRLが見つかりません; CRLチェックは実行されません。"
+
 #: ../lib/puppet/ssl/inventory.rb:32
 msgid "Rebuilding inventory file"
 msgstr "インベントリファイルを再構築しています。"
@@ -8996,11 +9024,11 @@ msgstr "FormatMessageWがコード%{code}のバッファの割り当てに失敗
 msgid "Failed to set file attributes"
 msgstr "ファイル属性の設定に失敗しました。"
 
-#: ../lib/puppet/util/windows/file.rb:193
+#: ../lib/puppet/util/windows/file.rb:207
 msgid "out_buffer is required"
 msgstr "out_bufferが必要です。"
 
-#: ../lib/puppet/util/windows/file.rb:274
+#: ../lib/puppet/util/windows/file.rb:288
 msgid "Failed to call GetLongPathName"
 msgstr "GetLongPathNameのコールに失敗しました。"