diff --git a/locales/ja/puppetlabs-apt.po b/locales/ja/puppetlabs-apt.po
index b5f4765..aa6b266 100644
--- a/locales/ja/puppetlabs-apt.po
+++ b/locales/ja/puppetlabs-apt.po
@@ -1,155 +1,155 @@
 # #-#-#-#-#  puppetlabs-apt.pot (puppetlabs-apt 6.0.0-27-gbb0f842)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2018 Puppet, Inc.
 # This file is distributed under the same license as the puppetlabs-apt package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
-# 
+#
 # #-#-#-#-#  puppetlabs-apt_metadata.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21T09:17:39+01:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Eriko Kashiwagi <eriko.55@d5.dion.ne.jp>, 2018\n"
 "Language-Team: Japanese (Japan) (https://www.transifex.com/puppet/teams/41915/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Translate Toolkit 2.0.0\n"
 
 #. ./manifests/backports.pp:69
 msgid ""
 "If not on Debian or Ubuntu, you must explicitly pass location, release, "
 "repos, and key"
 msgstr "DebianまたはUbuntu以外の場合、場所、リリース、リポジトリ、およびキーを明示的に渡す必要があります。"
 
 #. ./manifests/backports.pp:95
 msgid "pin must be either a string, number or hash"
 msgstr "pinは、文字列、数値またはハッシュのいずれかである必要があります。"
 
 #. ./manifests/conf.pp:25
 msgid "Need to pass in content parameter"
 msgstr "contentパラメータを渡す必要があります。"
 
 #. ./manifests/init.pp:143 ./manifests/params.pp:8
 msgid "This module only works on Debian or derivatives like Ubuntu"
 msgstr "本モジュールは、DebianまたはUbuntuなどの派生OSでのみ動作します。"
 
 #. ./manifests/key.pp:47
 msgid "key with id %{_id} already ensured as absent"
 msgstr "id %{_id}のキーは、存在しないことが既に確認されています。"
 
 #. ./manifests/key.pp:81
 msgid "key with id %{_id} already ensured as present"
 msgstr "id %{_id}のキーは、存在することが既に確認されています。"
 
 #. ./manifests/key.pp:97
 msgid "Invalid 'ensure' value '%{_ensure}' for apt::key"
 msgstr "apt::keyの'%{_ensure}'の'ensure'の値が無効です。"
 
 #. ./manifests/params.pp:100
 msgid "Unable to determine value for fact os[\"name\"]"
 msgstr "fact os[\"name\"]の値を特定できません。"
 
 #. ./manifests/pin.pp:84
 msgid "parameters release, origin, and version are mutually exclusive"
 msgstr "パラメータrelease、origin、versionは相互に排他的です。"
 
 #. ./manifests/pin.pp:88
 msgid "parameter version cannot be used in general form"
 msgstr "パラメータのバージョンは、一般的な形式では使用できません"
 
 #. ./manifests/pin.pp:91
 msgid "parameters release and origin are mutually exclusive"
 msgstr "パラメータreleaseとoriginは相互に排他的です。"
 
 #. ./manifests/ppa.pp:30 ./manifests/source.pp:79
 msgid "lsbdistcodename fact not available: release parameter required"
 msgstr "lsbdistcodenameのfactが使用できません。releaseパラメータが必要です。"
 
 #. ./manifests/ppa.pp:34
 msgid "apt::ppa is not currently supported on Debian."
 msgstr "apt::ppaは、現在Debianではサポートされていません。"
 
 #. ./manifests/setting.pp:31
 msgid "apt::setting cannot have both content and source"
 msgstr "apt::settingがcontentとsourceの両方を持つことはできません。"
 
 #. ./manifests/setting.pp:35
 msgid "apt::setting needs either of content or source"
 msgstr "apt::settingには、contentまたはsourceのいずれかが必要です。"
 
 #. ./manifests/setting.pp:43
 msgid ""
 "apt::setting resource name/title must start with either 'conf-', 'pref-' or "
 "'list-'"
 msgstr "apt::settingのリソース名/タイトルの先頭は、'conf-'、'pref-'、'list-'にする必要があります。"
 
 #. ./manifests/setting.pp:49
 msgid "apt::setting priority must be an integer or a zero-padded integer"
 msgstr "apt::settingのpriorityは、整数またはゼロパディングされた整数にする必要があります。"
 
 #. ./manifests/source.pp:87
 msgid "cannot create a source entry without specifying a location"
 msgstr "場所を指定せずにソースエントリを作成することはできません。"
 
 #. ./manifests/source.pp:101
 msgid "key hash must contain at least an id entry"
 msgstr "キーハッシュには、少なくともidエントリを含める必要があります。"
 
 #. ./manifests/source.pp:140
 msgid "Received invalid value for pin parameter"
 msgstr "pinパラメータに無効な値を受信しました。"
 
 #: ../lib/puppet/provider/apt_key/apt_key.rb:124
 msgid "The file %{_value} does not exist"
 msgstr "ファイル%{_value}が存在しません。"
 
 #: ../lib/puppet/provider/apt_key/apt_key.rb:144
 msgid "%{_e} for %{_resource}"
 msgstr "%{_resource}の%{_e}"
 
 #: ../lib/puppet/provider/apt_key/apt_key.rb:146
 msgid "could not resolve %{_resource}"
 msgstr "%{_resource}を解決できませんでした。"
 
 #: ../lib/puppet/provider/apt_key/apt_key.rb:173
 msgid ""
 "The id in your manifest %{_resource} and the fingerprint from content/source"
 " don't match. Check for an error in the id and content/source is legitimate."
 msgstr ""
 "マニフェスト%{_resource}に含まれるidと、content/sourceのフィンガープリントが一致しません。idに間違いがないか、content/sourceが正当であるかを確認してください。"
 
 #: ../lib/puppet/provider/apt_key/apt_key.rb:191
 #: ../lib/puppet/provider/apt_key/apt_key.rb:227
 msgid ""
 "an unexpected condition occurred while trying to add the key: %{_resource}"
 msgstr "キー%{_resource}の追加中に、予期しない状況が発生しました。"
 
 #: ../lib/puppet/provider/apt_key/apt_key.rb:243
 msgid "This is a read-only property."
 msgstr "これは、読み込み専用のプロパティです。"
 
 #: ../lib/puppet/type/apt_key.rb:27
 msgid "ensure => absent and refresh => true are mutually exclusive"
 msgstr "ensure => absentとrefresh => trueは相互に排他的です。"
 
 #: ../lib/puppet/type/apt_key.rb:30
 msgid "The properties content and source are mutually exclusive."
 msgstr "プロパティcontentとsourceは相互に排他的です。 are mutually exclusive."
 
 #: ../lib/puppet/type/apt_key.rb:33
 msgid "The id should be a full fingerprint (40 characters), see README."
 msgstr "idは完全なフィンガープリント(40文字)である必要があります。READMEを参照してください。"
 
 #. metadata.json
 #: .summary
 msgid ""
 "Provides an interface for managing Apt source, key, and definitions with "
 "Puppet"
 msgstr "Aptソース、キー、および定義をPuppetで管理するためのインターフェースを提供します。"
diff --git a/manifests/backports.pp b/manifests/backports.pp
index 21f1251..b3cb74b 100644
--- a/manifests/backports.pp
+++ b/manifests/backports.pp
@@ -1,113 +1,112 @@
 # @summary Manages backports.
 #
 # @example Set up a backport source for Linux Mint qiana
 #   class { 'apt::backports':
 #     location => 'http://us.archive.ubuntu.com/ubuntu',
 #     release  => 'trusty-backports',
 #     repos    => 'main universe multiverse restricted',
 #     key      => {
 #       id     => '630239CC130E1A7FD81A27B140976EAF437D05B5',
 #       server => 'hkps.pool.sks-keyservers.net',
 #     },
 #   }
 #
 # @param location
-#   Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Default value for Debian and 
+#   Specifies an Apt repository containing the backports to manage. Valid options: a string containing a URL. Default value for Debian and
 #   Ubuntu varies:
 #
 #   - Debian: 'http://deb.debian.org/debian'
 #
 #   - Ubuntu: 'http://archive.ubuntu.com/ubuntu'
 #
 # @param release
-#   Specifies a distribution of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file. 
-#   Default: on Debian and Ubuntu, '${lsbdistcodename}-backports'. We recommend keeping this default, except on other operating 
+#   Specifies a distribution of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file.
+#   Default: on Debian and Ubuntu, '${lsbdistcodename}-backports'. We recommend keeping this default, except on other operating
 #   systems.
 #
 # @param repos
-#   Specifies a component of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file. 
+#   Specifies a component of the Apt repository containing the backports to manage. Used in populating the `source.list` configuration file.
 #   Default value for Debian and Ubuntu varies:
-#   
+#
 #   - Debian: 'main contrib non-free'
 #
 #   - Ubuntu: 'main universe multiverse restricted'
 #
 # @param key
-#   Specifies a key to authenticate the backports. Valid options: a string to be passed to the id parameter of the apt::key defined type, or a 
+#   Specifies a key to authenticate the backports. Valid options: a string to be passed to the id parameter of the apt::key defined type, or a
 #   hash of parameter => value pairs to be passed to apt::key's id, server, content, source, and/or options parameters. Default value
 #   for Debian and Ubuntu varies:
 #
 #   - Debian: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553'
 #
 #   - Ubuntu: '630239CC130E1A7FD81A27B140976EAF437D05B5'
 #
 # @param pin
-#   Specifies a pin priority for the backports. Valid options: a number or string to be passed to the `id` parameter of the `apt::pin` defined 
+#   Specifies a pin priority for the backports. Valid options: a number or string to be passed to the `id` parameter of the `apt::pin` defined
 #   type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters.
 #
 # @param include
 #   Specifies whether to include 'deb' or 'src', or both.
 #
 class apt::backports (
   Optional[String] $location                    = undef,
   Optional[String] $release                     = undef,
   Optional[String] $repos                       = undef,
   Optional[Variant[String, Hash]] $key          = undef,
   Optional[Variant[Integer, String, Hash]] $pin = 200,
   Optional[Variant[Hash]] $include              = {},
-){
-
+) {
   include apt
 
   if $location {
     $_location = $location
   }
   if $release {
     $_release = $release
   }
   if $repos {
     $_repos = $repos
   }
   if $key {
     $_key = $key
   }
   if (!($facts['lsbdistid'] == 'Debian' or $facts['lsbdistid'] == 'Ubuntu')) {
     unless $location and $release and $repos and $key {
       fail(translate('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key'))
     }
   }
   unless $location {
     $_location = $::apt::backports['location']
   }
   unless $release {
     $_release = "${facts['lsbdistcodename']}-backports"
   }
   unless $repos {
     $_repos = $::apt::backports['repos']
   }
   unless $key {
     $_key =  $::apt::backports['key']
   }
 
   if $pin =~ Hash {
     $_pin = $pin
   } elsif $pin =~ Numeric or $pin =~ String {
     # apt::source defaults to pinning to origin, but we should pin to release
     # for backports
     $_pin = {
       'priority' => $pin,
       'release'  => $_release,
     }
   } else {
     fail(translate('pin must be either a string, number or hash'))
   }
 
   apt::source { 'backports':
     location => $_location,
     release  => $_release,
     repos    => $_repos,
     include  => $include,
     key      => $_key,
     pin      => $_pin,
   }
 }
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index ba05485..f7c78fc 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,104 +1,104 @@
 # @summary Manages PPA repositories using `add-apt-repository`. Not supported on Debian.
 #
 # @example Example declaration of an Apt PPA
 #   apt::ppa{ 'ppa:openstack-ppa/bleeding-edge': }
 #
 # @param ensure
-#   Specifies whether the PPA should exist. Valid options: 'present' and 'absent'. 
+#   Specifies whether the PPA should exist. Valid options: 'present' and 'absent'.
 #
 # @param options
 #   Supplies options to be passed to the `add-apt-repository` command. Default: '-y'.
 #
 # @param release
-#   Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint). 
+#   Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint).
 #   Specifies the operating system of your node. Valid options: a string containing a valid LSB distribution codename.
 #
 # @param dist
-#   Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint). 
+#   Optional if lsb-release is installed (unless you're using a different release than indicated by lsb-release, e.g., Linux Mint).
 #   Specifies the distribution of your node. Valid options: a string containing a valid distribution codename.
 #
 # @param package_name
 #   Names the package that provides the `apt-add-repository` command. Default: 'software-properties-common'.
 #
 # @param package_manage
 #   Specifies whether Puppet should manage the package that provides `apt-add-repository`.
 #
 define apt::ppa(
   String $ensure                 = 'present',
   Optional[String] $options      = $::apt::ppa_options,
   Optional[String] $release      = $facts['lsbdistcodename'],
   Optional[String] $dist         = $facts['lsbdistid'],
   Optional[String] $package_name = $::apt::ppa_package,
   Boolean $package_manage        = false,
 ) {
   unless $release {
     fail(translate('lsbdistcodename fact not available: release parameter required'))
   }
 
   if $dist == 'Debian' {
     fail(translate('apt::ppa is not currently supported on Debian.'))
   }
 
   if versioncmp($facts['lsbdistrelease'], '14.10') >= 0 {
     $distid = downcase($dist)
     $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-${distid}-\\2")
     $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_${distid}_\\2")
   } else {
     $dash_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1-\\2")
     $underscore_filename = regsubst($name, '^ppa:([^/]+)/(.+)$', "\\1_\\2")
   }
 
   $dash_filename_no_slashes      = regsubst($dash_filename, '/', '-', 'G')
   $dash_filename_no_specialchars = regsubst($dash_filename_no_slashes, '[\.\+]', '_', 'G')
   $underscore_filename_no_slashes      = regsubst($underscore_filename, '/', '-', 'G')
   $underscore_filename_no_specialchars = regsubst($underscore_filename_no_slashes, '[\.\+]', '_', 'G')
 
   $sources_list_d_filename  = "${dash_filename_no_specialchars}-${release}.list"
 
   if versioncmp($facts['lsbdistrelease'], '15.10') >= 0 {
     $trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"
   } else {
     $trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"
   }
 
   if $ensure == 'present' {
     if $package_manage {
       ensure_packages($package_name)
       $_require = [File['sources.list.d'], Package[$package_name]]
     } else {
       $_require = File['sources.list.d']
     }
 
     $_proxy = $::apt::_proxy
     if $_proxy['host'] {
       if $_proxy['https'] {
         $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}", "https_proxy=https://${$_proxy['host']}:${$_proxy['port']}"]
       } else {
         $_proxy_env = ["http_proxy=http://${$_proxy['host']}:${$_proxy['port']}"]
       }
     } else {
       $_proxy_env = []
     }
 
     exec { "add-apt-repository-${name}":
       environment => $_proxy_env,
       command     => "/usr/bin/add-apt-repository ${options} ${name} || (rm ${::apt::sources_list_d}/${sources_list_d_filename} && false)",
       unless      => "/usr/bin/test -f ${::apt::sources_list_d}/${sources_list_d_filename} && /usr/bin/test -f ${::apt::trusted_gpg_d}/${trusted_gpg_d_filename}",
       user        => 'root',
       logoutput   => 'on_failure',
       notify      => Class['apt::update'],
       require     => $_require,
     }
 
     file { "${::apt::sources_list_d}/${sources_list_d_filename}":
       ensure  => file,
       require => Exec["add-apt-repository-${name}"],
     }
   }
   else {
     file { "${::apt::sources_list_d}/${sources_list_d_filename}":
       ensure => 'absent',
       notify => Class['apt::update'],
     }
   }
 }
diff --git a/manifests/source.pp b/manifests/source.pp
index 365ba13..8cbde99 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,173 +1,173 @@
 # @summary Manages the Apt sources in /etc/apt/sources.list.d/.
 #
 # @example Install the puppetlabs apt source
 #   apt::source { 'puppetlabs':
 #     location => 'http://apt.puppetlabs.com',
 #     repos    => 'main',
 #     key      => {
 #       id     => '6F6B15509CF8E59E6E469F327F438280EF8D349F',
 #       server => 'hkps.pool.sks-keyservers.net',
 #     },
 #   }
 #
 # @param location
 #   Required, unless ensure is set to 'absent'. Specifies an Apt repository. Valid options: a string containing a repository URL.
 #
 # @param comment
 #   Supplies a comment for adding to the Apt source file.
 #
 # @param ensure
 #   Specifies whether the Apt source file should exist. Valid options: 'present' and 'absent'.
 #
 # @param release
 #   Specifies a distribution of the Apt repository.
 #
 # @param repos
 #   Specifies a component of the Apt repository.
 #
 # @param include
 #   Configures include options. Valid options: a hash of available keys.
-# 
+#
 # @option include [Boolean] :deb
 #   Specifies whether to request the distribution's compiled binaries. Default true.
 #
 # @option include [Boolean] :src
 #   Specifies whether to request the distribution's uncompiled source code. Default false.
 #
 # @param key
-#   Creates a declaration of the apt::key defined type. Valid options: a string to be passed to the `id` parameter of the `apt::key` 
-#   defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, and/or 
+#   Creates a declaration of the apt::key defined type. Valid options: a string to be passed to the `id` parameter of the `apt::key`
+#   defined type, or a hash of `parameter => value` pairs to be passed to `apt::key`'s `id`, `server`, `content`, `source`, and/or
 #   `options` parameters.
 #
 # @param pin
-#   Creates a declaration of the apt::pin defined type. Valid options: a number or string to be passed to the `id` parameter of the 
+#   Creates a declaration of the apt::pin defined type. Valid options: a number or string to be passed to the `id` parameter of the
 #   `apt::pin` defined type, or a hash of `parameter => value` pairs to be passed to `apt::pin`'s corresponding parameters.
 #
 # @param architecture
-#   Tells Apt to only download information for specified architectures. Valid options: a string containing one or more architecture names, 
-#   separated by commas (e.g., 'i386' or 'i386,alpha,powerpc'). Default: undef (if unspecified, Apt downloads information for all architectures 
+#   Tells Apt to only download information for specified architectures. Valid options: a string containing one or more architecture names,
+#   separated by commas (e.g., 'i386' or 'i386,alpha,powerpc'). Default: undef (if unspecified, Apt downloads information for all architectures
 #   defined in the Apt::Architectures option).
 #
 # @param allow_unsigned
 #   Specifies whether to authenticate packages from this release, even if the Release file is not signed or the signature can't be checked.
 #
 # @param notify_update
 #   Specifies whether to trigger an `apt-get update` run.
 #
 define apt::source(
   Optional[String] $location                    = undef,
   String $comment                               = $name,
   String $ensure                                = present,
   Optional[String] $release                     = undef,
   String $repos                                 = 'main',
   Optional[Variant[Hash]] $include              = {},
   Optional[Variant[String, Hash]] $key          = undef,
   Optional[Variant[Hash, Numeric, String]] $pin = undef,
   Optional[String] $architecture                = undef,
   Boolean $allow_unsigned                       = false,
   Boolean $notify_update                        = true,
 ) {
 
   include ::apt
 
   $_before = Apt::Setting["list-${title}"]
 
   if !$release {
     if $facts['lsbdistcodename'] {
       $_release = $facts['lsbdistcodename']
     } else {
       fail(translate('lsbdistcodename fact not available: release parameter required'))
     }
   } else {
     $_release = $release
   }
 
   if $ensure == 'present' {
     if ! $location {
       fail(translate('cannot create a source entry without specifying a location'))
     }
     elsif ($::apt::proxy['https_acng']) and ($location =~ /(?i:^https:\/\/)/) {
       $_location = regsubst($location, 'https://','http://HTTPS///')
     }
     else {
       $_location = $location
     }
     # Newer oses, do not need the package for HTTPS transport.
     $_transport_https_releases = [ 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial' ]
     if ($facts['lsbdistcodename'] in $_transport_https_releases) and $_location =~ /(?i:^https:\/\/)/ {
       ensure_packages('apt-transport-https')
     }
   } else {
     $_location = undef
   }
 
   $includes = merge($::apt::include_defaults, $include)
 
   if $key {
     if $key =~ Hash {
       unless $key['id'] {
         fail(translate('key hash must contain at least an id entry'))
       }
       $_key = merge($::apt::source_key_defaults, $key)
     } else {
       $_key = { 'id' => assert_type(String[1], $key) }
     }
   }
 
   $header = epp('apt/_header.epp')
 
   $sourcelist = epp('apt/source.list.epp', {
     'comment'          => $comment,
     'includes'         => $includes,
     'opt_architecture' => $architecture,
     'allow_unsigned'   => $allow_unsigned,
     'location'         => $_location,
     'release'          => $_release,
     'repos'            => $repos,
   })
 
   apt::setting { "list-${name}":
     ensure        => $ensure,
     content       => "${header}${sourcelist}",
     notify_update => $notify_update,
   }
 
   if $pin {
     if $pin =~ Hash {
       $_pin = merge($pin, { 'ensure' => $ensure, 'before' => $_before })
     } elsif ($pin =~ Numeric or $pin =~ String) {
       $url_split = split($location, '[:\/]+')
       $host      = $url_split[1]
       $_pin = {
         'ensure'   => $ensure,
         'priority' => $pin,
         'before'   => $_before,
         'origin'   => $host,
       }
     } else {
       fail(translate('Received invalid value for pin parameter'))
     }
     create_resources('apt::pin', { "${name}" => $_pin })
   }
 
   # We do not want to remove keys when the source is absent.
   if $key and ($ensure == 'present') {
     if $_key =~ Hash {
       if $_key['ensure'] != undef {
         $_ensure = $_key['ensure']
       } else {
         $_ensure = $ensure
       }
 
       apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}":
         ensure  => $_ensure,
         id      => $_key['id'],
         server  => $_key['server'],
         content => $_key['content'],
         source  => $_key['source'],
         options => $_key['options'],
         before  => $_before,
       }
     }
   }
 }