[opensuse-translation-commit] r90386 - trunk/yast/ja/po - openSUSE Translation Commits

29 Oct 2014

Author: keichwa
Date: 2014-10-29 16:38:48 +0100 (Wed, 29 Oct 2014)
New Revision: 90386

Modified:
   trunk/yast/ja/po/audit-laf.ja.po
   trunk/yast/ja/po/auth-client.ja.po
   trunk/yast/ja/po/auth-server.ja.po
   trunk/yast/ja/po/autoinst.ja.po
   trunk/yast/ja/po/base.ja.po
   trunk/yast/ja/po/bootloader.ja.po
   trunk/yast/ja/po/cluster.ja.po
   trunk/yast/ja/po/control.ja.po
   trunk/yast/ja/po/crowbar.ja.po
   trunk/yast/ja/po/drbd.ja.po
   trunk/yast/ja/po/ftp-server.ja.po
   trunk/yast/ja/po/geo-cluster.ja.po
   trunk/yast/ja/po/inetd.ja.po
   trunk/yast/ja/po/installation.ja.po
   trunk/yast/ja/po/instserver.ja.po
   trunk/yast/ja/po/iscsi-lio-server.ja.po
   trunk/yast/ja/po/isns.ja.po
   trunk/yast/ja/po/ldap.ja.po
   trunk/yast/ja/po/mail.ja.po
   trunk/yast/ja/po/network.ja.po
   trunk/yast/ja/po/packager.ja.po
   trunk/yast/ja/po/proxy.ja.po
   trunk/yast/ja/po/registration.ja.po
   trunk/yast/ja/po/s390.ja.po
   trunk/yast/ja/po/samba-server.ja.po
   trunk/yast/ja/po/security.ja.po
   trunk/yast/ja/po/services-manager.ja.po
   trunk/yast/ja/po/storage.ja.po
   trunk/yast/ja/po/vm.ja.po
Log:
merged

Modified: trunk/yast/ja/po/audit-laf.ja.po
===================================================================

--- trunk/yast/ja/po/audit-laf.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/audit-laf.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: audit-laf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:51+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-08-05 08:19+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -893,42 +893,58 @@
 
 #. question shown in a popup about start of audit daemon
 #: src/modules/AuditLaf.rb:463
-msgid "Do you want to start it and enable start at boot\n"
+#, fuzzy
+#| msgid "Do you want to start it and enable start at boot\n"
+msgid ""
+"Do you want to start it and enable start at boot\n"
+"or only start the daemon for now?"
 msgstr "今すぐ開始し、システムの起動時にも開始するように設定しますか？\n"
 
-#. question continues
-#: src/modules/AuditLaf.rb:467
+#: src/modules/AuditLaf.rb:466
 msgid "The daemon 'auditd' doesn't run.\n"
 msgstr "デーモン 'auditd' は動作しません。\n"
 
 #. message about loaded kernel module
-#: src/modules/AuditLaf.rb:471
-msgid "The 'apparmor' kernel module is loaded.\n"
-msgstr "'apparmor' カーネルモジュールが読み込まれています。\n"
+#: src/modules/AuditLaf.rb:470
+#, fuzzy
+#| msgid ""
+#| " The 'apparmor' kernel module is loaded.\n"
+#| "The kernel uses a running audit daemon to log audit\n"
+#| "events to /var/log/audit/audit.log (default). \n"
+#| "Do you want to start the daemon now?"
+msgid ""
+"The 'apparmor' kernel module is loaded.\n"
+"The kernel uses a running audit daemon to log audit\n"
+"events to /var/log/audit/audit.log (default).\n"
+msgstr ""
+"'apparmor' カーネルモジュールが読み込まれています。\n"
+"カーネルは監査イベントを /var/log/audit/audit.log (既定)\n"
+"に記録するため、起動中の監査デーモンを使用します。\n"
+"今すぐデーモンを起動しますか？"
 
 #. Headline of a popup
-#: src/modules/AuditLaf.rb:480
+#: src/modules/AuditLaf.rb:477
 msgid "Start of Audit Daemon"
 msgstr "監査デーモンの起動"
 
 #. label of three buttons belonging to the popup
-#: src/modules/AuditLaf.rb:482
+#: src/modules/AuditLaf.rb:479
 msgid "Start and &Enable"
 msgstr "開始して有効化する (&E)"
 
-#: src/modules/AuditLaf.rb:482
+#: src/modules/AuditLaf.rb:479
 msgid "&Start"
 msgstr "開始する (&S)"
 
-#: src/modules/AuditLaf.rb:482
+#: src/modules/AuditLaf.rb:479
 msgid "&Do not start"
 msgstr "開始しない (&D)"
 
-#: src/modules/AuditLaf.rb:491
+#: src/modules/AuditLaf.rb:488
 msgid "Cannot start the audit daemon."
 msgstr "監査デーモンを起動できません。"
 
-#: src/modules/AuditLaf.rb:492
+#: src/modules/AuditLaf.rb:489
 msgid ""
 "The rules may be locked.\n"
 "Continue to check the rules. You can change\n"
@@ -941,36 +957,36 @@
 "設定を変更したあとは再起動が必要になります。\n"
 
 #. Auditd read dialog caption
-#: src/modules/AuditLaf.rb:548
+#: src/modules/AuditLaf.rb:545
 msgid "Saving Audit Configuration"
 msgstr "監査設定を保存しています"
 
 #. Progress stage 1/2
-#: src/modules/AuditLaf.rb:564
+#: src/modules/AuditLaf.rb:561
 msgid "Write the settings"
 msgstr "設定の書き込み"
 
 #. Progress stage 2/2
-#: src/modules/AuditLaf.rb:566
+#: src/modules/AuditLaf.rb:563
 msgid "Write the rules"
 msgstr "ルールの書き込み"
 
 #. Progress step 1/2
-#: src/modules/AuditLaf.rb:570
+#: src/modules/AuditLaf.rb:567
 msgid "Writing the settings..."
 msgstr "設定を書き込んでいます..."
 
 #. Progress step 2/2
-#: src/modules/AuditLaf.rb:572
+#: src/modules/AuditLaf.rb:569
 msgid "Writing the rules..."
 msgstr "ルールを書き込んでいます..."
 
 #. check first whether rules are already locked
-#: src/modules/AuditLaf.rb:588
+#: src/modules/AuditLaf.rb:585
 msgid "The rules are already locked."
 msgstr "ルールは既にロック (施錠) されています。"
 
-#: src/modules/AuditLaf.rb:589
+#: src/modules/AuditLaf.rb:586
 msgid ""
 "Do you want to change the 'Enabled Flag'?\n"
 "If yes, the new rules will be written to /etc/audit/audit.rules.\n"
@@ -981,26 +997,29 @@
 "その後、システムを再起動する必要があります。\n"
 
 #. Error message
-#: src/modules/AuditLaf.rb:614
+#: src/modules/AuditLaf.rb:611
 msgid "Restart of the audit daemon failed."
 msgstr "監査デーモンの再起動に失敗しました。"
 
 #. Error message
-#: src/modules/AuditLaf.rb:621
+#: src/modules/AuditLaf.rb:618
 msgid "Cannot write settings to auditd.conf."
 msgstr "auditd.conf に設定を書き込めません"
 
 #. Error message, rules cannot be set
-#: src/modules/AuditLaf.rb:652
+#: src/modules/AuditLaf.rb:649
 msgid "Start yast2-audit-laf again and check the rules."
 msgstr "yast2-audit-laf を起動し直し、ルールを確認してください。"
 
-#: src/modules/AuditLaf.rb:658
+#: src/modules/AuditLaf.rb:655
 msgid "Cannot write settings to auditd.rules."
 msgstr "設定を auditd.rules に書き込めません。"
 
 #. Create a textual summary and a list of unconfigured cards
 #. @return summary of the current configuration
-#: src/modules/AuditLaf.rb:707
+#: src/modules/AuditLaf.rb:704
 msgid "Log file"
 msgstr "ログファイル"
+
+#~ msgid "The 'apparmor' kernel module is loaded.\n"
+#~ msgstr "'apparmor' カーネルモジュールが読み込まれています。\n"

Modified: trunk/yast/ja/po/auth-client.ja.po
===================================================================
--- trunk/yast/ja/po/auth-client.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/auth-client.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: auth-client\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:51+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-05-26 20:05+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -186,11 +186,13 @@
 
 #. Main dialog contents
 #: src/include/dialogs.rb:512
-msgid "SPAM Prevention"
-msgstr "SPAM 防御"
+#, fuzzy
+#| msgid "Authenticated Clients"
+msgid "Authentication Client"
+msgstr "認証済みのクライアント"
 
-#: src/include/dialogs.rb:526 src/include/dialogs.rb:580
-#: src/include/dialogs.rb:586
+#: src/include/dialogs.rb:526 src/include/dialogs.rb:599
+#: src/include/dialogs.rb:605
 msgid "Configured Authentication Domains"
 msgstr "設定済みの認証ドメイン"
 
@@ -213,871 +215,871 @@
 
 #. initialize GUI
 #: src/include/dialogs.rb:553
-msgid "TODO WRITE HELP"
-msgstr "TODO WRITE HELP"
+msgid "SSSD provides a set of daemons to manage access to remote directories and authentication mechanisms.<br>You have to confiugre at least one authentication domain.<br>The first you have to set for a authentication domain is the identification and auth provider used for the domain.<br>In the next step you have to set some mandatory parameter for the selected providers.You can select later all parameters available for the selected identification and auth provider.SSSD provides following id_provider:<br><b>proxy</b>: Support a legacy NSS provider.<br><b>local</b>: SSSD internal provider for local users.<br><b>ldap</b>: LDAP provider. See sssd-ldap(5) for more information on configuring LDAP.<br><b>ipa</b>: FreeIPA and Red Hat Enterprise Identity Management provider.<br><b>ad</b>: Active Directory provider.<br>Supported auth providers are:<br><b>ldap</b> for native LDAP authentication.<br><b>krb5</b> for Kerberos authentication.<br><b>ipa</b> FreeIPA and Red Hat Enterprise Identity
  Management provider.<br><b>ad</b> Active Directory provider.<br><b>proxy</b> for relaying authentication to some other PAM target.<br><b>none</b> disables authentication explicitly.<br>The default auth provider is the id_provider.<br>"
+msgstr ""
 
 #. Define Global Parameters
 #: src/include/sssd-parameters.rb:17
 msgid "Indicates what is the syntax of the config file."
 msgstr "設定ファイルの文法を表示する"
 
-#: src/include/sssd-parameters.rb:22
+#: src/include/sssd-parameters.rb:21
 msgid "Comma separated list of services that are started when sssd itself starts."
 msgstr "sssd が起動する際、一緒に起動するサービスの一覧 (カンマ区切り)"
 
-#: src/include/sssd-parameters.rb:27 src/include/sssd-parameters.rb:80
+#: src/include/sssd-parameters.rb:26 src/include/sssd-parameters.rb:79
 msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
 msgstr "データプロバイダがクラッシュした場合や再起動した際、サービスへの接続を試行する回数"
 
-#: src/include/sssd-parameters.rb:31
+#: src/include/sssd-parameters.rb:30
 msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start."
 msgstr "SSSD は複数のドメインを同時に設定することができますが、少なくとも 1 つ以上を設定しないと、 SSSD を起動することができません。"
 
-#: src/include/sssd-parameters.rb:32
+#: src/include/sssd-parameters.rb:31
 msgid "This parameter contains the list of domains in the order these will be queried."
 msgstr "このパラメータには、ドメインの問い合わせ順序の一覧が含まれます。"
 
-#: src/include/sssd-parameters.rb:36
+#: src/include/sssd-parameters.rb:35
 msgid "Default regular expression that describes how to parse the string containing user name and domain into these components"
 msgstr "どのようにしてユーザ名とドメインをコンポーネントに割り当てるのかを指定する、既定の正規表現"
 
-#: src/include/sssd-parameters.rb:40
+#: src/include/sssd-parameters.rb:39
 msgid "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name."
 msgstr "名前とドメインを完全修飾名に変換する際に利用する、 printf(3) 互換の既定書式"
 
-#: src/include/sssd-parameters.rb:44
+#: src/include/sssd-parameters.rb:43
 msgid "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver."
 msgstr "SSSD は resolv.conf の状態を監視して、必要であれば内部の DNS リゾルバを更新します。"
 
-#: src/include/sssd-parameters.rb:45
+#: src/include/sssd-parameters.rb:44
 msgid "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used."
 msgstr "既定では inotify を利用してこれを実現しますが、この機能が利用できない場合はresolv.conf を 5 分おきにチェックします。"
 
-#: src/include/sssd-parameters.rb:49
+#: src/include/sssd-parameters.rb:48
 msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
 msgstr "SSSD が Kerberos のリプレイキャッシュファイルを保存すべき、ファイルシステム内のディレクトリ"
 
-#: src/include/sssd-parameters.rb:53
+#: src/include/sssd-parameters.rb:52
 msgid "This string will be used as a default domain name for all names without a domain name component."
 msgstr "この文字列は、ドメイン名が書かれていない場合の既定のドメインとして使用されます。"
 
 #. Define Global Services Parameters
-#: src/include/sssd-parameters.rb:60
+#: src/include/sssd-parameters.rb:59
 msgid "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode."
 msgstr "デバッグレベルをビットマスク値で指定します。 0x0010 は既定値で、設定可能な最小値です。また、 0xfff0 は最も冗長な出力をするモードです。"
 
-#: src/include/sssd-parameters.rb:65
+#: src/include/sssd-parameters.rb:64
 msgid "Add a timestamp to the debug messages"
 msgstr "デバッグメッセージにタイムスタンプを追加する"
 
-#: src/include/sssd-parameters.rb:70
+#: src/include/sssd-parameters.rb:69
 msgid "Add microseconds to the timestamp in debug messages"
 msgstr "デバッグメッセージ内のタイムスタンプにマイクロ秒を表示する"
 
-#: src/include/sssd-parameters.rb:75
+#: src/include/sssd-parameters.rb:74
 msgid "Timeout in seconds between heartbeats for this service."
 msgstr "このサービスに対するハートビート間隔 (秒単位)"
 
-#: src/include/sssd-parameters.rb:85
+#: src/include/sssd-parameters.rb:84
 msgid "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process."
 msgstr "このオプションでは、 SSSD のプロセスで一度に利用できるファイルディスクリプタの最大値を指定します。"
 
-#: src/include/sssd-parameters.rb:90
+#: src/include/sssd-parameters.rb:89
 msgid "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it."
 msgstr "このオプションでは、 SSSD のクライアントプロセスが通信を行なわずに保持できるファイルディスクリプタの最大秒数を指定します。"
 
-#: src/include/sssd-parameters.rb:95
+#: src/include/sssd-parameters.rb:94
 msgid "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully."
 msgstr "サービスが ping チェックに応答しない場合 (参照: \"timeout\" オプション) 、最初に SIGTERM シグナルを送信して正常終了を促します。"
 
 #. NSS configuration options
-#: src/include/sssd-parameters.rb:103
+#: src/include/sssd-parameters.rb:102
 msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
 msgstr "どれだけの期間、 nss_sss の列挙 (全ユーザに対する情報) を記憶しておきますか？"
 
-#: src/include/sssd-parameters.rb:108
+#: src/include/sssd-parameters.rb:107
 msgid "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain."
 msgstr "項目キャッシュは、ドメインに対して entry_cache_timeout で指定した割合以上に要求があった場合、自動的に裏で項目を更新するように設定することができます。"
 
-#: src/include/sssd-parameters.rb:113
+#: src/include/sssd-parameters.rb:112
 msgid "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again."
 msgstr "nss_sss がネガティブキャッシュ (存在しないものなど、データベースに対する要求失敗の記憶) を保持する秒数"
 
-#: src/include/sssd-parameters.rb:118
+#: src/include/sssd-parameters.rb:117
 msgid "Exclude certain users from being fetched from the sss NSS database."
 msgstr "sss NSS データベースに対して、特定のユーザのみ問い合わせを除外する"
 
-#: src/include/sssd-parameters.rb:123
+#: src/include/sssd-parameters.rb:122
 msgid "Exclude certain groups from being fetched from the sss NSS database."
 msgstr "sss NSS データベースに対して、特定のグループのみ問い合わせを除外する"
 
-#: src/include/sssd-parameters.rb:128
+#: src/include/sssd-parameters.rb:127
 msgid "If you want filtered user to still be group members set this option to false."
 msgstr "フィルタ済みのユーザでもグループメンバーとしたい場合は、このオプションを false にしてください。"
 
-#: src/include/sssd-parameters.rb:132
+#: src/include/sssd-parameters.rb:131
 msgid "Override the user's home directory. You can either provide an absolute value or a template."
 msgstr "ユーザのホームディレクトリの上書き設定。ディレクトリをありのまま記述することができるほか、雛型を指定することもできます。"
 
-#: src/include/sssd-parameters.rb:136 src/include/sssd-parameters.rb:1103
+#: src/include/sssd-parameters.rb:135 src/include/sssd-parameters.rb:1101
 msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
 msgstr "ドメインのデータプロバイダで明示的に指定された場合以外で利用される、ユーザのホームディレクトリに対する既定の雛型"
 
-#: src/include/sssd-parameters.rb:140
+#: src/include/sssd-parameters.rb:139
 msgid "Override the login shell for all users."
 msgstr "全ユーザに対するログインシェルの上書き設定"
 
-#: src/include/sssd-parameters.rb:144
+#: src/include/sssd-parameters.rb:143
 msgid "Restrict user shell to one of the listed values."
 msgstr "一覧に示したシェル以外をユーザに使わせない設定"
 
-#: src/include/sssd-parameters.rb:148
+#: src/include/sssd-parameters.rb:147
 msgid "Replace any instance of these shells with the shell_fallback"
 msgstr "これらのいずれかのシェルを shell_fallback に置き換える"
 
-#: src/include/sssd-parameters.rb:153
+#: src/include/sssd-parameters.rb:152
 msgid "The default shell to use if an allowed shell is not installed on the machine."
 msgstr "このマシンで許可されていないシェルを利用するユーザに提供する、既定のシェル"
 
-#: src/include/sssd-parameters.rb:157 src/include/sssd-parameters.rb:1107
+#: src/include/sssd-parameters.rb:156 src/include/sssd-parameters.rb:1105
 msgid "The default shell to use if the provider does not return one during lookup."
 msgstr "プロバイダへの問い合わせ時に何も返却しなかった場合に提供する、既定のシェル"
 
-#: src/include/sssd-parameters.rb:162 src/include/sssd-parameters.rb:205
+#: src/include/sssd-parameters.rb:161 src/include/sssd-parameters.rb:204
 msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
 msgstr "サブドメインの一覧が有効であると判断する秒数"
 
-#: src/include/sssd-parameters.rb:167
+#: src/include/sssd-parameters.rb:166
 msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
 msgstr "メモリ内に記憶したレコードが有効であると判断する秒数を指定します。"
 
 #. PAM configuration options
-#: src/include/sssd-parameters.rb:175
+#: src/include/sssd-parameters.rb:174
 msgid "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)."
 msgstr "認証プロバイダがオフラインの場合、記憶済みの情報によるログインをどれだけ許可するか (オンラインのログインが成功してからの日数) 。"
 
-#: src/include/sssd-parameters.rb:180 src/include/sssd-parameters.rb:185
+#: src/include/sssd-parameters.rb:179 src/include/sssd-parameters.rb:184
 msgid "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible."
 msgstr "offline_failed_login_attempts の期間が経過したあと、新しいログイン試行ができるまでの時間 (分)"
 
-#: src/include/sssd-parameters.rb:190
+#: src/include/sssd-parameters.rb:189
 msgid "Controls what kind of messages are shown to the user during authentication."
 msgstr "認証時にユーザに対して表示するメッセージ種類の制御"
 
-#: src/include/sssd-parameters.rb:195
+#: src/include/sssd-parameters.rb:194
 msgid "For any PAM request while SSSD is online, the SSSD will attempt to immediately update the cached identity information for the user in order to ensure that authentication takes place with the latest information."
 msgstr "SSSD がオンラインの場合、 SSSD は PAM リクエストから判断したキャッシュ済み識別情報を即時に更新し、認証が常に最新の状態になるようにします。"
 
 #. The kerberos domain section
-#: src/include/sssd-parameters.rb:200 src/include/sssd-parameters.rb:693
-#: src/include/sssd-parameters.rb:990
+#: src/include/sssd-parameters.rb:199 src/include/sssd-parameters.rb:691
+#: src/include/sssd-parameters.rb:988
 msgid "Display a warning N days before the password expires."
 msgstr "パスワード期限切れ前の警告日数"
 
 #. SUDO configuration options
-#: src/include/sssd-parameters.rb:213
+#: src/include/sssd-parameters.rb:212
 msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
 msgstr "時間に依存した sudoers 項目である sudoNotBefore および sudoNotAfter を有効にするかどうか"
 
 #. AUTOFS configuration options
-#: src/include/sssd-parameters.rb:221
+#: src/include/sssd-parameters.rb:220
 msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
 msgstr "再度バックエンドに問い合わせるまでに、 autofs レスポンダが否定キャッシュを記憶しておく秒数を指定します。"
 
 #. SSH configuration options
-#: src/include/sssd-parameters.rb:229
+#: src/include/sssd-parameters.rb:228
 msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
 msgstr "ホスト名とアドレスを、管理下にある known_hosts ファイルに記録するかどうか"
 
-#: src/include/sssd-parameters.rb:234
+#: src/include/sssd-parameters.rb:233
 msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
 msgstr "ホストキーが要求されたあと、管理下にある known_hosts  ファイルの項目をどれだけの期間保持するか (秒)"
 
 #. DOMAIN SECTIONS
 #. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]”
-#: src/include/sssd-parameters.rb:243 src/include/sssd-parameters.rb:248
+#: src/include/sssd-parameters.rb:242 src/include/sssd-parameters.rb:247
 msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
 msgstr "ドメインに対する UID/GID の制限。これらの範囲外にある項目は無視されます。"
 
-#: src/include/sssd-parameters.rb:253
+#: src/include/sssd-parameters.rb:252
 msgid "Determines if a domain can be enumerated."
 msgstr "ドメインを列挙できるようにするかどうか"
 
-#: src/include/sssd-parameters.rb:258
+#: src/include/sssd-parameters.rb:257
 msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
 msgstr "サービスが \"force_timeout\" で指定した秒数を過ぎても終了しない場合、モニタは SIGKILL シグナルを送信して強制的に終了させます。"
 
-#: src/include/sssd-parameters.rb:263
+#: src/include/sssd-parameters.rb:262
 msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
 msgstr "再度バックエンドに問い合わせるまでに、 nss_sss が項目を有効であると判断する秒数。"
 
-#: src/include/sssd-parameters.rb:268
+#: src/include/sssd-parameters.rb:267
 msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
 msgstr "再度バックエンドに問い合わせるまでに、 nss_sss がユーザ項目を有効であると判断する秒数。"
 
-#: src/include/sssd-parameters.rb:273
+#: src/include/sssd-parameters.rb:272
 msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
 msgstr "再度バックエンドに問い合わせるまでに、 nss_sss がグループ項目を有効であると判断する秒数。"
 
-#: src/include/sssd-parameters.rb:278
+#: src/include/sssd-parameters.rb:277
 msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
 msgstr "再度バックエンドに問い合わせるまでに、 nss_sss が netgroup 項目を有効であると判断する秒数。"
 
-#: src/include/sssd-parameters.rb:283
+#: src/include/sssd-parameters.rb:282
 msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
 msgstr "再度バックエンドに問い合わせるまでに、 nss_sss がサービス項目を有効であると判断する秒数。"
 
-#: src/include/sssd-parameters.rb:288
+#: src/include/sssd-parameters.rb:287
 msgid "How many seconds sudo should consider rules valid before asking the backend again."
 msgstr "再度バックエンドに問い合わせるまでに、 sudo がルールを有効であると判断する秒数。"
 
-#: src/include/sssd-parameters.rb:293
+#: src/include/sssd-parameters.rb:292
 msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
 msgstr "再度バックエンドに問い合わせるまでに、 autofs が automounter マップを有効であると判断する秒数。"
 
-#: src/include/sssd-parameters.rb:298
+#: src/include/sssd-parameters.rb:297
 msgid "Determines if user credentials are also cached in the local LDB cache."
 msgstr "ユーザの資格情報をローカルの LDB キャッシュにも保持するかどうかを指定します。"
 
-#: src/include/sssd-parameters.rb:303
+#: src/include/sssd-parameters.rb:302
 msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
 msgstr "キャッシュのクリーンアップが行なわれるまでの間、どれだけの日数ログイン成功を残しておくか"
 
-#: src/include/sssd-parameters.rb:308
+#: src/include/sssd-parameters.rb:307
 msgid "The identification provider used for the domain."
 msgstr "ドメインに対して使用する識別プロバイダ"
 
-#: src/include/sssd-parameters.rb:313
+#: src/include/sssd-parameters.rb:312
 msgid "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS."
 msgstr "フルネームとドメイン (full_name_format で指定した書式) を利用してユーザのログイン名を作成し、 NSS に報告する"
 
-#: src/include/sssd-parameters.rb:319
+#: src/include/sssd-parameters.rb:318
 msgid "The authentication provider used for the domain."
 msgstr "ドメインに対して使用する認証プロバイダ"
 
-#: src/include/sssd-parameters.rb:325
+#: src/include/sssd-parameters.rb:324
 msgid "The access control provider used for the domain."
 msgstr "ドメインに対して使用する制御プロバイダ"
 
-#: src/include/sssd-parameters.rb:331
+#: src/include/sssd-parameters.rb:330
 msgid "The provider which should handle change password operations for the domain."
 msgstr "ドメインに対してパスワード変更を取り扱うプロバイダ"
 
-#: src/include/sssd-parameters.rb:337
+#: src/include/sssd-parameters.rb:336
 msgid "The SUDO provider used for the domain."
 msgstr "ドメインに対する SUDO プロバイダ"
 
-#: src/include/sssd-parameters.rb:343
+#: src/include/sssd-parameters.rb:342
 msgid "The provider which should handle loading of selinux settings."
 msgstr "selinux 設定を取り扱うプロバイダ"
 
-#: src/include/sssd-parameters.rb:349
+#: src/include/sssd-parameters.rb:348
 msgid "The provider which should handle fetching of subdomains."
 msgstr "サブドメインへのアクセスを取り扱うプロバイダ"
 
-#: src/include/sssd-parameters.rb:355
+#: src/include/sssd-parameters.rb:354
 msgid "The autofs provider used for the domain."
 msgstr "ドメインに対する autofs プロバイダ"
 
-#: src/include/sssd-parameters.rb:361
+#: src/include/sssd-parameters.rb:360
 msgid "The provider used for retrieving host identity information."
 msgstr "ホスト識別情報の取得に使用するプロバイダ"
 
-#: src/include/sssd-parameters.rb:366
+#: src/include/sssd-parameters.rb:365
 msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
 msgstr "このドメインに対するユーザ名とドメインを含む文字列の処理方法 (正規表現)"
 
-#: src/include/sssd-parameters.rb:371
+#: src/include/sssd-parameters.rb:370
 msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
 msgstr "このドメインに対する完全修飾名への名前／ドメインの変換方法 (printf(3) 互換書式)"
 
-#: src/include/sssd-parameters.rb:377
+#: src/include/sssd-parameters.rb:376
 msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
 msgstr "DNS 参照時に特定のアドレスファミリを優先して使用する機能"
 
-#: src/include/sssd-parameters.rb:382
+#: src/include/sssd-parameters.rb:381
 msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
 msgstr "DNS 解決器が、問い合わせ先に届かないと判断するまでの応答待機秒数の指定"
 
-#: src/include/sssd-parameters.rb:386
+#: src/include/sssd-parameters.rb:385
 msgid "Use the domain part of machine's hostname."
 msgstr "マシンのホスト名のドメイン部分を使用する"
 
-#: src/include/sssd-parameters.rb:387
+#: src/include/sssd-parameters.rb:386
 msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
 msgstr "バックエンドでサービス検出器を使用する場合、サービス検出器が DNS の問い合わせを行なう際のドメイン部分の指定"
 
-#: src/include/sssd-parameters.rb:391
+#: src/include/sssd-parameters.rb:390
 msgid "Override the primary GID value with the one specified."
 msgstr "指定した値でのプライマリ GID の上書き"
 
-#: src/include/sssd-parameters.rb:396
+#: src/include/sssd-parameters.rb:395
 msgid "Treat user and group names as case sensitive."
 msgstr "ユーザとグループの名前について、大文字と小文字を区別する"
 
-#: src/include/sssd-parameters.rb:401
+#: src/include/sssd-parameters.rb:400
 msgid "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias."
 msgstr "プロキシプロバイダでユーザ名とグループ名を参照する際、その名前が別名であった場合に ID での二次参照で名前を正規化する"
 
-#: src/include/sssd-parameters.rb:406
+#: src/include/sssd-parameters.rb:405
 msgid "Use this homedir as default value for all subdomains within this domain."
 msgstr "ドメイン内にある全てのサブドメインに対して、このホームディレクトリを既定値として使用する"
 
 #. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/include/sssd-parameters.rb:412
+#: src/include/sssd-parameters.rb:411
 msgid "Comma separated list of users who are allowed to log in."
 msgstr "ログインを許可するユーザの一覧 (カンマ区切り)"
 
-#: src/include/sssd-parameters.rb:417
+#: src/include/sssd-parameters.rb:416
 msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
 msgstr "ログインを許可するグループの一覧 (カンマ区切り) 。この設定は、 SSSD ドメイン内のグループにのみ適用されます。"
 
-#: src/include/sssd-parameters.rb:422
+#: src/include/sssd-parameters.rb:421
 msgid "Comma separated list of users who are explicitly denied access."
 msgstr "ログインを拒否するユーザの一覧 (カンマ区切り)"
 
-#: src/include/sssd-parameters.rb:427
+#: src/include/sssd-parameters.rb:426
 msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
 msgstr "ログインを拒否するグループの一覧 (カンマ区切り) 。この設定は、 SSSD ドメイン内のグループにのみ適用されます。"
 
-#: src/include/sssd-parameters.rb:433
+#: src/include/sssd-parameters.rb:432
 msgid "The default base DN to use for performing LDAP sudo rules."
 msgstr "LDAP で sudo ルールを問い合わせる際の既定のベース DN"
 
 #. The local domain section
 #. This section contains settings for domain that stores users and groups in SSSD native database, that is, a domain that uses id_provider=local.
-#: src/include/sssd-parameters.rb:442
+#: src/include/sssd-parameters.rb:441
 msgid "The tools append the login name to base_directory and use that as the home directory."
 msgstr "ツールがログイン名を base_directory に追加してホームディレクトリとする"
 
-#: src/include/sssd-parameters.rb:447
+#: src/include/sssd-parameters.rb:446
 msgid "Indicate if a home directory should be created by default for new users."
 msgstr "新規ユーザの場合、ホームディレクトリを作成すべきかどうかの設定"
 
-#: src/include/sssd-parameters.rb:452
+#: src/include/sssd-parameters.rb:451
 msgid "Indicate if a home directory should be removed by default for deleted users."
 msgstr "ユーザを削除した場合、ホームディレクトリも削除すべきかどうかの設定"
 
-#: src/include/sssd-parameters.rb:457
+#: src/include/sssd-parameters.rb:456
 msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
 msgstr "sss_useradd(8) で新しく作成したホームディレクトリに対する既定のパーミッションの指定"
 
-#: src/include/sssd-parameters.rb:462
+#: src/include/sssd-parameters.rb:461
 msgid "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)"
 msgstr "sss_useradd(8) でユーザを作成する際、ユーザのホームディレクトリにコピーすべきファイルやディレクトリを含む、スケルトンディレクトリ。"
 
-#: src/include/sssd-parameters.rb:467
+#: src/include/sssd-parameters.rb:466
 msgid "The mail spool directory."
 msgstr "メールスプールディレクトリ"
 
-#: src/include/sssd-parameters.rb:471
+#: src/include/sssd-parameters.rb:470
 msgid "The command that is run after a user is removed."
 msgstr "ユーザを削除したあとに実行するコマンド"
 
 #. The ldap domain section
-#: src/include/sssd-parameters.rb:480 src/include/sssd-parameters.rb:485
+#: src/include/sssd-parameters.rb:479 src/include/sssd-parameters.rb:484
 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
 msgstr "SSSD が接続すべき LDAP サーバの URI の順序リスト (カンマ区切り)"
 
-#: src/include/sssd-parameters.rb:491 src/include/sssd-parameters.rb:497
+#: src/include/sssd-parameters.rb:490 src/include/sssd-parameters.rb:496
 msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference to change the password of a user."
 msgstr "ユーザのパスワード変更時、 SSSD が接続すべき LDAP サーバの URI の順序リスト (カンマ区切り)"
 
-#: src/include/sssd-parameters.rb:503
+#: src/include/sssd-parameters.rb:501
 msgid "The default base DN to use for performing LDAP user operations."
 msgstr "LDAP ユーザ操作を実行する際に利用する既定のベース DN"
 
-#: src/include/sssd-parameters.rb:509
+#: src/include/sssd-parameters.rb:507
 msgid "Specifies the Schema Type in use on the target LDAP server."
 msgstr "目的の LDAP サーバで使用するスキーマタイプの指定"
 
-#: src/include/sssd-parameters.rb:513
+#: src/include/sssd-parameters.rb:511
 msgid "The default bind DN to use for performing LDAP operations."
 msgstr "LDAP 操作を実施する際の既定のベース DN"
 
-#: src/include/sssd-parameters.rb:519
+#: src/include/sssd-parameters.rb:517
 msgid "The type of the authentication token of the default bind DN."
 msgstr "既定のバインド DN に対する認証トークンの種類"
 
-#: src/include/sssd-parameters.rb:523
+#: src/include/sssd-parameters.rb:521
 msgid "The authentication token of the default bind DN."
 msgstr "既定のバインド DN に対する認証トークン"
 
-#: src/include/sssd-parameters.rb:528
+#: src/include/sssd-parameters.rb:526
 msgid "The object class of a user entry in LDAP."
 msgstr "LDAP 内でのユーザ項目のオブジェクトクラス"
 
-#: src/include/sssd-parameters.rb:533
+#: src/include/sssd-parameters.rb:531
 msgid "The LDAP attribute that corresponds to the user's login name."
 msgstr "ユーザのログイン名に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:538
+#: src/include/sssd-parameters.rb:536
 msgid "The LDAP attribute that corresponds to the user's id."
 msgstr "ユーザの ID に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:543
+#: src/include/sssd-parameters.rb:541
 msgid "The LDAP attribute that corresponds to the user's primary group id."
 msgstr "ユーザのプライマリグループ ID に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:548
+#: src/include/sssd-parameters.rb:546
 msgid "The LDAP attribute that corresponds to the user's gecos field."
 msgstr "ユーザの gecos 項目に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:553
+#: src/include/sssd-parameters.rb:551
 msgid " The LDAP attribute that contains the name of the user's home directory."
 msgstr " ユーザのホームディレクトリの名前に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:558
+#: src/include/sssd-parameters.rb:556
 msgid "The LDAP attribute that contains the path to the user's default shell."
 msgstr "ユーザの既定のシェルに対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:563
+#: src/include/sssd-parameters.rb:561
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
 msgstr "LDAP ユーザオブジェクトの UUID/GUID に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:568
+#: src/include/sssd-parameters.rb:566
 msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
 msgstr "LDAP ユーザオブジェクトの objectSID に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:573 src/include/sssd-parameters.rb:778
+#: src/include/sssd-parameters.rb:571 src/include/sssd-parameters.rb:776
 msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
 msgstr "親オブジェクトの最終更新タイムスタンプに対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:578
+#: src/include/sssd-parameters.rb:576
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (date of the last password change)."
 msgstr "ldap_pwd_policy=shadow を設定した場合、このパラメータには shadow(5) の項目に対応する LDAP 属性名 (最終パスワード変更日) を設定します。"
 
-#: src/include/sssd-parameters.rb:583
+#: src/include/sssd-parameters.rb:581
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (minimum password age)."
 msgstr "ldap_pwd_policy=shadow を設定した場合、このパラメータには shadow(5) の項目に対応する LDAP 属性名 (最小パスワード期間) を設定します。"
 
-#: src/include/sssd-parameters.rb:588
+#: src/include/sssd-parameters.rb:586
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (maximum password age)."
 msgstr "ldap_pwd_policy=shadow を設定した場合、このパラメータには shadow(5) の項目に対応する LDAP 属性名 (最大パスワード期間) を設定します。"
 
-#: src/include/sssd-parameters.rb:593
+#: src/include/sssd-parameters.rb:591
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password warning period)."
 msgstr "ldap_pwd_policy=shadow を設定した場合、このパラメータには shadow(5) の項目に対応する LDAP 属性名 (パスワード警告期限) を設定します。"
 
-#: src/include/sssd-parameters.rb:598
+#: src/include/sssd-parameters.rb:596
 msgid "When using ldap_pwd_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (password inactivity period)."
 msgstr "ldap_pwd_policy=shadow を設定した場合、このパラメータには shadow(5) の項目に対応する LDAP 属性名 (パスワード無効期間) を設定します。"
 
-#: src/include/sssd-parameters.rb:603
+#: src/include/sssd-parameters.rb:601
 msgid "When using ldap_pwd_policy=shadow or ldap_account_expire_policy=shadow, this parameter contains the name of an LDAP attribute corresponding to its shadow(5) counterpart (account expiration date)."
 msgstr "ldap_pwd_policy=shadow または ldap_account_expire_policy=shadow を設定した場合、このパラメータには shadow(5) の項目に対応する LDAP 属性名 (アカウント有効期限) を設定します。"
 
-#: src/include/sssd-parameters.rb:608
+#: src/include/sssd-parameters.rb:606
 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time of last password change in kerberos."
 msgstr "ldap_pwd_policy=mit_kerberos を設定した場合、このパラメータには Kerberos での最終パスワード変更日時に対応する LDAP 属性名を設定します。"
 
-#: src/include/sssd-parameters.rb:613
+#: src/include/sssd-parameters.rb:611
 msgid "When using ldap_pwd_policy=mit_kerberos, this parameter contains the name of an LDAP attribute storing the date and time when current password expires."
 msgstr "ldap_pwd_policy=mit_kerberos を設定した場合、このパラメータには現在のパスワードの有効期限日時に対応する LDAP 属性名を設定します。"
 
-#: src/include/sssd-parameters.rb:618
+#: src/include/sssd-parameters.rb:616
 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the expiration time of the account."
 msgstr "ldap_account_expire_policy=ad を設定した場合、このパラメータにはアカウントの期限切れ時刻を保存するための LDAP 属性名を設定します。"
 
-#: src/include/sssd-parameters.rb:623
+#: src/include/sssd-parameters.rb:621
 msgid "When using ldap_account_expire_policy=ad, this parameter contains the name of an LDAP attribute storing the user account control bit field."
 msgstr "ldap_account_expire_policy=ad を設定した場合、このパラメータにはユーザアカウントの制御ビットフィールドを保存するための LDAP 属性名を設定します。"
 
-#: src/include/sssd-parameters.rb:628
+#: src/include/sssd-parameters.rb:626
 msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
 msgstr "ldap_account_expire_policy=rhds または同種の設定を行なった場合、このパラメータにはアクセスを許可するかどうかのパラメータを設定します。"
 
-#: src/include/sssd-parameters.rb:633
+#: src/include/sssd-parameters.rb:631
 msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
 msgstr "ldap_account_expire_policy=nds を設定した場合、この属性にはアクセスを許可するかどうかを設定します。"
 
-#: src/include/sssd-parameters.rb:638
+#: src/include/sssd-parameters.rb:636
 msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
 msgstr "ldap_account_expire_policy=nds を設定した場合、この属性にはアクセスを許可する日を設定します。"
 
-#: src/include/sssd-parameters.rb:643
+#: src/include/sssd-parameters.rb:641
 msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
 msgstr "ldap_account_expire_policy=nds を設定した場合、この属性にはアクセスを許可する週内の時間を設定します。"
 
-#: src/include/sssd-parameters.rb:648
+#: src/include/sssd-parameters.rb:646
 msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
 msgstr "ユーザに対する Kerberos のユーザプリンシパル名 (UPN) を含む LDAP 属性"
 
-#: src/include/sssd-parameters.rb:652
+#: src/include/sssd-parameters.rb:650
 msgid "The LDAP attribute that contains the user's SSH public keys."
 msgstr "ユーザに対する SSH の公開鍵を含む LDAP 属性"
 
-#: src/include/sssd-parameters.rb:657
+#: src/include/sssd-parameters.rb:655
 msgid "Some directory servers, for example Active Directory, might deliver the realm part of the UPN in lower case, which might cause the authentication to fail."
 msgstr "Active Directory などのディレクトリサーバの場合、 UPN 内の領域部分が小文字で送信される場合があります。この場合、認証は失敗してしまいます。"
 
-#: src/include/sssd-parameters.rb:658
+#: src/include/sssd-parameters.rb:656
 msgid "Set this option to true if you want to use an upper-case realm."
 msgstr "領域名を大文字で使用したい場合は、このオプションを true に設定してください。"
 
-#: src/include/sssd-parameters.rb:663
+#: src/include/sssd-parameters.rb:661
 msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
 msgstr "SSSD に対する列挙レコードのキャッシュを更新待機秒数の指定"
 
-#: src/include/sssd-parameters.rb:668
+#: src/include/sssd-parameters.rb:666
 msgid "Determine how often to check the cache for inactive entries (such as groups with no members and users who have never logged in) and remove them to save space."
 msgstr "無効な項目 (メンバーのないグループやログインの行なわれていないユーザなど) のキャッシュをチェックし、無駄な領域を削除する間隔"
 
-#: src/include/sssd-parameters.rb:673
+#: src/include/sssd-parameters.rb:671
 msgid "The LDAP attribute that corresponds to the user's full name."
 msgstr "ユーザのフルネームに対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:678
+#: src/include/sssd-parameters.rb:676
 msgid "The LDAP attribute that lists the user's group memberships."
 msgstr "ユーザの所属先グループの一覧に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:683
+#: src/include/sssd-parameters.rb:681
 msgid "If access_provider=ldap and ldap_access_order=authorized_service, SSSD will use the presence of the authorizedService attribute in the user's LDAP entry to determine access privilege."
 msgstr "access_provider=ldap と ldap_access_order=authorized_service を設定した場合、 SSSD はユーザの LDAP 項目に authorizedService 属性が存在することをもって、アクセス許可の判断とします。"
 
-#: src/include/sssd-parameters.rb:688
+#: src/include/sssd-parameters.rb:686
 msgid "If access_provider=ldap and ldap_access_order=host, SSSD will use the presence of the host attribute in the user's LDAP entry to determine access privilege."
 msgstr "access_provider=ldap と ldap_access_order=host を設定した場合、 SSSD はユーザの LDAP 項目に host 属性が存在することをもって、アクセス許可の判断とします。"
 
-#: src/include/sssd-parameters.rb:698
+#: src/include/sssd-parameters.rb:696
 msgid "The object class of a group entry in LDAP."
 msgstr "LDAP 内でのグループ項目のオブジェクトクラス"
 
-#: src/include/sssd-parameters.rb:703
+#: src/include/sssd-parameters.rb:701
 msgid "The LDAP attribute that corresponds to the group name."
 msgstr "グループ名に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:708
+#: src/include/sssd-parameters.rb:706
 msgid "The LDAP attribute that corresponds to the group's id."
 msgstr "グループの ID に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:713
+#: src/include/sssd-parameters.rb:711
 msgid "The LDAP attribute that contains the names of the group's members."
 msgstr "グループのメンバーの名前に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:718
+#: src/include/sssd-parameters.rb:716
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
 msgstr "LDAP グループオブジェクトの UUID/GUID に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:723
+#: src/include/sssd-parameters.rb:721
 msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
 msgstr "LDAP グループオブジェクトの objectSID に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:728
+#: src/include/sssd-parameters.rb:726
 msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
 msgstr "親オブジェクトの最終更新タイムスタンプに対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:734
+#: src/include/sssd-parameters.rb:732
 msgid "If ldap_schema is set to a schema format that supports nested groups (e.g. RFC2307bis), then this option controls how many levels of nesting SSSD will follow."
 msgstr "ldap_schema に対して、入れ子グループに対応するスキーマ形式 (RFC2307bis など) を指定した場合、このオプションは SSSD がどれだけの深さまで入れ子にアクセスするかを指定します。"
 
-#: src/include/sssd-parameters.rb:740
+#: src/include/sssd-parameters.rb:738
 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which may speed up group lookup operations on deployments with complex or deep nested groups."
 msgstr "このオプションは、 SSSD に対して Active Directory 固有の機能の利点を生かし、複雑なグループや入れ子になったグループなど、高度なグループ参照を高速化するようにします。"
 
-#: src/include/sssd-parameters.rb:746
+#: src/include/sssd-parameters.rb:744
 msgid "This option tells SSSD to take advantage of an Active Directory-specific feature which might speed up initgroups operations (most notably when dealing with complex or deep nested groups)."
 msgstr "このオプションは、 SSSD に対して Active Directory 固有の機能の利点を生かし、 initgroups 操作を高速化するようにします (主に複雑なグループや入れ子になったグループなどで効果的です) 。"
 
-#: src/include/sssd-parameters.rb:752
+#: src/include/sssd-parameters.rb:750
 msgid "           The object class of a netgroup entry in LDAP."
 msgstr "           LDAP 内での netgroup 項目のオブジェクトクラス"
 
-#: src/include/sssd-parameters.rb:758
+#: src/include/sssd-parameters.rb:756
 msgid "The LDAP attribute that corresponds to the netgroup name."
 msgstr "netgroup 名に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:763
+#: src/include/sssd-parameters.rb:761
 msgid "The LDAP attribute that contains the names of the netgroup's members."
 msgstr "netgroup のメンバー名に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:768
+#: src/include/sssd-parameters.rb:766
 msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
 msgstr "netgroup セット (ホスト, ユーザ, ドメイン) に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:773
+#: src/include/sssd-parameters.rb:771
 msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
 msgstr "LDAP netgroup オブジェクトの UUID/GUID を含む LDAP 属性"
 
-#: src/include/sssd-parameters.rb:783
+#: src/include/sssd-parameters.rb:781
 msgid "The object class of a service entry in LDAP."
 msgstr "LDAP 内でのサービス項目のオブジェクトクラス"
 
-#: src/include/sssd-parameters.rb:788
+#: src/include/sssd-parameters.rb:786
 msgid "The LDAP attribute that contains the name of service attributes and their aliases."
 msgstr "サービス属性とその別名に対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:793
+#: src/include/sssd-parameters.rb:791
 msgid "The LDAP attribute that contains the port managed by this service."
 msgstr "このサービスが管理するポートに対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:798
+#: src/include/sssd-parameters.rb:796
 msgid "The LDAP attribute that contains the protocols understood by this service."
 msgstr "このサービスが理解可能なプロトコルに対応する LDAP 属性"
 
-#: src/include/sssd-parameters.rb:804
+#: src/include/sssd-parameters.rb:802
 msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
 msgstr "この属性タイプの LDAP 検索を絞り込むために使用する、検索スコープや LDAP フィルタとしての任意指定ベース DN"
 
-#: src/include/sssd-parameters.rb:809
+#: src/include/sssd-parameters.rb:807
 msgid " Specifies the timeout (in seconds) that ldap searches are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
 msgstr "LDAP 検索を開始してからキャッシュ済みの応答が返る (およびオフラインモードへの移行) までを基準とした、 LDAP 検索の制限時間 (秒)"
 
-#: src/include/sssd-parameters.rb:814
+#: src/include/sssd-parameters.rb:812
 msgid "Specifies the timeout (in seconds) that ldap searches for user and group enumerations are allowed to run before they are cancelled and cached results are returned (and offline mode is entered)."
 msgstr "LDAP 検索を開始してからキャッシュ済みの応答が返る (およびオフラインモードへの移行) までを基準とした、 LDAP ユーザ／グループ列挙の制限時間 (秒)"
 
-#: src/include/sssd-parameters.rb:819
+#: src/include/sssd-parameters.rb:817
 msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
 msgstr "connect(2) に続く poll(2)/select(2) に対して設定する、無応答時の制限時間 (秒)"
 
-#: src/include/sssd-parameters.rb:824
+#: src/include/sssd-parameters.rb:822
 msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
 msgstr "同期 LDAP API が応答を待つ際の制限時間 (秒)"
 
-#: src/include/sssd-parameters.rb:829
+#: src/include/sssd-parameters.rb:827
 msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
 msgstr "LDAP サーバへの接続を維持する制限時間 (秒)"
 
-#: src/include/sssd-parameters.rb:834
+#: src/include/sssd-parameters.rb:832
 msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
 msgstr "単一の要求で LDAP から取得するレコード数の指定。 LDAP サーバによっては、要求ごとの最大値が決まっているものがあります。"
 
-#: src/include/sssd-parameters.rb:839
+#: src/include/sssd-parameters.rb:837
 msgid "Disable the LDAP paging control."
 msgstr "LDAP ページングプロトコルを無効化する"
 
-#: src/include/sssd-parameters.rb:844
+#: src/include/sssd-parameters.rb:842
 msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
 msgstr "SASL を利用して LDAP サーバと通信する際、接続を確立するのに必要な最小限のセキュリティレベルの指定"
 
-#: src/include/sssd-parameters.rb:849
+#: src/include/sssd-parameters.rb:847
 msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
 msgstr "参照解釈処理を実施する際、内部キャッシュから失われていなければならないグループのメンバー数の指定"
 
-#: src/include/sssd-parameters.rb:855
+#: src/include/sssd-parameters.rb:853
 msgid "Specifies what checks to perform on server certificates in a TLS session, if any."
 msgstr "TLS 接続のサーバ証明書確認で、何を確認するかの設定"
 
-#: src/include/sssd-parameters.rb:860
+#: src/include/sssd-parameters.rb:858
 msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
 msgstr "SSSD が理解すべき全証明機関の証明書一覧を含むファイルの指定"
 
-#: src/include/sssd-parameters.rb:865
+#: src/include/sssd-parameters.rb:863
 msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
 msgstr "証明機関の証明書について、個別のファイルを含むディレクトリの指定"
 
-#: src/include/sssd-parameters.rb:869
+#: src/include/sssd-parameters.rb:867
 msgid "Specifies the file that contains the certificate for the client's key."
 msgstr "クライアントの鍵に対応する証明書を含むファイルの指定"
 
-#: src/include/sssd-parameters.rb:873
+#: src/include/sssd-parameters.rb:871
 msgid "Specifies the file that contains the client's key."
 msgstr "クライアントの鍵を含むファイルの指定"
 
-#: src/include/sssd-parameters.rb:878
+#: src/include/sssd-parameters.rb:876
 msgid "Specifies acceptable cipher suites."
 msgstr "受け入れ可能な暗号化スイートの指定"
 
-#: src/include/sssd-parameters.rb:883
+#: src/include/sssd-parameters.rb:881
 msgid "Specifies that the id_provider connection must also use tls to protect the channel."
 msgstr "id_provider 接続が通信を暗号化するため、 TLS を使用しなければならないかどうかの指定"
 
-#: src/include/sssd-parameters.rb:888
+#: src/include/sssd-parameters.rb:886
 msgid "Specifies that SSSD should attempt to map user and group IDs from the ldap_user_objectsid and ldap_group_objectsid attributes instead of relying on ldap_user_uid_number and ldap_group_gid_number."
 msgstr "SSSD が ldap_user_uid_number および ldap_group_gid_number ではなく、 ldap_user_objectsid および ldap_group_objectsid を利用してユーザとグループの ID を参照するようにする指定"
 
-#: src/include/sssd-parameters.rb:892
+#: src/include/sssd-parameters.rb:890
 msgid "Specify the SASL mechanism to use."
 msgstr "使用する SASL 機構の指定"
 
-#: src/include/sssd-parameters.rb:897
+#: src/include/sssd-parameters.rb:895
 msgid "Specify the SASL authorization id to use."
 msgstr "使用する SASL 認可 ID の指定"
 
-#: src/include/sssd-parameters.rb:902
+#: src/include/sssd-parameters.rb:900
 msgid "Specify the SASL realm to use."
 msgstr "使用する SASL 領域の指定"
 
-#: src/include/sssd-parameters.rb:907
+#: src/include/sssd-parameters.rb:905
 msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
 msgstr "true に設定すると、 LDAP ライブラリが SASL バインドを行なう際、ホスト名を正規化するために逆参照を行なう設定"
 
-#: src/include/sssd-parameters.rb:912
+#: src/include/sssd-parameters.rb:910
 msgid "Specify the keytab to use when using SASL/GSSAPI."
 msgstr "SASL/GSSAPI を利用する際の keytab の指定"
 
-#: src/include/sssd-parameters.rb:917
+#: src/include/sssd-parameters.rb:915
 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
 msgstr "id_provider が Kerberos 資格 (TGT) を初期化する指定"
 
-#: src/include/sssd-parameters.rb:922
+#: src/include/sssd-parameters.rb:920
 msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
 msgstr "GSSAPI を使用した場合の TGT の有効期間 (秒) の指定"
 
-#: src/include/sssd-parameters.rb:927
+#: src/include/sssd-parameters.rb:925
 msgid "Select the policy to evaluate the password expiration on the client side."
 msgstr "クライアント川でパスワードの有効期限切れを判断するためのポリシーの指定"
 
-#: src/include/sssd-parameters.rb:932
+#: src/include/sssd-parameters.rb:930
 msgid "Specifies whether automatic referral chasing should be enabled."
 msgstr "自動参照追跡機能を有効化するかどうかの指定"
 
-#: src/include/sssd-parameters.rb:937
+#: src/include/sssd-parameters.rb:935
 msgid "Specifies the service name to use when service discovery is enabled."
 msgstr "サービス検出器が有効化されている場合の使用するサービス名の指定"
 
-#: src/include/sssd-parameters.rb:941
+#: src/include/sssd-parameters.rb:939
 msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
 msgstr "サービス検出器が有効化されている場合、パスワード変更を許可する LDAP サーバを検出するのに使用するサービス名の指定"
 
-#: src/include/sssd-parameters.rb:946
+#: src/include/sssd-parameters.rb:944
 msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
 msgstr "パスワード変更操作後、 ldap_user_shadow_last_change にエポック日からの経過日数を更新するかどうかの指定"
 
-#: src/include/sssd-parameters.rb:951
+#: src/include/sssd-parameters.rb:949
 msgid "If using access_provider = ldap and ldap_access_order = filter (default), this option is mandatory. It specifies an LDAP search filter criterion that must be met for the user to be granted access on this host."
 msgstr "access_provider = ldap および ldap_access_order = filter を使用している場合 (既定値) 、このオプションは必須です。ここでは、ユーザがこのホストにログインする際、適合していなければならない LDAP 検索フィルタ条件を指定します。"
 
-#: src/include/sssd-parameters.rb:956
+#: src/include/sssd-parameters.rb:954
 msgid " With this option a client side evaluation of access control attributes can be enabled."
 msgstr " このオプションを指定することで、アクセス制御属性をクライアント側で判断できるようになります。"
 
-#: src/include/sssd-parameters.rb:962
+#: src/include/sssd-parameters.rb:960
 msgid "Comma separated list of access control options."
 msgstr "アクセス制御オプションのカンマ区切りリスト"
 
-#: src/include/sssd-parameters.rb:967
+#: src/include/sssd-parameters.rb:965
 msgid "Specifies how alias dereferencing is done when performing a search."
 msgstr "検索時、どのようにして別名の参照解釈を実施するかの指定"
 
-#: src/include/sssd-parameters.rb:972
+#: src/include/sssd-parameters.rb:970
 msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
 msgstr "RFC2307 スキーマを使用するサーバ向けの LDAP グループのメンバーに対し、これをローカルユーザとして許可する"
 
-#: src/include/sssd-parameters.rb:995 src/include/sssd-parameters.rb:999
+#: src/include/sssd-parameters.rb:993 src/include/sssd-parameters.rb:997
 msgid "Specifies the comma-separated list of IP addresses or hostnames of the Kerberos servers to which SSSD should connect, in the order of preference."
 msgstr "SSSD が接続すべき Kerberos サーバの IP アドレスまたはホスト名のカンマ区切り一覧。指定した順序どおりにアクセスが行なわれます。"
 
-#: src/include/sssd-parameters.rb:1004
+#: src/include/sssd-parameters.rb:1002
 msgid "The name of the Kerberos realm."
 msgstr "Kerberos 領域名"
 
-#: src/include/sssd-parameters.rb:1009 src/include/sssd-parameters.rb:1014
+#: src/include/sssd-parameters.rb:1007 src/include/sssd-parameters.rb:1012
 msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
 msgstr "KDC でパスワード変更サービスが動作していない場合に利用する、代替サーバを指定することができます。"
 
-#: src/include/sssd-parameters.rb:1019
+#: src/include/sssd-parameters.rb:1017
 msgid "Directory to store credential caches."
 msgstr "資格情報のキャッシュを保存しておくディレクトリ。"
 
-#: src/include/sssd-parameters.rb:1024
+#: src/include/sssd-parameters.rb:1022
 msgid "Location of the user's credential cache."
 msgstr "ユーザの資格情報キャッシュの場所"
 
-#: src/include/sssd-parameters.rb:1029
+#: src/include/sssd-parameters.rb:1027
 msgid " Timeout in seconds after an online authentication request or change password request is aborted."
 msgstr " オンライン認証要求またはパスワード変更要求を中止するまでの制限時間 (秒)"
 
-#: src/include/sssd-parameters.rb:1034
+#: src/include/sssd-parameters.rb:1032
 msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
 msgstr "取得した TGT が盗聴されていないことを krb5_keytab で検証する"
 
-#: src/include/sssd-parameters.rb:1039
+#: src/include/sssd-parameters.rb:1037
 msgid "The location of the keytab to use when validating credentials obtained from KDCs."
 msgstr "KDC から取得した資格情報を検証する際に使用する keytab の場所"
 
-#: src/include/sssd-parameters.rb:1044
+#: src/include/sssd-parameters.rb:1042
 msgid "Store the password of the user if the provider is offline and use it to request a TGT when the provider comes online again."
 msgstr "プロバイダがオフラインの場合にパスワードを保存し、プロバイダがオンラインに戻った際に TGT を要求するようにする"
 
-#: src/include/sssd-parameters.rb:1048
+#: src/include/sssd-parameters.rb:1046
 msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
 msgstr "指定した全体の有効期限 (整数 + 時間単位) で更新可能なチケットを要求する"
 
-#: src/include/sssd-parameters.rb:1052
+#: src/include/sssd-parameters.rb:1050
 msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
 msgstr "指定した有効期限 (整数 + 時間単位) でチケットを要求する"
 
-#: src/include/sssd-parameters.rb:1056
+#: src/include/sssd-parameters.rb:1054
 msgid "The time in seconds between two checks if the TGT should be renewed."
 msgstr "TGT を更新すべきかどうかを判断する時間 (秒)"
 
-#: src/include/sssd-parameters.rb:1061
+#: src/include/sssd-parameters.rb:1059
 msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
 msgstr "Kerberos の事前認証で Flexible Authentication Secure Tunneling (FAST) を有効化する"
 
-#: src/include/sssd-parameters.rb:1065
+#: src/include/sssd-parameters.rb:1063
 msgid "Specifies the server principal to use for FAST."
 msgstr "FAST で使用するサーバプリンシパルの指定"
 
-#: src/include/sssd-parameters.rb:1070
+#: src/include/sssd-parameters.rb:1068
 msgid "Specifies if the host and user principal should be canonicalized."
 msgstr "ホストおよびユーザプリンシパルを正規化すべきかどうかの指定"
 
 #. The Active Directory domain section
-#: src/include/sssd-parameters.rb:1083
+#: src/include/sssd-parameters.rb:1081
 msgid "Specifies the name of the Active Directory domain."
 msgstr "Active Directory ドメイン名の指定"
 
-#: src/include/sssd-parameters.rb:1087 src/include/sssd-parameters.rb:1091
+#: src/include/sssd-parameters.rb:1085 src/include/sssd-parameters.rb:1089
 msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
 msgstr "SSSD が接続すべき AD サーバの IP アドレスまたはホスト名のカンマ区切り一覧。指定した順序でアクセスします。"
 
-#: src/include/sssd-parameters.rb:1095
+#: src/include/sssd-parameters.rb:1093
 msgid "Optional. May be set on machines where the hostname(5) does not reflect the fully qualified name used in the Active Directory domain to identify this host."
 msgstr "任意指定です。このホストで hostname(5) が Active Directory ドメインで使用される完全修飾名を反映しない場合に、指定することができます。"
 
-#: src/include/sssd-parameters.rb:1099
+#: src/include/sssd-parameters.rb:1097
 msgid "Override the user's home directory."
 msgstr "ユーザのホームディレクトリの上書き指定"
 
-#: src/include/sssd-parameters.rb:1112
+#: src/include/sssd-parameters.rb:1110
 msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 msgstr " Active Directory のユーザ／グループ ID をマッピングするために使用する、 POSIX ID の範囲下限の指定"
 
-#: src/include/sssd-parameters.rb:1117
+#: src/include/sssd-parameters.rb:1115
 msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
 msgstr " Active Directory のユーザ／グループ ID をマッピングするために使用する、 POSIX ID の範囲上限の指定"
 
-#: src/include/sssd-parameters.rb:1122
+#: src/include/sssd-parameters.rb:1120
 msgid "Specifies the number of IDs available for each slice."
 msgstr "各スライスで利用可能な ID 数の指定"
 
-#: src/include/sssd-parameters.rb:1126
+#: src/include/sssd-parameters.rb:1124
 msgid "Specify the domain SID of the default domain."
 msgstr "既定のドメインに対するドメイン SID の指定"
 
-#: src/include/sssd-parameters.rb:1130
+#: src/include/sssd-parameters.rb:1128
 msgid "Specify the name of the default domain."
 msgstr "既定のドメイン名の指定"
 
-#: src/include/sssd-parameters.rb:1135
+#: src/include/sssd-parameters.rb:1133
 msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
 msgstr "winbind の \"idmap_autorid\" アルゴリズムにより似たアルゴリズムを利用して ID マッピングを動作させる指定"
 
 #. The Active Directory domain section
-#: src/include/sssd-parameters.rb:1147
+#: src/include/sssd-parameters.rb:1145
 msgid "Specifies the name of the IPA domain."
 msgstr "IPA ドメインの名前の指定"
 
-#: src/include/sssd-parameters.rb:1151
+#: src/include/sssd-parameters.rb:1149
 msgid "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference."
 msgstr "SSSD が接続に使用する IPA サーバの IP アドレスまたはホスト名の一覧 (カンマ区切りで、接続する順に指定)"
 
-#: src/include/sssd-parameters.rb:1155
+#: src/include/sssd-parameters.rb:1153
 msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
 msgstr "hostname(5) が完全修飾ドメイン名を反映しないマシンの場合に指定"
 
-#: src/include/sssd-parameters.rb:1160
+#: src/include/sssd-parameters.rb:1158
 msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
 msgstr "FreeIPA v2 に内蔵されている DNS サーバに対し、このクライアントの IP アドレスで自動更新するように SSSD に指定する"
 
-#: src/include/sssd-parameters.rb:1165
+#: src/include/sssd-parameters.rb:1163
 msgid "The TTL to apply to the client DNS record when updating it."
 msgstr "クライアントの DNS レコードを更新する際に適用する TTL"
 
-#: src/include/sssd-parameters.rb:1169
+#: src/include/sssd-parameters.rb:1167
 msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
 msgstr "動的 DNS 更新で使用すべきインターフェイスの IP アドレスを選択"
 
@@ -1087,18 +1089,24 @@
 #. Summary()
 #. returns html formated configuration summary
 #. @return summary
-#: src/modules/AuthClient.rb:334
+#: src/modules/AuthClient.rb:336
 msgid "System is configured for using nss_ldap.\n"
 msgstr "システムは nss_ldap を使用するように設定されています。\n"
 
-#: src/modules/AuthClient.rb:337
+#: src/modules/AuthClient.rb:339
 msgid "System is configured for using sssd.\n"
 msgstr "システムは sssd を使用するように設定されています。\n"
 
-#: src/modules/AuthClient.rb:343
+#: src/modules/AuthClient.rb:345
 msgid "System is configured for using OES.\n"
 msgstr "システムは OES を使用するように設定されています。\n"
 
-#: src/modules/AuthClient.rb:346
+#: src/modules/AuthClient.rb:348
 msgid "System is configured for using /etc/passwd only.\n"
 msgstr "システムは /etc/passwd のみを使用するように設定されています。\n"
+
+#~ msgid "SPAM Prevention"
+#~ msgstr "SPAM 防御"
+
+#~ msgid "TODO WRITE HELP"
+#~ msgstr "TODO WRITE HELP"

Modified: trunk/yast/ja/po/auth-server.ja.po
===================================================================
--- trunk/yast/ja/po/auth-server.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/auth-server.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: auth-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:51+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-08-05 08:17+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -287,8 +287,8 @@
 #. Initialization dialog caption
 #: src/include/auth-server/dialogs.rb:32 src/include/auth-server/wizards.rb:52
 #: src/include/auth-server/wizards.rb:122
-#: src/include/auth-server/wizards.rb:202
-#: src/include/auth-server/wizards.rb:295
+#: src/include/auth-server/wizards.rb:205
+#: src/include/auth-server/wizards.rb:298
 msgid "Authentication Server Configuration"
 msgstr "認証サーバの設定"
 
@@ -472,15 +472,15 @@
 
 #: src/include/auth-server/dialogs.rb:1093
 #: src/include/auth-server/dialogs.rb:1565
-#: src/include/auth-server/tree_structure.rb:907
-#: src/include/auth-server/widgets.rb:420
+#: src/include/auth-server/tree_structure.rb:910
+#: src/include/auth-server/widgets.rb:424
 msgid "Enter a password"
 msgstr "パスワードを入力してください"
 
 #: src/include/auth-server/dialogs.rb:1101
 #: src/include/auth-server/dialogs.rb:1570
-#: src/include/auth-server/tree_structure.rb:913
-#: src/include/auth-server/widgets.rb:430
+#: src/include/auth-server/tree_structure.rb:916
+#: src/include/auth-server/widgets.rb:435
 msgid "The passwords you have entered do not match. Try again."
 msgstr "入力したパスワードが一致しません。もう一度試してください。"
 
@@ -620,9 +620,9 @@
 msgstr "新しいパスワードを入力 (&P)"
 
 #: src/include/auth-server/dialogs.rb:1537
-#: src/include/auth-server/tree_structure.rb:961
-#: src/include/auth-server/tree_structure.rb:1003
-#: src/include/auth-server/widgets.rb:405 src/modules/LdapDatabase.rb:219
+#: src/include/auth-server/tree_structure.rb:964
+#: src/include/auth-server/tree_structure.rb:1006
+#: src/include/auth-server/widgets.rb:406 src/modules/LdapDatabase.rb:219
 msgid "&Validate Password"
 msgstr "パスワードの確認 (&V)"
 
@@ -2031,8 +2031,8 @@
 #: src/include/auth-server/mirrormode-wizard.rb:175
 #: src/include/auth-server/wizards.rb:53
 #: src/include/auth-server/wizards.rb:124
-#: src/include/auth-server/wizards.rb:204
-#: src/include/auth-server/wizards.rb:297
+#: src/include/auth-server/wizards.rb:207
+#: src/include/auth-server/wizards.rb:300
 msgid "Initializing..."
 msgstr "初期化しています..."
 
@@ -2144,74 +2144,74 @@
 #. Error Popup
 #. Error Popup
 #: src/include/auth-server/tree_structure.rb:750
-#: src/include/auth-server/tree_structure.rb:884
+#: src/include/auth-server/tree_structure.rb:887
 msgid "Unable to write settings for the current database."
 msgstr "現在のデータベースの設定を保存することができません。"
 
 #: src/include/auth-server/tree_structure.rb:804
-#: src/include/auth-server/tree_structure.rb:941
+#: src/include/auth-server/tree_structure.rb:944
 msgid "Unable to read settings for the current database."
 msgstr "現在のデータベースの設定を読み込むことができません。"
 
-#: src/include/auth-server/tree_structure.rb:959
-#: src/include/auth-server/tree_structure.rb:1001
-#: src/include/auth-server/widgets.rb:403
+#: src/include/auth-server/tree_structure.rb:962
+#: src/include/auth-server/tree_structure.rb:1004
+#: src/include/auth-server/widgets.rb:404
 msgid "New Administrator &Password"
 msgstr "新しい管理パスワード (&P)"
 
-#: src/include/auth-server/tree_structure.rb:965
-#: src/include/auth-server/tree_structure.rb:1007
-#: src/include/auth-server/widgets.rb:407
+#: src/include/auth-server/tree_structure.rb:968
+#: src/include/auth-server/tree_structure.rb:1010
+#: src/include/auth-server/widgets.rb:408
 msgid "Password &Encryption"
 msgstr "パスワードの暗号化 (&E)"
 
-#: src/include/auth-server/tree_structure.rb:1015
+#: src/include/auth-server/tree_structure.rb:1018
 #: src/include/auth-server/widgets.rb:368
 msgid "Change Administration Password"
 msgstr "管理パスワードの変更"
 
-#: src/include/auth-server/tree_structure.rb:1038
-#: src/include/auth-server/tree_structure.rb:1039
-#: src/include/auth-server/tree_structure.rb:1040
 #: src/include/auth-server/tree_structure.rb:1041
+#: src/include/auth-server/tree_structure.rb:1042
+#: src/include/auth-server/tree_structure.rb:1043
+#: src/include/auth-server/tree_structure.rb:1044
 #: src/modules/AuthServer.pm:2193 src/modules/AuthServer.pm:2212
 #: src/modules/AuthServer.pm:2213 src/modules/AuthServer.pm:2214
 msgid "No"
 msgstr "いいえ"
 
-#: src/include/auth-server/tree_structure.rb:1043
-#: src/include/auth-server/tree_structure.rb:1044
-#: src/include/auth-server/tree_structure.rb:1045
+#: src/include/auth-server/tree_structure.rb:1046
+#: src/include/auth-server/tree_structure.rb:1047
+#: src/include/auth-server/tree_structure.rb:1048
 #: src/modules/AuthServer.pm:2193 src/modules/AuthServer.pm:2212
 #: src/modules/AuthServer.pm:2213 src/modules/AuthServer.pm:2214
 msgid "Yes"
 msgstr "はい"
 
 #. skip attribute that already have an index defined
-#: src/include/auth-server/tree_structure.rb:1188
+#: src/include/auth-server/tree_structure.rb:1191
 msgid "Multiple Replication Consumers not supported currently"
 msgstr "現時点では、複数のレプリケーションコンシューマの設定には対応していません"
 
 #. ****************************************
 #. tree generation functions       **
 #. ***************************************
-#: src/include/auth-server/tree_structure.rb:1290
+#: src/include/auth-server/tree_structure.rb:1293
 msgid "Index Configuration"
 msgstr "インデックス設定"
 
-#: src/include/auth-server/tree_structure.rb:1298
+#: src/include/auth-server/tree_structure.rb:1301
 msgid "Password Policy Configuration"
 msgstr "パスワードポリシーの設定"
 
-#: src/include/auth-server/tree_structure.rb:1307
+#: src/include/auth-server/tree_structure.rb:1310
 msgid "Access Control Configuration"
 msgstr "アクセス制御設定"
 
-#: src/include/auth-server/tree_structure.rb:1316
+#: src/include/auth-server/tree_structure.rb:1319
 msgid "Replication Provider"
 msgstr "レプリケーションプロバイダ"
 
-#: src/include/auth-server/tree_structure.rb:1325
+#: src/include/auth-server/tree_structure.rb:1328
 msgid "Replication Consumer"
 msgstr "レプリケーションコンシューマ"
 
@@ -2445,25 +2445,31 @@
 msgstr "属性"
 
 #: src/include/auth-server/widgets.rb:384
-#: src/include/auth-server/widgets.rb:452
+#: src/include/auth-server/widgets.rb:457
 msgid "Presence"
 msgstr "存在"
 
 #: src/include/auth-server/widgets.rb:384
-#: src/include/auth-server/widgets.rb:453
+#: src/include/auth-server/widgets.rb:458
 msgid "Equality"
 msgstr "均等"
 
 #: src/include/auth-server/widgets.rb:384
-#: src/include/auth-server/widgets.rb:454
+#: src/include/auth-server/widgets.rb:459
 msgid "Substring"
 msgstr "部分文字列"
 
-#: src/include/auth-server/widgets.rb:402
+#: src/include/auth-server/widgets.rb:403
 msgid "Change Administrator Password"
 msgstr "管理者パスワードの変更"
 
-#: src/include/auth-server/widgets.rb:447
+#: src/include/auth-server/widgets.rb:410
+#, fuzzy
+#| msgid "Use Kerberos"
+msgid "Update Kerberos Stash"
+msgstr "Kerberos を使用する"
+
+#: src/include/auth-server/widgets.rb:452
 msgid "Add Index"
 msgstr "インデックスの追加"
 
@@ -2922,7 +2928,7 @@
 msgstr "LDAP サーバ側で Kerberos のスキーマが認識されていません。"
 
 #: src/modules/AuthServer.pm:975 src/modules/AuthServer.pm:3482
-#: src/modules/AuthServer.pm:3529 src/modules/AuthServer.pm:3575
+#: src/modules/AuthServer.pm:3536 src/modules/AuthServer.pm:3581
 msgid "Cannot execute kdb5_ldap_util."
 msgstr "kdb5_ldap_util を実行できません。"
 
@@ -3185,7 +3191,7 @@
 msgid "Could not create database directory."
 msgstr "データベースディレクトリを作成できませんでした。"
 
-#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4101
+#: src/modules/AuthServer.pm:2810 src/modules/AuthServer.pm:4107
 #: src/modules/YaPI/LdapServer.pm:498
 msgid "Could not adjust ownership of database directory."
 msgstr "データベースディレクトリの所有者を設定できませんでした。"
@@ -3208,70 +3214,70 @@
 msgid "Creating Kerberos database failed."
 msgstr "Kerberos データベースの作成に失敗しました。"
 
-#: src/modules/AuthServer.pm:3560 src/modules/AuthServer.pm:3606
+#: src/modules/AuthServer.pm:3566 src/modules/AuthServer.pm:3612
 msgid "Writing to password file failed."
 msgstr "パスワードポリシーの書き込みに失敗しました。"
 
-#: src/modules/AuthServer.pm:3972 src/modules/AuthServer.pm:3982
+#: src/modules/AuthServer.pm:3978 src/modules/AuthServer.pm:3988
 msgid "is not a valid LDAP DN."
 msgstr "は正しい LDAP DN ではありません"
 
-#: src/modules/AuthServer.pm:3977 src/modules/AuthServer.pm:3987
+#: src/modules/AuthServer.pm:3983 src/modules/AuthServer.pm:3993
 msgid "has multivalued RDNs."
 msgstr "は複数の値が存在する RDN です。"
 
-#: src/modules/AuthServer.pm:4019
+#: src/modules/AuthServer.pm:4025
 #, perl-format
 msgid "Invalid LDAP DN: \"%s\", cannot extract RDN values"
 msgstr "LDAP DN が正しくありません: \"%s\" RDN 値を抽出できません"
 
-#: src/modules/AuthServer.pm:4027
+#: src/modules/AuthServer.pm:4033
 msgid "The value of the \"c\" attribute must contain a valid ISO-3166 country 2-letter code."
 msgstr "\"c\" 属性の値には、 ISO-3166 に定義されている 2 文字の国コードを含んでいなければなりません。"
 
 #. parameter check failed
-#: src/modules/AuthServer.pm:4034 src/modules/YaPI/LdapServer.pm:373
+#: src/modules/AuthServer.pm:4040 src/modules/YaPI/LdapServer.pm:373
 msgid "First part of suffix must be c=, st=, l=, o=, ou= or dc=."
 msgstr "サフィックスの最初の部分は、 'c=', 'st=', 'l=', 'o=', 'ou=', 'dc=' のいずれかである必要があります。"
 
-#: src/modules/AuthServer.pm:4046
+#: src/modules/AuthServer.pm:4052
 #, perl-format
 msgid "Base DN \"%s\" is not a valid LDAP DN."
 msgstr "ベース DN \"%s\" は正しい LDAP DN ではありません"
 
-#: src/modules/AuthServer.pm:4051
+#: src/modules/AuthServer.pm:4057
 #, perl-format
 msgid "Base DN \"%s\" has multivalued RDNs (not supported by YaST)."
 msgstr "ベース DN \"%s\" は複数の値が存在する RDN です (YaST モジュールでは、この方式に対応していません) 。"
 
-#: src/modules/AuthServer.pm:4060
+#: src/modules/AuthServer.pm:4066
 #, perl-format
 msgid "Root DN \"%s\" is not a valid LDAP DN."
 msgstr "ルート DN \"%s\" は正しい LDAP DN ではありません"
 
-#: src/modules/AuthServer.pm:4065
+#: src/modules/AuthServer.pm:4071
 #, perl-format
 msgid "Root DN \"%s\" has multivalued RDNs (not supported by YaST)."
 msgstr "ルート DN \"%s\" は複数の値が存在する RDN です (YaST モジュールでは、この方式に対応していません) 。"
 
-#: src/modules/AuthServer.pm:4072
+#: src/modules/AuthServer.pm:4078
 msgid "The Root DN must be a child object of the Base DN."
 msgstr "ルート DN はベース DN の子オブジェクトでなければなりません。"
 
-#: src/modules/AuthServer.pm:4094 src/modules/YaPI/LdapServer.pm:484
+#: src/modules/AuthServer.pm:4100 src/modules/YaPI/LdapServer.pm:484
 msgid "Could not create directory."
 msgstr "ディレクトリを作成できませんでした。"
 
-#: src/modules/AuthServer.pm:4871
+#: src/modules/AuthServer.pm:4877
 #, perl-format
 msgid "CA Certificate File: \"%s\" does not exist."
 msgstr "証明機関の証明書ファイル: \"%s\" が存在しません。"
 
-#: src/modules/AuthServer.pm:4881
+#: src/modules/AuthServer.pm:4887
 msgid "Error while trying to verify the server certificate of the provider server.\n"
 msgstr "プロバイダサーバのサーバ証明書の検証時にエラーが発生しました。\n"
 
-#: src/modules/AuthServer.pm:4882
+#: src/modules/AuthServer.pm:4888
 #, perl-format
 msgid ""
 "Please make sure that \"%s\" contains the correct\n"
@@ -3280,21 +3286,21 @@
 "\"%s\" 内に、リモートのサーバ証明書を検証するための\n"
 "正しい証明書ファイルが含まれているかどうか、ご確認ください。"
 
-#: src/modules/AuthServer.pm:4890
+#: src/modules/AuthServer.pm:4896
 #, perl-format
 msgid "Certificate File: \"%s\" does not exist."
 msgstr "証明書ファイル: \"%s\" が存在しません。"
 
-#: src/modules/AuthServer.pm:4895
+#: src/modules/AuthServer.pm:4901
 #, perl-format
 msgid "Certificate Key File: \"%s\" does not exist."
 msgstr "証明書の鍵ファイル: \"%s\" が存在しません。"
 
-#: src/modules/AuthServer.pm:4976 src/modules/AuthServer.pm:4986
+#: src/modules/AuthServer.pm:4982 src/modules/AuthServer.pm:4992
 msgid "Writing to krb5.conf failed."
 msgstr "krb5.conf への書き込みに失敗しました。"
 
-#: src/modules/AuthServer.pm:5354 src/modules/AuthServer.pm:5363
+#: src/modules/AuthServer.pm:5360 src/modules/AuthServer.pm:5369
 msgid "Writing to kdc.conf failed."
 msgstr "kdc.conf への書き込みに失敗しました。"
 

Modified: trunk/yast/ja/po/autoinst.ja.po
===================================================================
--- trunk/yast/ja/po/autoinst.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/autoinst.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: autoinst\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:51+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-09-08 20:13+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -61,9 +61,9 @@
 #. Backup
 #. Now check if there any classes defined in theis pre final control file
 #: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
-#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:374
-#: src/clients/inst_autosetup_upgrade.rb:423
-#: src/modules/AutoInstallRules.rb:1001
+#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:403
+#: src/clients/inst_autosetup_upgrade.rb:482
+#: src/modules/AutoInstallRules.rb:1006
 msgid ""
 "Error while parsing the control file.\n"
 "Check the log files for more details or fix the\n"
@@ -115,7 +115,7 @@
 msgid "enable/disable all package handling"
 msgstr "全てのパッケージ処理の有効化／無効化"
 
-#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:82
+#: src/clients/ayast_setup.rb:87 src/clients/clone_system.rb:81
 msgid "Empty parameter list"
 msgstr "パラメータリストには何も入っていません"
 
@@ -126,24 +126,31 @@
 msgstr "AutoYaST プロファイルのパスを指定しなければなりません。"
 
 #. if we get no argument or map of options we are not in command line
-#: src/clients/clone_system.rb:47
+#: src/clients/clone_system.rb:46
 msgid "Client for creating an AutoYaST profile based on the currently running system"
 msgstr "現在稼働中のシステムをベースにした、 AutoYaST プロファイルを作成するクライアント"
 
-#: src/clients/clone_system.rb:57
+#: src/clients/clone_system.rb:56
 msgid "known modules: %1"
 msgstr "不明なモジュール: %1"
 
-#: src/clients/clone_system.rb:64
+#: src/clients/clone_system.rb:63
 msgid "comma separated list of modules to clone"
 msgstr "複製するモジュールのリスト (カンマ区切り)"
 
-#: src/clients/clone_system.rb:89
+#. TRANSLATORS: Warning that an already existing autoyast configuration file will be overwritten.
+#: src/clients/clone_system.rb:94
+#, fuzzy
+#| msgid "%1 exists! Really overwrite?"
+msgid "File %s exists! Really overwrite?"
+msgstr "%1 は既に存在します。上書きしてもよろしいですか？"
+
+#: src/clients/clone_system.rb:98
 msgid "Cloning the system..."
 msgstr "システムのクローンを作成しています..."
 
 #. TRANSLATORS: %s is path where profile can be found
-#: src/clients/clone_system.rb:91
+#: src/clients/clone_system.rb:100
 msgid "The resulting autoyast profile can be found in %s."
 msgstr "出力された autoyast プロファイルは %s にあります。"
 
@@ -498,64 +505,74 @@
 msgid "Create partition plans"
 msgstr "パーティションプランを作成"
 
-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:56
+msgid "Configure Bootloader"
+msgstr "ブートローダの設定"
+
+#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:54
+msgid "Registration"
+msgstr "登録"
+
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:55
 msgid "Configure Software selections"
 msgstr "ソフトウエア選択の設定"
 
-#: src/clients/inst_autosetup.rb:58
-msgid "Configure Bootloader"
-msgstr "ブートローダの設定"
-
-#: src/clients/inst_autosetup.rb:59
+#: src/clients/inst_autosetup.rb:60
 msgid "Configure Systemd Default Target"
 msgstr "systemd 既定のターゲットの設定"
 
-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:59
+#: src/clients/inst_autosetup.rb:64 src/clients/inst_autosetup_upgrade.rb:61
 msgid "Executing pre-install user scripts..."
 msgstr "プレインストールユーザスクリプトを実行しています..."
 
-#: src/clients/inst_autosetup.rb:64 src/clients/inst_autosetup_upgrade.rb:58
+#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:60
 msgid "Configuring general settings..."
 msgstr "一般的な設定を行なっています..."
 
-#: src/clients/inst_autosetup.rb:65
+#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:62
 msgid "Setting up language..."
 msgstr "言語を設定しています..."
 
-#: src/clients/inst_autosetup.rb:66
+#: src/clients/inst_autosetup.rb:67
 msgid "Creating partition plans..."
 msgstr "パーティションプランを作成しています..."
 
-#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:68 src/clients/inst_autosetup_upgrade.rb:65
+msgid "Configuring Bootloader..."
+msgstr "ブートローダを設定しています..."
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:63
+#, fuzzy
+#| msgid "Repairing file system..."
+msgid "Registering the system..."
+msgstr "ファイルシステムを修復しています..."
+
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:64
 msgid "Configuring Software selections..."
 msgstr "ソフトウエア選択を設定しています..."
 
-#: src/clients/inst_autosetup.rb:68
-msgid "Configuring Bootloader..."
-msgstr "ブートローダを設定しています..."
-
-#: src/clients/inst_autosetup.rb:69
+#: src/clients/inst_autosetup.rb:71
 msgid "Configuring Systemd Default Target..."
 msgstr "systemd 既定のターゲットを設定しています..."
 
-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:69
 msgid "Preparing System for Automated Installation"
 msgstr "自動インストールのためのシステム準備"
 
 #. configure general settings
-#: src/clients/inst_autosetup.rb:161
+#: src/clients/inst_autosetup.rb:163
 msgid "Handling Add-On Products..."
 msgstr "アドオン製品を処理しています..."
 
 #. Set it in the Language module.
 #.
 #. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:181 src/clients/inst_autosetup_upgrade.rb:144
+#: src/clients/inst_autosetup.rb:183 src/clients/inst_autosetup_upgrade.rb:149
 msgid "Configuring language..."
 msgstr "言語を設定しています..."
 
 #. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:267
+#: src/clients/inst_autosetup.rb:272
 msgid ""
 "Error while configuring partitions.\n"
 "Try again.\n"
@@ -564,7 +581,7 @@
 "再度試してください。\n"
 
 #. Software
-#: src/clients/inst_autosetup.rb:289
+#: src/clients/inst_autosetup.rb:328
 msgid ""
 "Error while configuring software selections.\n"
 "Try again.\n"
@@ -574,55 +591,55 @@
 
 #. ReportingDialog()
 #. @return sumbol
-#: src/clients/report_auto.rb:99
+#: src/clients/report_auto.rb:103
 msgid "Messages"
 msgstr "メッセージ"
 
-#: src/clients/report_auto.rb:105
+#: src/clients/report_auto.rb:109
 msgid "Sho&w messages"
 msgstr "メッセージを表示 (&W)"
 
-#: src/clients/report_auto.rb:113
+#: src/clients/report_auto.rb:117
 msgid "Lo&g messages"
 msgstr "メッセージを記録 (&G)"
 
-#: src/clients/report_auto.rb:124
+#: src/clients/report_auto.rb:128
 msgid "&Time-out (in sec.)"
 msgstr "タイムアウト (秒) (&T)"
 
-#: src/clients/report_auto.rb:136
+#: src/clients/report_auto.rb:140
 msgid "Warnings"
 msgstr "警告"
 
-#: src/clients/report_auto.rb:142
+#: src/clients/report_auto.rb:146
 msgid "Sh&ow warnings"
 msgstr "警告を表示する (&O)"
 
-#: src/clients/report_auto.rb:150
+#: src/clients/report_auto.rb:154
 msgid "Log wa&rnings"
 msgstr "警告を記録 (&R)"
 
-#: src/clients/report_auto.rb:161
+#: src/clients/report_auto.rb:165
 msgid "Time-out (in s&ec.)"
 msgstr "タイムアウト (秒) (&E)"
 
-#: src/clients/report_auto.rb:173
+#: src/clients/report_auto.rb:177
 msgid "Errors"
 msgstr "エラー"
 
-#: src/clients/report_auto.rb:179
+#: src/clients/report_auto.rb:183
 msgid "Show error&s"
 msgstr "エラーを表示 (&S)"
 
-#: src/clients/report_auto.rb:187
+#: src/clients/report_auto.rb:191
 msgid "&Log errors"
 msgstr "エラーを記録 (&L)"
 
-#: src/clients/report_auto.rb:198
+#: src/clients/report_auto.rb:202
 msgid "Time-o&ut (in sec.)"
 msgstr "タイムアウト (秒) (&U)"
 
-#: src/clients/report_auto.rb:213
+#: src/clients/report_auto.rb:217
 msgid ""
 "<p>Depending on your experience, you can skip, log, and show (with time-out)\n"
 "installation messages.</p> \n"
@@ -630,7 +647,7 @@
 "<p>ご要望に応じて、インストール時のメッセージを表示せずに飛ばすことができるほか、それらを記録したり時間切れ設定付きで\n"
 "表示したりすることができます。</p>\n"
 
-#: src/clients/report_auto.rb:219
+#: src/clients/report_auto.rb:223
 msgid ""
 "<p>It is recommended to show all  <b>messages</b> with time-out.\n"
 "Warnings can be skipped in some places, but should not be ignored.</p>\n"
@@ -638,7 +655,7 @@
 "<p><b>メッセージ</b> のすべてを、タイムアウト付きで表示しておくことをお勧めします。\n"
 "警告メッセージによっては飛ばすことができるものがありますが、それらは無視するべきものではありません。</p>\n"
 
-#: src/clients/report_auto.rb:226
+#: src/clients/report_auto.rb:230
 msgid "Messages and Logging"
 msgstr "メッセージとログ"
 
@@ -1020,7 +1037,7 @@
 msgstr "新規 (&W)"
 
 #: src/include/autoinstall/classes.rb:65
-#: src/include/autoinstall/conftree.rb:172
+#: src/include/autoinstall/conftree.rb:175
 msgid "&Edit"
 msgstr "編集 (&E)"
 
@@ -1214,31 +1231,27 @@
 msgid "Groups"
 msgstr "グループ"
 
-#. Creates the modules selection box displaying modules in the specified group.
-#. The specified YaST module is selected.
-#.
-#. @param [String] group_name YaST group of modules to display.
-#. @param [String] selectedModule Module to preselect.
-#: src/include/autoinstall/conftree.rb:151
+#. bnc #887115 comment #9: Desktop file is "hidden" and should not be shown at all
+#: src/include/autoinstall/conftree.rb:154
 msgid "No modules available"
 msgstr "利用できるモジュールがありません"
 
-#: src/include/autoinstall/conftree.rb:154
+#: src/include/autoinstall/conftree.rb:157
 msgid "Modules"
 msgstr "モジュール"
 
 #. Creates an `HBox containing the buttons to be displayed below the summary column
 #.
 #. @return The `HBox widget.
-#: src/include/autoinstall/conftree.rb:167
+#: src/include/autoinstall/conftree.rb:170
 msgid "&Clone"
 msgstr "複製 (&C)"
 
-#: src/include/autoinstall/conftree.rb:168
+#: src/include/autoinstall/conftree.rb:171
 msgid "&Apply to System"
 msgstr "システムに適用 (&A)"
 
-#: src/include/autoinstall/conftree.rb:173
+#: src/include/autoinstall/conftree.rb:176
 msgid "Clea&r"
 msgstr "消去 (&R)"
 
@@ -1246,7 +1259,7 @@
 #.
 #. @param [String] module_name The module to summarize.
 #. @return The `VBox widget.
-#: src/include/autoinstall/conftree.rb:192
+#: src/include/autoinstall/conftree.rb:195
 msgid "Details"
 msgstr "詳細"
 
@@ -1546,7 +1559,7 @@
 #. list<any> l = [ "key1",0,"key3" ];
 #. m[ l ] = v;
 #. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:791
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:794
 msgid "Checking XML with RNG validation..."
 msgstr "RNG 検証で XML を確認しています..."
 
@@ -1556,7 +1569,7 @@
 msgstr "セクション %1: "
 
 #. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:803
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:806
 msgid "Checking XML with RNC validation..."
 msgstr "RNC 検証で XML を確認しています..."
 
@@ -1595,7 +1608,7 @@
 msgstr "第 2 ステージの完了後にマシンを再起動する"
 
 #: src/include/autoinstall/general_dialogs.rb:90
-#: src/modules/AutoinstGeneral.rb:118
+#: src/modules/AutoinstGeneral.rb:121
 msgid "Signature Handling"
 msgstr "署名処理"
 
@@ -2253,7 +2266,7 @@
 
 #. Read rules file
 #. @return [void]
-#: src/modules/AutoInstallRules.rb:448
+#: src/modules/AutoInstallRules.rb:453
 msgid "Parsing the rules file failed. XML parser reports:\n"
 msgstr "規則ファイルの解析に失敗しました。 XML パーサの報告:\n"
 
@@ -2261,12 +2274,12 @@
 #. @param [String] result_profile the resulting control file path
 #. @return [Boolean] true on success
 #. autoyast has read the autoyast configuration file but something went wrong
-#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:722
+#: src/modules/AutoInstallRules.rb:914 src/modules/Profile.rb:725
 msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
 msgstr "AutoYAST プロファイルを解析中に XML パーサがエラーを報告しました。エラーメッセージ:\n"
 
 #. backdoor for merging problems.
-#: src/modules/AutoInstallRules.rb:1054
+#: src/modules/AutoInstallRules.rb:1059
 msgid ""
 "\n"
 "User-defined classes could not be retrieved.  Make sure all classes \n"
@@ -2282,45 +2295,45 @@
 
 #. The line above needs to be fixed when we have more attributes
 #. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:271
+#: src/modules/AutoinstConfig.rb:273
 msgid "Choose Profile"
 msgstr "プロファイルの選択"
 
 #. SetProtocolMessage ()
 #. @return [void]
-#: src/modules/AutoinstConfig.rb:327
+#: src/modules/AutoinstConfig.rb:329
 msgid "Retrieving control file from floppy."
 msgstr "コントロールファイルをフロッピィディスクから読み込みます。"
 
-#: src/modules/AutoinstConfig.rb:330
+#: src/modules/AutoinstConfig.rb:332
 msgid "Retrieving control file (%1) from TFTP server: %2."
 msgstr "%2 の TFTP サーバからコントロールファイル %1 を読み込みます。"
 
-#: src/modules/AutoinstConfig.rb:336
+#: src/modules/AutoinstConfig.rb:338
 msgid "Retrieving control file (%1) from NFS server: %2."
 msgstr "%2 の NFS サーバからコントロールファイル %1 を読み込みます。"
 
-#: src/modules/AutoinstConfig.rb:342
+#: src/modules/AutoinstConfig.rb:344
 msgid "Retrieving control file (%1) from HTTP server: %2."
 msgstr "%2 の HTTP サーバからコントロールファイル %1 を読み込みます。"
 
-#: src/modules/AutoinstConfig.rb:348
+#: src/modules/AutoinstConfig.rb:350
 msgid "Retrieving control file (%1) from FTP server: %2."
 msgstr "%2 の FTP サーバからコントロールファイル %1 を読み込みます。"
 
-#: src/modules/AutoinstConfig.rb:354
+#: src/modules/AutoinstConfig.rb:356
 msgid "Copying control file from file: %1."
 msgstr "%1 のファイルからコントロールファイルをコピーします。"
 
-#: src/modules/AutoinstConfig.rb:359
+#: src/modules/AutoinstConfig.rb:361
 msgid "Copying control file from device: /dev/%1."
 msgstr "/dev/%1 のデバイスからコントロールファイルをコピーします。"
 
-#: src/modules/AutoinstConfig.rb:363
+#: src/modules/AutoinstConfig.rb:365
 msgid "Copying control file from default location."
 msgstr "デフォルトの場所からコントロールファイルをコピーします。"
 
-#: src/modules/AutoinstConfig.rb:365
+#: src/modules/AutoinstConfig.rb:367
 msgid "Source unknown."
 msgstr "不明なソース。"
 
@@ -2330,7 +2343,7 @@
 #. {
 #. local_rules_file = (string)WFM::Args(1);
 #. }
-#: src/modules/AutoinstConfig.rb:445
+#: src/modules/AutoinstConfig.rb:447
 msgid ""
 "<h3>AutoYaST Configuration Management System</h3>\n"
 "<p>Almost all resources of the control file can be\n"
@@ -2340,7 +2353,7 @@
 "<p>コントロールファイルのほとんどすべてのリソースを、\n"
 "設定管理システムで設定することができます。</p>\n"
 
-#: src/modules/AutoinstConfig.rb:450
+#: src/modules/AutoinstConfig.rb:452
 msgid ""
 "<p>Most of the modules used to create the configuration are identical to those available\n"
 "through the YaST Control Center. Instead of configuring this system, the data\n"
@@ -2353,7 +2366,7 @@
 "コントロールファイルに出力されます。\n"
 "</p>\n"
 
-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:459
 msgid ""
 "<p>In addition to the existing and familiar modules,\n"
 "new interfaces were created for special and complex configurations, including\n"
@@ -2371,12 +2384,12 @@
 #. @param [Hash{String => Object}] drive to create node name for
 #.
 #. @return the newly created node name
-#: src/modules/AutoinstDrive.rb:129
+#: src/modules/AutoinstDrive.rb:128
 msgid " - Drive"
 msgstr " - ドライブ"
 
 #. volume group
-#: src/modules/AutoinstDrive.rb:133
+#: src/modules/AutoinstDrive.rb:132
 msgid " - Volume group"
 msgstr " - ボリュームグループ "
 
@@ -2387,74 +2400,74 @@
 
 #. string language_name		= "";
 #. string keyboard_name		= "";
-#: src/modules/AutoinstGeneral.rb:82
+#: src/modules/AutoinstGeneral.rb:85
 msgid "Confirm installation?"
 msgstr "インストールを開始してよろしいでしょうか？"
 
-#: src/modules/AutoinstGeneral.rb:85 src/modules/AutoinstGeneral.rb:91
-#: src/modules/AutoinstGeneral.rb:100 src/modules/AutoinstGeneral.rb:107
-#: src/modules/AutoinstGeneral.rb:114
+#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
+#: src/modules/AutoinstGeneral.rb:103 src/modules/AutoinstGeneral.rb:110
+#: src/modules/AutoinstGeneral.rb:117
 msgid "Yes"
 msgstr "はい"
 
-#: src/modules/AutoinstGeneral.rb:85 src/modules/AutoinstGeneral.rb:91
-#: src/modules/AutoinstGeneral.rb:100
+#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
+#: src/modules/AutoinstGeneral.rb:103
 msgid "No"
 msgstr "いいえ"
 
-#: src/modules/AutoinstGeneral.rb:88
+#: src/modules/AutoinstGeneral.rb:91
 msgid "Second Stage of AutoYaST"
 msgstr "AutoYaST の第 2 ステージ"
 
-#: src/modules/AutoinstGeneral.rb:96
+#: src/modules/AutoinstGeneral.rb:99
 msgid "Halting the machine after stage one"
 msgstr "ステージ 1 の完了後にマシンを停止する"
 
-#: src/modules/AutoinstGeneral.rb:105
+#: src/modules/AutoinstGeneral.rb:108
 msgid "Halting the machine after stage two"
 msgstr "ステージ 2 の完了後にマシンを停止する"
 
-#: src/modules/AutoinstGeneral.rb:112
+#: src/modules/AutoinstGeneral.rb:115
 msgid "Reboot the machine after stage two"
 msgstr "ステージ 2 の完了後にマシンを再起動する"
 
-#: src/modules/AutoinstGeneral.rb:122
+#: src/modules/AutoinstGeneral.rb:125
 msgid "Accepting unsigned files"
 msgstr "署名なしのファイルを受け入れる"
 
-#: src/modules/AutoinstGeneral.rb:123
+#: src/modules/AutoinstGeneral.rb:126
 msgid "Not accepting unsigned files"
 msgstr "署名なしのファイルを受け入れない"
 
-#: src/modules/AutoinstGeneral.rb:132
+#: src/modules/AutoinstGeneral.rb:135
 msgid "Accepting files without a checksum"
 msgstr "チェックサムなしのファイルを受け入れる"
 
-#: src/modules/AutoinstGeneral.rb:133
+#: src/modules/AutoinstGeneral.rb:136
 msgid "Not accepting files without a checksum"
 msgstr "チェックサムなしのファイルを受け入れない"
 
-#: src/modules/AutoinstGeneral.rb:142
+#: src/modules/AutoinstGeneral.rb:145
 msgid "Accepting failed verifications"
 msgstr "検証が失敗したものを受け入れる"
 
-#: src/modules/AutoinstGeneral.rb:143
+#: src/modules/AutoinstGeneral.rb:146
 msgid "Not accepting failed verifications"
 msgstr "検証が失敗したものを受け入れない"
 
-#: src/modules/AutoinstGeneral.rb:148
+#: src/modules/AutoinstGeneral.rb:151
 msgid "Accepting unknown GPG keys"
 msgstr "不明な GPG 鍵を受け入れる"
 
-#: src/modules/AutoinstGeneral.rb:149
+#: src/modules/AutoinstGeneral.rb:152
 msgid "Not accepting unknown GPG Keys"
 msgstr "不明な GPG 鍵を受け入れない"
 
-#: src/modules/AutoinstGeneral.rb:154
+#: src/modules/AutoinstGeneral.rb:157
 msgid "Importing new GPG keys"
 msgstr "新しい GPG 鍵をインポートする"
 
-#: src/modules/AutoinstGeneral.rb:155
+#: src/modules/AutoinstGeneral.rb:158
 msgid "Not importing new GPG Keys"
 msgstr "新しい GPG 鍵をインポートしない"
 
@@ -2475,11 +2488,11 @@
 #. @return  [String] configuration summary dialog
 #. return Summary of configuration
 #. @return  [String] configuration summary dialog
-#: src/modules/AutoinstPartPlan.rb:681 src/modules/AutoinstStorage.rb:912
+#: src/modules/AutoinstPartPlan.rb:682 src/modules/AutoinstStorage.rb:912
 msgid "Drives"
 msgstr "ドライブ"
 
-#: src/modules/AutoinstPartPlan.rb:685 src/modules/AutoinstStorage.rb:916
+#: src/modules/AutoinstPartPlan.rb:686 src/modules/AutoinstStorage.rb:916
 msgid "Total of %1 drive"
 msgstr "全 %1 ドライブ"
 
@@ -2543,31 +2556,31 @@
 
 #. 4 means "already exists"
 #. Add add-ons
-#: src/modules/AutoinstSoftware.rb:312 src/modules/AutoinstSoftware.rb:332
+#: src/modules/AutoinstSoftware.rb:315 src/modules/AutoinstSoftware.rb:335
 msgid "Adding repo %1 failed"
 msgstr "リポジトリ %1 を追加できませんでした"
 
 #. Install
-#: src/modules/AutoinstSoftware.rb:360
+#: src/modules/AutoinstSoftware.rb:363
 msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
 msgstr "パターンのインストール時にイメージの作成が失敗しました。 /tmp/ay_image.log をご確認ください。"
 
-#: src/modules/AutoinstSoftware.rb:368
+#: src/modules/AutoinstSoftware.rb:371
 msgid "Creating Image - installing packages"
 msgstr "イメージの作成 - パッケージをインストールしています"
 
-#: src/modules/AutoinstSoftware.rb:378
+#: src/modules/AutoinstSoftware.rb:381
 msgid "Image creation failed while package installation. Please check /tmp/ay_image.log"
 msgstr "パッケージのインストール時にイメージの作成が失敗しました。 /tmp/ay_image.log をご確認ください。"
 
 #. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
-#: src/modules/AutoinstSoftware.rb:389
+#: src/modules/AutoinstSoftware.rb:392
 msgid "Store image to ..."
 msgstr "イメージの保存 ..."
 
 #. Compress image:
 #. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*"  .
-#: src/modules/AutoinstSoftware.rb:418
+#: src/modules/AutoinstSoftware.rb:421
 msgid ""
 "You can do changes to the image now in %1/\n"
 "If you press the ok-button, the image will be compressed and can't be changed anymore."
@@ -2575,16 +2588,16 @@
 "%1/ 内でイメージを変更することができます。\n"
 "OK ボタンを押すとイメージは圧縮され、変更できなくなります。"
 
-#: src/modules/AutoinstSoftware.rb:432
+#: src/modules/AutoinstSoftware.rb:435
 msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
 msgstr "イメージの圧縮が '%1' で失敗しました。 /tmp/ay_image.log をご確認ください。"
 
-#: src/modules/AutoinstSoftware.rb:439
+#: src/modules/AutoinstSoftware.rb:442
 msgid "Image created successfully"
 msgstr "イメージは正しく作成されました"
 
 #. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:475
+#: src/modules/AutoinstSoftware.rb:478
 msgid ""
 "can not get the directory.yast file at `%1`.\n"
 "You can create that file with 'ls -F > directory.yast' if it's missing."
@@ -2593,30 +2606,30 @@
 "存在しない場合は、 'ls -F > directory.yast' で作成することができます。"
 
 #. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
-#: src/modules/AutoinstSoftware.rb:509
+#: src/modules/AutoinstSoftware.rb:512
 msgid "can not read '%1'. Try again?"
 msgstr "'%1' を読み込めません。再試行しますか？"
 
 #. copy a file
-#: src/modules/AutoinstSoftware.rb:527
+#: src/modules/AutoinstSoftware.rb:530
 msgid "can not read '%1'. ISO creation failed"
 msgstr "'%1' を読み込めません。 ISO の作成に失敗しました。"
 
 #. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:557
+#: src/modules/AutoinstSoftware.rb:560
 msgid "Preparing ISO Filestructure ..."
 msgstr "ISO のファイル構造を準備しています ..."
 
 #. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:606
+#: src/modules/AutoinstSoftware.rb:609
 msgid "boot config for the DVD"
 msgstr "DVD 向けの起動設定"
 
-#: src/modules/AutoinstSoftware.rb:610
+#: src/modules/AutoinstSoftware.rb:613
 msgid "Ok"
 msgstr "了解"
 
-#: src/modules/AutoinstSoftware.rb:613
+#: src/modules/AutoinstSoftware.rb:616
 msgid ""
 "You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n"
 "If you press the ok-button, the iso will be created."
@@ -2626,43 +2639,43 @@
 
 #. create the actual ISO file
 #. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") );
-#: src/modules/AutoinstSoftware.rb:632
+#: src/modules/AutoinstSoftware.rb:635
 msgid "Store ISO image to ..."
 msgstr "ISO イメージの保存 ..."
 
-#: src/modules/AutoinstSoftware.rb:633
+#: src/modules/AutoinstSoftware.rb:636
 msgid "Creating ISO File ..."
 msgstr "ISO ファイルを作成しています ..."
 
-#: src/modules/AutoinstSoftware.rb:654
+#: src/modules/AutoinstSoftware.rb:657
 msgid "ISO successfully created at %1"
 msgstr "ISO は %1 に正しく作成できました"
 
 #. Summary
 #. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:730
+#: src/modules/AutoinstSoftware.rb:733
 msgid "Selected Patterns"
 msgstr "選択したパターン"
 
-#: src/modules/AutoinstSoftware.rb:740
+#: src/modules/AutoinstSoftware.rb:743
 msgid "Individually Selected Packages"
 msgstr "個別に選択されたパッケージ"
 
-#: src/modules/AutoinstSoftware.rb:746
+#: src/modules/AutoinstSoftware.rb:749
 msgid "Packages to Remove"
 msgstr "削除するパッケージ"
 
-#: src/modules/AutoinstSoftware.rb:753
+#: src/modules/AutoinstSoftware.rb:756
 msgid "Force Kernel Package"
 msgstr "必須のカーネルパッケージ"
 
 #. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:843
+#: src/modules/AutoinstSoftware.rb:846
 msgid "Could not set patterns: %1."
 msgstr "パターンを設定できません： %1"
 
 #. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:903
+#: src/modules/AutoinstSoftware.rb:907
 msgid "The package resolver run failed. Please check your software section in the autoyast profile."
 msgstr "パッケージ解決器の実行に失敗しました。 AutoYaST プロファイルのソフトウエアのセクションを確認してください。"
 
@@ -2710,7 +2723,7 @@
 #. Save YCP data into XML
 #. @param  path to file
 #. @return	[Boolean] true on success
-#: src/modules/Profile.rb:438
+#: src/modules/Profile.rb:441
 msgid "Encrypted AutoYaST profile. Enter the password twice."
 msgstr "AutoYAST プロファイルを暗号化します。パスワードを 2 回入力してください"
 
@@ -2718,14 +2731,14 @@
 #.
 #. @param [String] dir - directory to store section xml files in
 #. @return	  - list of filenames
-#: src/modules/Profile.rb:512
+#: src/modules/Profile.rb:515
 msgid "Could not write section %1 to file %2."
 msgstr "ファイル %2 にセクション %1 を書き込むことができませんでした。"
 
 #. Read XML into  YCP data
 #. @param  path to file
 #. @return	[Boolean]
-#: src/modules/Profile.rb:679 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:682 src/modules/ProfileLocation.rb:190
 msgid "Encrypted AutoYaST profile. Enter the correct password."
 msgstr "AutoYAST プロファイルは暗号化されています。正しいパスワードを入力してください。"
 

Modified: trunk/yast/ja/po/base.ja.po
===================================================================
--- trunk/yast/ja/po/base.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/base.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: base\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-07 13:28+0200\n"
+"POT-Creation-Date: 2014-10-29 16:22+0100\n"
 "PO-Revision-Date: 2014-08-08 07:40+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -1291,7 +1291,7 @@
 #. this media (CD) so no packages from this media will be installed
 #. PushButton label
 #: library/general/src/modules/Label.rb:250
-#: library/packages/src/modules/PackageCallbacks.rb:887
+#: library/packages/src/modules/PackageCallbacks.rb:889
 #: library/wizard/src/modules/Confirm.rb:127
 msgid "&Skip"
 msgstr "この処理を飛ばす (&S)"
@@ -1314,7 +1314,7 @@
 #. TextEntry Label
 #. textentry label
 #: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2562
+#: library/packages/src/modules/PackageCallbacks.rb:2581
 msgid "&Password"
 msgstr "パスワード (&P)"
 
@@ -2654,37 +2654,37 @@
 "スペースは使用できません。\n"
 
 #. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:109
+#: library/network/src/modules/SuSEFirewall.rb:114
 msgid "External Zone"
 msgstr "外部ゾーン"
 
 #. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:113
+#: library/network/src/modules/SuSEFirewall.rb:118
 msgid "Internal Zone"
 msgstr "内部ゾーン"
 
 #. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:117
+#: library/network/src/modules/SuSEFirewall.rb:122
 msgid "Demilitarized Zone"
 msgstr "非武装ゾーン"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:238
+#: library/network/src/modules/SuSEFirewall.rb:243
 msgid "TCP"
 msgstr "TCP"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:240
+#: library/network/src/modules/SuSEFirewall.rb:245
 msgid "UDP"
 msgstr "UDP"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:242
+#: library/network/src/modules/SuSEFirewall.rb:247
 msgid "RPC"
 msgstr "RPC"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:244
+#: library/network/src/modules/SuSEFirewall.rb:249
 msgid "IP"
 msgstr "IP"
 
@@ -2721,82 +2721,72 @@
 "YaST2 ファイアウオールを実行して割り当ててください。\n"
 
 #. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2486
+#: library/network/src/modules/SuSEFirewall.rb:2478
 msgid "Initializing Firewall Configuration"
 msgstr "ファイアウオールの設定を準備しています"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
+#: library/network/src/modules/SuSEFirewall.rb:2486
 msgid "Check for network devices"
 msgstr "ネットワークデバイスの確認"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
+#: library/network/src/modules/SuSEFirewall.rb:2488
 msgid "Read current configuration"
 msgstr "現在の設定の読み込み"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
+#: library/network/src/modules/SuSEFirewall.rb:2490
 msgid "Check possibly conflicting services"
 msgstr "競合する可能性のあるサービスの確認"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2500
-msgid "Read dynamic definitions of installed services"
-msgstr "インストールされたサービスの動的設定の読み込み"
-
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2504
+#: library/network/src/modules/SuSEFirewall.rb:2494
 msgid "Checking for network devices..."
 msgstr "ネットワークデバイスを確認しています..."
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2506
+#: library/network/src/modules/SuSEFirewall.rb:2496
 msgid "Reading current configuration..."
 msgstr "現在の設定を読み込んでいます..."
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2508
+#: library/network/src/modules/SuSEFirewall.rb:2498
 msgid "Checking possibly conflicting services..."
 msgstr "競合する可能性のあるサービスを確認しています..."
 
-#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2510
-msgid "Reading dynamic definitions of installed services..."
-msgstr "インストールされたサービスの動的設定を読み込んでいます..."
-
 #. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2671
+#: library/network/src/modules/SuSEFirewall.rb:2655
 msgid "Writing Firewall Configuration"
 msgstr "ファイアウオール設定を書き込んでいます"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2679
+#: library/network/src/modules/SuSEFirewall.rb:2663
 msgid "Write firewall settings"
 msgstr "ファイアウオール設定の書き込み"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2681
+#: library/network/src/modules/SuSEFirewall.rb:2665
 msgid "Adjust firewall service"
 msgstr "ファイアウオールサービスの調整"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2685
+#: library/network/src/modules/SuSEFirewall.rb:2669
 msgid "Writing firewall settings..."
 msgstr "ファイアウオール設定を書き込んでいます..."
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2687
+#: library/network/src/modules/SuSEFirewall.rb:2671
 msgid "Adjusting firewall service..."
 msgstr "ファイアウオールサービスを調整しています..."
 
 #. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2706
+#: library/network/src/modules/SuSEFirewall.rb:2690
 msgid "Writing settings failed"
 msgstr "設定を保存できませんでした"
 
 #. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3504
+#: library/network/src/modules/SuSEFirewall.rb:3488
 msgid "Unknown protocol (%1)"
 msgstr "不明なプロトコルです (%1) 。"
 
@@ -2921,18 +2911,18 @@
 #. "broadcast_ports" : [ ],
 #. ]
 #. );
-#: library/network/src/modules/SuSEFirewallServices.rb:345
-#: library/network/src/modules/SuSEFirewallServices.rb:617
+#: library/network/src/modules/SuSEFirewallServices.rb:355
+#: library/network/src/modules/SuSEFirewallServices.rb:638
 msgid "Service with name '%{service_name}' does not exist"
 msgstr "'%{service_name}' という名前のサービスは存在していません"
 
 #. Fallback for presented service
-#: library/network/src/modules/SuSEFirewallServices.rb:420
+#: library/network/src/modules/SuSEFirewallServices.rb:431
 msgid "Service: %{filename}"
 msgstr "サービス: %{filename}"
 
 #. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:483
+#: library/network/src/modules/SuSEFirewallServices.rb:504
 msgid "Unknown service '%1'"
 msgstr "不明なサービスです '%1'"
 
@@ -2957,51 +2947,51 @@
 msgstr "アンインストール (&U)"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:205
-#: library/packages/src/modules/PackageCallbacks.rb:1725
+#: library/packages/src/modules/PackageCallbacks.rb:207
+#: library/packages/src/modules/PackageCallbacks.rb:1727
 msgid "Package: "
 msgstr "パッケージ: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:206
+#: library/packages/src/modules/PackageCallbacks.rb:208
 msgid "Size: "
 msgstr "サイズ: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:229
+#: library/packages/src/modules/PackageCallbacks.rb:231
 msgid "Remaining time to automatic retry: %1"
 msgstr "自動再試行への残り時間: %1"
 
 #. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:242
-#: library/packages/src/modules/PackageCallbacks.rb:250
+#: library/packages/src/modules/PackageCallbacks.rb:244
+#: library/packages/src/modules/PackageCallbacks.rb:252
 msgid "Downloading package %1 (%2)..."
 msgstr "パッケージ %1 (%2) をダウンロードしています..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:254
+#: library/packages/src/modules/PackageCallbacks.rb:256
 msgid "Downloading Package"
 msgstr "パッケージをダウンロードしています"
 
 #. check box
-#: library/packages/src/modules/PackageCallbacks.rb:312
+#: library/packages/src/modules/PackageCallbacks.rb:314
 msgid "Show &details"
 msgstr "詳細の表示 (&D)"
 
 #. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:378
+#: library/packages/src/modules/PackageCallbacks.rb:380
 msgid "Package %1 is broken, integrity check has failed."
 msgstr "パッケージ %1 は壊れています。整合性チェックが失敗しました。"
 
 #. command line mode - ask user whether installation of the failed package should be retried
 #. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:391
-#: library/packages/src/modules/PackageCallbacks.rb:608
+#: library/packages/src/modules/PackageCallbacks.rb:393
+#: library/packages/src/modules/PackageCallbacks.rb:610
 msgid "Retry installation of the package?"
 msgstr "パッケージのインストールを再試行しますか？"
 
 #. command line mode - ask user whether the installation should be aborted
 #. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:399
-#: library/packages/src/modules/PackageCallbacks.rb:616
+#: library/packages/src/modules/PackageCallbacks.rb:401
+#: library/packages/src/modules/PackageCallbacks.rb:618
 msgid "Abort the installation?"
 msgstr "インストールを中止しますか？"
 
@@ -3010,15 +3000,15 @@
 #. detail string is appended to the end
 #. error message, %1 is code of the error,
 #. detail string is appended to the end
-#: library/packages/src/modules/PackageCallbacks.rb:427
-#: library/packages/src/modules/PackageCallbacks.rb:461
-#: library/packages/src/modules/PackageCallbacks.rb:2491
+#: library/packages/src/modules/PackageCallbacks.rb:429
+#: library/packages/src/modules/PackageCallbacks.rb:463
+#: library/packages/src/modules/PackageCallbacks.rb:2493
 msgid "Error: %1:"
 msgstr "エラー: %1:"
 
 #. TODO: add "Don't show again" checkbox
 #. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:484
+#: library/packages/src/modules/PackageCallbacks.rb:486
 msgid ""
 "Ignoring a download failure may result in a broken system.\n"
 "Verify the system later by running the Software Management module.\n"
@@ -3027,35 +3017,35 @@
 "処理完了後にソフトウエア管理モジュールを実行して、システムの正当性を確認してください。\n"
 
 #. At start of package install.
-#: library/packages/src/modules/PackageCallbacks.rb:524
+#: library/packages/src/modules/PackageCallbacks.rb:526
 msgid "Uninstalling package %1 (%2)..."
 msgstr "パッケージ %1 (%2) をアンインストールしています..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:525
+#: library/packages/src/modules/PackageCallbacks.rb:527
 msgid "Installing package %1 (%2)..."
 msgstr "パッケージ %1 (%2) をインストールしています..."
 
-#: library/packages/src/modules/PackageCallbacks.rb:532
+#: library/packages/src/modules/PackageCallbacks.rb:534
 msgid "Uninstalling Package"
 msgstr "パッケージをアンインストールしています"
 
-#: library/packages/src/modules/PackageCallbacks.rb:532
+#: library/packages/src/modules/PackageCallbacks.rb:534
 msgid "Installing Package"
 msgstr "パッケージをインストールしています"
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:595
 msgid "Removal of package %1 failed."
 msgstr "パッケージ %1 のアンインストールに失敗しました。"
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:595
+#: library/packages/src/modules/PackageCallbacks.rb:597
 msgid "Installation of package %1 failed."
 msgstr "パッケージ %1 のインストールに失敗しました。"
 
 #. TODO: add "Don't show again" checkbox
 #. a warning popup displayed after pressing [Ignore] after a package installation error
-#: library/packages/src/modules/PackageCallbacks.rb:667
+#: library/packages/src/modules/PackageCallbacks.rb:669
 msgid ""
 "Ignoring a package failure may result in a broken system.\n"
 "The system should be later verified by running the Software Management module."
@@ -3064,7 +3054,7 @@
 "処理完了後にソフトウエア管理モジュールを実行して、システムの正当性を確認してください。"
 
 #. error report
-#: library/packages/src/modules/PackageCallbacks.rb:790
+#: library/packages/src/modules/PackageCallbacks.rb:792
 msgid ""
 "<p>The repository at the specified URL now provides a different media ID.\n"
 "If the URL is correct, this indicates that the repository content has changed. To \n"
@@ -3079,27 +3069,27 @@
 #. media is double sided, we want the user to insert the 'Side A' of the media
 #. the complete string will be "<product> <media> <number>, <side>"
 #. e.g. "'SuSE Linux 9.0' DVD 1, Side A"
-#: library/packages/src/modules/PackageCallbacks.rb:805
+#: library/packages/src/modules/PackageCallbacks.rb:807
 msgid "Side A"
 msgstr "A 面"
 
 #. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:808
+#: library/packages/src/modules/PackageCallbacks.rb:810
 msgid "Side B"
 msgstr "B 面"
 
 #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:822
+#: library/packages/src/modules/PackageCallbacks.rb:824
 msgid "%1 (Disc %2)"
 msgstr "%1 (ディスク %2)"
 
 #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:824
+#: library/packages/src/modules/PackageCallbacks.rb:826
 msgid "%1 (Medium %2)"
 msgstr "%1 (メディア番号 %2)"
 
 #. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:829
+#: library/packages/src/modules/PackageCallbacks.rb:831
 msgid ""
 "Insert\n"
 "'%1'"
@@ -3108,7 +3098,7 @@
 "を挿入してください"
 
 #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:834
+#: library/packages/src/modules/PackageCallbacks.rb:836
 msgid ""
 "Cannot access installation media\n"
 "%1\n"
@@ -3121,7 +3111,7 @@
 "ディレクトリにアクセスできることを確認してください。"
 
 #. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:846
+#: library/packages/src/modules/PackageCallbacks.rb:848
 msgid ""
 "Cannot access installation media \n"
 "%1\n"
@@ -3134,89 +3124,89 @@
 "サーバにアクセスできることを確認してください。"
 
 #. currently unused
-#: library/packages/src/modules/PackageCallbacks.rb:858
+#: library/packages/src/modules/PackageCallbacks.rb:860
 msgid "The correct repository medium could not be mounted."
 msgstr "正しいリポジトリのメディアをマウントできませんでした。"
 
 #. wrong media id, offer "Ignore"
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:879
-#: library/packages/src/modules/PackageCallbacks.rb:2168
+#: library/packages/src/modules/PackageCallbacks.rb:881
+#: library/packages/src/modules/PackageCallbacks.rb:2170
 msgid "Skip Autorefresh"
 msgstr "自動更新を行なわずに飛ばす"
 
 #. menu button label - used for more then one device
 #. push button label - in the media change popup, user can eject the CD/DVD
-#: library/packages/src/modules/PackageCallbacks.rb:902
-#: library/packages/src/modules/PackageCallbacks.rb:907
+#: library/packages/src/modules/PackageCallbacks.rb:904
+#: library/packages/src/modules/PackageCallbacks.rb:909
 msgid "&Eject"
 msgstr "取り出す (&E)"
 
-#: library/packages/src/modules/PackageCallbacks.rb:919
+#: library/packages/src/modules/PackageCallbacks.rb:921
 msgid "A&utomatically Eject CD or DVD Medium"
 msgstr "CD/DVD メディアを自動的にイジェクトする (&U)"
 
 #. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:987
+#: library/packages/src/modules/PackageCallbacks.rb:989
 msgid "Retry the installation?"
 msgstr "インストールを再試行しますか？"
 
 #. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:995
+#: library/packages/src/modules/PackageCallbacks.rb:997
 msgid "Skip the medium?"
 msgstr "このメディアを飛ばしますか？"
 
 #. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:1002
+#: library/packages/src/modules/PackageCallbacks.rb:1004
 msgid "Ignoring the bad medium..."
 msgstr "不正なメディアを無視します..."
 
 #. TextEntry label
 #. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:1023
-#: library/packages/src/modules/PackageCallbacks.rb:1084
+#: library/packages/src/modules/PackageCallbacks.rb:1025
+#: library/packages/src/modules/PackageCallbacks.rb:1086
 msgid "&URL"
 msgstr "URL (&U)"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1331
+#: library/packages/src/modules/PackageCallbacks.rb:1333
 msgid "Creating Repository %1"
 msgstr "リポジトリ %1 を作成しています"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1364
+#: library/packages/src/modules/PackageCallbacks.rb:1366
 msgid "An error occurred while creating the repository."
 msgstr "リポジトリを作成する際にエラーが発生しました。"
 
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1368
-#: library/packages/src/modules/PackageCallbacks.rb:1499
-#: library/packages/src/modules/PackageCallbacks.rb:1611
+#: library/packages/src/modules/PackageCallbacks.rb:1370
+#: library/packages/src/modules/PackageCallbacks.rb:1501
+#: library/packages/src/modules/PackageCallbacks.rb:1613
 msgid "Unable to retrieve the remote repository description."
 msgstr "リモートのリポジトリの説明を取得できませんでした。"
 
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1371
-#: library/packages/src/modules/PackageCallbacks.rb:1502
-#: library/packages/src/modules/PackageCallbacks.rb:1614
+#: library/packages/src/modules/PackageCallbacks.rb:1373
+#: library/packages/src/modules/PackageCallbacks.rb:1504
+#: library/packages/src/modules/PackageCallbacks.rb:1616
 msgid "An error occurred while retrieving the new metadata."
 msgstr "新しいメタデータの検索時にエラーが発生しました。"
 
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1374
-#: library/packages/src/modules/PackageCallbacks.rb:1505
-#: library/packages/src/modules/PackageCallbacks.rb:1617
+#: library/packages/src/modules/PackageCallbacks.rb:1376
+#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1619
 msgid "The repository is not valid."
 msgstr "指定したリポジトリは無効です。"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1377
+#: library/packages/src/modules/PackageCallbacks.rb:1379
 msgid "The repository metadata is invalid."
 msgstr "リポジトリのメタデータは無効です。"
 
@@ -3224,96 +3214,96 @@
 #. command line mode - ask user whether the repository refreshment should be retried
 #. command line mode - ask user whether the repository refreshment should be retried
 #. command line mode - ask user whether target initializatin can be restarted
-#: library/packages/src/modules/PackageCallbacks.rb:1390
-#: library/packages/src/modules/PackageCallbacks.rb:1524
-#: library/packages/src/modules/PackageCallbacks.rb:1630
-#: library/packages/src/modules/PackageCallbacks.rb:2445
+#: library/packages/src/modules/PackageCallbacks.rb:1392
+#: library/packages/src/modules/PackageCallbacks.rb:1526
+#: library/packages/src/modules/PackageCallbacks.rb:1632
+#: library/packages/src/modules/PackageCallbacks.rb:2447
 msgid "Retry?"
 msgstr "再試行しますか？"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1438
-#: library/packages/src/modules/PackageCallbacks.rb:1446
+#: library/packages/src/modules/PackageCallbacks.rb:1440
+#: library/packages/src/modules/PackageCallbacks.rb:1448
 msgid "Probing Repository %1"
 msgstr "リポジトリ %1 を確認しています"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1495
+#: library/packages/src/modules/PackageCallbacks.rb:1497
 msgid "Error occurred while probing the repository."
 msgstr "リポジトリを確認している最中にエラーが発生しました。"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1508
+#: library/packages/src/modules/PackageCallbacks.rb:1510
 msgid "Repository probing details."
 msgstr "リポジトリの確認結果"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1511
+#: library/packages/src/modules/PackageCallbacks.rb:1513
 msgid "Repository metadata is invalid."
 msgstr "リポジトリのメタデータは無効です。"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1607
+#: library/packages/src/modules/PackageCallbacks.rb:1609
 msgid "Repository %1"
 msgstr "リポジトリ %1"
 
 #. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1695
+#: library/packages/src/modules/PackageCallbacks.rb:1697
 msgid "Downloading delta RPM package %1 (%2)..."
 msgstr "差分 RPM パッケージ %1(%2) をダウンロードしています..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1703
+#: library/packages/src/modules/PackageCallbacks.rb:1705
 msgid "Downloading Delta RPM package"
 msgstr "差分 RPM パッケージをダウンロードしています"
 
 #. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1716
+#: library/packages/src/modules/PackageCallbacks.rb:1718
 msgid "Applying delta RPM package %1..."
 msgstr "差分 RPM パッケージ %1 を適用しています..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1723
+#: library/packages/src/modules/PackageCallbacks.rb:1725
 msgid "Applying delta RPM package"
 msgstr "差分 RPM パッケージを適用しています"
 
 #. at start of patch providal
-#: library/packages/src/modules/PackageCallbacks.rb:1744
+#: library/packages/src/modules/PackageCallbacks.rb:1746
 msgid "Downloading patch RPM package %1 (%2)..."
 msgstr "修正 RPM パッケージ %1(%2) をダウンロードしています..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1752
+#: library/packages/src/modules/PackageCallbacks.rb:1754
 msgid "Downloading Patch RPM Package"
 msgstr "修正 RPM パッケージをダウンロードしています..."
 
 #. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1822
+#: library/packages/src/modules/PackageCallbacks.rb:1824
 msgid "Starting script %1 (patch %2)..."
 msgstr "スクリプト %1 を開始しています (修正 %2)..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1831
+#: library/packages/src/modules/PackageCallbacks.rb:1833
 msgid "Running Script"
 msgstr "スクリプトの実行"
 
 #. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1836
+#: library/packages/src/modules/PackageCallbacks.rb:1838
 msgid "Patch: "
 msgstr "修正: "
 
 #. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1843
+#: library/packages/src/modules/PackageCallbacks.rb:1845
 msgid "Script: "
 msgstr "スクリプト: "
 
 #. label
-#: library/packages/src/modules/PackageCallbacks.rb:1849
+#: library/packages/src/modules/PackageCallbacks.rb:1851
 msgid "Output of the Script"
 msgstr "スクリプトの出力"
 
 #. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1937
+#: library/packages/src/modules/PackageCallbacks.rb:1939
 msgid ""
 "Patch: %1\n"
 "\n"
@@ -3322,7 +3312,7 @@
 "\n"
 
 #. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1954
+#: library/packages/src/modules/PackageCallbacks.rb:1956
 msgid ""
 "The repositories are being refreshed.\n"
 "Continue with refreshing?\n"
@@ -3337,44 +3327,44 @@
 "見えなくなったり古いままになったりします。"
 
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1969
+#: library/packages/src/modules/PackageCallbacks.rb:1971
 msgid "&Skip Refresh"
 msgstr "更新処理を飛ばす(&S)"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:2003
-#: library/packages/src/modules/PackageCallbacks.rb:2045
+#: library/packages/src/modules/PackageCallbacks.rb:2005
+#: library/packages/src/modules/PackageCallbacks.rb:2047
 msgid "Downloading"
 msgstr "ダウンロードしています"
 
 #. message in a progress popup
 #. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:2053
-#: library/packages/src/modules/PackageCallbacks.rb:2101
+#: library/packages/src/modules/PackageCallbacks.rb:2055
+#: library/packages/src/modules/PackageCallbacks.rb:2103
 msgid "Downloading: %1"
 msgstr "ダウンロードしています: %1"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:2206
-#: library/packages/src/modules/PackageCallbacks.rb:2281
+#: library/packages/src/modules/PackageCallbacks.rb:2208
+#: library/packages/src/modules/PackageCallbacks.rb:2283
 msgid "Checking Package Database"
 msgstr "パッケージデータベースを確認しています"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:2209
+#: library/packages/src/modules/PackageCallbacks.rb:2211
 msgid "Rebuilding package database. This process can take some time."
 msgstr "パッケージデータベースを再構築しています。しばらくお待ちください。"
 
 #. progress bar label
-#: library/packages/src/modules/PackageCallbacks.rb:2214
-#: library/packages/src/modules/PackageCallbacks.rb:2297
+#: library/packages/src/modules/PackageCallbacks.rb:2216
+#: library/packages/src/modules/PackageCallbacks.rb:2299
 msgid "Status"
 msgstr "状態"
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:2247
+#: library/packages/src/modules/PackageCallbacks.rb:2249
 msgid ""
 "Rebuilding of package database failed:\n"
 "%1"
@@ -3383,12 +3373,12 @@
 "%1"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:2284
+#: library/packages/src/modules/PackageCallbacks.rb:2286
 msgid "Converting package database. This process can take some time."
 msgstr "パッケージデータベースを変換しています。しばらくお待ちください。"
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:2323
+#: library/packages/src/modules/PackageCallbacks.rb:2325
 msgid ""
 "Conversion of package database failed:\n"
 "%1"
@@ -3397,12 +3387,12 @@
 "%1"
 
 #. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2363
+#: library/packages/src/modules/PackageCallbacks.rb:2365
 msgid "Reading RPM database..."
 msgstr "RPM データベースを読み込んでいます..."
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2373
+#: library/packages/src/modules/PackageCallbacks.rb:2375
 msgid "Reading Installed Packages"
 msgstr "インストール済みのパッケージを読み込んでいます"
 
@@ -3413,27 +3403,27 @@
 #. `Label(""),
 #. `PushButton(`id(`abort), Label::AbortButton())
 #. )
-#: library/packages/src/modules/PackageCallbacks.rb:2379
-#: library/packages/src/modules/PackageCallbacks.rb:2395
+#: library/packages/src/modules/PackageCallbacks.rb:2381
+#: library/packages/src/modules/PackageCallbacks.rb:2397
 msgid "Scanning RPM database..."
 msgstr "RPM データベースを確認しています..."
 
 #. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2434
+#: library/packages/src/modules/PackageCallbacks.rb:2436
 msgid "Initialization of the target failed."
 msgstr "ターゲットの準備に失敗しました。"
 
 #. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2525
+#: library/packages/src/modules/PackageCallbacks.rb:2527
 msgid "RPM database read"
 msgstr "RPM データベースの読み込み"
 
 #. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2544
+#: library/packages/src/modules/PackageCallbacks.rb:2563
 msgid "User Authentication"
 msgstr "ユーザ認証"
 
-#: library/packages/src/modules/PackageCallbacks.rb:2550
+#: library/packages/src/modules/PackageCallbacks.rb:2569
 msgid ""
 "URL: %1\n"
 "\n"
@@ -3444,7 +3434,7 @@
 "%2"
 
 #. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2559
+#: library/packages/src/modules/PackageCallbacks.rb:2578
 msgid "&User Name"
 msgstr "ユーザ名 (&U)"
 
@@ -4891,7 +4881,7 @@
 msgstr "このメッセージを以降表示しない"
 
 #. error report
-#: library/system/src/modules/Initrd.rb:409
+#: library/system/src/modules/Initrd.rb:416
 msgid "An error occurred during initrd creation."
 msgstr "initrd の作成中にエラーが発生しました。"
 
@@ -5890,3 +5880,9 @@
 msgstr ""
 "お使いの DNS サーバで管理している %1 に逆引きゾーンが設定されていません。\n"
 "ホスト名 %2 を追加することができません。"
+
+#~ msgid "Read dynamic definitions of installed services"
+#~ msgstr "インストールされたサービスの動的設定の読み込み"
+
+#~ msgid "Reading dynamic definitions of installed services..."
+#~ msgstr "インストールされたサービスの動的設定を読み込んでいます..."

Modified: trunk/yast/ja/po/bootloader.ja.po
===================================================================
--- trunk/yast/ja/po/bootloader.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/bootloader.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: bootloader\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-30 10:10+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-07-31 08:03+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -35,77 +35,53 @@
 
 #. command line help text for delete action
 #: src/clients/bootloader.rb:58
-msgid "Delete a global option or option of a section"
-msgstr "グローバルオプションまたはセクション内のオプションの削除"
+#, fuzzy
+#| msgid "Set a global option"
+msgid "Delete a global option"
+msgstr "グローバルオプションを設定する"
 
 #. command line help text for set action
 #: src/clients/bootloader.rb:65
-msgid "Set a global option or option of a section"
-msgstr "グローバルオプションまたはセクション内のオプションの設定"
+msgid "Set a global option"
+msgstr "グローバルオプションを設定する"
 
-#. command line help text for add action
-#: src/clients/bootloader.rb:72
-msgid "Add a new section - please use interactive mode"
-msgstr "新しいセクションを追加 - 対話モードでお使いください"
-
 #. command line help text for print action
-#: src/clients/bootloader.rb:82
+#: src/clients/bootloader.rb:75
 msgid "Print value of specified option"
 msgstr "指定したオプション値の表示"
 
 #. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The name of the section"
-msgstr "セクションの名前"
-
-#. command line help text for an option
-#: src/clients/bootloader.rb:97
+#: src/clients/bootloader.rb:83
 msgid "The key of the option"
 msgstr "オプションのキー"
 
 #. command line help text for an option
-#: src/clients/bootloader.rb:104
+#: src/clients/bootloader.rb:90
 msgid "The value of the option"
 msgstr "オプションの値"
 
-#. command line error report, %1 is section name
-#. command line error report, %1 is section name
-#: src/clients/bootloader.rb:185 src/clients/bootloader.rb:225
-msgid "Section %1 not found."
-msgstr "セクション %1 が見つかりません。"
-
 #. command line error report
-#: src/clients/bootloader.rb:201
+#: src/clients/bootloader.rb:154
 msgid "Value was not specified."
 msgstr "値が指定されていません。"
 
-#. Add a new bootloader section with specified name
-#. @param [Hash] options a list of parameters passed as args
-#. @return [Boolean] true on success
-#: src/clients/bootloader.rb:239
-msgid "Add option is available only in commandline interactive mode"
-msgstr "オプションの追加は、コマンドライン対話モードでのみ利用できます。"
-
 #. command line error report
-#: src/clients/bootloader.rb:245
-msgid "Section name must be specified."
-msgstr "セクション名を指定してください。"
-
-#. command line error report
-#: src/clients/bootloader.rb:265
+#: src/clients/bootloader.rb:176
 msgid "Option was not specified."
 msgstr "オプションが指定されていません。"
 
+#. command line, %1 is the value of bootloader option
+#: src/clients/bootloader.rb:182
+#, fuzzy
+#| msgid "Value: %1"
+msgid "Value: %s"
+msgstr "値: %1"
+
 #. command line error report
-#: src/clients/bootloader.rb:284
+#: src/clients/bootloader.rb:185
 msgid "Specified option does not exist."
 msgstr "指定されたオプションは存在しません。"
 
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:287
-msgid "Value: %1"
-msgstr "値: %1"
-
 #. progress step title
 #: src/clients/bootloader_finish.rb:52
 msgid "Saving bootloader configuration..."
@@ -134,52 +110,25 @@
 msgstr "システムを再起動します..."
 
 #. warning text in the summary richtext
-#: src/clients/bootloader_proposal.rb:116
+#: src/clients/bootloader_proposal.rb:115
 msgid "No boot loader is selected for installation. Your system might not be bootable."
 msgstr "インストール用のブートローダが選択されていません。システムを起動することができません。"
 
 #. error in the proposal
-#: src/clients/bootloader_proposal.rb:126
+#: src/clients/bootloader_proposal.rb:125
 msgid "Because of the partitioning, the bootloader cannot be installed properly"
 msgstr "パーティション設定により、ブートローダを正しくインストールすることができません"
 
 #. proposal part - bootloader label
-#: src/clients/bootloader_proposal.rb:225
+#: src/clients/bootloader_proposal.rb:224
 msgid "Booting"
 msgstr "起動"
 
 #. menubutton entry
-#: src/clients/bootloader_proposal.rb:227
+#: src/clients/bootloader_proposal.rb:226
 msgid "&Booting"
 msgstr "起動 (&B)"
 
-#. Run dialog to adjust installation on i386 and AMD64
-#. @return [Symbol] for wizard sequencer
-#. Run dialog to adjust installation on i386 and AMD64
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:41
-#: src/include/bootloader/grub2/dialogs.rb:221
-msgid "Disk Order"
-msgstr "ディスクの順序"
-
-#: src/include/bootloader/grub/dialogs.rb:50
-#: src/include/bootloader/grub2/dialogs.rb:230
-msgid "Disk order settings"
-msgstr "ディスク順序の設定"
-
-#. Run dialog for loader installation details on i386
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:68
-msgid "Boot Menu"
-msgstr "起動メニュー"
-
-#. `VSpacing(1),
-#. Window title
-#: src/include/bootloader/grub/dialogs.rb:106
-#: src/include/bootloader/grub2/dialogs.rb:143
-msgid "Boot Loader Options"
-msgstr "ブートローダのオプション"
-
 #. encoding: utf-8
 #. File:
 #. include/bootloader/grup/helps.ycp
@@ -269,21 +218,13 @@
 
 #: src/include/bootloader/grub/helps.rb:47
 msgid ""
-"<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n"
-"It is recommended to install grub to MBR</p>"
-msgstr ""
-"<p><b>信頼済み Grub を使用する</b> は、信頼済みの grub をインストールしてそれを使用することを意味します。 オプション <i>グラフィカルなメニューファイル</i> は無視されます。\n"
-"MBR (マスターブートレコード) に grub をインストールする場合にはお勧めです。</p>"
-
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
 "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
 "installed on your computer</p>"
 msgstr ""
 "<p><b>マスターブートレコード (MBR) から起動</b> は、お使いのコンピュータに他の OS をインストールしている\n"
 "場合にはお勧めできません。</p>"
 
-#: src/include/bootloader/grub/helps.rb:53
+#: src/include/bootloader/grub/helps.rb:50
 msgid ""
 "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
 "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
@@ -295,7 +236,7 @@
 "と <b>MBR に汎用ブートコードを書き込む</b> を選択するか、もしくはこのセクションを開始するために他のブートマネージャを\n"
 "設定してください。</p>"
 
-#: src/include/bootloader/grub/helps.rb:59
+#: src/include/bootloader/grub/helps.rb:56
 msgid ""
 "<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
 "logical partition and the /boot partition is missing</p>"
@@ -303,11 +244,11 @@
 "<p>ルートパーティションが論理パーティション内にあり、個別の /boot パーティションが存在しない場合は、\n"
 "<b>拡張パーティションから起動</b> を選択する必要があります。</p>"
 
-#: src/include/bootloader/grub/helps.rb:62
+#: src/include/bootloader/grub/helps.rb:59
 msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
 msgstr "<p><b>カスタムブートパーティション</b> を選択すると、起動するパーティションを選択することができます。</p>"
 
-#: src/include/bootloader/grub/helps.rb:65
+#: src/include/bootloader/grub/helps.rb:62
 msgid ""
 "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
 "enable to write GRUB to MBR of both disks.</p>"
@@ -315,15 +256,19 @@
 "<p>MD アレイは 2 つのディスクから構成されます。 それぞれのディスクの MBR に\n"
 "GRUB を書き込むには、 <b>MD アレイの冗長化を有効にする</b> を選択してください。</p>"
 
-#: src/include/bootloader/grub/helps.rb:68
+#: src/include/bootloader/grub/helps.rb:65
+#, fuzzy
+#| msgid ""
+#| "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#| "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
 msgid ""
 "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
+"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
 msgstr ""
 "<p><b>シリアルコンソールを使用する</b> を指定すると、シリアルコンソールで\n"
 "使用するパラメータを設定することができます。詳細は grub のドキュメンテーション (<code>info grub</code>) をご覧ください。</p>"
 
-#: src/include/bootloader/grub/helps.rb:71
+#: src/include/bootloader/grub/helps.rb:68
 msgid ""
 "<p><b>Terminal Definition</b></p><br>\n"
 "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n"
@@ -337,7 +282,7 @@
 "のように設定することもできます。この場合は何らかのキーを押すことで GRUB 端末を選択することが\n"
 "できます。</p>"
 
-#: src/include/bootloader/grub/helps.rb:78
+#: src/include/bootloader/grub/helps.rb:75
 msgid ""
 "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
 "that will be used for booting in case the default section is unbootable.</p>"
@@ -345,19 +290,11 @@
 "<p><b>既定の項目が失敗した場合のフォールバックセクション</b> には、既定のセクションで\n"
 "起動することができなかった場合に使用するセクションを、セクション番号の一覧で指定します。</p>"
 
-#: src/include/bootloader/grub/helps.rb:81
+#: src/include/bootloader/grub/helps.rb:78
 msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
 msgstr "<p><b>起動時にメニューを隠す</b> を選択すると、起動メニューを表示しなくなります。</p>"
 
-#: src/include/bootloader/grub/helps.rb:84
-msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
-msgstr "<p><b>グラフィカルメニューファイル</b> には、グラフィカルな起動メニューで使用するファイルを設定します。</p>"
-
-#: src/include/bootloader/grub/helps.rb:87
-msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
-msgstr "<p>聴覚に訴える種類の信号を有効にするには、 <b>聴覚信号を有効にする</b> を選択してください。</p>"
-
-#: src/include/bootloader/grub/helps.rb:90
+#: src/include/bootloader/grub/helps.rb:81
 msgid ""
 "<p><b>Protect Boot Loader with Password</b><br>\n"
 "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n"
@@ -368,7 +305,7 @@
 "バスワードを受け入れます。</p>"
 
 #. help text 1/5
-#: src/include/bootloader/grub/helps.rb:97
+#: src/include/bootloader/grub/helps.rb:88
 msgid ""
 "<p><big><b>Disks Order</b></big><br>\n"
 "To specify the order of the disks according to the order in BIOS, use\n"
@@ -382,197 +319,120 @@
 "また、ディスクを追加するには <b>追加</b> ボタンを、\n"
 "ディスクを削除するには <b>削除</b> ボタンをそれぞれ押してください。</p>"
 
-#: src/include/bootloader/grub/helps.rb:108
+#: src/include/bootloader/grub/helps.rb:99
 msgid "Boot Loader Locations"
 msgstr "ブートローダの場所"
 
-#: src/include/bootloader/grub/helps.rb:109
+#: src/include/bootloader/grub/helps.rb:100
 msgid "Set &active Flag in Partition Table for Boot Partition"
 msgstr "ブートパーティションをアクティブに設定 (&A)"
 
-#: src/include/bootloader/grub/helps.rb:112
+#: src/include/bootloader/grub/helps.rb:103
 #: src/include/bootloader/routines/common_helps.rb:29
 msgid "&Timeout in Seconds"
 msgstr "タイムアウト (秒) (&T)"
 
-#: src/include/bootloader/grub/helps.rb:113
+#: src/include/bootloader/grub/helps.rb:104
 msgid "&Default Boot Section"
 msgstr "既定のブートセクション (&D)"
 
-#: src/include/bootloader/grub/helps.rb:114
+#: src/include/bootloader/grub/helps.rb:105
 msgid "Write &generic Boot Code to MBR"
 msgstr "MBR に汎用ブートコードを書き込む (&G)"
 
-#: src/include/bootloader/grub/helps.rb:115
-msgid "Use &Trusted Grub"
-msgstr "信頼済み Grub を使用する (&T)"
-
-#: src/include/bootloader/grub/helps.rb:116
+#: src/include/bootloader/grub/helps.rb:106
 msgid "Custom Boot Partition"
 msgstr "カスタムブートパーティション"
 
-#: src/include/bootloader/grub/helps.rb:117
+#: src/include/bootloader/grub/helps.rb:107
 msgid "Boot from Master Boot Record"
 msgstr "マスターブートレコード (MBR) から起動"
 
-#: src/include/bootloader/grub/helps.rb:118
+#: src/include/bootloader/grub/helps.rb:108
 msgid "Boot from Root Partition"
 msgstr "ルートパーティションから起動"
 
-#: src/include/bootloader/grub/helps.rb:119
+#: src/include/bootloader/grub/helps.rb:109
 msgid "Boot from Boot Partition"
 msgstr "ブートパーティションから起動"
 
-#: src/include/bootloader/grub/helps.rb:120
+#: src/include/bootloader/grub/helps.rb:110
 msgid "Boot from Extended Partition"
 msgstr "拡張パーティションから起動"
 
-#: src/include/bootloader/grub/helps.rb:121
+#: src/include/bootloader/grub/helps.rb:111
 msgid "Serial Connection &Parameters"
 msgstr "シリアル接続パラメータ (&P)"
 
-#: src/include/bootloader/grub/helps.rb:122
+#: src/include/bootloader/grub/helps.rb:112
 msgid "Fallback Sections if Default fails"
 msgstr "既定の項目が失敗した場合のフォールバックセクション"
 
-#: src/include/bootloader/grub/helps.rb:123
+#: src/include/bootloader/grub/helps.rb:113
 msgid "&Hide Menu on Boot"
 msgstr "ブート時にメニューを隠す (&H)"
 
-#: src/include/bootloader/grub/helps.rb:124
-msgid "Graphical &Menu File"
-msgstr "グラフィカルメニューファイル (&M)"
-
-#: src/include/bootloader/grub/helps.rb:125
+#: src/include/bootloader/grub/helps.rb:114
 msgid "Pa&ssword for the Menu Interface"
 msgstr "メニューインターフェイスのパスワード (&S)"
 
-#: src/include/bootloader/grub/helps.rb:126
+#: src/include/bootloader/grub/helps.rb:115
 msgid "Debugg&ing Flag"
 msgstr "デバッグ用フラグ (&I)"
 
-#. encoding: utf-8
-#. File:
-#. modules/BootGRUB.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Module containing specific functions for GRUB configuration
-#. and installation
-#.
-#. Authors:
-#. Jiri Srain <jsrain@suse.cz>
-#. Joachim Plack <jplack@suse.de>
-#. Olaf Dabrunz <od@suse.de>
-#. Philipp Thomas <pth@suse.de>
-#.
-#. $Id$
-#: src/include/bootloader/grub/options.rb:68
-msgid "Choose new graphical menu file"
-msgstr "新しいグラフィカルなメニューファイルを選択"
-
-#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))),
-#: src/include/bootloader/grub/options.rb:129
-msgid "Enable Acoustic &Signals"
-msgstr "聴覚信号を有効にする (&S)"
-
 #. Validate function of a popup
 #. @param [String] key any widget key
 #. @param [Hash] event map event that caused validation
 #. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:254
+#: src/include/bootloader/grub/options.rb:73
 msgid "Prot&ect Boot Loader with Password"
 msgstr "ブートローダをパスワードで保護する (&E)"
 
 #. text entry
-#: src/include/bootloader/grub/options.rb:259
+#: src/include/bootloader/grub/options.rb:78
 msgid "&Password"
 msgstr "パスワード (&P)"
 
 #. text entry
-#: src/include/bootloader/grub/options.rb:262
+#: src/include/bootloader/grub/options.rb:81
 msgid "Re&type Password"
 msgstr "パスワードの再入力 (&T) :"
 
-#. Common widget of a console
-#. @return [Hash{String => Object}] CWS widget
-#: src/include/bootloader/grub/options.rb:359
-#: src/include/bootloader/grub2/options.rb:295
-msgid "Use &serial console"
-msgstr "シリアルコンソールを使用する (&S)"
-
-#: src/include/bootloader/grub/options.rb:366
-#: src/include/bootloader/grub2/options.rb:302
-msgid "&Console arguments"
-msgstr "コンソールのパラメータ (&C)"
-
-#. textentry header
-#: src/include/bootloader/grub/options.rb:455
-msgid "&Device"
-msgstr "デバイス (&D)"
-
-#. disabling & enabling up/down
-#: src/include/bootloader/grub/options.rb:544
-msgid "Device map must contain at least one device"
-msgstr "デバイスマップには、少なくとも 1 つのデバイスを含める必要があります。"
-
-#: src/include/bootloader/grub/options.rb:553
-msgid "D&isks"
-msgstr "ディスク (&I)"
-
-#: src/include/bootloader/grub/options.rb:565
-msgid "&Up"
-msgstr "上へ (&U)"
-
-#: src/include/bootloader/grub/options.rb:566
-msgid "&Down"
-msgstr "下へ (&D)"
-
 #. Create Frame "Boot Loader Location"
 #.
 #. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:740
+#: src/include/bootloader/grub/options.rb:217
 msgid "Boot from &Root Partition"
 msgstr "ルートパーティションから起動 (&R)"
 
-#: src/include/bootloader/grub/options.rb:741
+#: src/include/bootloader/grub/options.rb:218
 msgid "Boo&t from Boot Partition"
 msgstr "ブートパーティションから起動 (&T)"
 
-#: src/include/bootloader/grub/options.rb:749
-#: src/include/bootloader/grub/options.rb:776
-#: src/include/bootloader/grub/options.rb:811
+#: src/include/bootloader/grub/options.rb:228
+msgid "C&ustom Boot Partition"
+msgstr "カスタムブートパーティション  (&U)"
+
+#: src/include/bootloader/grub/options.rb:243
+#: src/include/bootloader/grub/options.rb:271
+#: src/include/bootloader/grub/options.rb:292
 msgid "Boot Loader Location"
 msgstr "ブートローダの場所"
 
-#: src/include/bootloader/grub/options.rb:755
-#: src/include/bootloader/grub/options.rb:782
-#: src/include/bootloader/grub/options.rb:817
+#: src/include/bootloader/grub/options.rb:249
+#: src/include/bootloader/grub/options.rb:277
+#: src/include/bootloader/grub/options.rb:298
 msgid "Boot from &Master Boot Record"
 msgstr "マスターブートレコード (MBR) から起動 (&M)"
 
-#: src/include/bootloader/grub/options.rb:762
+#: src/include/bootloader/grub/options.rb:256
 msgid "Boot from &Extended Partition"
 msgstr "拡張パーティションから起動 (&E)"
 
-#: src/include/bootloader/grub/options.rb:788
-#: src/include/bootloader/grub/options.rb:829
-msgid "C&ustom Boot Partition"
-msgstr "カスタムブートパーティション  (&U)"
-
-#: src/include/bootloader/grub/options.rb:822
+#: src/include/bootloader/grub/options.rb:303
 msgid "Enable Red&undancy for MD Array"
 msgstr "MD アレイの冗長化を有効にする (&U)"
 
-#. push button
-#. push button
-#: src/include/bootloader/grub/options.rb:881
-#: src/include/bootloader/routines/global_widgets.rb:831
-msgid "Boot Loader Installation &Details"
-msgstr "ブートローダのインストール詳細 (&D)"
-
 #. Title in tab
 #: src/include/bootloader/grub2/dialogs.rb:57
 msgid "Boot Code Options"
@@ -588,6 +448,11 @@
 msgid "Bootloader Options"
 msgstr "ブートローダのオプション"
 
+#. Window title
+#: src/include/bootloader/grub2/dialogs.rb:143
+msgid "Boot Loader Options"
+msgstr "ブートローダのオプション"
+
 #: src/include/bootloader/grub2/dialogs.rb:183
 msgid "Secure Boot"
 msgstr "Secure Boot"
@@ -597,12 +462,12 @@
 msgstr "Secure Boot サポートを有効にする (&S)"
 
 #. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:262
+#: src/include/bootloader/grub2/dialogs.rb:240
 msgid "Boot &Loader Location"
 msgstr "ブートローダの場所 (&L)"
 
 #. help text
-#: src/include/bootloader/grub2/dialogs.rb:281
+#: src/include/bootloader/grub2/dialogs.rb:259
 msgid "Choose partition where is boot sequence installed."
 msgstr "ブートコードをインストールするパーティションを選択してください。"
 
@@ -621,12 +486,10 @@
 #.
 #. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
 #: src/include/bootloader/grub2/helps.rb:23
-#: src/include/bootloader/routines/section_helps.rb:33
 msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
 msgstr "<p><b>オプションのカーネルコマンドラインパラメータ</b> にはカーネルに渡す他のパラメータを設定します。</p>"
 
 #: src/include/bootloader/grub2/helps.rb:26
-#: src/include/bootloader/routines/section_helps.rb:30
 msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
 msgstr "<p><b>VGA モード</b> では、起動時にカーネルが設定すべき <i>コンソール</i> の VGA モードを設定します。</p>"
 
@@ -647,7 +510,6 @@
 msgstr "<p><b>ディストリビュータ</b> には、起動用の項目を作成する際に使用する、カーネルの配布者名 (ディストリビュータ) を指定します。 </p>"
 
 #: src/include/bootloader/grub2/helps.rb:44
-#: src/include/bootloader/routines/section_helps.rb:99
 msgid "O&ptional Kernel Command Line Parameter"
 msgstr "オプションのカーネルコマンドラインパラメータ (&P)"
 
@@ -656,7 +518,6 @@
 msgstr "ディストリビュータ (&I)"
 
 #: src/include/bootloader/grub2/helps.rb:46
-#: src/include/bootloader/routines/section_helps.rb:98
 msgid "&Vga Mode"
 msgstr "VGA モード (&V)"
 
@@ -677,30 +538,20 @@
 #. %2 is Y resolution (height) in pixels
 #. %3 is color depth (usually one of 8, 16, 24, 32)
 #. %4 is the VGA mode ID (hexadecimal number)
-#. combo box item
-#. %1 is X resolution (width) in pixels
-#. %2 is Y resolution (height) in pixels
-#. %3 is color depth (usually one of 8, 16, 24, 32)
-#. %4 is the VGA mode ID (hexadecimal number)
 #: src/include/bootloader/grub2/options.rb:58
-#: src/include/bootloader/routines/section_widgets.rb:523
 msgid "%1x%2, %3 bits (mode %4)"
 msgstr "%1x%2, %3 ビット (モード %4)"
 
 #: src/include/bootloader/grub2/options.rb:68
-#: src/include/bootloader/routines/section_widgets.rb:537
 msgid "Standard 8-pixel font mode."
 msgstr "標準の 8 ピクセルフォントモード"
 
 #. item of a combo box
-#. item of a combo box
 #: src/include/bootloader/grub2/options.rb:71
-#: src/include/bootloader/routines/section_widgets.rb:540
 msgid "Text Mode"
 msgstr "テキストモード"
 
 #: src/include/bootloader/grub2/options.rb:72
-#: src/include/bootloader/routines/section_widgets.rb:541
 msgid "Unspecified"
 msgstr "指定なし"
 
@@ -743,17 +594,21 @@
 msgid "&Console theme"
 msgstr "コンソールのテーマ (&C)"
 
+#: src/include/bootloader/grub2/options.rb:295
+msgid "Use &serial console"
+msgstr "シリアルコンソールを使用する (&S)"
+
+#: src/include/bootloader/grub2/options.rb:302
+msgid "&Console arguments"
+msgstr "コンソールのパラメータ (&C)"
+
 #. FIXME this should be better handled by exception and show it properly, but it require too big change now
-#: src/include/bootloader/routines/autoinstall.rb:169
+#: src/include/bootloader/routines/autoinstall.rb:132
 msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
 msgstr "未対応のブートローダ '%s' です。 AutoYaST のプロファイルを調整してください。"
 
 #. file open popup caption
-#. file open popup caption
-#. file open popup caption
 #: src/include/bootloader/routines/common_options.rb:102
-#: src/include/bootloader/routines/section_widgets.rb:265
-#: src/include/bootloader/routines/section_widgets.rb:279
 msgid "Select File"
 msgstr "ファイルの選択"
 
@@ -761,183 +616,27 @@
 #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
 #. F#300779 - Install diskless client (NFS-root)
 #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:90 src/modules/Bootloader.rb:270
+#: src/include/bootloader/routines/dialogs.rb:85 src/modules/Bootloader.rb:256
 msgid "The boot partition is of type NFS. Bootloader cannot be installed."
 msgstr "起動パーティションが NFS になっています。ブートローダをインストールすることができません。"
 
 #. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:131
+#: src/include/bootloader/routines/dialogs.rb:115
 msgid "Boot Loader Settings"
 msgstr "ブートローダの設定"
 
 #. message
-#: src/include/bootloader/routines/dialogs.rb:159
+#: src/include/bootloader/routines/dialogs.rb:143
 msgid "There are no options to set for the current boot loader."
 msgstr "現在のブートローダに設定できるオプションはありません。"
 
-#. heading
-#. heading
-#. heading
-#: src/include/bootloader/routines/dialogs.rb:177
-#: src/include/bootloader/routines/dialogs.rb:255
-#: src/include/bootloader/routines/dialogs.rb:325
-msgid "Kernel Section"
-msgstr "カーネルセクション"
-
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#. frame
-#: src/include/bootloader/routines/dialogs.rb:183
-#: src/include/bootloader/routines/dialogs.rb:261
-#: src/include/bootloader/routines/dialogs.rb:331
-#: src/include/bootloader/routines/dialogs.rb:399
-#: src/include/bootloader/routines/dialogs.rb:474
-#: src/include/bootloader/routines/dialogs.rb:522
-#: src/include/bootloader/routines/dialogs.rb:581
-#: src/include/bootloader/routines/dialogs.rb:636
-msgid "Section Settings"
-msgstr "セクション設定"
-
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:231
-#: src/include/bootloader/routines/dialogs.rb:302
-#: src/include/bootloader/routines/dialogs.rb:370
-#: src/include/bootloader/routines/dialogs.rb:445
-#: src/include/bootloader/routines/dialogs.rb:494
-#: src/include/bootloader/routines/dialogs.rb:542
-#: src/include/bootloader/routines/dialogs.rb:605
-#: src/include/bootloader/routines/dialogs.rb:683
-#: src/include/bootloader/routines/dialogs.rb:721
-msgid "Boot Loader Settings: Section Management"
-msgstr "ブートローダの設定: セクション管理"
-
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:393
-#: src/include/bootloader/routines/section_helps.rb:108
-#: src/include/bootloader/routines/section_widgets.rb:585
-msgid "Xen Section"
-msgstr "Xen セクション"
-
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:468
-#: src/include/bootloader/routines/section_helps.rb:111
-#: src/include/bootloader/routines/section_helps.rb:121
-#: src/include/bootloader/routines/section_widgets.rb:591
-msgid "Menu Section"
-msgstr "メニューセクション"
-
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:516
-#: src/include/bootloader/routines/section_widgets.rb:593
-msgid "Dump Section"
-msgstr "ダンプセクション"
-
-#. label
-#. label
-#: src/include/bootloader/routines/dialogs.rb:573
-#: src/include/bootloader/routines/dialogs.rb:628
-msgid "Other System Section"
-msgstr "その他のシステムセクション"
-
-#. combobox label
-#: src/include/bootloader/routines/dialogs.rb:803
-msgid "&Filename"
-msgstr "ファイル名 (&F)"
-
-#. label. %1 is name of file (eg. /etc/lilo.conf
-#: src/include/bootloader/routines/dialogs.rb:811
-msgid "Filename: %1"
-msgstr "ファイル名: %1"
-
-#. multiline edit header
-#: src/include/bootloader/routines/dialogs.rb:828
-msgid "Fi&le Contents"
-msgstr "ファイル内容 (&L)"
-
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:836
-msgid "Expert Manual Configuration"
-msgstr "熟練者設定"
-
-#. sections list widget
-#. Refresh and redraw widget wits sections
-#. @param [Array<Hash{String => Object>}] sects list of current sections
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:114
-#: src/include/bootloader/routines/global_widgets.rb:641
-msgid "Other"
-msgstr "その他"
-
-#: src/include/bootloader/routines/global_widgets.rb:116
-msgid "Image"
-msgstr "イメージ"
-
-#: src/include/bootloader/routines/global_widgets.rb:134
-msgid "Xen"
-msgstr "Xen"
-
-#: src/include/bootloader/routines/global_widgets.rb:152
-msgid "Floppy"
-msgstr "フロッピィ"
-
-#: src/include/bootloader/routines/global_widgets.rb:154
-msgid "Menu"
-msgstr "メニュー"
-
-#: src/include/bootloader/routines/global_widgets.rb:161
-msgid "Dump"
-msgstr "ダンプ"
-
-#. table header, Def stands for default
-#: src/include/bootloader/routines/global_widgets.rb:255
-msgid "Def."
-msgstr "既定"
-
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Label"
-msgstr "ラベル"
-
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:259
-#: src/include/bootloader/routines/global_widgets.rb:746
-msgid "Type"
-msgstr "種類"
-
-#. table header; header for section details, either
-#. the specification of the kernel image to load,
-#. or the specification of device to boot from
-#: src/include/bootloader/routines/global_widgets.rb:263
-msgid "Image / Device"
-msgstr "イメージ／デバイス"
-
-#: src/include/bootloader/routines/global_widgets.rb:271
-msgid "Set as De&fault"
-msgstr "既定に設定 (&F)"
-
 #. combo box
-#: src/include/bootloader/routines/global_widgets.rb:312
+#: src/include/bootloader/routines/global_widgets.rb:114
 msgid "&Boot Loader"
 msgstr "ブートローダ (&B)"
 
 #. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:343
+#: src/include/bootloader/routines/global_widgets.rb:144
 msgid ""
 "\n"
 "If you do not install any boot loader, the system\n"
@@ -951,116 +650,66 @@
 " \n"
 "続行してよろしいですか？\n"
 
-#. warning - popup, followed by radio buttons
-#: src/include/bootloader/routines/global_widgets.rb:377
-msgid ""
-"\n"
-"You chose to change your boot loader. When converting \n"
-"the configuration, some settings might be lost.\n"
-"\n"
-"The current configuration will be saved and you can\n"
-"restore it if you return to the current boot loader.\n"
-"\n"
-"Select a course of action:\n"
-msgstr ""
-"\n"
-"ブートローダを変更しようとしています。設定を変換する際に、\n"
-"項目によっては内容が失われる可能性があります。\n"
-"\n"
-"現在の設定は保存されますので、今のブートローダに戻した際に\n"
-"設定を復元することができます。\n"
-"\n"
-"アクションを選択してください:\n"
+#. menu button entry
+#: src/include/bootloader/routines/global_widgets.rb:181
+msgid "E&dit Configuration Files"
+msgstr "設定ファイルの編集 (&D)"
 
-#. radiobutton
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:399
-#: src/include/bootloader/routines/global_widgets.rb:593
+#: src/include/bootloader/routines/global_widgets.rb:188
 msgid "&Propose New Configuration"
 msgstr "新しい設定を提示 (&P)"
 
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:406
-msgid "Co&nvert Current Configuration"
-msgstr "現在の設定を変換 (&N)"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:415
-msgid "&Start New Configuration from Scratch"
-msgstr "新しい設定の作成 (&S)"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:423
-msgid "&Read Configuration Saved on Disk"
-msgstr "ディスクに保存された設定の読み込み (&R)"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:433
-msgid "Res&tore Configuration Saved before Conversion"
-msgstr "変換前に保存した設定に戻す (&T)"
-
-#. popup message
-#: src/include/bootloader/routines/global_widgets.rb:514
-msgid "Select the boot loader before editing sections."
-msgstr "セクションを編集する前にブートローダを選択してください。"
-
-#. pushbutton
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:563
-#: src/include/bootloader/routines/global_widgets.rb:586
-msgid "E&dit Configuration Files"
-msgstr "設定ファイルの編集 (&D)"
-
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:600
+#: src/include/bootloader/routines/global_widgets.rb:195
 msgid "&Start from Scratch"
 msgstr "全く新しい設定を作成 (&S)"
 
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:608
+#: src/include/bootloader/routines/global_widgets.rb:203
 msgid "&Reread Configuration from Disk"
 msgstr "ディスクから設定を再読み込みする (&R)"
 
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:625
+#: src/include/bootloader/routines/global_widgets.rb:220
 msgid "Restore MBR of Hard Disk"
 msgstr "ハードディスクの MBR を復元する"
 
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:633
+#: src/include/bootloader/routines/global_widgets.rb:228
 msgid "Write bootloader boot code to disk"
 msgstr "ブートローダの起動コードをディスクに書き込む"
 
+#. menu button
+#: src/include/bootloader/routines/global_widgets.rb:236
+msgid "Other"
+msgstr "その他"
+
 #. message popup
-#: src/include/bootloader/routines/global_widgets.rb:665
+#: src/include/bootloader/routines/global_widgets.rb:260
 msgid "MBR restored successfully."
 msgstr "MBR が正しく復元されました。"
 
 #. message popup
-#: src/include/bootloader/routines/global_widgets.rb:668
+#: src/include/bootloader/routines/global_widgets.rb:263
 msgid "Failed to restore MBR."
 msgstr "MBR の復元に失敗しました。"
 
 #. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:691
+#: src/include/bootloader/routines/global_widgets.rb:286
 msgid "Writing bootloader settings failed."
 msgstr "ブートローダ設定の書き込みに失敗しました。"
 
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:730
-msgid "&Section Management"
-msgstr "セクション管理 (&S)"
-
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:740
-msgid "Boot Loader &Installation"
-msgstr "ブートローダのインストール (&I)"
-
 #. push button
-#: src/include/bootloader/routines/global_widgets.rb:818
+#: src/include/bootloader/routines/global_widgets.rb:340
 msgid "Boot &Loader Options"
 msgstr "ブートローダのオプション (&L)"
 
+#. push button
+#: src/include/bootloader/routines/global_widgets.rb:353
+msgid "Boot Loader Installation &Details"
+msgstr "ブートローダのインストール詳細 (&D)"
+
 #. help text 1/1 (shown during settings reading progress)
 #: src/include/bootloader/routines/helps.rb:32
 msgid ""
@@ -1079,18 +728,9 @@
 "<P><B><BIG>ブートローダの設定を保存しています</BIG></B><BR>\n"
 "しばらくお待ちください...<br></p>"
 
-#. help text, optional part of following
+#. help text 1/2 (%1 may be following sentence, optionally empty)
 #: src/include/bootloader/routines/helps.rb:52
 msgid ""
-"If you have multiple Linux systems installed,\n"
-"YaST can try to find them and merge their menus."
-msgstr ""
-"複数の Linux システムをインストールしている場合、\n"
-" YaST はそれらを検出してメニュー内に組み込むことができます。"
-
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:58
-msgid ""
 "<P>From <B>Other</B>,\n"
 "you can manually edit the boot loader configuration files, clear the current \n"
 "configuration and propose a new configuration, start from scratch, or reread\n"
@@ -1102,7 +742,7 @@
 "設定ファイルから再読み込みしたりすることができます。 %1</P>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:73
+#: src/include/bootloader/routines/helps.rb:67
 msgid ""
 "<P>To edit boot loader configuration files\n"
 "manually, click <B>Edit Configuration Files</B>.</P>"
@@ -1111,7 +751,7 @@
 "<b>設定ファイルの編集</b> を押してください。</P>"
 
 #. help 1/4
-#: src/include/bootloader/routines/helps.rb:83
+#: src/include/bootloader/routines/helps.rb:77
 msgid ""
 "<P> In the table, each section represents one item\n"
 "in the boot menu.</P>"
@@ -1120,7 +760,7 @@
 "対応しています。</P>"
 
 #. help 2/4
-#: src/include/bootloader/routines/helps.rb:87
+#: src/include/bootloader/routines/helps.rb:81
 msgid ""
 "<P> Press <B>Edit</B> to display the properties of the\n"
 "selected section.</P>"
@@ -1129,7 +769,7 @@
 "表示します。</P>"
 
 #. help 3/4
-#: src/include/bootloader/routines/helps.rb:91
+#: src/include/bootloader/routines/helps.rb:85
 msgid ""
 "<P> By pressing <b>Set as Default</b>, mark the selected \n"
 "section as default. When booting, the boot loader will provide \n"
@@ -1146,7 +786,7 @@
 " <b>下へ</b> でそれぞれ変更することができます。</p>"
 
 #. help 4/4
-#: src/include/bootloader/routines/helps.rb:100
+#: src/include/bootloader/routines/helps.rb:94
 msgid ""
 "<P>Press <B>Add</B> to create a new boot loader section\n"
 "or <B>Delete</B> to delete the selected section.</P>"
@@ -1157,7 +797,7 @@
 #. help text for the custom boot manager installation, 1 of 7
 #. %1 = name of boot loader (e.g. "LILO")
 #. this should be per architecture
-#: src/include/bootloader/routines/helps.rb:115
+#: src/include/bootloader/routines/helps.rb:109
 msgid ""
 "<p><big><b>Boot Loader Location</b></big><br>\n"
 "The boot manager (%1) can be installed in the following ways:</p>"
@@ -1166,7 +806,7 @@
 "ブートマネージャ (%1) は以下の方法でインストールすることができます:</p>"
 
 #. custom bootloader help text, 2 of 7
-#: src/include/bootloader/routines/helps.rb:124
+#: src/include/bootloader/routines/helps.rb:118
 msgid ""
 "<p>- In the <b>Master Boot Record</b> (MBR).\n"
 "This is not recommended if there is another operating system installed\n"
@@ -1177,7 +817,7 @@
 "お勧めできません。</p>"
 
 #. custom bootloader help text, 3 of 7
-#: src/include/bootloader/routines/helps.rb:134
+#: src/include/bootloader/routines/helps.rb:128
 msgid ""
 "<p>\n"
 "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
@@ -1196,24 +836,8 @@
 "もしくは &product; を開始するために他のブートマネージャを設定してください。\n"
 "</p>"
 
-#. custom bootloader help text, 4 of 7
-#. this part will only be shown if a floppy drive is attached.
-#: src/include/bootloader/routines/helps.rb:151
-msgid ""
-"<p>\n"
-"- On a <b>Floppy Disk</b>.\n"
-"Use this to avoid the risk of interfering with an already existing\n"
-"boot mechanism. Enable booting from floppy disk in\n"
-"the BIOS of your machine to use this option.</p>"
-msgstr ""
-"<p>\n"
-"- <b>フロッピィディスク</b> 内\n"
-"既にインストールされている起動メカニズムを邪魔したくない場合には、これを\n"
-"お使いください。お使いのマシンの BIOS 設定で、フロッピィディスクから\n"
-"起動できるように設定する必要があります。</p>"
-
 #. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:164
+#: src/include/bootloader/routines/helps.rb:143
 msgid ""
 "<p>\n"
 "- In some <b>Other</b> partition. Consider your system's restrictions\n"
@@ -1224,7 +848,7 @@
 "システム側の制限にも注意してください。</p>"
 
 #. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:174
+#: src/include/bootloader/routines/helps.rb:153
 msgid ""
 "<p>For example, most PCs have a BIOS\n"
 "limit that restricts booting to\n"
@@ -1237,7 +861,7 @@
 "論理パーティションから起動できないものもあります。</p>"
 
 #. custom bootloader help text, 7 of 7
-#: src/include/bootloader/routines/helps.rb:186
+#: src/include/bootloader/routines/helps.rb:165
 msgid ""
 "<p>\n"
 "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
@@ -1248,7 +872,7 @@
 "<tt>/dev/sdb</tt> など) 。</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:199
+#: src/include/bootloader/routines/helps.rb:178
 msgid ""
 "<p><b>Boot Loader Installation Details</b><br>\n"
 "To adjust advanced boot loader installation options (such as the device\n"
@@ -1259,7 +883,7 @@
 " <b>ブートローダのインストール詳細</b> を押してください。</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:210
+#: src/include/bootloader/routines/helps.rb:189
 msgid ""
 "<p><b>Boot Loader Type</b><br>\n"
 "To select whether to install a boot loader and which bootloader to install,\n"
@@ -1270,7 +894,7 @@
 "<b>ブートローダ</b> をご利用ください。</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:222
+#: src/include/bootloader/routines/helps.rb:201
 msgid ""
 "<p><b>Boot Loader Options</b><br>\n"
 "To adjust options of the boot loader, such as the time-out, click\n"
@@ -1281,7 +905,7 @@
 "<b>ブートローダオプション</b> を押してください。</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:233
+#: src/include/bootloader/routines/helps.rb:212
 msgid ""
 "<P><B>Expert Manual Configuration</B><BR>\n"
 "Here, manually edit the boot loader configuration.</P>\n"
@@ -1292,7 +916,7 @@
 "<P>注意: 最終的な設定ファイルではインデント (字下げ) が異なる場合があります。</P>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:244
+#: src/include/bootloader/routines/helps.rb:223
 msgid ""
 "<p><b>Section Name</b><br>\n"
 "Use <b>Section Name</b> to specify the boot loader section name. The section\n"
@@ -1303,7 +927,7 @@
 "一意である必要があります。</p>"
 
 #. help text 1/5
-#: src/include/bootloader/routines/helps.rb:255
+#: src/include/bootloader/routines/helps.rb:234
 msgid ""
 "<p><big><b>Type of the New Section</b></big><br>\n"
 "Select the type of the new section to create.</p>"
@@ -1312,7 +936,7 @@
 "作成する新しいセクションの種類を選択してください。</p>"
 
 #. help text 2/5
-#: src/include/bootloader/routines/helps.rb:259
+#: src/include/bootloader/routines/helps.rb:238
 msgid ""
 "<p>Select <b>Clone Selected Section</b> to clone the currently selected\n"
 "section. Then modify the options that should differ from the\n"
@@ -1323,7 +947,7 @@
 "</p>"
 
 #. help text 3/5
-#: src/include/bootloader/routines/helps.rb:265
+#: src/include/bootloader/routines/helps.rb:244
 msgid ""
 "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
 "to load and start.</p>"
@@ -1332,7 +956,7 @@
 "<b>イメージセクション</b> を選択してください。</p>"
 
 #. help text 4/5
-#: src/include/bootloader/routines/helps.rb:269
+#: src/include/bootloader/routines/helps.rb:248
 msgid ""
 "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
 "but to start it in a Xen environment.</p>"
@@ -1341,7 +965,7 @@
 " <b>Xen セクション</b> を選択してください。</p>"
 
 #. help text 5/5
-#: src/include/bootloader/routines/helps.rb:273
+#: src/include/bootloader/routines/helps.rb:252
 msgid ""
 "<p>Select <b>Other System (Chainloader)</b> to add a section that \n"
 "loads and starts a boot sector of a partition of the disk. This is used for\n"
@@ -1351,7 +975,7 @@
 "実行する種類のセクションを追加するには、 <b>その他のシステム (チェインローダ)</b> を選択してください。\n"
 "これは他のオペレーティングシステム (OS) を起動する際に利用します。</p>"
 
-#: src/include/bootloader/routines/helps.rb:278
+#: src/include/bootloader/routines/helps.rb:257
 msgid ""
 "<p>Select <b>Menu Section</b> to add a section that \n"
 "loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
@@ -1362,50 +986,40 @@
 "これは他のオペレーティングシステム (OS) を起動する際に利用します。</p>"
 
 #. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:743
+#: src/include/bootloader/routines/lilolike.rb:266
 msgid "Order of Hard Disks: %1"
 msgstr "ハードディスクの順序: %1"
 
 #. summary string
-#: src/include/bootloader/routines/misc.rb:48
+#: src/include/bootloader/routines/misc.rb:51
 msgid "Do not install any boot loader"
 msgstr "ブートローダをインストールしない"
 
 #. combo box item
-#: src/include/bootloader/routines/misc.rb:50
+#: src/include/bootloader/routines/misc.rb:53
 msgid "Do Not Install Any Boot Loader"
 msgstr "ブートローダをインストールしない"
 
 #. summary string
-#: src/include/bootloader/routines/misc.rb:55
+#: src/include/bootloader/routines/misc.rb:58
 msgid "Install the default boot loader"
 msgstr "既定のブートローダをインストールする"
 
 #. combo box item
-#: src/include/bootloader/routines/misc.rb:57
+#: src/include/bootloader/routines/misc.rb:60
 msgid "Install Default Boot Loader"
 msgstr "既定のブートローダをインストールする"
 
 #. summary string
-#: src/include/bootloader/routines/misc.rb:61
+#: src/include/bootloader/routines/misc.rb:64
 msgid "Boot loader"
 msgstr "ブートローダ"
 
 #. combo box item
-#: src/include/bootloader/routines/misc.rb:63
+#: src/include/bootloader/routines/misc.rb:66
 msgid "Boot Loader"
 msgstr "ブートローダ"
 
-#. popup, %1 is bootloader name
-#: src/include/bootloader/routines/misc.rb:101
-msgid "The %1 boot sector has been written to the floppy disk."
-msgstr "%1 ブートセクタがフロッピィディスクに書き込まれました。"
-
-#. popup - continuing
-#: src/include/bootloader/routines/misc.rb:113
-msgid "Leave the floppy disk in the drive."
-msgstr "フロッピィディスクをドライブに入れたままにしておいてください。"
-
 #. popup message
 #: src/include/bootloader/routines/popups.rb:35
 msgid ""
@@ -1424,18 +1038,13 @@
 "ブートローダの設定を保存しないまま中止してよろしいですか？\n"
 "すべての変更は破棄されます。\n"
 
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:59
-msgid "Really delete section %1?"
-msgstr "セクション %1 を削除してよろしいですか？"
-
 #. error popup
-#: src/include/bootloader/routines/popups.rb:65
+#: src/include/bootloader/routines/popups.rb:57
 msgid "The password must not be empty."
 msgstr "パスワードを設定してください。"
 
 #. error popup
-#: src/include/bootloader/routines/popups.rb:74
+#: src/include/bootloader/routines/popups.rb:66
 msgid ""
 "'Password' and 'Retype password'\n"
 "do not match. Retype the password."
@@ -1443,81 +1052,15 @@
 "'パスワード' と 'パスワードの再入力' に\n"
 "入力したパスワードが異なっています。もう一度入力してください。"
 
-#. message popup, %1 is sectino label
-#: src/include/bootloader/routines/popups.rb:88
-msgid ""
-"The disk settings have changed.\n"
-"Check section %1 settings.\n"
-msgstr ""
-"ディスク設定を変更しました。\n"
-"セクション %1 の設定を確認してください。\n"
-
-#. message popup
-#: src/include/bootloader/routines/popups.rb:100
-msgid ""
-"The disk settings have changed and you edited boot loader\n"
-"configuration files manually. Check the boot loader settings.\n"
-msgstr ""
-"ディスク設定を変更し、ブートローダの設定ファイルを手動で変更しました。\n"
-"ブートローダの設定を確認してください。\n"
-
 #. Confirmation box with yes-no popup. %1 is reason why we need to set
 #. default location. It is translated on caller side and it is complete
 #. sentence.
-#: src/include/bootloader/routines/popups.rb:116
+#: src/include/bootloader/routines/popups.rb:82
 msgid "%1Set default boot loader location?\n"
 msgstr "%1 既定のブートローダ位置に設定しますか？\n"
 
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:128
-msgid "Do Not Create a File System"
-msgstr "ファイルシステムを作成しない"
-
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:130
-msgid "Create an ext2 File System"
-msgstr "ext2 ファイルシステムを作成する"
-
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:136
-msgid "Create a FAT File System"
-msgstr "FAT ファイルシステムを作成する"
-
-#. label
-#: src/include/bootloader/routines/popups.rb:142
-msgid ""
-"The boot loader boot sector will be written\n"
-"to a floppy disk. Insert a floppy disk\n"
-"and confirm with OK.\n"
-msgstr ""
-"ブートローダのブートセクタをフロッピィディスクに\n"
-"書き込みます。フロッピィディスクを入れて、\n"
-"'了解' ボタンを押してください。\n"
-
-#. checkbox
-#: src/include/bootloader/routines/popups.rb:150
-msgid "&Low Level Format"
-msgstr "ローレベルフォーマット (&L)"
-
-#. combobox
-#: src/include/bootloader/routines/popups.rb:153
-msgid "&Create File System"
-msgstr "ファイルシステムの作成 (&C)"
-
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:182
-msgid "Low level format failed. Try again?"
-msgstr "ローレベルフォーマットが失敗しました。やり直しますか？"
-
-#. error report
-#. error report
-#: src/include/bootloader/routines/popups.rb:195
-#: src/include/bootloader/routines/popups.rb:207
-msgid "Creating file system failed."
-msgstr "ファイルシステムの作成に失敗しました。"
-
 #. error popup
-#: src/include/bootloader/routines/popups.rb:218
+#: src/include/bootloader/routines/popups.rb:90
 msgid ""
 "The name selected is already used.\n"
 "Use a different one.\n"
@@ -1526,7 +1069,7 @@
 "別の名前を指定してください。\n"
 
 #. yes-no popup
-#: src/include/bootloader/routines/popups.rb:229
+#: src/include/bootloader/routines/popups.rb:101
 msgid ""
 "An error occurred during boot loader\n"
 "installation. Retry boot loader configuration?\n"
@@ -1534,14 +1077,9 @@
 "ブートローダを設定する際にエラーが\n"
 "発生しました。ブートローダ設定をやり直しますか？\n"
 
-#. FIXME too generic, but was already translated
-#: src/include/bootloader/routines/popups.rb:241
-msgid "Unable to install the boot loader."
-msgstr "ブートローダをインストールすることができません。"
-
 #. warning popup. %1 is device name, %2 is date/time in form of
 #. 'date' command output
-#: src/include/bootloader/routines/popups.rb:283
+#: src/include/bootloader/routines/popups.rb:125
 msgid ""
 "Warning!\n"
 "\n"
@@ -1564,315 +1102,10 @@
 "続行しますか？\n"
 
 #. PushButton
-#: src/include/bootloader/routines/popups.rb:305
+#: src/include/bootloader/routines/popups.rb:147
 msgid "&Yes, Rewrite"
 msgstr "はい、上書きします (&Y)"
 
-#. encoding: utf-8
-#. File:
-#. include/bootloader/routines/section_helps.ycp
-#.
-#. Module:
-#. Bootloader installation and configuration
-#.
-#. Summary:
-#. Help and label strings for bootloader section widgets
-#.
-#. Authors:
-#. Josef Reidinger <jreidinger@suse.cz>
-#.
-#. $Id$
-#: src/include/bootloader/routines/section_helps.rb:23
-msgid "<p><b>Image Section</b></p>"
-msgstr "<p><b>イメージセクション</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:24
-msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"
-msgstr "<p><b>カーネルイメージ</b> には起動するカーネルを設定します。ファイル名を直接入力するか、 <b>参照</b> ボタンを押して選択してください。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:27
-msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
-msgstr "<p><b>ルートデバイス</b> ではカーネルに対してルートデバイスとして通知するデバイスを設定します。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:36
-msgid ""
-"<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
-"directly or choose by using <b>Browse</b>.</p>\n"
-msgstr ""
-"<p><b>初期 RAM ディスク (initrd)</b> には、利用する初期 RAM ディスク (initrd) のファイル名を指定します。 パスとファイル名を\n"
-"直接入力するか、 <b>参照</b> ボタンを押して選択してください。</p>\n"
-
-#: src/include/bootloader/routines/section_helps.rb:39
-msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
-msgstr "<p>Linux ではない他の OS を起動するセクションを設定するには、 <b>チェインローダセクション</b> を選択してください。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:42
-msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
-msgstr "<p><b>パスワード保護を使用</b> を設定すると、このセクションを選択する際にパスワード入力を求められます。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:45
-msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
-msgstr "<p><b>他のシステム</b> を選択すると、お使いのコンピュータにある Linux 以外の OS を選択することができます。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:48
-msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
-msgstr "<p>このシステムを起動するために BIOS 側で必要となる場合、 <b>起動選択時にパーティションをアクティブ化</b> を選択することもできます。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:51
-msgid ""
-"<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
-"to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n"
-msgstr ""
-"<p><b>チェインロード用ブロックオフセット</b> には起動時に利用するブロックの一覧を指定します。多くの場合、\n"
-"<code>+1</code> を指定すれば問題なく起動します。ブロックリストの詳細な書式については、 grub のドキュメントをお読みください。</p>\n"
-
-#: src/include/bootloader/routines/section_helps.rb:54
-msgid ""
-"<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n"
-"and start it in a Xen environment.</p>\n"
-msgstr ""
-"<p>XEN 環境下で開始する新しい Linux カーネルやその他のイメージを追加するには、\n"
-" <b>Xen セクション</b> を選択してください。</p>\n"
-
-#: src/include/bootloader/routines/section_helps.rb:57
-msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
-msgstr "<p><b>ハイパーバイザ</b> には使用するハイパーバイザを指定します。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:60
-msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
-msgstr "<p><b>追加の Xen ハイパーバイザパラメータ</b> Xen ハイパーバイザに渡す追加のパラメータを指定します。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:63
-msgid "<p><b>Menu Section</b></p>"
-msgstr "<p><b>メニューセクション</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:64
-msgid "<p><b>Partition of Menu File</b></p>"
-msgstr "<p><b>メニューファイルのパーティション</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:65
-msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
-msgstr "<p><b>メニュー説明ファイル</b> には、メニューファイルを読み込むパス (ルートデバイス上のパス) を指定します。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:68
-msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>"
-msgstr "<p><b>デバイスマップから最初のディスクにセクションを配置する</b> Windows では通常、最初のディスク上に存在する必要があります。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:71
-msgid ""
-"<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n"
-"<b>Edit</b> and <b>Delete</b></p>"
-msgstr ""
-"<p><b>計測</b> には PCR で計測されたファイルが含まれています。表内の変更は <b>追加</b>, \n"
-"<b>編集</b>, <b>削除</b> で行なうことができます。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:74
-msgid ""
-"<p><b>Allow attempt to relocate</b>\n"
-"Usually specified in global section</p>"
-msgstr ""
-"<p><b>再配置を試すことを許可</b>\n"
-"通常はグローバルセクションで指定します。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:77
-msgid ""
-"<p><b>Force root filesystem to be mounted read-only</b><br>\n"
-"Usually specified in global section</p>"
-msgstr ""
-"<p><b>ルートファイルシステムの読み取り専用マウント</b><br>\n"
-"通常はグローバルセクションで指定します。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:80
-msgid ""
-"<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
-"create a system dump either on a DASD disk partition or tape device or to a\n"
-"file on a SCSI disk partition.</p>"
-msgstr ""
-"<p>DASD ディスクのパーティション上やテープデバイス上、または SCSI ディスクパーティション上に、\n"
-"システムダンプを作成する方法を指定したセクションを追加するには、 <b>ダンプセクション</b> \n"
-"を選択してください。</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:85
-msgid ""
-"<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
-"Menu sections represent a list of tasks which are grouped together.</p>\n"
-msgstr ""
-"<p>設定に新しいメニューを追加するには <b>メニューセクション</b> を選択してください。\n"
-"メニューセクションはグループ化された作業リストを表わします。</p>\n"
-
-#: src/include/bootloader/routines/section_helps.rb:88
-msgid ""
-"<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n"
-"Please note that this will also disable AppArmor.</p>"
-msgstr ""
-"<p>SELinux セキュリティフレームワークを有効にするため、必要なカーネル起動パラメータを追加するには、 <b>SELinux を有効にする</b> を選択してください。\n"
-"ただし、この設定により AppArmor が無効になりますので注意してください。</p>"
-
-#. radio button
-#: src/include/bootloader/routines/section_helps.rb:95
-#: src/include/bootloader/routines/section_widgets.rb:583
-msgid "Image Section"
-msgstr "イメージセクション"
-
-#: src/include/bootloader/routines/section_helps.rb:96
-msgid "&Kernel Image"
-msgstr "カーネルイメージ(&K)"
-
-#: src/include/bootloader/routines/section_helps.rb:97
-msgid "&Root Device"
-msgstr "ルートデバイス (&R)"
-
-#: src/include/bootloader/routines/section_helps.rb:100
-msgid "&Initial RAM Disk"
-msgstr "初期 RAM ディスク (&I)"
-
-#: src/include/bootloader/routines/section_helps.rb:101
-msgid "Chainloader Section"
-msgstr "チェインローダセクション"
-
-#: src/include/bootloader/routines/section_helps.rb:102
-msgid "Use Password Protection"
-msgstr "パスワード保護を使用"
-
-#: src/include/bootloader/routines/section_helps.rb:103
-msgid "&Other System"
-msgstr "他のシステム (&O)"
-
-#: src/include/bootloader/routines/section_helps.rb:104
-msgid "Do not &verify Filesystem before Booting"
-msgstr "起動前にファイルシステムを検査しない (&V)"
-
-#: src/include/bootloader/routines/section_helps.rb:105
-msgid "&Activate this Partition when selected for Boot"
-msgstr "起動選択時にパーティションをアクティブ化 (&A)"
-
-#: src/include/bootloader/routines/section_helps.rb:106
-msgid "B&lock Offset for Chainloading"
-msgstr "チェインロード用ブロックオフセット (&L)"
-
-#: src/include/bootloader/routines/section_helps.rb:107
-msgid "&Map Section to the First Disk in Device Map"
-msgstr "デバイスマップから最初のディスクにセクションを配置する (&M)"
-
-#: src/include/bootloader/routines/section_helps.rb:109
-msgid "&Hypervisor"
-msgstr "ハイパーバイザ (&H)"
-
-#: src/include/bootloader/routines/section_helps.rb:110
-msgid "&Additional Xen Hypervisor Parameters"
-msgstr "追加の Xen ハイパーバイザパラメータ (&A)"
-
-#: src/include/bootloader/routines/section_helps.rb:112
-msgid "&Partition of Menu File"
-msgstr "メニューファイルのパーティション (&P)"
-
-#: src/include/bootloader/routines/section_helps.rb:113
-msgid "&Menu Description File"
-msgstr "メニュー説明ファイル (&M)"
-
-#: src/include/bootloader/routines/section_helps.rb:114
-msgid "&Force root filesystem to be mounted read-only"
-msgstr "ルートファイルシステムの読み取り専用でのマウントを強制する (&F)"
-
-#: src/include/bootloader/routines/section_helps.rb:115
-msgid "Allow attempt to &relocate"
-msgstr "再配置を試すことを許可 (&R)"
-
-#: src/include/bootloader/routines/section_helps.rb:116
-msgid "Tar&get Directory for Section"
-msgstr "セクション向けのターゲットディレクトリ (&G)"
-
-#: src/include/bootloader/routines/section_helps.rb:117
-msgid "Op&tional Parameter File"
-msgstr "オプションのパラメータファイル (&T)"
-
-#: src/include/bootloader/routines/section_helps.rb:118
-msgid "Dump Section (obsolete)"
-msgstr "ダンプセクション (廃止)"
-
-#: src/include/bootloader/routines/section_helps.rb:119
-msgid "&Dump Device"
-msgstr "ダンプデバイス (&D)"
-
-#: src/include/bootloader/routines/section_helps.rb:120
-msgid "&SCSI Dump Device"
-msgstr "SCSI ダンプデバイス (&S)"
-
-#: src/include/bootloader/routines/section_helps.rb:122
-msgid "&List of Menu Entries"
-msgstr "メニュー項目リスト (&L)"
-
-#: src/include/bootloader/routines/section_helps.rb:123
-msgid "&Number of Default Entry"
-msgstr "既定の項目数 (&N)"
-
-#: src/include/bootloader/routines/section_helps.rb:124
-msgid "&Timeout in seconds"
-msgstr "タイムアウト (秒) (&T)"
-
-#: src/include/bootloader/routines/section_helps.rb:125
-msgid "&Show boot menu"
-msgstr "起動メニューを表示 (&S)"
-
-#: src/include/bootloader/routines/section_helps.rb:126
-msgid "C&opy Image to Boot Partition"
-msgstr "イメージを起動パーティションにコピー (&O)"
-
-#: src/include/bootloader/routines/section_helps.rb:127
-msgid "&Skip Section gracefully on Errors"
-msgstr "エラー時に自動でセクションを飛ばす (&S)"
-
-#: src/include/bootloader/routines/section_helps.rb:128
-msgid "Boot &Partition of Other System"
-msgstr "その他のシステムの起動パーティション (&P)"
-
-#. Cache for CommonSectionWidgets
-#: src/include/bootloader/routines/section_widgets.rb:58
-msgid "Image section must have specified kernel image"
-msgstr "イメージセクションには、カーネルイメージを設定しなければなりません。"
-
-#: src/include/bootloader/routines/section_widgets.rb:65
-msgid "Image file doesn't exist now. Do you really want use it?"
-msgstr "指定したイメージファイルは存在しません。このままの設定でよろしいですか？"
-
-#: src/include/bootloader/routines/section_widgets.rb:82
-msgid "Initrd file doesn't exist now. Do you really want use it?"
-msgstr "指定した initrd ファイルは存在しません。このままの設定でよろしいですか？"
-
-#. string append = BootCommon::current_section["append"]:"";
-#: src/include/bootloader/routines/section_widgets.rb:227
-msgid "Enable &SELinux"
-msgstr "SELinux を有効にする (&S)"
-
-#. bnc#456362 filter out special chars like diacritics china chars etc.
-#: src/include/bootloader/routines/section_widgets.rb:401
-msgid "The name includes unallowable char(s)"
-msgstr "名前欄に許可されない文字が使用されています"
-
-#: src/include/bootloader/routines/section_widgets.rb:533
-msgid "Ask for resolution during boot."
-msgstr "起動時に解像度を尋ねる"
-
-#. radio button
-#: src/include/bootloader/routines/section_widgets.rb:573
-msgid "Clone Selected Section"
-msgstr "選択したセクションの複製"
-
-#. radio button (don't translate 'chainloader')
-#: src/include/bootloader/routines/section_widgets.rb:587
-msgid "Other System (Chainloader)"
-msgstr "その他のシステム (チェインローダ)"
-
-#. frame
-#: src/include/bootloader/routines/section_widgets.rb:609
-msgid "Section Type"
-msgstr "セクションの種類"
-
-#. text entry
-#: src/include/bootloader/routines/section_widgets.rb:668
-msgid "Section &Name"
-msgstr "セクション名 (&N)"
-
 #. error report
 #: src/include/bootloader/routines/wizards.rb:36
 msgid "Because of the partitioning, the boot loader cannot be installed properly."
@@ -1880,99 +1113,65 @@
 
 #. FATE#303643 Enable one-click changes in bootloader proposal
 #.
-#.
-#. FIXME identical code in BootGRUB module
-#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189
+#: src/modules/BootGRUB2.rb:193
 msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
 msgstr "MBR にブートコードをインストールします (<a href=\"disable_boot_mbr\">インストールしない</a>"
 
-#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
+#: src/modules/BootGRUB2.rb:197
 msgid "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
 msgstr "MBR にブートコードをインストールしません (<a href=\"enable_boot_mbr\">インストールする</a>"
 
 #. check for separated boot partition, use root otherwise
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206
+#: src/modules/BootGRUB2.rb:210
 msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
 msgstr "/boot パーティションにブートコードをインストールします (<a href=\"disable_boot_boot\">インストールしない</a>"
 
-#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
+#: src/modules/BootGRUB2.rb:214
 msgid "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
 msgstr "/boot パーティションにブートコードをインストールしません (<a href=\"enable_boot_boot\">インストールする</a>"
 
-#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
+#: src/modules/BootGRUB2.rb:220
 msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
 msgstr "\"/\" パーティションにブートコードをインストールします (<a href=\"disable_boot_root\">インストールしない</a>"
 
-#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
+#: src/modules/BootGRUB2.rb:224
 msgid "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">install</a>)"
 msgstr "\"/\" パーティションにブートコードをインストールしません (<a href=\"enable_boot_root\">インストールする</a>"
 
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/modules/BootGRUB2.rb:234
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgstr "警告: ブートローダのステージ 1 の場所を選択していません。特別な知識がある場合を除き、上記の場所を選択してください。"
+
 #. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
+#: src/modules/BootGRUB2.rb:242
 msgid "Change Location: %s"
 msgstr "変更先: %s"
 
-#. summary text, %1 is bootloader name (eg. LILO)
 #. Display bootloader summary
 #. @return a list of summary lines
 #. Display bootloader summary
 #. @return a list of summary lines
-#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248
-#: src/modules/BootGRUB2EFI.rb:94
+#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:96
 msgid "Boot Loader Type: %1"
 msgstr "ブートローダの種類: %1"
 
-#. summary text, location is location description (eg. /dev/hda)
-#: src/modules/BootGRUB.rb:718
-msgid " (\"/boot\")"
-msgstr " (\"/boot\")"
-
 #. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
+#: src/modules/BootGRUB2.rb:263
 msgid " (extended)"
 msgstr " (拡張)"
 
-#: src/modules/BootGRUB.rb:730
-msgid " (\"/\")"
-msgstr " (\"/\")"
-
 #. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
 #. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267
+#: src/modules/BootGRUB2.rb:271
 msgid " (MBR)"
 msgstr " (MBR)"
 
-#. FIXME: should we translate all devices to names and add MBR suffixes?
-#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274
+#: src/modules/BootGRUB2.rb:278
 msgid "Status Location: %1"
 msgstr "インストール先: %1"
 
-#. section name "suffix" for default section
-#: src/modules/BootGRUB.rb:768
-msgid " (default)"
-msgstr " (既定)"
-
-#: src/modules/BootGRUB.rb:779
-msgid "Sections:<br>%1"
-msgstr "セクション:<br>%1"
-
-#. summary text
-#: src/modules/BootGRUB.rb:788
-msgid "Do not install boot loader; just create configuration files"
-msgstr "ブートローダをインストールせずに設定ファイルの作成のみを行なう"
-
-#. menubutton item, keep as short as possible
-#: src/modules/BootGRUB.rb:919
-msgid "Propose and &Merge with Existing GRUB Menus"
-msgstr "設定を提案して GRUB メニューに組み込む (&M)"
-
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:230
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
-msgstr "警告: ブートローダのステージ 1 の場所を選択していません。特別な知識がある場合を除き、上記の場所を選択してください。"
-
-#: src/modules/BootGRUB2EFI.rb:102
+#: src/modules/BootGRUB2EFI.rb:104
 msgid "Enable Secure Boot: %1"
 msgstr "Secure Boot サポートを有効にする: %1"
 
@@ -1986,107 +1185,589 @@
 msgid "Unsupported combination of hardware platform %1 and bootloader %2"
 msgstr "サポートされていないハードウエア %1 とブートローダ %2 の組み合わせです"
 
-#. TODO add more devices
-#: src/modules/BootSupportCheck.rb:128
-msgid "Partition number > 3 is being used for booting with GPT partition table"
-msgstr "GPT パーティションテーブルで起動用に 3 より大きいパーティション番号が使われています"
-
 #. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: src/modules/BootSupportCheck.rb:153
+#: src/modules/BootSupportCheck.rb:140
 msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR."
 msgstr "MBR からの起動は、 btrfs ファイルシステムを使用している場合で、 bios_grub パーティションのない GPT ディスクを使用している場合には動作しません。この問題を解決するには、 bios_grub パーティションを作成するか、任意の ext ファイルシステムのパーティションを起動用のパーティションとして設定するか、もしくは MBR 以外にステージ 1 をインストールするかのいずれかを実施してください。"
 
 #. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:181
+#: src/modules/BootSupportCheck.rb:168
 msgid "The boot device is on raid type: %1. System will not boot."
 msgstr "起動デバイスは RAID 種類 %1 上に存在します。システムを起動することができないものと思われます。"
 
 #. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:201
+#: src/modules/BootSupportCheck.rb:188
 msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
 msgstr "起動デバイスはソフトウエア RAID1 上にあります。マスターブートレコードなど、他のブートローダの場所を選択してください。"
 
-#. s390 do not have bios boot order (bnc#874106)
-#: src/modules/BootSupportCheck.rb:256
-msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\""
-msgstr "YaST はデバイスマップを作成する目的で、ディスクの正確な順序を確定しようとしましたが、できませんでした。 \"ブートローダのインストール詳細\" でディスクの順序をご確認のうえ、必要であれば変更してください。"
-
 #. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:276
+#: src/modules/BootSupportCheck.rb:244
 msgid "Missing ext partition for booting. Cannot install boot code."
 msgstr "起動用の ext パーティションが見つかりません。ブートコードをインストールできません。"
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:170
+#: src/modules/Bootloader.rb:159
 msgid "Check boot loader"
 msgstr "ブートローダの検査"
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:172
+#: src/modules/Bootloader.rb:161
 msgid "Read partitioning"
 msgstr "パーティションの読み込み"
 
 #. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:174
+#: src/modules/Bootloader.rb:163
 msgid "Load boot loader settings"
 msgstr "ブートローダ設定の読み込み"
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:178
+#: src/modules/Bootloader.rb:167
 msgid "Checking boot loader..."
 msgstr "ブートローダを検査しています..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:180
+#: src/modules/Bootloader.rb:169
 msgid "Reading partitioning..."
 msgstr "パーティションを読み込んでいます..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:182
+#: src/modules/Bootloader.rb:171
 msgid "Loading boot loader settings..."
 msgstr "ブートローダ設定を読み込んでいます..."
 
 #. dialog header
-#: src/modules/Bootloader.rb:186
+#: src/modules/Bootloader.rb:175
 msgid "Initializing Boot Loader Configuration"
 msgstr "ブートローダの設定を準備しています"
 
-#. part of summary, %1 is a part of kernel command line
-#: src/modules/Bootloader.rb:307
-msgid "Added Kernel Parameters: %1"
-msgstr "追加のカーネルのパラメータ: %1"
-
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:367
+#: src/modules/Bootloader.rb:322
 msgid "Create initrd"
 msgstr "initrd の作成"
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:369
+#: src/modules/Bootloader.rb:324
 msgid "Save boot loader configuration files"
 msgstr "ブートローダ設定ファイルの保存"
 
 #. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:371
+#: src/modules/Bootloader.rb:326
 msgid "Install boot loader"
 msgstr "ブートローダのインストール"
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:375
+#: src/modules/Bootloader.rb:330
 msgid "Creating initrd..."
 msgstr "initrd を作成しています..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:377
+#: src/modules/Bootloader.rb:332
 msgid "Saving boot loader configuration files..."
 msgstr "ブートローダ設定ファイルを保存しています..."
 
 #. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:379
+#: src/modules/Bootloader.rb:334
 msgid "Installing boot loader..."
 msgstr "ブートローダをインストールしています..."
 
 #. progress line
-#: src/modules/Bootloader.rb:385
+#: src/modules/Bootloader.rb:340
 msgid "Saving Boot Loader Configuration"
 msgstr "ブートローダ設定を保存しています"
+
+#~ msgid "Delete a global option or option of a section"
+#~ msgstr "グローバルオプションまたはセクション内のオプションの削除"
+
+#~ msgid "Set a global option or option of a section"
+#~ msgstr "グローバルオプションまたはセクション内のオプションの設定"
+
+#~ msgid "Add a new section - please use interactive mode"
+#~ msgstr "新しいセクションを追加 - 対話モードでお使いください"
+
+#~ msgid "The name of the section"
+#~ msgstr "セクションの名前"
+
+#~ msgid "Section %1 not found."
+#~ msgstr "セクション %1 が見つかりません。"
+
+#~ msgid "Add option is available only in commandline interactive mode"
+#~ msgstr "オプションの追加は、コマンドライン対話モードでのみ利用できます。"
+
+#~ msgid "Section name must be specified."
+#~ msgstr "セクション名を指定してください。"
+
+#~ msgid "Disk Order"
+#~ msgstr "ディスクの順序"
+
+#~ msgid "Disk order settings"
+#~ msgstr "ディスク順序の設定"
+
+#~ msgid "Boot Menu"
+#~ msgstr "起動メニュー"
+
+#~ msgid ""
+#~ "<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n"
+#~ "It is recommended to install grub to MBR</p>"
+#~ msgstr ""
+#~ "<p><b>信頼済み Grub を使用する</b> は、信頼済みの grub をインストールしてそれを使用することを意味します。 オプション <i>グラフィカルなメニューファイル</i> は無視されます。\n"
+#~ "MBR (マスターブートレコード) に grub をインストールする場合にはお勧めです。</p>"
+
+#~ msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
+#~ msgstr "<p><b>グラフィカルメニューファイル</b> には、グラフィカルな起動メニューで使用するファイルを設定します。</p>"
+
+#~ msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
+#~ msgstr "<p>聴覚に訴える種類の信号を有効にするには、 <b>聴覚信号を有効にする</b> を選択してください。</p>"
+
+#~ msgid "Use &Trusted Grub"
+#~ msgstr "信頼済み Grub を使用する (&T)"
+
+#~ msgid "Graphical &Menu File"
+#~ msgstr "グラフィカルメニューファイル (&M)"
+
+#~ msgid "Choose new graphical menu file"
+#~ msgstr "新しいグラフィカルなメニューファイルを選択"
+
+#~ msgid "Enable Acoustic &Signals"
+#~ msgstr "聴覚信号を有効にする (&S)"
+
+#~ msgid "&Device"
+#~ msgstr "デバイス (&D)"
+
+#~ msgid "Device map must contain at least one device"
+#~ msgstr "デバイスマップには、少なくとも 1 つのデバイスを含める必要があります。"
+
+#~ msgid "D&isks"
+#~ msgstr "ディスク (&I)"
+
+#~ msgid "&Up"
+#~ msgstr "上へ (&U)"
+
+#~ msgid "&Down"
+#~ msgstr "下へ (&D)"
+
+#~ msgid "Kernel Section"
+#~ msgstr "カーネルセクション"
+
+#~ msgid "Section Settings"
+#~ msgstr "セクション設定"
+
+#~ msgid "Boot Loader Settings: Section Management"
+#~ msgstr "ブートローダの設定: セクション管理"
+
+#~ msgid "Xen Section"
+#~ msgstr "Xen セクション"
+
+#~ msgid "Menu Section"
+#~ msgstr "メニューセクション"
+
+#~ msgid "Dump Section"
+#~ msgstr "ダンプセクション"
+
+#~ msgid "Other System Section"
+#~ msgstr "その他のシステムセクション"
+
+#~ msgid "&Filename"
+#~ msgstr "ファイル名 (&F)"
+
+#~ msgid "Filename: %1"
+#~ msgstr "ファイル名: %1"
+
+#~ msgid "Fi&le Contents"
+#~ msgstr "ファイル内容 (&L)"
+
+#~ msgid "Expert Manual Configuration"
+#~ msgstr "熟練者設定"
+
+#~ msgid "Image"
+#~ msgstr "イメージ"
+
+#~ msgid "Xen"
+#~ msgstr "Xen"
+
+#~ msgid "Floppy"
+#~ msgstr "フロッピィ"
+
+#~ msgid "Menu"
+#~ msgstr "メニュー"
+
+#~ msgid "Dump"
+#~ msgstr "ダンプ"
+
+#~ msgid "Def."
+#~ msgstr "既定"
+
+#~ msgid "Label"
+#~ msgstr "ラベル"
+
+#~ msgid "Type"
+#~ msgstr "種類"
+
+#~ msgid "Image / Device"
+#~ msgstr "イメージ／デバイス"
+
+#~ msgid "Set as De&fault"
+#~ msgstr "既定に設定 (&F)"
+
+#~ msgid ""
+#~ "\n"
+#~ "You chose to change your boot loader. When converting \n"
+#~ "the configuration, some settings might be lost.\n"
+#~ "\n"
+#~ "The current configuration will be saved and you can\n"
+#~ "restore it if you return to the current boot loader.\n"
+#~ "\n"
+#~ "Select a course of action:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "ブートローダを変更しようとしています。設定を変換する際に、\n"
+#~ "項目によっては内容が失われる可能性があります。\n"
+#~ "\n"
+#~ "現在の設定は保存されますので、今のブートローダに戻した際に\n"
+#~ "設定を復元することができます。\n"
+#~ "\n"
+#~ "アクションを選択してください:\n"
+
+#~ msgid "Co&nvert Current Configuration"
+#~ msgstr "現在の設定を変換 (&N)"
+
+#~ msgid "&Start New Configuration from Scratch"
+#~ msgstr "新しい設定の作成 (&S)"
+
+#~ msgid "&Read Configuration Saved on Disk"
+#~ msgstr "ディスクに保存された設定の読み込み (&R)"
+
+#~ msgid "Res&tore Configuration Saved before Conversion"
+#~ msgstr "変換前に保存した設定に戻す (&T)"
+
+#~ msgid "Select the boot loader before editing sections."
+#~ msgstr "セクションを編集する前にブートローダを選択してください。"
+
+#~ msgid "&Section Management"
+#~ msgstr "セクション管理 (&S)"
+
+#~ msgid "Boot Loader &Installation"
+#~ msgstr "ブートローダのインストール (&I)"
+
+#~ msgid ""
+#~ "If you have multiple Linux systems installed,\n"
+#~ "YaST can try to find them and merge their menus."
+#~ msgstr ""
+#~ "複数の Linux システムをインストールしている場合、\n"
+#~ " YaST はそれらを検出してメニュー内に組み込むことができます。"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "- On a <b>Floppy Disk</b>.\n"
+#~ "Use this to avoid the risk of interfering with an already existing\n"
+#~ "boot mechanism. Enable booting from floppy disk in\n"
+#~ "the BIOS of your machine to use this option.</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "- <b>フロッピィディスク</b> 内\n"
+#~ "既にインストールされている起動メカニズムを邪魔したくない場合には、これを\n"
+#~ "お使いください。お使いのマシンの BIOS 設定で、フロッピィディスクから\n"
+#~ "起動できるように設定する必要があります。</p>"
+
+#~ msgid "The %1 boot sector has been written to the floppy disk."
+#~ msgstr "%1 ブートセクタがフロッピィディスクに書き込まれました。"
+
+#~ msgid "Leave the floppy disk in the drive."
+#~ msgstr "フロッピィディスクをドライブに入れたままにしておいてください。"
+
+#~ msgid "Really delete section %1?"
+#~ msgstr "セクション %1 を削除してよろしいですか？"
+
+#~ msgid ""
+#~ "The disk settings have changed.\n"
+#~ "Check section %1 settings.\n"
+#~ msgstr ""
+#~ "ディスク設定を変更しました。\n"
+#~ "セクション %1 の設定を確認してください。\n"
+
+#~ msgid ""
+#~ "The disk settings have changed and you edited boot loader\n"
+#~ "configuration files manually. Check the boot loader settings.\n"
+#~ msgstr ""
+#~ "ディスク設定を変更し、ブートローダの設定ファイルを手動で変更しました。\n"
+#~ "ブートローダの設定を確認してください。\n"
+
+#~ msgid "Do Not Create a File System"
+#~ msgstr "ファイルシステムを作成しない"
+
+#~ msgid "Create an ext2 File System"
+#~ msgstr "ext2 ファイルシステムを作成する"
+
+#~ msgid "Create a FAT File System"
+#~ msgstr "FAT ファイルシステムを作成する"
+
+#~ msgid ""
+#~ "The boot loader boot sector will be written\n"
+#~ "to a floppy disk. Insert a floppy disk\n"
+#~ "and confirm with OK.\n"
+#~ msgstr ""
+#~ "ブートローダのブートセクタをフロッピィディスクに\n"
+#~ "書き込みます。フロッピィディスクを入れて、\n"
+#~ "'了解' ボタンを押してください。\n"
+
+#~ msgid "&Low Level Format"
+#~ msgstr "ローレベルフォーマット (&L)"
+
+#~ msgid "&Create File System"
+#~ msgstr "ファイルシステムの作成 (&C)"
+
+#~ msgid "Low level format failed. Try again?"
+#~ msgstr "ローレベルフォーマットが失敗しました。やり直しますか？"
+
+#~ msgid "Creating file system failed."
+#~ msgstr "ファイルシステムの作成に失敗しました。"
+
+#~ msgid "Unable to install the boot loader."
+#~ msgstr "ブートローダをインストールすることができません。"
+
+#~ msgid "<p><b>Image Section</b></p>"
+#~ msgstr "<p><b>イメージセクション</b></p>"
+
+#~ msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"
+#~ msgstr "<p><b>カーネルイメージ</b> には起動するカーネルを設定します。ファイル名を直接入力するか、 <b>参照</b> ボタンを押して選択してください。</p>"
+
+#~ msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
+#~ msgstr "<p><b>ルートデバイス</b> ではカーネルに対してルートデバイスとして通知するデバイスを設定します。</p>"
+
+#~ msgid ""
+#~ "<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
+#~ "directly or choose by using <b>Browse</b>.</p>\n"
+#~ msgstr ""
+#~ "<p><b>初期 RAM ディスク (initrd)</b> には、利用する初期 RAM ディスク (initrd) のファイル名を指定します。 パスとファイル名を\n"
+#~ "直接入力するか、 <b>参照</b> ボタンを押して選択してください。</p>\n"
+
+#~ msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
+#~ msgstr "<p>Linux ではない他の OS を起動するセクションを設定するには、 <b>チェインローダセクション</b> を選択してください。</p>"
+
+#~ msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
+#~ msgstr "<p><b>パスワード保護を使用</b> を設定すると、このセクションを選択する際にパスワード入力を求められます。</p>"
+
+#~ msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
+#~ msgstr "<p><b>他のシステム</b> を選択すると、お使いのコンピュータにある Linux 以外の OS を選択することができます。</p>"
+
+#~ msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
+#~ msgstr "<p>このシステムを起動するために BIOS 側で必要となる場合、 <b>起動選択時にパーティションをアクティブ化</b> を選択することもできます。</p>"
+
+#~ msgid ""
+#~ "<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
+#~ "to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n"
+#~ msgstr ""
+#~ "<p><b>チェインロード用ブロックオフセット</b> には起動時に利用するブロックの一覧を指定します。多くの場合、\n"
+#~ "<code>+1</code> を指定すれば問題なく起動します。ブロックリストの詳細な書式については、 grub のドキュメントをお読みください。</p>\n"
+
+#~ msgid ""
+#~ "<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n"
+#~ "and start it in a Xen environment.</p>\n"
+#~ msgstr ""
+#~ "<p>XEN 環境下で開始する新しい Linux カーネルやその他のイメージを追加するには、\n"
+#~ " <b>Xen セクション</b> を選択してください。</p>\n"
+
+#~ msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
+#~ msgstr "<p><b>ハイパーバイザ</b> には使用するハイパーバイザを指定します。</p>"
+
+#~ msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
+#~ msgstr "<p><b>追加の Xen ハイパーバイザパラメータ</b> Xen ハイパーバイザに渡す追加のパラメータを指定します。</p>"
+
+#~ msgid "<p><b>Menu Section</b></p>"
+#~ msgstr "<p><b>メニューセクション</b></p>"
+
+#~ msgid "<p><b>Partition of Menu File</b></p>"
+#~ msgstr "<p><b>メニューファイルのパーティション</b></p>"
+
+#~ msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
+#~ msgstr "<p><b>メニュー説明ファイル</b> には、メニューファイルを読み込むパス (ルートデバイス上のパス) を指定します。</p>"
+
+#~ msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>"
+#~ msgstr "<p><b>デバイスマップから最初のディスクにセクションを配置する</b> Windows では通常、最初のディスク上に存在する必要があります。</p>"
+
+#~ msgid ""
+#~ "<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n"
+#~ "<b>Edit</b> and <b>Delete</b></p>"
+#~ msgstr ""
+#~ "<p><b>計測</b> には PCR で計測されたファイルが含まれています。表内の変更は <b>追加</b>, \n"
+#~ "<b>編集</b>, <b>削除</b> で行なうことができます。</p>"
+
+#~ msgid ""
+#~ "<p><b>Allow attempt to relocate</b>\n"
+#~ "Usually specified in global section</p>"
+#~ msgstr ""
+#~ "<p><b>再配置を試すことを許可</b>\n"
+#~ "通常はグローバルセクションで指定します。</p>"
+
+#~ msgid ""
+#~ "<p><b>Force root filesystem to be mounted read-only</b><br>\n"
+#~ "Usually specified in global section</p>"
+#~ msgstr ""
+#~ "<p><b>ルートファイルシステムの読み取り専用マウント</b><br>\n"
+#~ "通常はグローバルセクションで指定します。</p>"
+
+#~ msgid ""
+#~ "<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
+#~ "create a system dump either on a DASD disk partition or tape device or to a\n"
+#~ "file on a SCSI disk partition.</p>"
+#~ msgstr ""
+#~ "<p>DASD ディスクのパーティション上やテープデバイス上、または SCSI ディスクパーティション上に、\n"
+#~ "システムダンプを作成する方法を指定したセクションを追加するには、 <b>ダンプセクション</b> \n"
+#~ "を選択してください。</p>"
+
+#~ msgid ""
+#~ "<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
+#~ "Menu sections represent a list of tasks which are grouped together.</p>\n"
+#~ msgstr ""
+#~ "<p>設定に新しいメニューを追加するには <b>メニューセクション</b> を選択してください。\n"
+#~ "メニューセクションはグループ化された作業リストを表わします。</p>\n"
+
+#~ msgid ""
+#~ "<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n"
+#~ "Please note that this will also disable AppArmor.</p>"
+#~ msgstr ""
+#~ "<p>SELinux セキュリティフレームワークを有効にするため、必要なカーネル起動パラメータを追加するには、 <b>SELinux を有効にする</b> を選択してください。\n"
+#~ "ただし、この設定により AppArmor が無効になりますので注意してください。</p>"
+
+#~ msgid "Image Section"
+#~ msgstr "イメージセクション"
+
+#~ msgid "&Kernel Image"
+#~ msgstr "カーネルイメージ(&K)"
+
+#~ msgid "&Root Device"
+#~ msgstr "ルートデバイス (&R)"
+
+#~ msgid "&Initial RAM Disk"
+#~ msgstr "初期 RAM ディスク (&I)"
+
+#~ msgid "Chainloader Section"
+#~ msgstr "チェインローダセクション"
+
+#~ msgid "Use Password Protection"
+#~ msgstr "パスワード保護を使用"
+
+#~ msgid "&Other System"
+#~ msgstr "他のシステム (&O)"
+
+#~ msgid "Do not &verify Filesystem before Booting"
+#~ msgstr "起動前にファイルシステムを検査しない (&V)"
+
+#~ msgid "&Activate this Partition when selected for Boot"
+#~ msgstr "起動選択時にパーティションをアクティブ化 (&A)"
+
+#~ msgid "B&lock Offset for Chainloading"
+#~ msgstr "チェインロード用ブロックオフセット (&L)"
+
+#~ msgid "&Map Section to the First Disk in Device Map"
+#~ msgstr "デバイスマップから最初のディスクにセクションを配置する (&M)"
+
+#~ msgid "&Hypervisor"
+#~ msgstr "ハイパーバイザ (&H)"
+
+#~ msgid "&Additional Xen Hypervisor Parameters"
+#~ msgstr "追加の Xen ハイパーバイザパラメータ (&A)"
+
+#~ msgid "&Partition of Menu File"
+#~ msgstr "メニューファイルのパーティション (&P)"
+
+#~ msgid "&Menu Description File"
+#~ msgstr "メニュー説明ファイル (&M)"
+
+#~ msgid "&Force root filesystem to be mounted read-only"
+#~ msgstr "ルートファイルシステムの読み取り専用でのマウントを強制する (&F)"
+
+#~ msgid "Allow attempt to &relocate"
+#~ msgstr "再配置を試すことを許可 (&R)"
+
+#~ msgid "Tar&get Directory for Section"
+#~ msgstr "セクション向けのターゲットディレクトリ (&G)"
+
+#~ msgid "Op&tional Parameter File"
+#~ msgstr "オプションのパラメータファイル (&T)"
+
+#~ msgid "Dump Section (obsolete)"
+#~ msgstr "ダンプセクション (廃止)"
+
+#~ msgid "&Dump Device"
+#~ msgstr "ダンプデバイス (&D)"
+
+#~ msgid "&SCSI Dump Device"
+#~ msgstr "SCSI ダンプデバイス (&S)"
+
+#~ msgid "&List of Menu Entries"
+#~ msgstr "メニュー項目リスト (&L)"
+
+#~ msgid "&Number of Default Entry"
+#~ msgstr "既定の項目数 (&N)"
+
+#~ msgid "&Timeout in seconds"
+#~ msgstr "タイムアウト (秒) (&T)"
+
+#~ msgid "&Show boot menu"
+#~ msgstr "起動メニューを表示 (&S)"
+
+#~ msgid "C&opy Image to Boot Partition"
+#~ msgstr "イメージを起動パーティションにコピー (&O)"
+
+#~ msgid "&Skip Section gracefully on Errors"
+#~ msgstr "エラー時に自動でセクションを飛ばす (&S)"
+
+#~ msgid "Boot &Partition of Other System"
+#~ msgstr "その他のシステムの起動パーティション (&P)"
+
+#~ msgid "Image section must have specified kernel image"
+#~ msgstr "イメージセクションには、カーネルイメージを設定しなければなりません。"
+
+#~ msgid "Image file doesn't exist now. Do you really want use it?"
+#~ msgstr "指定したイメージファイルは存在しません。このままの設定でよろしいですか？"
+
+#~ msgid "Initrd file doesn't exist now. Do you really want use it?"
+#~ msgstr "指定した initrd ファイルは存在しません。このままの設定でよろしいですか？"
+
+#~ msgid "Enable &SELinux"
+#~ msgstr "SELinux を有効にする (&S)"
+
+#~ msgid "The name includes unallowable char(s)"
+#~ msgstr "名前欄に許可されない文字が使用されています"
+
+#~ msgid "Ask for resolution during boot."
+#~ msgstr "起動時に解像度を尋ねる"
+
+#~ msgid "Clone Selected Section"
+#~ msgstr "選択したセクションの複製"
+
+#~ msgid "Other System (Chainloader)"
+#~ msgstr "その他のシステム (チェインローダ)"
+
+#~ msgid "Section Type"
+#~ msgstr "セクションの種類"
+
+#~ msgid "Section &Name"
+#~ msgstr "セクション名 (&N)"
+
+#~ msgid " (\"/boot\")"
+#~ msgstr " (\"/boot\")"
+
+#~ msgid " (\"/\")"
+#~ msgstr " (\"/\")"
+
+#~ msgid " (default)"
+#~ msgstr " (既定)"
+
+#~ msgid "Sections:<br>%1"
+#~ msgstr "セクション:<br>%1"
+
+#~ msgid "Do not install boot loader; just create configuration files"
+#~ msgstr "ブートローダをインストールせずに設定ファイルの作成のみを行なう"
+
+#~ msgid "Propose and &Merge with Existing GRUB Menus"
+#~ msgstr "設定を提案して GRUB メニューに組み込む (&M)"
+
+#~ msgid "Partition number > 3 is being used for booting with GPT partition table"
+#~ msgstr "GPT パーティションテーブルで起動用に 3 より大きいパーティション番号が使われています"
+
+#~ msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\""
+#~ msgstr "YaST はデバイスマップを作成する目的で、ディスクの正確な順序を確定しようとしましたが、できませんでした。 \"ブートローダのインストール詳細\" でディスクの順序をご確認のうえ、必要であれば変更してください。"
+
+#~ msgid "Added Kernel Parameters: %1"
+#~ msgstr "追加のカーネルのパラメータ: %1"

Modified: trunk/yast/ja/po/cluster.ja.po
===================================================================
--- trunk/yast/ja/po/cluster.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/cluster.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: cluster\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-08-05 20:01+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -99,170 +99,257 @@
 msgid "Redundant IP Address"
 msgstr "冗長 IP アドレス"
 
-#: src/include/cluster/dialogs.rb:115
-msgid "nodeid"
-msgstr "ノード ID"
+#: src/include/cluster/dialogs.rb:115 src/include/cluster/dialogs.rb:499
+#, fuzzy
+#| msgid "Node IP"
+msgid "Node ID"
+msgstr "ノードIP"
 
+#. Set need to require 'set'
+#: src/include/cluster/dialogs.rb:163
+msgid "Node ID has to be fulfilled with a positive integer"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:170
+#, fuzzy
+#| msgid "The hardware address must be unique."
+msgid "Node ID must be unique"
+msgstr "ハードウエアアドレスは一意である必要があります。"
+
+#. BNC#871970, change member address struct
+#: src/include/cluster/dialogs.rb:191 src/include/cluster/dialogs.rb:245
+#, fuzzy
+#| msgid "Bind Network Address:"
+msgid "The Bind Network Address has to be fulfilled"
+msgstr "バインドネットワークアドレス:"
+
+#: src/include/cluster/dialogs.rb:197
+msgid "The cluster name has to be fulfilled"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:214
+msgid "The Member Address has to be fulfilled"
+msgstr ""
+
+#. BNC#880242, expected_votes must have value when "udp"
+#: src/include/cluster/dialogs.rb:220
+#, fuzzy
+#| msgid "Play the test sound when the card is configured"
+msgid "The Expected Votes has to be fulfilled when udp is configured"
+msgstr "カードを設定したときにテストサウンドを再生する"
+
+#: src/include/cluster/dialogs.rb:226 src/include/cluster/dialogs.rb:254
+#: src/include/cluster/dialogs.rb:1463
+msgid "The Multicast Address has to be fulfilled"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:236 src/include/cluster/dialogs.rb:264
+#, fuzzy
+#| msgid "The value for pos must be a positive integer."
+msgid "The Multicast port must be a positive integer"
+msgstr "位置の値は正の整数である必要があります。"
+
+#: src/include/cluster/dialogs.rb:270
+msgid "Only passive or active can be chosen if multiple interface used. Set to passive."
+msgstr ""
+
 #. BNC#871970, change member address struct to memberaddr
 #: src/include/cluster/dialogs.rb:439
 msgid "Transport:"
 msgstr "トランスポート:"
 
-#: src/include/cluster/dialogs.rb:444
+#: src/include/cluster/dialogs.rb:447
 msgid "Channel"
 msgstr "チャンネル"
 
-#: src/include/cluster/dialogs.rb:449 src/include/cluster/dialogs.rb:470
+#: src/include/cluster/dialogs.rb:452 src/include/cluster/dialogs.rb:473
 msgid "Bind Network Address:"
 msgstr "バインドネットワークアドレス:"
 
-#: src/include/cluster/dialogs.rb:455 src/include/cluster/dialogs.rb:473
-#: src/include/cluster/dialogs.rb:1396
+#: src/include/cluster/dialogs.rb:458 src/include/cluster/dialogs.rb:476
+#: src/include/cluster/dialogs.rb:1399
 msgid "Multicast Address:"
 msgstr "マルチキャストアドレス:"
 
-#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:474
+#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:477
 msgid "Multicast Port:"
 msgstr "マルチキャストポート:"
 
-#: src/include/cluster/dialogs.rb:464
+#: src/include/cluster/dialogs.rb:467
 msgid "Redundant Channel"
 msgstr "冗長チャンネル"
 
-#: src/include/cluster/dialogs.rb:480
+#: src/include/cluster/dialogs.rb:483
 msgid "Cluster Name:"
 msgstr "クラスタ名:"
 
-#: src/include/cluster/dialogs.rb:481
+#: src/include/cluster/dialogs.rb:484
 msgid "Expected Votes:"
 msgstr "期待する投票:"
 
-#: src/include/cluster/dialogs.rb:485
+#: src/include/cluster/dialogs.rb:488
 msgid "rrp mode:"
 msgstr "RRP モード:"
 
-#: src/include/cluster/dialogs.rb:490
+#: src/include/cluster/dialogs.rb:493
 msgid "Auto Generate Node ID"
 msgstr "ノード ID の自動生成"
 
-#: src/include/cluster/dialogs.rb:495
+#: src/include/cluster/dialogs.rb:498
 msgid "Member Address:"
 msgstr "メンバーアドレス:"
 
+#: src/include/cluster/dialogs.rb:499
+msgid "IP"
+msgstr "IP"
+
+#: src/include/cluster/dialogs.rb:499
+#, fuzzy
+#| msgid "Redundant IP Address"
+msgid "Redundant IP"
+msgstr "冗長 IP アドレス"
+
+#. BNC#879596, check the corosync.conf format
+#: src/include/cluster/dialogs.rb:539
+msgid ""
+" NOTICE: Detected old corosync configuration.\n"
+" Please reconfigure the member list and confirm all other settings."
+msgstr ""
+
 #. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:731
+#: src/include/cluster/dialogs.rb:690
+msgid "Number of threads must be integer"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:696
+msgid "Number of threads must larger then 0"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:734
 msgid "Enable Security Auth"
 msgstr "セキュリティ認証を有効にする"
 
-#: src/include/cluster/dialogs.rb:734
+#: src/include/cluster/dialogs.rb:737
 msgid "Threads:"
 msgstr "スレッド:"
 
-#: src/include/cluster/dialogs.rb:737
+#: src/include/cluster/dialogs.rb:740
 msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
 msgstr "新しく作成するクラスタの場合、下記のボタンを押すと /etc/corosync/authkey を生成することができます。"
 
-#: src/include/cluster/dialogs.rb:742
+#: src/include/cluster/dialogs.rb:745
 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
 msgstr "既存のクラスタに追加する場合は、他のノードから手作業で /etc/corosync/authkey をコピーしてください。"
 
-#: src/include/cluster/dialogs.rb:847 src/include/cluster/dialogs.rb:917
+#: src/include/cluster/dialogs.rb:773
+msgid "Failed to create /etc/corosync/authkey"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:775
+msgid "Create /etc/corosync/authkey succeeded"
+msgstr ""
+
+#: src/include/cluster/dialogs.rb:850 src/include/cluster/dialogs.rb:920
 msgid "Running"
 msgstr "実行中"
 
-#: src/include/cluster/dialogs.rb:849
+#: src/include/cluster/dialogs.rb:852
 msgid "Not running"
 msgstr "実行されていません"
 
 #. servie:cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:885
+#: src/include/cluster/dialogs.rb:888
 msgid "Booting"
 msgstr "起動中"
 
-#: src/include/cluster/dialogs.rb:895
-msgid "On -- Start pacemaker at booting"
+#: src/include/cluster/dialogs.rb:898
+#, fuzzy
+#| msgid "On -- Start pacemaker at booting"
+msgid "On -- Start pacemaker during boot"
 msgstr "オン -- システム起動時に pacemaker を開始する"
 
-#: src/include/cluster/dialogs.rb:902
-msgid "Off -- Start pacemaker manually only"
+#: src/include/cluster/dialogs.rb:905
+#, fuzzy
+#| msgid "Off -- Start pacemaker manually only"
+msgid "Off -- Start pacemaker manually"
 msgstr "オフ -- 手動で pacemaker サービスを開始する"
 
-#: src/include/cluster/dialogs.rb:911
+#: src/include/cluster/dialogs.rb:914
 msgid "Switch On and Off"
 msgstr "開始／停止"
 
-#: src/include/cluster/dialogs.rb:916
+#: src/include/cluster/dialogs.rb:919
 msgid "Current Status: "
 msgstr "現在の状態: "
 
-#: src/include/cluster/dialogs.rb:925
+#: src/include/cluster/dialogs.rb:928
 msgid "Start pacemaker Now"
 msgstr "今すぐ pacemaker を起動する"
 
-#: src/include/cluster/dialogs.rb:926
+#: src/include/cluster/dialogs.rb:929
 msgid "Stop pacemaker Now"
 msgstr "今すぐ pacemaker を停止する"
 
 #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:1024
+#: src/include/cluster/dialogs.rb:1027
 msgid "Sync Host"
 msgstr "同期ホスト"
 
-#: src/include/cluster/dialogs.rb:1028 src/include/cluster/dialogs.rb:1040
+#: src/include/cluster/dialogs.rb:1031 src/include/cluster/dialogs.rb:1043
 msgid "Add"
 msgstr "追加"
 
-#: src/include/cluster/dialogs.rb:1029 src/include/cluster/dialogs.rb:1041
+#: src/include/cluster/dialogs.rb:1032 src/include/cluster/dialogs.rb:1044
 msgid "Del"
 msgstr "削除"
 
-#: src/include/cluster/dialogs.rb:1030 src/include/cluster/dialogs.rb:1042
+#: src/include/cluster/dialogs.rb:1033 src/include/cluster/dialogs.rb:1045
 msgid "Edit"
 msgstr "編集"
 
-#: src/include/cluster/dialogs.rb:1036
+#: src/include/cluster/dialogs.rb:1039
 msgid "Sync File"
 msgstr "同期ファイル"
 
-#: src/include/cluster/dialogs.rb:1043
+#: src/include/cluster/dialogs.rb:1046
 msgid "Add Suggested Files"
 msgstr "推奨されるファイルの追加"
 
-#: src/include/cluster/dialogs.rb:1052
+#: src/include/cluster/dialogs.rb:1055
 msgid "Generate Pre-Shared-Keys"
 msgstr "事前共有鍵の生成"
 
 #. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1176
+#: src/include/cluster/dialogs.rb:1179
 msgid "Csync2 Status Unknown"
 msgstr "Csync2 の状態は不明です"
 
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1182
 msgid "Turn csync2 ON"
 msgstr "Csync2 を有効にする"
 
-#: src/include/cluster/dialogs.rb:1182
+#: src/include/cluster/dialogs.rb:1185
 msgid "Turn csync2 OFF"
 msgstr "Csync2 を無効にする"
 
-#: src/include/cluster/dialogs.rb:1212
+#: src/include/cluster/dialogs.rb:1215
 msgid "Enter a hostname"
 msgstr "ホスト名の入力"
 
-#: src/include/cluster/dialogs.rb:1226
+#: src/include/cluster/dialogs.rb:1229
 msgid "Edit the hostname"
 msgstr "ホスト名の編集"
 
-#: src/include/cluster/dialogs.rb:1240
+#: src/include/cluster/dialogs.rb:1243
 msgid "Enter a filename to synchronize"
 msgstr "同期するファイルの選択"
 
-#: src/include/cluster/dialogs.rb:1255
+#: src/include/cluster/dialogs.rb:1258
 msgid "Edit the filename"
 msgstr "ファイル名の編集"
 
 #. key file exist
-#: src/include/cluster/dialogs.rb:1287
+#: src/include/cluster/dialogs.rb:1290
 msgid ""
 "Key file %1 already exist.\n"
 "Do you want to overwrite it?"
@@ -271,12 +358,12 @@
 "上書きしてもよろしいですか？"
 
 #. remove exist key file
-#: src/include/cluster/dialogs.rb:1297
+#: src/include/cluster/dialogs.rb:1300
 msgid "Delete key file %1 failed."
 msgstr "鍵ファイル %1 の削除に失敗しました。"
 
 #. generate key file
-#: src/include/cluster/dialogs.rb:1311
+#: src/include/cluster/dialogs.rb:1314
 msgid ""
 "Key file %1 is generated.\n"
 "Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -284,12 +371,12 @@
 "鍵ファイル %1 を生成しました。\n"
 "\"推奨されるファイルの追加\" を押すと、同期一覧の中に追加することができます。"
 
-#: src/include/cluster/dialogs.rb:1318
+#: src/include/cluster/dialogs.rb:1321
 msgid "Key generation failed."
 msgstr "鍵の作成に失敗しました。"
 
 #. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1380
+#: src/include/cluster/dialogs.rb:1383
 msgid ""
 "Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n"
 "YaST can help to configure some basic aspects of conntrackd.\n"
@@ -299,29 +386,45 @@
 "YaST では conntrackd のうち、いくつかの基本的な要素を設定することができます。\n"
 "設定後は ocf:heartbeat:conntrackd で起動する必要があります。"
 
-#: src/include/cluster/dialogs.rb:1391
+#: src/include/cluster/dialogs.rb:1394
 msgid "Dedicated Interface:"
 msgstr "専用インターフェイス:"
 
-#: src/include/cluster/dialogs.rb:1394
+#: src/include/cluster/dialogs.rb:1397
 msgid "IP:"
 msgstr "IP:"
 
-#: src/include/cluster/dialogs.rb:1397
+#: src/include/cluster/dialogs.rb:1400
 msgid "Group Number:"
 msgstr "グループ番号:"
 
-#: src/include/cluster/dialogs.rb:1401
+#: src/include/cluster/dialogs.rb:1404
 msgid "Generate /etc/conntrackd/conntrackd.conf"
 msgstr "/etc/conntrackd/conntrackd.conf の生成"
 
+#: src/include/cluster/dialogs.rb:1471
+#, fuzzy
+#| msgid "The value for pos must be a positive integer."
+msgid "The Group Number must be a positive integer"
+msgstr "位置の値は正の整数である必要があります。"
+
 #. All helps are here
 #: src/include/cluster/helps.rb:35
+#, fuzzy
+#| msgid ""
+#| "<p><b><big>Bind Network Address</big></b><br>This  specifies  the  address which the openais executive should bind.  This address should always end in  zero.   If  the  totem traffic  should  be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6  networking will  be used.  In this case, the full address must be specified and there is no automatic selection  of  the  network  interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n"
+#| "<p><b><big>Multicast Address</big></b><br>This is the multicast address used by  openais  executive.   The default  should work for most networks, but the network administrator should be queried  about  a  multicast  address  to  use.  Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This  may  also be an IPV6 multicast address, in which case IPV6 networking will be used.  If IPv6 networking is used, the nodeid field must be specified.</p>\n"
+#| "<p><b><big>Port</big></b><br>This  specifies  the UDP port number.  It is possible to use the same multicast address on a network with  the  openais  services configured for different UDP ports.<br></p>\n"
+#| "<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu <br></p>\n"
+#| "<p><b><big>Node ID</big></b><br>This  configuration  option  is  optional  when  using  IPv4 and required when using IPv6.  This is a 32 bit value specifying the node identifier delivered to the cluster membership service.  If this is not specified with IPv4, the node id will be  determined from  the  32  bit  IP address the system to which the system is bound with ring identifier of 0.  The node identifier  value  of zero is reserved and should not be used.<br></p>\n"
+#| "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which  may  be  none, active,  or  passive.   Active replication offers slightly lower latency from transmit to delivery in faulty network environments but  with less performance.  Passive replication may nearly double the speed of the totem  protocol  if  the  protocol  doesn't become  cpu bound.  The final option is none, in which case only one network interface will be used to operate the  totem  protocol.  If  only one interface directive is specified, none is automatically chosen.  If multiple interface directives  are  specified, only active or passive may be chosen.<br></p>\n"
+#| "<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum.  Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n"
+#| "<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n"
 msgid ""
 "<p><b><big>Bind Network Address</big></b><br>This  specifies  the  address which the openais executive should bind.  This address should always end in  zero.   If  the  totem traffic  should  be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6  networking will  be used.  In this case, the full address must be specified and there is no automatic selection  of  the  network  interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n"
 "<p><b><big>Multicast Address</big></b><br>This is the multicast address used by  openais  executive.   The default  should work for most networks, but the network administrator should be queried  about  a  multicast  address  to  use.  Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This  may  also be an IPV6 multicast address, in which case IPV6 networking will be used.  If IPv6 networking is used, the nodeid field must be specified.</p>\n"
 "<p><b><big>Port</big></b><br>This  specifies  the UDP port number.  It is possible to use the same multicast address on a network with  the  openais  services configured for different UDP ports.<br></p>\n"
-"<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu <br></p>\n"
+"<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br></p>\n"
 "<p><b><big>Node ID</big></b><br>This  configuration  option  is  optional  when  using  IPv4 and required when using IPv6.  This is a 32 bit value specifying the node identifier delivered to the cluster membership service.  If this is not specified with IPv4, the node id will be  determined from  the  32  bit  IP address the system to which the system is bound with ring identifier of 0.  The node identifier  value  of zero is reserved and should not be used.<br></p>\n"
 "<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which  may  be  none, active,  or  passive.   Active replication offers slightly lower latency from transmit to delivery in faulty network environments but  with less performance.  Passive replication may nearly double the speed of the totem  protocol  if  the  protocol  doesn't become  cpu bound.  The final option is none, in which case only one network interface will be used to operate the  totem  protocol.  If  only one interface directive is specified, none is automatically chosen.  If multiple interface directives  are  specified, only active or passive may be chosen.<br></p>\n"
 "<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum.  Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section.<br></p>\n"
@@ -337,10 +440,15 @@
 "<p><b><big>ノード ID の自動生成</big></b><br>IPv6 を使用する場合、ノード ID を設定する必要があります。自動生成では、これを自動的に生成することができます。<br></p>\n"
 
 #: src/include/cluster/helps.rb:45
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages.  If secauth is off, the  protocol  will never  use  threaded  sending.  If secauth is on, this directive allows systems to be  configured  to  use  multiple  threads  to encrypt and send multicast messages.  A  thread  directive of 0 indicates that no threaded send should be used.  This mode offers best performance for non-SMP systems.  The default is 0. <br></p>\n"
+#| "<p><b><big>Enable Security Auth</big></b><br>This  specifies  that HMAC/SHA1 authentication should be used to authenticate all messages.  It further specifies that  all  data should  be  encrypted  with the sober128 encryption algorithm to protect data from eavesdropping.  Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput.  Encryption and authentication consume 75% of CPU cycles in aisexec as  measured  with gprof when enabled.  For  100mbit  networks  with  1500  MTU  frame  transmissions: A throughput of 9mb/sec is possible with 100% cpu utilization when this  option  is enabled on 3ghz cpus.  A throughput of 10mb/sec is possible wth 20% cpu utilization when this option is  disabled on 3ghz cpus.  For  gig-e networks with large frame transmissions: A throughput of 20mb/sec is possible when this  option  is  enabled  on  3ghz cpus.   A throughput of 60mb/sec is possible when this option is disabled on 3ghz cpus.  The defaul
 t is on. <br></p>\n"
 msgid ""
 "\n"
 "<p><b><big>Threads</big></b><br>This directive controls how many threads are used to encrypt and send multicast messages.  If secauth is off, the  protocol  will never  use  threaded  sending.  If secauth is on, this directive allows systems to be  configured  to  use  multiple  threads  to encrypt and send multicast messages.  A  thread  directive of 0 indicates that no threaded send should be used.  This mode offers best performance for non-SMP systems.  The default is 0. <br></p>\n"
-"<p><b><big>Enable Security Auth</big></b><br>This  specifies  that HMAC/SHA1 authentication should be used to authenticate all messages.  It further specifies that  all  data should  be  encrypted  with the sober128 encryption algorithm to protect data from eavesdropping.  Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput.  Encryption and authentication consume 75% of CPU cycles in aisexec as  measured  with gprof when enabled.  For  100mbit  networks  with  1500  MTU  frame  transmissions: A throughput of 9mb/sec is possible with 100% cpu utilization when this  option  is enabled on 3ghz cpus.  A throughput of 10mb/sec is possible wth 20% cpu utilization when this option is  disabled on 3ghz cpus.  For  gig-e networks with large frame transmissions: A throughput of 20mb/sec is possible when this  option  is  enabled  on  3ghz cpus.   A throughput of 60mb/sec is possible when this option is disabled on 3ghz cpus.  The default i
 s on. <br></p>\n"
+"<p><b><big>Enable Security Auth</big></b><br>This  specifies  that HMAC/SHA1 authentication should be used to authenticate all messages.  It further specifies that  all  data should  be  encrypted  with the sober128 encryption algorithm to protect data from eavesdropping.  Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput.  Encryption and authentication consume 75% of CPU cycles in aisexec as  measured  with gprof when enabled.  For  100Mbit  networks  with  1500  MTU  frame  transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this  option  is enabled on 3GHz cpus.  A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is  disabled on 3GHz cpus.  For  gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this  option  is  enabled  on  3GHz cpus.   A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus.  The default is on. <b
 r></p>\n"
 msgstr ""
 "\n"
 "<p><b><big>スレッド</big></b><br>ここでは、マルチキャストメッセージの暗号化や送信を行なう際に使用する、スレッド数を指定します。セキュリティ認証を無効にした場合、プロトコルはスレッドを利用した送信を行ないません。セキュリティ認証を有効にした場合、ここでの設定は複数のスレッドがメッセージを暗号化したり送信したりするように設定すべき内容になります。なお、 0 を指定すると、スレッドを利用した送信を行なわない意味になります。 0 の設定は、非 SMP (対称型マルチプロセッサ) 環境で最も良い性能を発揮します。なお、既定値は 0 です。<br></p>\n"
@@ -532,3 +640,6 @@
 #: src/modules/Cluster.rb:537
 msgid "Cannot write settings."
 msgstr "設定を書き込むことができませんでした。"
+
+#~ msgid "nodeid"
+#~ msgstr "ノード ID"

Modified: trunk/yast/ja/po/control.ja.po
===================================================================
--- trunk/yast/ja/po/control.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/control.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: control\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-08-05 08:06+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -22,217 +22,310 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: control/control.SLES.glade.translations.glade:3
+#: control/control.openSUSE.glade.translations.glade:3
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p><b>Congratulations!</b></p>\n"
+#| "<p>The installation of openSUSE on your machine is complete.\n"
+#| "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+#| "<p>Visit us at %1.</p>\n"
+#| "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+#| "\t    "
 msgid ""
 "\n"
-"<p>\n"
-"The installation has completed successfully.\n"
-"Your system is ready for use.\n"
-"Click Finish to log in to the system.\n"
-"</p>\n"
-"<p>\n"
-"Please visit us at http://www.suse.com/.\n"
-"</p>\n"
-"        "
+"<p><b>Congratulations!</b></p>\n"
+"<p>The installation of openSUSE on your machine is complete.\n"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+"<p>Visit us at %1.</p>\n"
+"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+"            "
 msgstr ""
 "\n"
-"<p>\n"
-"インストールは正常に完了しました。\n"
-"システムをお使いいただけます。\n"
-"'完了' を押してシステムにログインしてください。\n"
-"</p>\n"
-"<p>\n"
-"よろしければ我々の Web サイト http://www.suse.com/ もご覧ください。\n"
-"</p>\n"
-"        "
+"<p><b>お疲れ様でした！</b></p>\n"
+"<p>openSUSE のインストールが完了しました。\n"
+"<b>完了</b> ボタンを押すとシステムにログインすることができます。</p>\n"
+"<p>よろしければ我々の Web サイト %1 もご覧ください。</p>\n"
+"<p>お楽しみください！<br>openSUSE 開発チーム一同</p>\n"
+"\t    "
 
-#: control/control.SLES.glade.translations.glade:14
-msgid "CIM Server"
-msgstr "CIM サーバ"
+#: control/control.openSUSE.glade.translations.glade:10
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments.  The most widely\n"
+"used desktop environments are GNOME and KDE, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+"お使いのコンピュータにおけるデスクトップ環境とは、お使いのコンピュータにおける\n"
+"グラフィカルユーザインターフェイスのことを指すほか、電子メールや Web ブラウザ、\n"
+"オフィススイートやゲーム、コンピュータの管理などのアプリケーション集を選択することにも\n"
+"なります。\n"
+"\n"
+"openSUSE ではデスクトップ環境を選択することができます。もっとも幅広く利用されている\n"
+"デスクトップ環境は、それぞれ GNOME と KDE と呼ばれています。これらは openSUSE で\n"
+"同等にサポートされています。いずれのデスクトップ環境とも使いやすくかつ高度に統合され、\n"
+"魅力的な外観を備えています。それぞれのデスクトップ環境にはそれぞれ独特の\n"
+"スタイルがありますので、どれが適切であるかは個人的な趣味や嗜好に依存します。"
 
-#: control/control.SLES.glade.translations.glade:15
-#: control/control.SLES.glade.translations.glade:16
-#: control/control.SLES.glade.translations.glade:17
-#: control/control.SLES.glade.translations.glade:22
-#: control/control.SLES.glade.translations.glade:23
-#: control/control.SLES.glade.translations.glade:58
-#: control/control.SLES.glade.translations.glade:59
+#: control/control.openSUSE.glade.translations.glade:21
+msgid "GNOME Desktop"
+msgstr "GNOME デスクトップ"
+
+#: control/control.openSUSE.glade.translations.glade:22
+msgid "KDE Desktop"
+msgstr "KDE デスクトップ"
+
+#: control/control.openSUSE.glade.translations.glade:23
+msgid "XFCE Desktop"
+msgstr "XFCE デスクトップ"
+
+#: control/control.openSUSE.glade.translations.glade:24
+msgid "LXDE Desktop"
+msgstr "LXDE デスクトップ"
+
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "Minimal X Window"
+msgstr "最小限の X Window システム"
+
+#: control/control.openSUSE.glade.translations.glade:26
+#, fuzzy
+#| msgid "Alternate Desktops"
+msgid "Enlightenment Desktop"
+msgstr "代替デスクトップ"
+
+#: control/control.openSUSE.glade.translations.glade:27
+msgid "Minimal Server Selection (Text Mode)"
+msgstr "最小限のサーバ (テキストモード)"
+
+#: control/control.openSUSE.glade.translations.glade:28
+#: control/control.openSUSE.glade.translations.glade:29
+#: control/control.openSUSE.glade.translations.glade:32
+#: control/control.openSUSE.glade.translations.glade:70
+#: control/control.openSUSE.glade.translations.glade:71
 msgid "Installation Settings"
 msgstr "インストール設定"
 
-#: control/control.SLES.glade.translations.glade:18
-msgid "Overview"
-msgstr "概要"
-
-#: control/control.SLES.glade.translations.glade:19
-msgid "Expert"
-msgstr "熟練者"
-
-#: control/control.SLES.glade.translations.glade:20
+#: control/control.openSUSE.glade.translations.glade:30
 msgid "Live Installation Settings"
 msgstr "ライブインストールの設定"
 
-#: control/control.SLES.glade.translations.glade:21
+#: control/control.openSUSE.glade.translations.glade:31
+#: control/control.openSUSE.glade.translations.glade:85
 msgid "Update Settings"
 msgstr "更新設定"
 
-#: control/control.SLES.glade.translations.glade:24
-#: control/control.SLES.glade.translations.glade:25
+#: control/control.openSUSE.glade.translations.glade:33
 msgid "Network Configuration"
 msgstr "ネットワーク設定"
 
-#: control/control.SLES.glade.translations.glade:26
-msgid "Network Services Configuration"
-msgstr "ネットワークサービスの設定"
-
-#: control/control.SLES.glade.translations.glade:27
-#: control/control.SLES.glade.translations.glade:28
-#: control/control.SLES.glade.translations.glade:29
+#: control/control.openSUSE.glade.translations.glade:34
 msgid "Hardware Configuration"
 msgstr "ハードウエア設定"
 
-#: control/control.SLES.glade.translations.glade:30
-#: control/control.SLES.glade.translations.glade:65
-#: control/control.SLES.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:35
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:103
 msgid "Preparation"
 msgstr "準備"
 
-#: control/control.SLES.glade.translations.glade:31
-#: control/control.SLES.glade.translations.glade:52
-#: control/control.SLES.glade.translations.glade:66
-msgid "Load Linuxrc Network Configuration"
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:63
+#, fuzzy
+#| msgid "Load Linuxrc Network Configuration"
+msgid "Load linuxrc Network Configuration"
 msgstr "linuxrc ネットワーク設定の読み込み"
 
-#: control/control.SLES.glade.translations.glade:32
-#: control/control.SLES.glade.translations.glade:53
-#: control/control.SLES.glade.translations.glade:67
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:64
 msgid "Network Autosetup"
 msgstr "ネットワークの自動設定"
 
-#: control/control.SLES.glade.translations.glade:33
-#: control/control.SLES.glade.translations.glade:54
-#: control/control.SLES.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:65
+#: control/control.openSUSE.glade.translations.glade:78
 msgid "Welcome"
 msgstr "ようこそ"
 
-#: control/control.SLES.glade.translations.glade:34
-#: control/control.SLES.glade.translations.glade:55
-#: control/control.SLES.glade.translations.glade:69
+#: control/control.openSUSE.glade.translations.glade:39
 msgid "Network Activation"
 msgstr "ネットワークの有効化"
 
-#: control/control.SLES.glade.translations.glade:35
-#: control/control.SLES.glade.translations.glade:70
+#: control/control.openSUSE.glade.translations.glade:40
+#: control/control.openSUSE.glade.translations.glade:79
 msgid "Disk Activation"
 msgstr "ディスクの有効化"
 
-#: control/control.SLES.glade.translations.glade:36
-#: control/control.SLES.glade.translations.glade:37
-#: control/control.SLES.glade.translations.glade:71
-#: control/control.SLES.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:41
+#: control/control.openSUSE.glade.translations.glade:42
+#: control/control.openSUSE.glade.translations.glade:80
+#: control/control.openSUSE.glade.translations.glade:104
 msgid "System Analysis"
 msgstr "システム分析"
 
-#: control/control.SLES.glade.translations.glade:38
-#: control/control.SLES.glade.translations.glade:73
-msgid "Add-On Products"
-msgstr "アドオン製品"
-
-#: control/control.SLES.glade.translations.glade:39
-#: control/control.SLES.glade.translations.glade:56
+#: control/control.openSUSE.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:67
 msgid "Disk"
 msgstr "ディスク"
 
-#: control/control.SLES.glade.translations.glade:40
-#: control/control.SLES.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:66
 msgid "Time Zone"
 msgstr "タイムゾーン"
 
-#: control/control.SLES.glade.translations.glade:41
-#: control/control.SLES.glade.translations.glade:51
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:82
+msgid "Online Repositories"
+msgstr "オンラインリポジトリ"
+
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:83
+msgid "Add-On Products"
+msgstr "アドオン製品"
+
+#: control/control.openSUSE.glade.translations.glade:47
+msgid "Desktop Selection"
+msgstr "デスクトップの選択"
+
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:49
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:69
+msgid "User Settings"
+msgstr "ユーザ設定"
+
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:62
 msgid "Installation"
 msgstr "インストール"
 
-#: control/control.SLES.glade.translations.glade:42
-msgid "Installation Summary"
+#: control/control.openSUSE.glade.translations.glade:51
+msgid "Installation Overview"
 msgstr "インストールの概要"
 
-#: control/control.SLES.glade.translations.glade:43
-#: control/control.SLES.glade.translations.glade:44
-#: control/control.SLES.glade.translations.glade:45
-#: control/control.SLES.glade.translations.glade:46
-#: control/control.SLES.glade.translations.glade:47
-#: control/control.SLES.glade.translations.glade:48
-#: control/control.SLES.glade.translations.glade:49
-#: control/control.SLES.glade.translations.glade:50
-#: control/control.SLES.glade.translations.glade:60
-#: control/control.SLES.glade.translations.glade:61
-#: control/control.SLES.glade.translations.glade:62
-#: control/control.SLES.glade.translations.glade:63
-#: control/control.SLES.glade.translations.glade:64
-#: control/control.SLES.glade.translations.glade:85
-#: control/control.SLES.glade.translations.glade:86
-#: control/control.SLES.glade.translations.glade:87
-#: control/control.SLES.glade.translations.glade:88
-#: control/control.SLES.glade.translations.glade:89
-#: control/control.SLES.glade.translations.glade:90
-#: control/control.SLES.glade.translations.glade:105
-#: control/control.SLES.glade.translations.glade:106
-#: control/control.SLES.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:52
+#: control/control.openSUSE.glade.translations.glade:53
+#: control/control.openSUSE.glade.translations.glade:54
+#: control/control.openSUSE.glade.translations.glade:55
+#: control/control.openSUSE.glade.translations.glade:56
+#: control/control.openSUSE.glade.translations.glade:57
+#: control/control.openSUSE.glade.translations.glade:58
+#: control/control.openSUSE.glade.translations.glade:59
+#: control/control.openSUSE.glade.translations.glade:60
+#: control/control.openSUSE.glade.translations.glade:61
+#: control/control.openSUSE.glade.translations.glade:72
+#: control/control.openSUSE.glade.translations.glade:73
+#: control/control.openSUSE.glade.translations.glade:74
+#: control/control.openSUSE.glade.translations.glade:75
+#: control/control.openSUSE.glade.translations.glade:76
+#: control/control.openSUSE.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:97
+#: control/control.openSUSE.glade.translations.glade:98
+#: control/control.openSUSE.glade.translations.glade:99
+#: control/control.openSUSE.glade.translations.glade:100
+#: control/control.openSUSE.glade.translations.glade:101
+#: control/control.openSUSE.glade.translations.glade:102
+#: control/control.openSUSE.glade.translations.glade:117
+#: control/control.openSUSE.glade.translations.glade:118
+#: control/control.openSUSE.glade.translations.glade:119
 msgid "Perform Installation"
 msgstr "インストールの実行"
 
-#: control/control.SLES.glade.translations.glade:72
-#: control/control.SLES.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:105
 msgid "System for Update"
 msgstr "更新するシステム"
 
-#: control/control.SLES.glade.translations.glade:74
-#: control/control.SLES.glade.translations.glade:96
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:108
 msgid "Update"
 msgstr "更新"
 
-#: control/control.SLES.glade.translations.glade:75
-msgid "Update Summary"
-msgstr "更新の概要"
-
 #  power saving scheme name, combo box and default contents of text entry
-#: control/control.SLES.glade.translations.glade:76
-#: control/control.SLES.glade.translations.glade:77
-#: control/control.SLES.glade.translations.glade:78
-#: control/control.SLES.glade.translations.glade:79
-#: control/control.SLES.glade.translations.glade:80
-#: control/control.SLES.glade.translations.glade:98
-#: control/control.SLES.glade.translations.glade:99
-#: control/control.SLES.glade.translations.glade:100
-#: control/control.SLES.glade.translations.glade:101
-#: control/control.SLES.glade.translations.glade:102
-#: control/control.SLES.glade.translations.glade:103
-#: control/control.SLES.glade.translations.glade:104
-#: control/control.SLES.glade.translations.glade:110
-#: control/control.SLES.glade.translations.glade:111
+#: control/control.openSUSE.glade.translations.glade:86
+#: control/control.openSUSE.glade.translations.glade:87
+#: control/control.openSUSE.glade.translations.glade:88
+#: control/control.openSUSE.glade.translations.glade:89
+#: control/control.openSUSE.glade.translations.glade:90
+#: control/control.openSUSE.glade.translations.glade:110
+#: control/control.openSUSE.glade.translations.glade:111
+#: control/control.openSUSE.glade.translations.glade:112
+#: control/control.openSUSE.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:114
+#: control/control.openSUSE.glade.translations.glade:115
+#: control/control.openSUSE.glade.translations.glade:116
+#: control/control.openSUSE.glade.translations.glade:122
+#: control/control.openSUSE.glade.translations.glade:123
 msgid "Perform Update"
 msgstr "更新の実行"
 
-#: control/control.SLES.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:120
+#: control/control.openSUSE.glade.translations.glade:124
+msgid "Configuration"
+msgstr "設定"
+
+#: control/control.openSUSE.glade.translations.glade:92
 msgid "Base Installation"
 msgstr "基本インストール"
 
-#: control/control.SLES.glade.translations.glade:82
-#: control/control.SLES.glade.translations.glade:83
-#: control/control.SLES.glade.translations.glade:84
-#: control/control.SLES.glade.translations.glade:94
-#: control/control.SLES.glade.translations.glade:95
-#: control/control.SLES.glade.translations.glade:97
+#: control/control.openSUSE.glade.translations.glade:93
+#: control/control.openSUSE.glade.translations.glade:94
+#: control/control.openSUSE.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:106
+#: control/control.openSUSE.glade.translations.glade:107
+#: control/control.openSUSE.glade.translations.glade:109
 msgid "AutoYaST Settings"
 msgstr "AutoYaST 設定"
 
-#: control/control.SLES.glade.translations.glade:108
-#: control/control.SLES.glade.translations.glade:112
-msgid "Configuration"
-msgstr "設定"
-
-#: control/control.SLES.glade.translations.glade:109
-#: control/control.SLES.glade.translations.glade:113
+#: control/control.openSUSE.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:125
 msgid "System Configuration"
 msgstr "システムの設定"
+
+#~ msgid ""
+#~ "\n"
+#~ "<p>\n"
+#~ "The installation has completed successfully.\n"
+#~ "Your system is ready for use.\n"
+#~ "Click Finish to log in to the system.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Please visit us at http://www.suse.com/.\n"
+#~ "</p>\n"
+#~ "        "
+#~ msgstr ""
+#~ "\n"
+#~ "<p>\n"
+#~ "インストールは正常に完了しました。\n"
+#~ "システムをお使いいただけます。\n"
+#~ "'完了' を押してシステムにログインしてください。\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "よろしければ我々の Web サイト http://www.suse.com/ もご覧ください。\n"
+#~ "</p>\n"
+#~ "        "
+
+#~ msgid "CIM Server"
+#~ msgstr "CIM サーバ"
+
+#~ msgid "Overview"
+#~ msgstr "概要"
+
+#~ msgid "Expert"
+#~ msgstr "熟練者"
+
+#~ msgid "Network Services Configuration"
+#~ msgstr "ネットワークサービスの設定"
+
+#~ msgid "Installation Summary"
+#~ msgstr "インストールの概要"
+
+#~ msgid "Update Summary"
+#~ msgstr "更新の概要"

Modified: trunk/yast/ja/po/crowbar.ja.po
===================================================================
--- trunk/yast/ja/po/crowbar.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/crowbar.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: crowbar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2012-11-15 07:48+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -26,89 +26,202 @@
 msgid "Configuration of crowbar"
 msgstr "crowbar の設定"
 
+#. table header
+#: src/include/crowbar/complex.rb:96
+#, fuzzy
+#| msgid "&Repository Name"
+msgid "Repository Name"
+msgstr "リポジトリ名 (&R)"
+
+#: src/include/crowbar/complex.rb:96
+msgid "URL"
+msgstr "URL"
+
+#: src/include/crowbar/complex.rb:96
+#, fuzzy
+#| msgid "User Found Error"
+msgid "Ask On Error"
+msgstr "ユーザがエラーを見つけました"
+
+#. help text
+#: src/include/crowbar/complex.rb:106
+msgid ""
+"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
+"<p>\n"
+"Some examples of how the URL could look like:\n"
+"</p><p>\n"
+"<ul>\n"
+"<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> for SMT server\n"
+"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-sp3-x86_64/</i> for SUSE Manager Server.\n"
+"</p><p>\n"
+"For detailed description, check the Deployment Guide.\n"
+"</p>"
+msgstr ""
+
 #. textentry label
-#: src/include/crowbar/complex.rb:71
-msgid "Password for Crowbar Administrator"
-msgstr "Crowbar 管理者のパスワード"
+#: src/include/crowbar/complex.rb:122
+#, fuzzy
+#| msgid "Repository URL"
+msgid "Repository &URL"
+msgstr "リポジトリ URL"
 
+#. textentry label
+#: src/include/crowbar/complex.rb:135
+#, fuzzy
+#| msgid "User Found Error"
+msgid "&Ask On Error"
+msgstr "ユーザがエラーを見つけました"
+
+#. table header
+#: src/include/crowbar/complex.rb:155
+#, fuzzy
+#| msgid "Administrator DN"
+msgid "Administrator Name"
+msgstr "管理者 DN"
+
 #. help text
-#: src/include/crowbar/complex.rb:75
-msgid "<p>Enter the password for Crowbar administrator.</p>"
+#: src/include/crowbar/complex.rb:165
+#, fuzzy
+#| msgid "<p>Enter the password for Crowbar administrator.</p>"
+msgid "<p>Manage user names and passwords for Crowbar administrators.</p>"
 msgstr "<p>Crowbar 管理者のパスワードを入力してください。</p>"
 
 #. textentry label
-#: src/include/crowbar/complex.rb:97
-msgid "Repeat the Password"
-msgstr "パスワードを再度入力してください"
+#: src/include/crowbar/complex.rb:201
+#, fuzzy
+#| msgid "&Model"
+msgid "&Mode"
+msgstr "モデル (&M)"
 
-#. textentry label
-#: src/include/crowbar/complex.rb:104
-msgid "Mode"
-msgstr "モード"
+#. help text for the Network mode tab (do not translate bastion)
+#: src/include/crowbar/complex.rb:203
+msgid ""
+"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</p>\n"
+"<p>You can also specify interface names for the bastion network conduits as space-separated list.</p>"
+msgstr ""
 
 #. textentry label
-#: src/include/crowbar/complex.rb:113
-msgid "Bonding Policy"
+#: src/include/crowbar/complex.rb:213
+#, fuzzy
+#| msgid "Bonding Policy"
+msgid "Bonding &Policy"
 msgstr "ボンディングポリシー"
 
+#. textentry label
+#: src/include/crowbar/complex.rb:222
+msgid "P&hysical interfaces mapping for bastion network"
+msgstr ""
+
+#. help text for conduit if list
+#: src/include/crowbar/complex.rb:231
+msgid ""
+"<p>Each physical interface definition needs to fit the pattern\n"
+"<tt>[Quantifier][Speed][Order]</tt>.\n"
+"Valid examples are <tt>+1g2</tt>, <tt>10g1</tt> or <tt>?1g2</tt>.</p>"
+msgstr ""
+
 #. table header
-#: src/include/crowbar/complex.rb:139
+#: src/include/crowbar/complex.rb:265
 msgid "Network"
 msgstr "ネットワーク"
 
-#: src/include/crowbar/complex.rb:140
+#: src/include/crowbar/complex.rb:266
 msgid "Subnet Address"
 msgstr "サブネットアドレス"
 
-#: src/include/crowbar/complex.rb:141
+#: src/include/crowbar/complex.rb:267
 msgid "Network Mask"
 msgstr "ネットマスク"
 
-#: src/include/crowbar/complex.rb:142
+#: src/include/crowbar/complex.rb:268
 msgid "VLAN"
 msgstr "VLAN"
 
 #. checkbox label
-#: src/include/crowbar/complex.rb:159
-msgid "Use VLAN"
+#: src/include/crowbar/complex.rb:286
+#, fuzzy
+#| msgid "Use VLAN"
+msgid "Use &VLAN"
 msgstr "VLAN を使用する"
 
 #. textentry label
-#: src/include/crowbar/complex.rb:169
-msgid "VLAN ID"
+#: src/include/crowbar/complex.rb:296
+#, fuzzy
+#| msgid "VLAN ID"
+msgid "VLAN &ID"
 msgstr "VLAN ID"
 
 #. textentry label
-#: src/include/crowbar/complex.rb:179
-msgid "Router"
-msgstr "ルータ"
+#: src/include/crowbar/complex.rb:306
+msgid "Rou&ter"
+msgstr ""
 
 #. textentry label
-#: src/include/crowbar/complex.rb:201
-msgid "Subnet"
-msgstr "サブネット"
+#: src/include/crowbar/complex.rb:328
+#, fuzzy
+#| msgid "Restoring user preferences..."
+msgid "Router pre&ference"
+msgstr "ユーザ設定の復元をしています..."
 
 #. textentry label
-#: src/include/crowbar/complex.rb:224
-msgid "Netmask"
-msgstr "ネットマスク"
+#: src/include/crowbar/complex.rb:338
+msgid "&Subnet"
+msgstr "サブネット (&S)"
 
-#: src/include/crowbar/complex.rb:246
-msgid "Broadcast"
+#. textentry label
+#: src/include/crowbar/complex.rb:361
+msgid "Net&mask"
+msgstr "ネットマスク (&M)"
+
+#: src/include/crowbar/complex.rb:383
+#, fuzzy
+#| msgid "Broadcast"
+msgid "Broa&dcast"
 msgstr "ブロードキャスト"
 
 #. checkbox label
-#: src/include/crowbar/complex.rb:256
-msgid "Add Bridge"
+#: src/include/crowbar/complex.rb:393
+#, fuzzy
+#| msgid "Add Bridge"
+msgid "&Add Bridge"
 msgstr "ブリッジの追加"
 
-#. push button label
-#: src/include/crowbar/complex.rb:265
-msgid "&Edit Ranges..."
+#. push button label&
+#: src/include/crowbar/complex.rb:402
+#, fuzzy
+#| msgid "&Edit Ranges..."
+msgid "Edit Ran&ges..."
 msgstr "範囲の編集 (&E)..."
 
+#. checkbox label
+#: src/include/crowbar/complex.rb:413
+#, fuzzy
+#| msgid "Bond Network"
+msgid "Add &Bastion Network"
+msgstr "ボンドネットワーク"
+
+#. textentry label
+#: src/include/crowbar/complex.rb:425
+msgid "&IP Address"
+msgstr "IP アドレス (&I)"
+
+#. text entry label
+#: src/include/crowbar/complex.rb:585
+msgid "User Name"
+msgstr "ユーザ名"
+
+#. text entry label
+#: src/include/crowbar/complex.rb:587
+msgid "Password"
+msgstr "パスワード"
+
+#. text entry label
+#: src/include/crowbar/complex.rb:589
+msgid "Repeat the Password"
+msgstr "パスワードを再度入力してください"
+
 #. error popup
-#: src/include/crowbar/complex.rb:391
+#: src/include/crowbar/complex.rb:627
 msgid ""
 "The passwords do not match.\n"
 "Try again."
@@ -116,13 +229,33 @@
 "パスワードが一致しません。\n"
 "もう一度試してください。"
 
+#. error popup
+#: src/include/crowbar/complex.rb:636
+#, fuzzy
+#| msgid ""
+#| "Configuration name %1 already exists.\n"
+#| "Choose a different one."
+msgid ""
+"User '%1' already exists.\n"
+"Choose a different name."
+msgstr ""
+"設定名 %1 はすでに存在します。\n"
+"他の名前を選んでください。"
+
+#. error popup
+#: src/include/crowbar/complex.rb:781
+#, fuzzy
+#| msgid "The entered URL is not valid."
+msgid "The interface format '%1' is not valid"
+msgstr "入力した URL が正しくありません。"
+
 #. table entry (VLAN status)
-#: src/include/crowbar/complex.rb:426
+#: src/include/crowbar/complex.rb:861
 msgid "disabled"
 msgstr "無効"
 
 #. error popup
-#: src/include/crowbar/complex.rb:527
+#: src/include/crowbar/complex.rb:986
 msgid ""
 "The netmask '%1' is invalid.\n"
 "%2"
@@ -131,7 +264,8 @@
 "%2"
 
 #. error popup
-#: src/include/crowbar/complex.rb:540
+#. error popup
+#: src/include/crowbar/complex.rb:999 src/include/crowbar/complex.rb:1036
 msgid ""
 "The IP address '%1' is invalid.\n"
 "%2"
@@ -140,7 +274,7 @@
 "%2"
 
 #. error popup
-#: src/include/crowbar/complex.rb:552
+#: src/include/crowbar/complex.rb:1011
 msgid ""
 "The router address '%1' is invalid.\n"
 "%2"
@@ -149,12 +283,19 @@
 "%2"
 
 #. error popup
-#: src/include/crowbar/complex.rb:564
+#: src/include/crowbar/complex.rb:1023
 msgid "The router address '%1' is not part of network '%2'."
 msgstr "ルータアドレス '%1' は、 '%2' ネットワーク内にありません。"
 
+#. error popup
+#: src/include/crowbar/complex.rb:1047
+#, fuzzy
+#| msgid "The address '%1' is not part of network '%2'."
+msgid "The IP address '%1' is not part of network '%2'."
+msgstr "アドレス '%1' は、 '%2' ネットワーク内にありません。"
+
 #. popup message
-#: src/include/crowbar/complex.rb:585
+#: src/include/crowbar/complex.rb:1068
 msgid ""
 "Some address ranges are not part of network '%1'.\n"
 "Adapt them using 'Edit ranges' button."
@@ -163,46 +304,75 @@
 "'範囲の編集' ボタンを利用して調整してください。"
 
 #. inputfield label
-#: src/include/crowbar/complex.rb:687
+#: src/include/crowbar/complex.rb:1173
 msgid "Min IP Address"
 msgstr "最小 IP アドレス"
 
 #. inputfield label
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:1180
 msgid "Max IP Address"
 msgstr "最大 IP アドレス"
 
-#: src/include/crowbar/complex.rb:761
+#: src/include/crowbar/complex.rb:1247
 msgid "The address '%1' is not part of network '%2'."
 msgstr "アドレス '%1' は、 '%2' ネットワーク内にありません。"
 
 #. error message
-#: src/include/crowbar/complex.rb:777
+#: src/include/crowbar/complex.rb:1263
 msgid "The lowest address must be lower than the highest one."
 msgstr "開始アドレスは終了アドレスよりも前でなければなりません。"
 
 #. error message
-#: src/include/crowbar/complex.rb:810
+#: src/include/crowbar/complex.rb:1296
 msgid "Ranges '%1' and '%2' are overlapping."
 msgstr "範囲 '%1' と '%2' は重複しています。"
 
 #. tab header
-#: src/include/crowbar/complex.rb:841
-msgid "Administration Settings"
-msgstr "管理者の設定"
+#: src/include/crowbar/complex.rb:1373
+#, fuzzy
+#| msgid "User Settings"
+msgid "&User Settings"
+msgstr "ユーザ設定"
 
+#. label (hint for user)
+#: src/include/crowbar/complex.rb:1385
+msgid "If no user is present, user 'crowbar' with default password will be used."
+msgstr ""
+
 #. tab header
-#: src/include/crowbar/complex.rb:851
-msgid "Network Mode"
+#: src/include/crowbar/complex.rb:1403
+#, fuzzy
+#| msgid "Network Mode"
+msgid "N&etwork Mode"
 msgstr "ネットワークモード"
 
+#: src/include/crowbar/complex.rb:1411
+#, fuzzy
+#| msgid "Bond Network"
+msgid "Bastion Network"
+msgstr "ボンドネットワーク"
+
 #. tab header
-#: src/include/crowbar/complex.rb:861
-msgid "Networks"
+#: src/include/crowbar/complex.rb:1454
+#, fuzzy
+#| msgid "Networks"
+msgid "Net&works"
 msgstr "ネットワーク"
 
+#. tab header
+#: src/include/crowbar/complex.rb:1490
+#, fuzzy
+#| msgid "Repositories"
+msgid "Re&positories"
+msgstr "リポジトリ"
+
+#. label (hint for user)
+#: src/include/crowbar/complex.rb:1501
+msgid "Empty URL means that default value will be used."
+msgstr ""
+
 #. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:925
+#: src/include/crowbar/complex.rb:1653
 msgid ""
 "The SUSE Cloud Admin Server has been deployed. Changing the network is\n"
 "currently not supported.\n"
@@ -215,7 +385,7 @@
 "Crowbar Web UI にアクセスするには、 http://%1:3000/ を開いてしてください。"
 
 #. default dialog caption
-#: src/include/crowbar/complex.rb:943
+#: src/include/crowbar/complex.rb:1671
 msgid "Crowbar Configuration Overview"
 msgstr "Crowbar の設定概要"
 
@@ -270,37 +440,55 @@
 msgstr "準備しています..."
 
 #. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:114
+#: src/modules/Crowbar.rb:144
 msgid "Initializing crowbar Configuration"
 msgstr "crowbar 設定を準備しています"
 
 #. Progress stage
-#: src/modules/Crowbar.rb:125
+#: src/modules/Crowbar.rb:155
 msgid "Read the configuraton"
 msgstr "設定の読み込み"
 
 #. Progress step
-#: src/modules/Crowbar.rb:129
+#: src/modules/Crowbar.rb:159
 msgid "Reading the configuration..."
 msgstr "設定を読み込んでいます..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Crowbar.rb:131 src/modules/Crowbar.rb:200
+#: src/modules/Crowbar.rb:161 src/modules/Crowbar.rb:255
 msgid "Finished"
 msgstr "完了"
 
 #. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:183
+#: src/modules/Crowbar.rb:238
 msgid "Saving crowbar Configuration"
 msgstr "crowbar 設定を保存しています"
 
 #. Progress stage 1/2
-#: src/modules/Crowbar.rb:194
+#: src/modules/Crowbar.rb:249
 msgid "Write the settings"
 msgstr "設定の書き込み"
 
 #. Progress step 1/2
-#: src/modules/Crowbar.rb:198
+#: src/modules/Crowbar.rb:253
 msgid "Writing the settings..."
 msgstr "設定を書き込んでいます..."
+
+#~ msgid "Password for Crowbar Administrator"
+#~ msgstr "Crowbar 管理者のパスワード"
+
+#~ msgid "Mode"
+#~ msgstr "モード"
+
+#~ msgid "Router"
+#~ msgstr "ルータ"
+
+#~ msgid "Subnet"
+#~ msgstr "サブネット"
+
+#~ msgid "Netmask"
+#~ msgstr "ネットマスク"
+
+#~ msgid "Administration Settings"
+#~ msgstr "管理者の設定"

Modified: trunk/yast/ja/po/drbd.ja.po
===================================================================
--- trunk/yast/ja/po/drbd.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/drbd.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: drbd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-08-05 08:06+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -239,12 +239,22 @@
 "\t\t"
 
 #: src/include/drbd/helps.rb:75
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes</p>\n"
+#| "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n"
+#| "\t\t<p>\"Device\": The  name of the block device node of the resource being described.  You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number.\n"
+#| "\t\tLike: '/dev/drbd_r0 minor 0'</p>\n"
+#| "\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>\n"
+#| "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n"
+#| "\t\t"
 msgid ""
 "\n"
-"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes</p>\n"
+"\t\t<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>\n"
 "\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n"
-"\t\t<p>\"Device\": The  name of the block device node of the resource being described.  You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number.\n"
-"\t\tLike: '/dev/drbd_r0 minor 0'</p>\n"
+"\t\t<p>\"Device\": The name of the block device node of the resource being described.  You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Or either omit the name or minor and the minor number. If you omit the name a default of /dev/drbdminor will be used.\n"
+"\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n"
 "\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>\n"
 "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n"
 "\t\t"
@@ -454,7 +464,11 @@
 msgid "Node names must be different."
 msgstr "ノード名が異なるものでなければなりません。"
 
-#: src/include/drbd/resource_conf.rb:568
+#: src/include/drbd/resource_conf.rb:552
+msgid "Node names must not include \".\" , using the local hostname."
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:582
 msgid "Please fill out all fields."
 msgstr "すべての項目に記入してください。"
 
@@ -598,7 +612,7 @@
 msgid "Reading daemon status..."
 msgstr "デーモンの状態を読み込んでいます..."
 
-#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:492
+#: src/modules/Drbd.rb:149 src/modules/Drbd.rb:494
 msgid "Finished"
 msgstr "完了"
 
@@ -628,32 +642,34 @@
 msgid "Writing DRBD Configuration"
 msgstr "DRBD の設定を書き込んでいます"
 
-#. if (!modified) return true;
+#. Comment code below due to change the "booting" status
+#. won't change modified flag
+#. return true if !@modified
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:484
+#: src/modules/Drbd.rb:486
 msgid "Write global settings"
 msgstr "グローバル設定の書き込み"
 
-#: src/modules/Drbd.rb:485
+#: src/modules/Drbd.rb:487
 msgid "Write resources"
 msgstr "リソースの書き込み"
 
-#: src/modules/Drbd.rb:486
+#: src/modules/Drbd.rb:488
 msgid "Set daemon status"
 msgstr "デーモン状態の設定"
 
-#: src/modules/Drbd.rb:489
+#: src/modules/Drbd.rb:491
 msgid "Writing global settings..."
 msgstr "グローバル設定を書き込んでいます..."
 
-#: src/modules/Drbd.rb:490
+#: src/modules/Drbd.rb:492
 msgid "Writing resources..."
 msgstr "リソースを書き込んでいます..."
 
-#: src/modules/Drbd.rb:491
+#: src/modules/Drbd.rb:493
 msgid "Setting daemon status..."
 msgstr "デーモンの状態を設定しています..."
 
-#: src/modules/Drbd.rb:502
+#: src/modules/Drbd.rb:504
 msgid "Failed to make directory /etc/drbd.d"
 msgstr "/etc/drbd.d ディレクトリの作成に失敗しました"

Modified: trunk/yast/ja/po/ftp-server.ja.po
===================================================================
--- trunk/yast/ja/po/ftp-server.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/ftp-server.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ftp-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2012-04-02 20:04+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -808,8 +808,8 @@
 #: src/include/ftp-server/wid_functions.rb:263
 #: src/include/ftp-server/wid_functions.rb:317
 #: src/include/ftp-server/wid_functions.rb:408
-#: src/include/ftp-server/wid_functions.rb:498
-#: src/include/ftp-server/wid_functions.rb:507
+#: src/include/ftp-server/wid_functions.rb:502
+#: src/include/ftp-server/wid_functions.rb:511
 msgid "FTP is running"
 msgstr "FTP は動作中です"
 
@@ -1760,7 +1760,7 @@
 #. Valid function of "Umask (umask files:umask dirs)"
 #. check value of textentry
 #. only pure-ftpd
-#: src/include/ftp-server/wid_functions.rb:619
+#: src/include/ftp-server/wid_functions.rb:623
 msgid "Not a valid umask."
 msgstr "ネットマスクが正しくありません。"
 
@@ -1768,21 +1768,21 @@
 #. handling value in textentry of "Umask for Anonynmous Users"
 #. Handle function of "Browse"
 #. handling value in textentry of "Umask for Authenticated Users"
-#: src/include/ftp-server/wid_functions.rb:781
-#: src/include/ftp-server/wid_functions.rb:819
+#: src/include/ftp-server/wid_functions.rb:785
+#: src/include/ftp-server/wid_functions.rb:823
 msgid "Select directory"
 msgstr "ディレクトリを選択"
 
 #. end of if (button == "EnableUpload") {
-#: src/include/ftp-server/wid_functions.rb:1055
+#: src/include/ftp-server/wid_functions.rb:1059
 msgid "Create the \"upload\" directory in %1\n"
 msgstr "%1 内に \"upload\" (アップロード) ディレクトリを作成し、\n"
 
-#: src/include/ftp-server/wid_functions.rb:1060
+#: src/include/ftp-server/wid_functions.rb:1064
 msgid "and enable write access?\n"
 msgstr "書き込みアクセスを許可しますか？\n"
 
-#: src/include/ftp-server/wid_functions.rb:1062
+#: src/include/ftp-server/wid_functions.rb:1066
 msgid ""
 "If you want anonymous users to be able to upload,\n"
 " you need to create a directory with write access.\n"
@@ -1792,15 +1792,15 @@
 "書き込み許可のあるディレクトリを作成する必要があります。\n"
 "\n"
 
-#: src/include/ftp-server/wid_functions.rb:1069
-#: src/include/ftp-server/wid_functions.rb:1090
-#: src/include/ftp-server/wid_functions.rb:1116
-#: src/include/ftp-server/wid_functions.rb:1139
+#: src/include/ftp-server/wid_functions.rb:1073
+#: src/include/ftp-server/wid_functions.rb:1094
+#: src/include/ftp-server/wid_functions.rb:1120
+#: src/include/ftp-server/wid_functions.rb:1143
 msgid " is a home directory after the login of anonymous users."
 msgstr " は匿名ユーザがログイン後に利用するホームディレクトリです。"
 
-#: src/include/ftp-server/wid_functions.rb:1080
-#: src/include/ftp-server/wid_functions.rb:1127
+#: src/include/ftp-server/wid_functions.rb:1084
+#: src/include/ftp-server/wid_functions.rb:1131
 msgid ""
 "Do you want to change permissions\n"
 "for\n"
@@ -1808,12 +1808,12 @@
 "以下のアクセス許可の設定を変更しても\n"
 "よろしいですか？\n"
 
-#: src/include/ftp-server/wid_functions.rb:1083
-#: src/include/ftp-server/wid_functions.rb:1130
+#: src/include/ftp-server/wid_functions.rb:1087
+#: src/include/ftp-server/wid_functions.rb:1134
 msgid "Upload (allow writing)?"
 msgstr "アップロード (書き込みを許可しますか)？"
 
-#: src/include/ftp-server/wid_functions.rb:1085
+#: src/include/ftp-server/wid_functions.rb:1089
 msgid ""
 "To allow anonymous users to upload, you need a directory with write access.\n"
 "\n"
@@ -1822,15 +1822,15 @@
 "書き込み許可のあるディレクトリを作成する必要があります。\n"
 "\n"
 
-#: src/include/ftp-server/wid_functions.rb:1104
+#: src/include/ftp-server/wid_functions.rb:1108
 msgid "Do you want to create a directory?\n"
 msgstr "ディレクトリを作成しますか？\n"
 
-#: src/include/ftp-server/wid_functions.rb:1107
+#: src/include/ftp-server/wid_functions.rb:1111
 msgid "Upload with write access?"
 msgstr "書き込み許可を設定しますか？"
 
-#: src/include/ftp-server/wid_functions.rb:1109
+#: src/include/ftp-server/wid_functions.rb:1113
 msgid ""
 "If you want to allow anonymous users to create directories,\n"
 " you have to create a directory with write access.\n"
@@ -1840,7 +1840,7 @@
 "書き込み許可のあるディレクトリを作成する必要があります。\n"
 "\n"
 
-#: src/include/ftp-server/wid_functions.rb:1132
+#: src/include/ftp-server/wid_functions.rb:1136
 msgid ""
 "If you want anonymous users to be able to create directories,\n"
 " you need a directory with write access.\n"
@@ -1858,15 +1858,15 @@
 #. check permissions for upload dir
 #.
 #. end of if (FtpServer::pure_ftp_allowed_permissios_upload == 0)
-#: src/include/ftp-server/wid_functions.rb:1199
-#: src/include/ftp-server/wid_functions.rb:1219
-#: src/include/ftp-server/wid_functions.rb:1286
-#: src/include/ftp-server/wid_functions.rb:1306
+#: src/include/ftp-server/wid_functions.rb:1203
+#: src/include/ftp-server/wid_functions.rb:1223
+#: src/include/ftp-server/wid_functions.rb:1290
+#: src/include/ftp-server/wid_functions.rb:1310
 msgid "Change permissions of %1 ?\n"
 msgstr "%1 のアクセス許可を変更しますか？ \n"
 
-#: src/include/ftp-server/wid_functions.rb:1203
-#: src/include/ftp-server/wid_functions.rb:1290
+#: src/include/ftp-server/wid_functions.rb:1207
+#: src/include/ftp-server/wid_functions.rb:1294
 msgid ""
 "If you want to allow uploads for \"anonymous\" users, \n"
 "you need a directory with write access for them."
@@ -1874,135 +1874,135 @@
 "\"匿名\" ユーザがアップロードできるようにするには、\n"
 "書き込み許可のあるディレクトリを指定する必要があります。"
 
-#: src/include/ftp-server/wid_functions.rb:1223
+#: src/include/ftp-server/wid_functions.rb:1227
 msgid "For anonymous connections the home directory of an anonymous user should have no write access.\n"
 msgstr "匿名接続の場合、匿名ユーザ用のホームディレクトリは書き込み禁止である必要があります。\n"
 
-#: src/include/ftp-server/wid_functions.rb:1310
+#: src/include/ftp-server/wid_functions.rb:1314
 msgid "For anonymous connections the home directory of an anonymous user should have no write access."
 msgstr "匿名接続の場合、匿名ユーザ用のホームディレクトリは書き込み禁止である必要があります。"
 
 #. Valid function of "Max Port for Pas. Mode"
 #. check values Max Port >= Min Port
-#: src/include/ftp-server/wid_functions.rb:1453
+#: src/include/ftp-server/wid_functions.rb:1457
 msgid "Condition for ports is max port > min port."
 msgstr "最大ポート番号は最小ポート番号より大きい必要があります。"
 
 #. Valid function of "DSA Certificate to Use for SSL Encrypted Connections"
 #. check value if user enable SSL Certificate (textentry) doesn't be empty
-#: src/include/ftp-server/wid_functions.rb:1633
+#: src/include/ftp-server/wid_functions.rb:1637
 msgid "DSA certificate is missing."
 msgstr "DSA 証明書が指定されていません。"
 
 #. Handle function of "Browse"
 #. handling value in textentry of "DSA Certificate to Use for SSL Encrypted Connections"
-#: src/include/ftp-server/wid_functions.rb:1660
+#: src/include/ftp-server/wid_functions.rb:1664
 msgid "Select File"
 msgstr "ファイルの選択"
 
 #. Valid function of "Security Settings"
 #. check of existing certificate
-#: src/include/ftp-server/wid_functions.rb:1718
+#: src/include/ftp-server/wid_functions.rb:1722
 msgid "The <tt>/etc/ssl/private/pure-ftpd.pem</tt> certificate for the SSL connection is missing."
 msgstr "SSL 接続用の証明書 <tt>/etc/ssl/private/pure-ftpd.pem</tt> がありません。"
 
 #. 0 => anonymous only, 1 => authenticated only, 2=> both
-#: src/modules/FtpServer.rb:219
+#: src/modules/FtpServer.rb:214
 msgid "Welcome message"
 msgstr "接続時メッセージ"
 
 #. FtpServer read dialog caption
-#: src/modules/FtpServer.rb:893
+#: src/modules/FtpServer.rb:816
 msgid "Initializing FTP Configuration"
 msgstr "FTP 設定を準備しています"
 
 #. Part for commandline - it is necessary choose daemon if both are installed
-#: src/modules/FtpServer.rb:904
+#: src/modules/FtpServer.rb:827
 msgid "You have installed both daemons:"
 msgstr "以下のデーモンが両方ともインストールされています:"
 
-#: src/modules/FtpServer.rb:906
+#: src/modules/FtpServer.rb:829
 msgid "Choose one of them for configuration."
 msgstr "設定を行なうにはいずれかを選択してください。"
 
-#: src/modules/FtpServer.rb:908
+#: src/modules/FtpServer.rb:831
 msgid "Do you want to configure vsftpd? Alternatively choose pure-ftpd."
 msgstr "vsftpd を設定しますか？ それとも pure-ftpd を設定しますか？"
 
-#: src/modules/FtpServer.rb:916
+#: src/modules/FtpServer.rb:839
 msgid "You have installed both daemons. Therefore you have to run the configuration in interactive mode."
 msgstr "お使いのシステムには両方のデーモンがインストールされています。対話形式での設定作業が必要です。"
 
 #. Progress stage 1/2
-#: src/modules/FtpServer.rb:935
+#: src/modules/FtpServer.rb:858
 msgid "Read settings from the config file"
 msgstr "設定ファイルからの読み出し"
 
 #. Progress stage 2/2
-#: src/modules/FtpServer.rb:937
+#: src/modules/FtpServer.rb:860
 msgid "Read the previous settings"
 msgstr "以前の設定を読み込み"
 
 #. Progress stage 1/2
-#: src/modules/FtpServer.rb:941
+#: src/modules/FtpServer.rb:864
 msgid "Reading the settings..."
 msgstr "設定を読み込んでいます..."
 
 #. calling read function for reading settings form config file
-#: src/modules/FtpServer.rb:951
+#: src/modules/FtpServer.rb:874
 msgid "Cannot Read Current Settings."
 msgstr "現在の設定を読み込めませんでした。"
 
 #. FtpServer read dialog caption
-#: src/modules/FtpServer.rb:968
+#: src/modules/FtpServer.rb:891
 msgid "Saving FTP Configuration"
 msgstr "FTP 設定の保存"
 
 #. Progress stage 1/2
-#: src/modules/FtpServer.rb:978
+#: src/modules/FtpServer.rb:901
 msgid "Write the settings to the config file"
 msgstr "設定ファイルの書き込み"
 
 #. Progress stage 2/2
-#: src/modules/FtpServer.rb:980
+#: src/modules/FtpServer.rb:903
 msgid "Write the settings for starting daemon"
 msgstr "デーモンの開始のための設定書き込み"
 
 #. Progress step 1/1
-#: src/modules/FtpServer.rb:984
+#: src/modules/FtpServer.rb:907
 msgid "Writing the settings..."
 msgstr "設定を書き込んでいます..."
 
 #. write options to the config file
-#: src/modules/FtpServer.rb:994
+#: src/modules/FtpServer.rb:917
 msgid "Cannot write settings!"
 msgstr "設定を書き込めませんでした！"
 
 #. write settings for starting daemon
-#: src/modules/FtpServer.rb:1000
+#: src/modules/FtpServer.rb:923
 msgid "Cannot write settings for xinetd!"
 msgstr "xinetd の設定を書き込めませんでした！"
 
 #. write settings for starting daemon
-#: src/modules/FtpServer.rb:1008
+#: src/modules/FtpServer.rb:931
 msgid "Cannot create upload directory for anonymous connections."
 msgstr "匿名接続用のアップロードディレクトリを作成できませんでした。"
 
 #. anonymous dir
-#: src/modules/FtpServer.rb:1150
+#: src/modules/FtpServer.rb:1074
 msgid "<p><ul><i>FTP daemon is not configured.</i></ul></p>"
 msgstr "<p><ul><i>FTP デーモンは設定されていません。</i></ul></p>"
 
 #. Translators: Summary head, if nothing configured
-#: src/modules/FtpServer.rb:1162
+#: src/modules/FtpServer.rb:1084
 msgid "FTP daemon"
 msgstr "FTP デーモン"
 
 #. Translators: Summary head, if something configured
-#: src/modules/FtpServer.rb:1167
+#: src/modules/FtpServer.rb:1089
 msgid "FTP daemon %1"
 msgstr "FTP デーモン %1"
 
-#: src/modules/FtpServer.rb:1171
+#: src/modules/FtpServer.rb:1093
 msgid "These options will be configured"
 msgstr "これらの項目が設定されます"

Modified: trunk/yast/ja/po/geo-cluster.ja.po
===================================================================
--- trunk/yast/ja/po/geo-cluster.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/geo-cluster.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: geo-cluster\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-08-05 08:02+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -37,16 +37,47 @@
 
 #. GeoCluster summary dialog caption
 #. GeoCluster configure2 dialog caption
+#. encoding: utf-8
+#. ------------------------------------------------------------------------------
+#. Copyright (c) 2006 Novell, Inc. All Rights Reserved.
+#.
+#.
+#. This program is free software; you can redistribute it and/or modify it under
+#. the terms of version 2 of the GNU General Public License as published by the
+#. Free Software Foundation.
+#.
+#. This program is distributed in the hope that it will be useful, but WITHOUT
+#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#.
+#. You should have received a copy of the GNU General Public License along with
+#. this program; if not, contact Novell, Inc.
+#.
+#. To contact Novell about this file by physical or electronic mail, you may find
+#. current contact information at www.novell.com.
+#. ------------------------------------------------------------------------------
+#. File:	include/geo-cluster/wizards.ycp
+#. Package:	Configuration of geo-cluster
+#. Summary:	Wizards definitions
+#. Authors:	Dongmao Zhang <dmzhang@suse.com>
+#.
+#. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
 #. Initialization dialog caption
 #: src/include/geo-cluster/complex.rb:83
-#: src/include/geo-cluster/dialogs.rb:430
+#: src/include/geo-cluster/dialogs.rb:416
+#: src/include/geo-cluster/dialogs.rb:689
+#: src/include/geo-cluster/wizards.rb:46
 #: src/include/geo-cluster/wizards.rb:140
-msgid "GeoCluster Configuration"
+#, fuzzy
+#| msgid "GeoCluster Configuration"
+msgid "Geo Cluster Configuration"
 msgstr "GeoCluster の設定"
 
 #. GeoCluster overview dialog caption
 #: src/include/geo-cluster/complex.rb:143
-msgid "GeoCluster Overview"
+#, fuzzy
+#| msgid "GeoCluster Overview"
+msgid "Geo Cluster Overview"
 msgstr "GeoCluster の概要"
 
 #. encoding: utf-8
@@ -78,223 +109,207 @@
 msgid "configuration file"
 msgstr "設定ファイル"
 
-#: src/include/geo-cluster/dialogs.rb:59
-msgid "arbitrator ip"
-msgstr "調停サーバの IP"
-
-#: src/include/geo-cluster/dialogs.rb:65
+#: src/include/geo-cluster/dialogs.rb:58
 msgid "transport"
 msgstr "トランスポート"
 
-#: src/include/geo-cluster/dialogs.rb:71
+#: src/include/geo-cluster/dialogs.rb:65
 msgid "port"
 msgstr "ポート"
 
-#: src/include/geo-cluster/dialogs.rb:76
-msgid "site"
-msgstr "サイト"
+#: src/include/geo-cluster/dialogs.rb:71
+#, fuzzy
+#| msgid "arbitrator ip"
+msgid "arbitrator"
+msgstr "調停サーバの IP"
 
-#: src/include/geo-cluster/dialogs.rb:79
-#: src/include/geo-cluster/dialogs.rb:653
+#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
+#: src/include/geo-cluster/dialogs.rb:679
 msgid "Add"
 msgstr "追加"
 
-#: src/include/geo-cluster/dialogs.rb:80
-#: src/include/geo-cluster/dialogs.rb:654
+#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
+#: src/include/geo-cluster/dialogs.rb:680
 msgid "Edit"
 msgstr "編集"
 
-#: src/include/geo-cluster/dialogs.rb:81
-#: src/include/geo-cluster/dialogs.rb:655
+#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
+#: src/include/geo-cluster/dialogs.rb:681
 msgid "Delete"
 msgstr "削除"
 
-#: src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:178
+#: src/include/geo-cluster/dialogs.rb:82
+msgid "site"
+msgstr "サイト"
+
+#: src/include/geo-cluster/dialogs.rb:94
+#: src/include/geo-cluster/dialogs.rb:186
 msgid "ticket"
 msgstr "チケット"
 
 #. return `cacel or a string
-#: src/include/geo-cluster/dialogs.rb:98
-#: src/include/geo-cluster/dialogs.rb:120
-#: src/include/geo-cluster/dialogs.rb:197
+#: src/include/geo-cluster/dialogs.rb:106
+#: src/include/geo-cluster/dialogs.rb:128
+#: src/include/geo-cluster/dialogs.rb:205
 msgid "OK"
 msgstr "OK"
 
-#: src/include/geo-cluster/dialogs.rb:99
-#: src/include/geo-cluster/dialogs.rb:121
-#: src/include/geo-cluster/dialogs.rb:198
+#: src/include/geo-cluster/dialogs.rb:107
+#: src/include/geo-cluster/dialogs.rb:129
+#: src/include/geo-cluster/dialogs.rb:206
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/include/geo-cluster/dialogs.rb:135
-msgid "Please enter valid ip address"
+#: src/include/geo-cluster/dialogs.rb:143
+#, fuzzy
+#| msgid "Please enter valid ip address"
+msgid "Please enter a valid ip address"
 msgstr "正しい IP アドレスを入力してください"
 
-#: src/include/geo-cluster/dialogs.rb:176
+#: src/include/geo-cluster/dialogs.rb:184
 msgid "Enter ticket and timeout"
 msgstr "チケットと有効期限を入力してください"
 
-#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:190
 msgid "timeout"
 msgstr "タイムアウト"
 
-#: src/include/geo-cluster/dialogs.rb:184
+#: src/include/geo-cluster/dialogs.rb:192
 msgid "retries"
 msgstr "再試行"
 
-#: src/include/geo-cluster/dialogs.rb:186
+#: src/include/geo-cluster/dialogs.rb:194
 msgid "weights"
 msgstr "重さ"
 
-#: src/include/geo-cluster/dialogs.rb:188
+#: src/include/geo-cluster/dialogs.rb:196
 msgid "expire"
 msgstr "有効期限"
 
-#: src/include/geo-cluster/dialogs.rb:190
+#: src/include/geo-cluster/dialogs.rb:198
 msgid "acquire-after"
 msgstr "acquire-after"
 
-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:200
 msgid "before-acquire-handler"
 msgstr "before-acquire-handler"
 
-#: src/include/geo-cluster/dialogs.rb:229
-msgid "timeout is no valid"
+#: src/include/geo-cluster/dialogs.rb:237
+#, fuzzy
+#| msgid "timeout is no valid"
+msgid "timeout is invalid"
 msgstr "タイムアウトが正しくありません"
 
-#: src/include/geo-cluster/dialogs.rb:231
-msgid "expire is no valid"
+#: src/include/geo-cluster/dialogs.rb:239
+#, fuzzy
+#| msgid "expire is no valid"
+msgid "expire is invalid"
 msgstr "有効期限が正しくありません"
 
-#: src/include/geo-cluster/dialogs.rb:233
-msgid "acquireafter is no valid"
+#: src/include/geo-cluster/dialogs.rb:241
+#, fuzzy
+#| msgid "acquireafter is no valid"
+msgid "acquireafter is invalid"
 msgstr "acquire-after の値が正しくありません"
 
-#: src/include/geo-cluster/dialogs.rb:235
-msgid "retries is no valid"
+#: src/include/geo-cluster/dialogs.rb:243
+#, fuzzy
+#| msgid "retries is no valid"
+msgid "retries is invalid"
 msgstr "再試行の値が正しくありません"
 
-#: src/include/geo-cluster/dialogs.rb:237
+#: src/include/geo-cluster/dialogs.rb:245
 msgid "retries values lower than 3 is illegal"
 msgstr "再試行の値には 3 以上を指定してください"
 
-#: src/include/geo-cluster/dialogs.rb:239
-msgid "weights is no valid"
+#: src/include/geo-cluster/dialogs.rb:247
+#, fuzzy
+#| msgid "weights is no valid"
+msgid "weights is invalid"
 msgstr "重さの値が正しくありません"
 
-#: src/include/geo-cluster/dialogs.rb:241
-msgid "ticket can not be null"
+#: src/include/geo-cluster/dialogs.rb:249
+#, fuzzy
+#| msgid "ticket can not be null"
+msgid "ticket can not be empty"
 msgstr "チケットには何らかの値を指定する必要があります"
 
 #. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:332
-msgid "site have to be filled"
-msgstr "サイトの値を指定する必要があります"
+#: src/include/geo-cluster/dialogs.rb:358
+#: src/include/geo-cluster/wizards.rb:47
+msgid "Firewall Configuration"
+msgstr "ファイアウオールの設定"
 
-#: src/include/geo-cluster/dialogs.rb:337
-msgid "ticket have to be filled"
-msgstr "チケットの値を指定する必要があります"
-
-#: src/include/geo-cluster/dialogs.rb:344
-#: src/include/geo-cluster/dialogs.rb:582
-msgid "arbitrator IP address is invalid!"
-msgstr "調停サーバの IP アドレスが正しくありません！"
-
-#. servie:geo-cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/geo-cluster
-#: src/include/geo-cluster/dialogs.rb:389
-msgid "Geo Cluster(geo-cluster) firewall configure"
-msgstr "Geo Cluster(geo-cluster) のファイアウオール設定"
-
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#. FIXME ugly work. Better use alias and function, see yast2 drbd.
-#: src/include/geo-cluster/dialogs.rb:439
-#: src/include/geo-cluster/dialogs.rb:669
-msgid "Geo Cluster configure"
-msgstr "Geo Cluster の設定"
+#: src/include/geo-cluster/dialogs.rb:494
+#, fuzzy
+#| msgid "Enter an IP address of your site"
+msgid "Enter an IP address of your arbitrator"
+msgstr "お使いのサイトに対する IP アドレスを入力してください"
 
-#: src/include/geo-cluster/dialogs.rb:494
+#: src/include/geo-cluster/dialogs.rb:505
+#, fuzzy
+#| msgid "Edit IP address of your site"
+msgid "Edit IP address of your arbitrator"
+msgstr "お使いのサイトの IP アドレスを編集してください"
+
+#: src/include/geo-cluster/dialogs.rb:521
 msgid "Enter an IP address of your site"
 msgstr "お使いのサイトに対する IP アドレスを入力してください"
 
-#: src/include/geo-cluster/dialogs.rb:505
+#: src/include/geo-cluster/dialogs.rb:532
 msgid "Edit IP address of your site"
 msgstr "お使いのサイトの IP アドレスを編集してください"
 
-#: src/include/geo-cluster/dialogs.rb:527
+#: src/include/geo-cluster/dialogs.rb:554
 msgid "Ticket name already exist!"
 msgstr "その名前のチケットは既に存在しています！"
 
 #. abort?
-#: src/include/geo-cluster/dialogs.rb:573
-msgid "Configuration name can not be null"
-msgstr "設定名には何らかの値を指定する必要があります"
+#: src/include/geo-cluster/dialogs.rb:600
+#, fuzzy
+#| msgid "Configuration name cannot be empty."
+msgid "Configuration name can not be empty."
+msgstr "設定名を指定する必要があります。"
 
-#: src/include/geo-cluster/dialogs.rb:576
+#: src/include/geo-cluster/dialogs.rb:603
 msgid "Configuration name can not be duplicated."
 msgstr "設定名には重複した値を指定することはできません。"
 
-#: src/include/geo-cluster/dialogs.rb:589
+#: src/include/geo-cluster/dialogs.rb:610
 msgid "port is invalid!"
 msgstr "ポートが正しくありません！"
 
-#: src/include/geo-cluster/dialogs.rb:595
+#: src/include/geo-cluster/dialogs.rb:616
 msgid "transport have to be filled!"
 msgstr "トランスポートの値を指定しなければなりません！"
 
-#: src/include/geo-cluster/dialogs.rb:600
+#: src/include/geo-cluster/dialogs.rb:621
+#, fuzzy
+#| msgid "transport have to be filled!"
+msgid "arbitrator have to be filled!"
+msgstr "トランスポートの値を指定しなければなりません！"
+
+#: src/include/geo-cluster/dialogs.rb:626
 msgid "site have to be filled!"
 msgstr "サイトの値を指定しなければなりません！"
 
-#: src/include/geo-cluster/dialogs.rb:605
+#: src/include/geo-cluster/dialogs.rb:631
 msgid "ticket have to be filled!"
 msgstr "チケットの値を指定しなければなりません！"
 
 #. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:644
+#: src/include/geo-cluster/dialogs.rb:670
 msgid "GeoCluster Configuration Select"
 msgstr "GeoCluster の設定選択"
 
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:650
+#: src/include/geo-cluster/dialogs.rb:676
 msgid "Choose configuration file:"
 msgstr "設定ファイルの選択:"
 
-#. encoding: utf-8
-#. ------------------------------------------------------------------------------
-#. Copyright (c) 2006 Novell, Inc. All Rights Reserved.
-#.
-#.
-#. This program is free software; you can redistribute it and/or modify it under
-#. the terms of version 2 of the GNU General Public License as published by the
-#. Free Software Foundation.
-#.
-#. This program is distributed in the hope that it will be useful, but WITHOUT
-#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#.
-#. You should have received a copy of the GNU General Public License along with
-#. this program; if not, contact Novell, Inc.
-#.
-#. To contact Novell about this file by physical or electronic mail, you may find
-#. current contact information at www.novell.com.
-#. ------------------------------------------------------------------------------
-#. File:	include/geo-cluster/wizards.ycp
-#. Package:	Configuration of geo-cluster
-#. Summary:	Wizards definitions
-#. Authors:	Dongmao Zhang <dmzhang@suse.com>
-#.
-#. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
-#: src/include/geo-cluster/wizards.rb:46
-msgid "GeoCluster Configurations"
-msgstr "GeoCluster の設定"
-
-#: src/include/geo-cluster/wizards.rb:47
-msgid "Firewall Configuration"
-msgstr "ファイアウオールの設定"
-
 #. Initialization dialog contents
 #: src/include/geo-cluster/wizards.rb:142
 msgid "Initializing..."
@@ -317,10 +332,16 @@
 msgstr "グローバルチケット設定を書き込めません。"
 
 #. GeoCluster read dialog caption
-#: src/modules/GeoCluster.rb:273 src/modules/GeoCluster2.pm:129
-msgid "Initializing geo-cluster Configuration"
+#: src/modules/GeoCluster.rb:273
+#, fuzzy
+#| msgid "Initializing geo-cluster Configuration"
+msgid "Initializing Geo Cluster Configuration"
 msgstr "geo-cluster 設定を準備しています"
 
+#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289
+msgid "Read SuSEFirewall Settings"
+msgstr "SuSEFirewall 設定の読み込み"
+
 #. #-#-#-#-#  geo-cluster.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO FIXME Names of real stages
 #. We do not set help text here, because it was set outside
@@ -330,10 +351,6 @@
 msgid "Read the previous settings"
 msgstr "以前の設定の読み込み"
 
-#: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289
-msgid "Read SuSEFirewall Settings"
-msgstr "SuSEFirewall 設定の読み込み"
-
 #. #-#-#-#-#  geo-cluster.xgettext.pot  #-#-#-#-#
 #. Progress step 2/3
 #: src/modules/GeoCluster.rb:288 src/modules/GeoCluster2.pm:150
@@ -346,12 +363,11 @@
 msgid "Finished"
 msgstr "完了"
 
-#. #-#-#-#-#  geo-cluster.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
 #. GeoCluster write dialog caption
-#. #-#-#-#-#  geo-cluster.xgettext.pot  #-#-#-#-#
-#. GeoCluster read dialog caption
-#: src/modules/GeoCluster.rb:332 src/modules/GeoCluster2.pm:211
-msgid "Saving geo-cluster Configuration"
+#: src/modules/GeoCluster.rb:332
+#, fuzzy
+#| msgid "Saving geo-cluster Configuration"
+msgid "Saving Geo Cluster Configuration"
 msgstr "geo-cluster の設定を保存しています"
 
 #. Progress stage 1/2
@@ -386,6 +402,11 @@
 msgid "Configuration summary..."
 msgstr "設定概要..."
 
+#. GeoCluster read dialog caption
+#: src/modules/GeoCluster2.pm:129
+msgid "Initializing geo-cluster Configuration"
+msgstr "geo-cluster 設定を準備しています"
+
 #. Progress stage 1/3
 #: src/modules/GeoCluster2.pm:141
 msgid "Read the database"
@@ -418,6 +439,11 @@
 msgid "Cannot detect devices."
 msgstr "デバイスを検出できません。"
 
+#. GeoCluster read dialog caption
+#: src/modules/GeoCluster2.pm:211
+msgid "Saving geo-cluster Configuration"
+msgstr "geo-cluster の設定を保存しています"
+
 #. Progress stage 2/2
 #: src/modules/GeoCluster2.pm:225
 msgid "Run SuSEconfig"
@@ -431,3 +457,24 @@
 #: src/modules/GeoCluster2.pm:295
 msgid "Configuration summary ..."
 msgstr "設定概要 ..."
+
+#~ msgid "site have to be filled"
+#~ msgstr "サイトの値を指定する必要があります"
+
+#~ msgid "ticket have to be filled"
+#~ msgstr "チケットの値を指定する必要があります"
+
+#~ msgid "arbitrator IP address is invalid!"
+#~ msgstr "調停サーバの IP アドレスが正しくありません！"
+
+#~ msgid "Geo Cluster(geo-cluster) firewall configure"
+#~ msgstr "Geo Cluster(geo-cluster) のファイアウオール設定"
+
+#~ msgid "Geo Cluster configure"
+#~ msgstr "Geo Cluster の設定"
+
+#~ msgid "Configuration name can not be null"
+#~ msgstr "設定名には何らかの値を指定する必要があります"
+
+#~ msgid "GeoCluster Configurations"
+#~ msgstr "GeoCluster の設定"

Modified: trunk/yast/ja/po/inetd.ja.po
===================================================================
--- trunk/yast/ja/po/inetd.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/inetd.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: inetd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-04-05 11:10+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -108,11 +108,11 @@
 msgid "The 'id' option cannot be combined with other options."
 msgstr "'id' オプションは他のオプションと組み合わせて指定することはできません。"
 
-#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:353
+#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:356
 msgid "Status"
 msgstr "状態"
 
-#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:354
+#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:357
 msgid "Service"
 msgstr "サービス"
 
@@ -124,15 +124,15 @@
 msgid "Prot."
 msgstr "プロトコル"
 
-#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:357
+#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:360
 msgid "Wait"
 msgstr "待機"
 
-#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:358
+#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:361
 msgid "User"
 msgstr "ユーザ"
 
-#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:359
+#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:362
 msgid "Server"
 msgstr "サーバ"
 
@@ -147,12 +147,12 @@
 msgstr "オフ"
 
 #. determine wait mode (convert to string)
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
 #: src/include/inetd/routines.rb:211
 msgid "Yes"
 msgstr "はい"
 
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
 #: src/include/inetd/routines.rb:213
 msgid "No"
 msgstr "いいえ"
@@ -168,127 +168,127 @@
 
 #. Translators: In autoinstallation mode:
 #. The package name is stored in %1. This is Popup::ContinueCancel.
-#: src/include/inetd/dialogs.rb:160
+#: src/include/inetd/dialogs.rb:164
 msgid "Package %1 will be installed during the write process."
 msgstr "書き込み処理の際にパッケージ %1 をインストールします。"
 
 #. if (true) { // for debugging
 #. Translators: The package name is stored in %1. This is Popup::Message.
-#: src/include/inetd/dialogs.rb:179
+#: src/include/inetd/dialogs.rb:183
 msgid "Package %1 was not installed. The service cannot be edited."
 msgstr "パッケージ %1 をインストールできませんでした。サービスを編集することができません。"
 
 #. Translators: The package name is stored in %1
-#: src/include/inetd/dialogs.rb:201
+#: src/include/inetd/dialogs.rb:205
 msgid "Package %1 was successfully installed."
 msgstr "パッケージ %1 は正常にインストールされました。"
 
 #. This is main inetd module dialog.
 #. @return dialog result
-#: src/include/inetd/dialogs.rb:299
+#: src/include/inetd/dialogs.rb:303
 msgid "&Activate All Services"
 msgstr "全てのサービスを有効にする (&A)"
 
-#: src/include/inetd/dialogs.rb:300
+#: src/include/inetd/dialogs.rb:304
 msgid "&Deactivate All Services"
 msgstr "全てのサービスを無効にする (&D)"
 
 #. Translators: Initial and target state of xinetd (or inetd)
-#: src/include/inetd/dialogs.rb:334
+#: src/include/inetd/dialogs.rb:339
 msgid "D&isable"
 msgstr "無効 (&I)"
 
-#: src/include/inetd/dialogs.rb:336
+#: src/include/inetd/dialogs.rb:340
 msgid "Enab&le"
 msgstr "有効 (&L)"
 
 #. Main dialog edit inetd.conf
 #. Translators: Name of table with services (echo, chargen, ...)
-#: src/include/inetd/dialogs.rb:344
+#: src/include/inetd/dialogs.rb:347
 msgid "Currently Available Services"
 msgstr "現在利用可能なサービス"
 
 #. `opt(`notify),
 #. `opt(`keepSorting),
-#: src/include/inetd/dialogs.rb:352
+#: src/include/inetd/dialogs.rb:355
 msgid "Ch"
 msgstr "変更"
 
-#: src/include/inetd/dialogs.rb:355
+#: src/include/inetd/dialogs.rb:358
 msgid "Type "
 msgstr "種類 "
 
-#: src/include/inetd/dialogs.rb:356
+#: src/include/inetd/dialogs.rb:359
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: src/include/inetd/dialogs.rb:360
+#: src/include/inetd/dialogs.rb:363
 msgid "Server / Args"
 msgstr "サーバ／引数"
 
 #. Translators: Add service
-#: src/include/inetd/dialogs.rb:370
+#: src/include/inetd/dialogs.rb:373
 msgid "&Add"
 msgstr "追加 (&A)"
 
 #. Translators: Edit service
-#: src/include/inetd/dialogs.rb:373
+#: src/include/inetd/dialogs.rb:376
 msgid "&Edit"
 msgstr "編集 (&E)"
 
 #. Translators: Delete service
-#: src/include/inetd/dialogs.rb:376
+#: src/include/inetd/dialogs.rb:379
 msgid "&Delete"
 msgstr "削除 (&D)"
 
 #. Translators: Change service status
-#: src/include/inetd/dialogs.rb:384
+#: src/include/inetd/dialogs.rb:387
 msgid "&Toggle Status (On or Off)"
 msgstr "状態を変更する (オン／オフ) (&T)"
 
-#: src/include/inetd/dialogs.rb:396
+#: src/include/inetd/dialogs.rb:399
 msgid "Status for All &Services"
 msgstr "全てのサービスの状態 (&S)"
 
 #. Inetd configure dialog caption
-#: src/include/inetd/dialogs.rb:410
+#: src/include/inetd/dialogs.rb:413
 msgid "Network Service Configuration (xinetd)"
 msgstr "ネットワークサービスの設定 (xinetd)"
 
 #. execute dialog
 #. Translators: Caption for EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:498
+#: src/include/inetd/dialogs.rb:504
 msgid "Add a New Service Entry"
 msgstr "新しいサービス項目を追加する"
 
 #. Translators: Popup::Error
-#: src/include/inetd/dialogs.rb:528
+#: src/include/inetd/dialogs.rb:534
 msgid "Cannot delete the service. It is not installed."
 msgstr "サービスを削除できません。インストールされていません。"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:552
+#: src/include/inetd/dialogs.rb:558
 msgid "To delete a service, select one in the main dialog"
 msgstr "サービスを削除するには、削除するサービスをメインダイアログで選択する必要があります"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:599
+#: src/include/inetd/dialogs.rb:605
 msgid "To activate or deactivate a service, select one in the main dialog."
 msgstr "サービスを有効／無効にするには、設定するサービスをメインダイアログで選択する必要があります。"
 
 #. y2milestone("Current line %1", current_line);
 #. Translators: Caption of EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:736
+#: src/include/inetd/dialogs.rb:742
 msgid "Edit a service entry"
 msgstr "サービス項目を編集する"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:751
+#: src/include/inetd/dialogs.rb:757
 msgid "To edit a service, select one in the main dialog"
 msgstr "サービスを編集するには、設定するサービスをメインダイアログで選択する必要があります"
 
 #. Translators: Popup::Warning
-#: src/include/inetd/dialogs.rb:782
+#: src/include/inetd/dialogs.rb:788
 msgid ""
 "All services are marked as disabled (locked).\n"
 "Internet super-server will be disabled."
@@ -297,54 +297,54 @@
 "インターネットスーパサーバは無効になります。"
 
 #. service name
-#: src/include/inetd/dialogs.rb:807
+#: src/include/inetd/dialogs.rb:811
 msgid "&Service"
 msgstr "サービス (&S)"
 
-#: src/include/inetd/dialogs.rb:809
+#: src/include/inetd/dialogs.rb:813
 msgid "RPC Versio&n"
 msgstr "RPC バージョン (&N)"
 
 #. service status (running or stopped)
-#: src/include/inetd/dialogs.rb:815
+#: src/include/inetd/dialogs.rb:819
 msgid "Service is acti&ve."
 msgstr "このサービスを有効にする (&V)"
 
 #. service socket type
-#: src/include/inetd/dialogs.rb:828
+#: src/include/inetd/dialogs.rb:832
 msgid "Socket T&ype"
 msgstr "ソケット種類 (&Y)"
 
 #. for protocol option - ediatble ComboBox
-#: src/include/inetd/dialogs.rb:839
+#: src/include/inetd/dialogs.rb:843
 msgid "&Protocol"
 msgstr "プロトコル (&P)"
 
 #. for flags (wait/nowait) - noneditable ComboBox
-#: src/include/inetd/dialogs.rb:850
+#: src/include/inetd/dialogs.rb:854
 msgid "&Wait"
 msgstr "待機 (&W)"
 
 #. user and group ComboBoxes
-#: src/include/inetd/dialogs.rb:860
+#: src/include/inetd/dialogs.rb:864
 msgid "&User"
 msgstr "ユーザ (&U)"
 
-#: src/include/inetd/dialogs.rb:862
+#: src/include/inetd/dialogs.rb:866
 msgid "&Group"
 msgstr "グループ (&G)"
 
 #. Server arguments
-#: src/include/inetd/dialogs.rb:865
+#: src/include/inetd/dialogs.rb:869
 msgid "S&erver"
 msgstr "サーバ (&E)"
 
-#: src/include/inetd/dialogs.rb:866
+#: src/include/inetd/dialogs.rb:870
 msgid "Server Argumen&ts"
 msgstr "サーバの引数 (&T)"
 
 #. Comment above the service line in inetd.conf
-#: src/include/inetd/dialogs.rb:868
+#: src/include/inetd/dialogs.rb:872
 msgid "Co&mment"
 msgstr "コメント (&M)"
 
@@ -358,14 +358,14 @@
 #. It does not get the NIS entries.
 #. "+" is filtered out.
 #. @return [Array] groups
-#: src/include/inetd/dialogs.rb:914 src/include/inetd/dialogs.rb:952
-#: src/include/inetd/dialogs.rb:957 src/include/inetd/dialogs.rb:996
+#: src/include/inetd/dialogs.rb:918 src/include/inetd/dialogs.rb:956
+#: src/include/inetd/dialogs.rb:961 src/include/inetd/dialogs.rb:1000
 #: src/include/inetd/routines.rb:333 src/include/inetd/routines.rb:353
 msgid "--default--"
 msgstr "--デフォルト--"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:942
+#: src/include/inetd/dialogs.rb:946
 msgid ""
 "Service is empty.\n"
 "Enter valid values.\n"
@@ -374,12 +374,12 @@
 "正しい値を入力してください。\n"
 
 #. Error message
-#: src/include/inetd/dialogs.rb:948
+#: src/include/inetd/dialogs.rb:952
 msgid "Service name contains disallowed character \"/\"."
 msgstr "サービス名に \"/\" の文字を使用することはできません。"
 
 #. Translators: sformat-ed() 3 strings
-#: src/include/inetd/dialogs.rb:956
+#: src/include/inetd/dialogs.rb:960
 msgid "The user %1 is reserved for internal server processes only."
 msgstr "ユーザ %1 は内部サーバプロセスのみに予約されています。"
 
@@ -658,57 +658,57 @@
 msgstr "初期化しています..."
 
 #. Inetd read dialog caption
-#: src/modules/Inetd.rb:185
+#: src/modules/Inetd.rb:188
 msgid "Initializing inetd Configuration"
 msgstr "inetd 設定を準備しています"
 
-#: src/modules/Inetd.rb:193
+#: src/modules/Inetd.rb:196
 msgid "Read the Configuration"
 msgstr "設定の読み込み"
 
-#: src/modules/Inetd.rb:194
+#: src/modules/Inetd.rb:197
 msgid "Reading the configuration..."
 msgstr "設定を読み込んでいます..."
 
 #. read database
-#: src/modules/Inetd.rb:194 src/modules/Inetd.rb:212 src/modules/Inetd.rb:276
-#: src/modules/Inetd.rb:340
+#: src/modules/Inetd.rb:197 src/modules/Inetd.rb:214 src/modules/Inetd.rb:278
+#: src/modules/Inetd.rb:306
 msgid "Finished"
 msgstr "完了"
 
 #. Inetd read dialog caption
-#: src/modules/Inetd.rb:267
+#: src/modules/Inetd.rb:269
 msgid "Saving inetd Configuration"
 msgstr "inetd 設定を保存しています"
 
-#: src/modules/Inetd.rb:275
+#: src/modules/Inetd.rb:277
 msgid "Write the settings"
 msgstr "設定の書き込み"
 
-#: src/modules/Inetd.rb:276
+#: src/modules/Inetd.rb:278
 msgid "Writing the settings..."
 msgstr "設定を書き込んでいます..."
 
 #. in future: catch errors
-#: src/modules/Inetd.rb:337
+#: src/modules/Inetd.rb:303
 msgid "Cannot write settings!"
 msgstr "設定を書き込めません！"
 
 #. "enabled" defaults to true
-#: src/modules/Inetd.rb:607
+#: src/modules/Inetd.rb:598
 msgid "<p><ul><i>All services are marked as stopped.</i></ul></p>"
 msgstr "<p><ul><i>全てのサービスに停止マークを付けました。</i></ul></p>"
 
 #. Translators: Summary head, if nothing configured
-#: src/modules/Inetd.rb:618
+#: src/modules/Inetd.rb:609
 msgid "Network services"
 msgstr "ネットワークサービス"
 
 #. Translators: Summary head, if something configured
-#: src/modules/Inetd.rb:623
+#: src/modules/Inetd.rb:613
 msgid "Network services are managed via %1"
 msgstr "%1 でネットワークサービスを管理します"
 
-#: src/modules/Inetd.rb:627
+#: src/modules/Inetd.rb:616
 msgid "These services will be enabled"
 msgstr "このサービスを有効にします"

Modified: trunk/yast/ja/po/installation.ja.po
===================================================================
--- trunk/yast/ja/po/installation.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/installation.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: installation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-03 16:45+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-09-02 07:59+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"

Modified: trunk/yast/ja/po/instserver.ja.po
===================================================================
--- trunk/yast/ja/po/instserver.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/instserver.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: instserver\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2012-10-26 21:39+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -66,25 +66,25 @@
 msgstr "メディアの変更"
 
 #. %1 is the current cd number
-#: src/include/instserver/dialogs.rb:241
+#: src/include/instserver/dialogs.rb:230
 msgid "Insert CD %1 then press continue."
 msgstr "CD %1 を選択し、 '続行' を押してください。"
 
-#: src/include/instserver/dialogs.rb:246
+#: src/include/instserver/dialogs.rb:235
 msgid "Select ISO image %1 then press continue."
 msgstr "CD %1 の ISO イメージを選択し、 '続行' を押してください。"
 
 #. %2 is the product name and version
-#: src/include/instserver/dialogs.rb:252
+#: src/include/instserver/dialogs.rb:241
 msgid "Insert CD %1 of %2."
 msgstr "%1 枚目 (全 %2 枚) の CD を挿入してください。"
 
-#: src/include/instserver/dialogs.rb:253
+#: src/include/instserver/dialogs.rb:242
 msgid "Select ISO image %1 of %2."
 msgstr "ISO イメージ %1 (全 %2 イメージ) を選択してください。"
 
 #. popup request, %1 is CD medium name
-#: src/include/instserver/dialogs.rb:292
+#: src/include/instserver/dialogs.rb:281
 msgid ""
 "Insert\n"
 "%1"
@@ -93,12 +93,12 @@
 "を入れてください"
 
 #. popup request, %1 is ISO name
-#: src/include/instserver/dialogs.rb:321
+#: src/include/instserver/dialogs.rb:310
 msgid "Select %1"
 msgstr "%1 を選択"
 
 #. add-on medium (e.g. service pack) doesn't match configured repository
-#: src/include/instserver/dialogs.rb:573
+#: src/include/instserver/dialogs.rb:551
 msgid ""
 "The medium requires product %1, which is not provided\n"
 "by the current repository.\n"
@@ -111,63 +111,63 @@
 "先にこの製品を含むメディアを指定してください。"
 
 #. else, we create CD1, CD2, etc. (for code10 always)
-#: src/include/instserver/dialogs.rb:697
+#: src/include/instserver/dialogs.rb:669
 msgid "Copying CD contents to local directory"
 msgstr "CD の内容をローカルディレクトリにコピーしています"
 
-#: src/include/instserver/dialogs.rb:698
+#: src/include/instserver/dialogs.rb:670
 msgid "This may take a while..."
 msgstr "しばらくお待ちください..."
 
 #. TODO: report more details (stderr)
 #. rename the directory
-#: src/include/instserver/dialogs.rb:755 src/modules/Instserver.rb:1361
+#: src/include/instserver/dialogs.rb:727 src/modules/Instserver.rb:1341
 msgid "Error while moving repository content."
 msgstr "リポジトリ内容の移動中にエラーが発生しました。"
 
 #. Instserver configuration dialog caption
 #. Instserver configuration dialog caption
-#: src/include/instserver/dialogs.rb:978
-#: src/include/instserver/dialogs.rb:1191
+#: src/include/instserver/dialogs.rb:949
+#: src/include/instserver/dialogs.rb:1162
 msgid "Repository Configuration"
 msgstr "リポジトリ設定"
 
 #. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:994
+#: src/include/instserver/dialogs.rb:965
 msgid "Read &CD or DVD Medium"
 msgstr "CD または DVD メディアを読み込む (&C)"
 
-#: src/include/instserver/dialogs.rb:1000
+#: src/include/instserver/dialogs.rb:971
 msgid "Data &Source"
 msgstr "データソース (&S)"
 
-#: src/include/instserver/dialogs.rb:1008
+#: src/include/instserver/dialogs.rb:979
 msgid "Use &ISO Images"
 msgstr "ISO イメージを使用する (&I)"
 
-#: src/include/instserver/dialogs.rb:1017
+#: src/include/instserver/dialogs.rb:988
 msgid "Di&rectory with CD Images:"
 msgstr "CD イメージがあるディレクトリ (&R):"
 
-#: src/include/instserver/dialogs.rb:1020
-#: src/include/instserver/dialogs.rb:1400
+#: src/include/instserver/dialogs.rb:991
+#: src/include/instserver/dialogs.rb:1371
 msgid "Select &Directory"
 msgstr "ディレクトリを選択する (&D)"
 
 #. abort?
 #. abort?
-#: src/include/instserver/dialogs.rb:1063
-#: src/include/instserver/dialogs.rb:1469
+#: src/include/instserver/dialogs.rb:1034
+#: src/include/instserver/dialogs.rb:1440
 msgid "Select Directory"
 msgstr "ディレクトリの選択"
 
 #. abort?
-#: src/include/instserver/dialogs.rb:1080
-#: src/include/instserver/dialogs.rb:1244
+#: src/include/instserver/dialogs.rb:1051
+#: src/include/instserver/dialogs.rb:1215
 msgid "Installation server name missing."
 msgstr "インストールサーバの名前が設定されていません。"
 
-#: src/include/instserver/dialogs.rb:1095
+#: src/include/instserver/dialogs.rb:1066
 msgid ""
 "Contents already exist in this directory.\n"
 "Not copying CDs."
@@ -176,7 +176,7 @@
 "CD の内容をコピーできません。"
 
 #. for translators: popup question (prefer more shorter lines than few long lines)
-#: src/include/instserver/dialogs.rb:1123
+#: src/include/instserver/dialogs.rb:1094
 msgid ""
 "Add an additional product (Service Pack, Additional\n"
 "Package CD, etc.) to the repository?"
@@ -185,20 +185,20 @@
 " をリポジトリに追加しますか?"
 
 #. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:1199
+#: src/include/instserver/dialogs.rb:1170
 msgid "Repository &Name:"
 msgstr "リポジトリ名 (&N):"
 
-#: src/include/instserver/dialogs.rb:1204
+#: src/include/instserver/dialogs.rb:1175
 msgid "A&nnounce as Installation Service with SLP"
 msgstr "SLP を使用するインストールサービスとして通知する (&N)"
 
-#: src/include/instserver/dialogs.rb:1252
+#: src/include/instserver/dialogs.rb:1223
 msgid "Invalid repository name."
 msgstr "リポジトリ名が正しくありません。"
 
 #. an error message - entered repository name already exists
-#: src/include/instserver/dialogs.rb:1260
+#: src/include/instserver/dialogs.rb:1231
 msgid ""
 "Repository '%1' already exists,\n"
 "enter another name."
@@ -207,7 +207,7 @@
 "別の名前を入力してください。"
 
 #. create directory only for a new repository
-#: src/include/instserver/dialogs.rb:1273
+#: src/include/instserver/dialogs.rb:1244
 msgid ""
 "Error while creating <tt>repository</tt> directory.\n"
 "Verify that the directory \n"
@@ -220,7 +220,7 @@
 "が書き込み可能であることを確認して再実行してください。\n"
 
 #. confirm removal of a repository, the action is done immediately and cannot be reverted
-#: src/include/instserver/dialogs.rb:1292
+#: src/include/instserver/dialogs.rb:1263
 msgid ""
 "Repository '%1' has been marked to delete.\n"
 "When adding a new repository with the same name\n"
@@ -235,87 +235,87 @@
 "古い情報を消去して新たに作成してよろしいですか？"
 
 #. Instserver server dialog caption
-#: src/include/instserver/dialogs.rb:1376
+#: src/include/instserver/dialogs.rb:1347
 msgid "Initial Setup -- Initial Setup"
 msgstr "初期セットアップ -- 初期セットアップ"
 
-#: src/include/instserver/dialogs.rb:1392
+#: src/include/instserver/dialogs.rb:1363
 msgid "Do Not Configure Any Net&work Services"
 msgstr "ネットワークサービスを設定しない (&W)"
 
-#: src/include/instserver/dialogs.rb:1397
+#: src/include/instserver/dialogs.rb:1368
 msgid "Di&rectory to Contain Repositories:"
 msgstr "リポジトリを設置するディレクトリ (&R):"
 
 #. radio button label
-#: src/include/instserver/dialogs.rb:1412
+#: src/include/instserver/dialogs.rb:1383
 msgid "&Configure as HTTP Repository"
 msgstr "HTTP リポジトリとして設定する (&C)"
 
 #. radio button label
-#: src/include/instserver/dialogs.rb:1420
+#: src/include/instserver/dialogs.rb:1391
 msgid "&Configure as FTP Repository"
 msgstr "FTP リポジトリとして設定する (&C)"
 
 #. radio button label
-#: src/include/instserver/dialogs.rb:1428
+#: src/include/instserver/dialogs.rb:1399
 msgid "&Configure as NFS Repository"
 msgstr "NFS リポジトリとして設定する (&C)"
 
-#: src/include/instserver/dialogs.rb:1480
+#: src/include/instserver/dialogs.rb:1451
 msgid "Directory path for the installation server missing."
 msgstr "インストールサーバのディレクトリが指定されていません。"
 
 #. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1507
+#: src/include/instserver/dialogs.rb:1478
 msgid "Installation Server -- NFS"
 msgstr "インストールサーバ -- NFS"
 
 #. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1525
+#: src/include/instserver/dialogs.rb:1496
 msgid "&Host Wild Card"
 msgstr "ワイルドカードホスト (&H)"
 
-#: src/include/instserver/dialogs.rb:1527
+#: src/include/instserver/dialogs.rb:1498
 msgid "&Options"
 msgstr "オプション (&O)"
 
 #. store the firewall setting, (activation is in SetupNFS())
-#: src/include/instserver/dialogs.rb:1585
+#: src/include/instserver/dialogs.rb:1556
 msgid "Error occurred while configuring NFS."
 msgstr "NFS の設定中にエラーが生じました。"
 
 #. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1617
+#: src/include/instserver/dialogs.rb:1588
 msgid "Installation Server -- FTP"
 msgstr "インストールサーバ -- FTP"
 
 #. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1625
+#: src/include/instserver/dialogs.rb:1596
 msgid "&FTP Server Root Directory:"
 msgstr "FTP サーバのルートディレクトリ (&F):"
 
-#: src/include/instserver/dialogs.rb:1627
+#: src/include/instserver/dialogs.rb:1598
 msgid "&Directory Alias:"
 msgstr "ディレクトリ別名 (&D):"
 
 #. store the firewall setting, (activation is in SetupFTP())
-#: src/include/instserver/dialogs.rb:1684
+#: src/include/instserver/dialogs.rb:1655
 msgid "Error occurred while configuring FTP."
 msgstr "FTP の設定中にエラーが発生しました。"
 
 #. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1704
+#: src/include/instserver/dialogs.rb:1675
 msgid "Installation Server -- HTTP"
 msgstr "インストールサーバ -- HTTP"
 
 #. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1720
+#: src/include/instserver/dialogs.rb:1691
 msgid "&Directory Alias"
 msgstr "ディレクトリ別名 (&D)"
 
 #. store the firewall setting, (activation is in SetupHTTP())
-#: src/include/instserver/dialogs.rb:1777
+#: src/include/instserver/dialogs.rb:1748
 msgid "Error creating HTTPD configuration."
 msgstr "HTTPD 設定を作成中にエラーが発生しました。"
 
@@ -644,7 +644,7 @@
 "<b>編集</b> または <b>削除</b> ボタンを押してください。</p>\n"
 
 #. Read service data using _auto
-#: src/modules/Instserver.rb:308
+#: src/modules/Instserver.rb:306
 msgid ""
 "The FTP installation server requires an FTP server package. The vsftpd package\n"
 "will now be installed.\n"
@@ -671,7 +671,7 @@
 #. @param string directory
 #. @param [String] options
 #. @return [Boolean]
-#: src/modules/Instserver.rb:570
+#: src/modules/Instserver.rb:569
 msgid ""
 "Directory is already exported via NFS.\n"
 "Leave NFS exports unmodified?\n"
@@ -680,72 +680,72 @@
 "NFS のエクスポート設定を変更せずに進めますか？\n"
 
 #. Instserver read dialog caption
-#: src/modules/Instserver.rb:1152
+#: src/modules/Instserver.rb:1155
 msgid "Initializing Configuration"
 msgstr "設定を準備しています"
 
 #. Progress stage 1/2
-#: src/modules/Instserver.rb:1166
+#: src/modules/Instserver.rb:1165
 msgid "Read configuration file"
 msgstr "設定ファイルを読み込んでいます"
 
 #. Progress stage 2/2
-#: src/modules/Instserver.rb:1168
+#: src/modules/Instserver.rb:1167
 msgid "Search for a new repository"
 msgstr "新しいリポジトリを検索"
 
 #. Progress step 1/2
-#: src/modules/Instserver.rb:1172
+#: src/modules/Instserver.rb:1171
 msgid "Reading configuration file..."
 msgstr "設定ファイルを読み込んでいます..."
 
 #. Progress step 2/2
-#: src/modules/Instserver.rb:1174
+#: src/modules/Instserver.rb:1173
 msgid "Searching for a new repository..."
 msgstr "新しいリポジトリを検索しています..."
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Instserver.rb:1176 src/modules/Instserver.rb:1278
+#: src/modules/Instserver.rb:1175 src/modules/Instserver.rb:1260
 msgid "Finished"
 msgstr "完了"
 
-#. Error message
-#: src/modules/Instserver.rb:1224
+#. TRANSLATORS: Error message
+#: src/modules/Instserver.rb:1188
 msgid "Cannot read current settings."
 msgstr "現在の設定を読み込めませんでした。"
 
 #. Instserver read dialog caption
-#: src/modules/Instserver.rb:1254
+#: src/modules/Instserver.rb:1240
 msgid "Saving Installation Server Configuration"
 msgstr "インストールサーバの設定を保存しています"
 
 #. Progress stage 1/2
-#: src/modules/Instserver.rb:1268
+#: src/modules/Instserver.rb:1250
 msgid "Write the settings"
 msgstr "設定を書き込む"
 
 #. Progress stage 2/2
-#: src/modules/Instserver.rb:1270
+#: src/modules/Instserver.rb:1252
 msgid "Run SuSEconfig"
 msgstr "SuSEconfig を起動する"
 
 #. Progress step 1/2
-#: src/modules/Instserver.rb:1274
+#: src/modules/Instserver.rb:1256
 msgid "Writing the settings..."
 msgstr "設定を書き込んでいます..."
 
 #. Progress step 2/2
-#: src/modules/Instserver.rb:1276
+#: src/modules/Instserver.rb:1258
 msgid "Running SuSEconfig..."
 msgstr "SuSEconfig を実行しています..."
 
 #. Error message
-#: src/modules/Instserver.rb:1292
+#: src/modules/Instserver.rb:1274
 msgid "Cannot write settings."
 msgstr "設定を書き込むことができませんでした。"
 
 #. Configuration summary text for autoyast
-#: src/modules/Instserver.rb:1465
+#: src/modules/Instserver.rb:1441
 msgid "Configured Repositories"
 msgstr "設定済みリポジトリ"

Modified: trunk/yast/ja/po/iscsi-lio-server.ja.po
===================================================================
--- trunk/yast/ja/po/iscsi-lio-server.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/iscsi-lio-server.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: iscsi-lio-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-05-21 20:14+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -50,24 +50,24 @@
 #. third tab - targets / luns
 #. targets dialog
 #: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:318
+#: src/include/iscsi-lio-server/dialogs.rb:320
 #: src/modules/IscsiLioServer.rb:443
 msgid "Targets"
 msgstr "ターゲット"
 
 #: src/include/iscsi-lio-server/dialogs.rb:115
-#: src/include/iscsi-lio-server/dialogs.rb:174
+#: src/include/iscsi-lio-server/dialogs.rb:176
 msgid "Target"
 msgstr "ターゲット"
 
 #: src/include/iscsi-lio-server/dialogs.rb:124
-#: src/include/iscsi-lio-server/dialogs.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:185
 msgid "Identifier"
 msgstr "識別子"
 
 #: src/include/iscsi-lio-server/dialogs.rb:128
-#: src/include/iscsi-lio-server/dialogs.rb:187
-#: src/include/iscsi-lio-server/dialogs.rb:318
+#: src/include/iscsi-lio-server/dialogs.rb:189
+#: src/include/iscsi-lio-server/dialogs.rb:320
 msgid "Portal group"
 msgstr "ポータルグループ"
 
@@ -80,170 +80,176 @@
 msgstr "ポート番号"
 
 #: src/include/iscsi-lio-server/dialogs.rb:143
+#, fuzzy
+#| msgid "Bad list of IP addresses."
+msgid "Bind all IP addresses"
+msgstr "IP アドレス一覧が正しくありません。"
+
+#: src/include/iscsi-lio-server/dialogs.rb:145
 msgid "Use Authentication"
 msgstr "認証を使用する"
 
-#: src/include/iscsi-lio-server/dialogs.rb:147
+#: src/include/iscsi-lio-server/dialogs.rb:149
 #: src/include/iscsi-lio-server/widgets.rb:301
 msgid "LUN"
 msgstr "LUN"
 
-#: src/include/iscsi-lio-server/dialogs.rb:147
+#: src/include/iscsi-lio-server/dialogs.rb:149
 msgid "Name"
 msgstr "名前"
 
-#: src/include/iscsi-lio-server/dialogs.rb:147
+#: src/include/iscsi-lio-server/dialogs.rb:149
 msgid "Path"
 msgstr "パス"
 
-#: src/include/iscsi-lio-server/dialogs.rb:152
-#: src/include/iscsi-lio-server/dialogs.rb:196
-#: src/include/iscsi-lio-server/dialogs.rb:235
-#: src/include/iscsi-lio-server/dialogs.rb:323
-#: src/include/iscsi-lio-server/dialogs.rb:370
+#: src/include/iscsi-lio-server/dialogs.rb:154
+#: src/include/iscsi-lio-server/dialogs.rb:198
+#: src/include/iscsi-lio-server/dialogs.rb:237
+#: src/include/iscsi-lio-server/dialogs.rb:325
+#: src/include/iscsi-lio-server/dialogs.rb:372
 #: src/include/iscsi-lio-server/widgets.rb:442
 msgid "Add"
 msgstr "追加"
 
-#: src/include/iscsi-lio-server/dialogs.rb:153
-#: src/include/iscsi-lio-server/dialogs.rb:236
-#: src/include/iscsi-lio-server/dialogs.rb:324
-#: src/include/iscsi-lio-server/dialogs.rb:371
+#: src/include/iscsi-lio-server/dialogs.rb:155
+#: src/include/iscsi-lio-server/dialogs.rb:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
 msgid "Edit"
 msgstr "編集"
 
-#: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:199
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
+#: src/include/iscsi-lio-server/dialogs.rb:156
+#: src/include/iscsi-lio-server/dialogs.rb:201
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
 #: src/include/iscsi-lio-server/widgets.rb:443
 msgid "Delete"
 msgstr "削除"
 
-#: src/include/iscsi-lio-server/dialogs.rb:191
+#: src/include/iscsi-lio-server/dialogs.rb:193
 msgid "Client"
 msgstr "クライアント"
 
-#: src/include/iscsi-lio-server/dialogs.rb:191
+#: src/include/iscsi-lio-server/dialogs.rb:193
 msgid "Lun Mapping"
 msgstr "LUN マッピング"
 
-#: src/include/iscsi-lio-server/dialogs.rb:191
+#: src/include/iscsi-lio-server/dialogs.rb:193
 msgid "Auth"
 msgstr "認証"
 
-#: src/include/iscsi-lio-server/dialogs.rb:197
+#: src/include/iscsi-lio-server/dialogs.rb:199
 msgid "Edit LUN"
 msgstr "LUN の編集"
 
-#: src/include/iscsi-lio-server/dialogs.rb:198
+#: src/include/iscsi-lio-server/dialogs.rb:200
 msgid "Edit Auth"
 msgstr "認証の編集"
 
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:202
 msgid "Copy"
 msgstr "コピー"
 
 #. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:214
+#: src/include/iscsi-lio-server/dialogs.rb:216
 #: src/include/iscsi-lio-server/widgets.rb:207
 #: src/modules/IscsiLioServer.rb:434
 msgid "No Authentication"
 msgstr "認証なし"
 
-#: src/include/iscsi-lio-server/dialogs.rb:223
+#: src/include/iscsi-lio-server/dialogs.rb:225
 #: src/include/iscsi-lio-server/widgets.rb:218
 #: src/modules/IscsiLioServer.rb:437
 msgid "Incoming Authentication"
 msgstr "受信認証"
 
 #. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:230
-#: src/include/iscsi-lio-server/dialogs.rb:251
+#: src/include/iscsi-lio-server/dialogs.rb:232
+#: src/include/iscsi-lio-server/dialogs.rb:253
 #: src/include/iscsi-lio-server/widgets.rb:223
 #: src/include/iscsi-lio-server/widgets.rb:236
-#: src/include/iscsi-lio-server/widgets.rb:721
+#: src/include/iscsi-lio-server/widgets.rb:720
 msgid "Username"
 msgstr "ユーザ名"
 
-#: src/include/iscsi-lio-server/dialogs.rb:230
-#: src/include/iscsi-lio-server/dialogs.rb:252
+#: src/include/iscsi-lio-server/dialogs.rb:232
+#: src/include/iscsi-lio-server/dialogs.rb:254
 #: src/include/iscsi-lio-server/widgets.rb:224
 #: src/include/iscsi-lio-server/widgets.rb:237
-#: src/include/iscsi-lio-server/widgets.rb:722
+#: src/include/iscsi-lio-server/widgets.rb:721
 msgid "Password"
 msgstr "パスワード"
 
-#: src/include/iscsi-lio-server/dialogs.rb:246
+#: src/include/iscsi-lio-server/dialogs.rb:248
 #: src/include/iscsi-lio-server/widgets.rb:231
 #: src/modules/IscsiLioServer.rb:440
 msgid "Outgoing Authentication"
 msgstr "送信認証"
 
 #. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:272
+#: src/include/iscsi-lio-server/dialogs.rb:274
 msgid "When &Booting"
 msgstr "システム起動時 (&B)"
 
 #. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:276
+#: src/include/iscsi-lio-server/dialogs.rb:278
 msgid "&Manually"
 msgstr "手動 (&M)"
 
 #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:282
+#: src/include/iscsi-lio-server/dialogs.rb:284
 #: src/modules/IscsiLioServer.rb:429
 msgid "When Booting"
 msgstr "システム起動時"
 
 #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:286
 #: src/modules/IscsiLioServer.rb:431
 msgid "Manually"
 msgstr "手動"
 
 #. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:367
+#: src/include/iscsi-lio-server/dialogs.rb:369
 msgid "Key"
 msgstr "キー"
 
-#: src/include/iscsi-lio-server/dialogs.rb:367
+#: src/include/iscsi-lio-server/dialogs.rb:369
 msgid "Value"
 msgstr "値"
 
 #. Summary dialog
 #. @return dialog result
 #. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:428
+#: src/include/iscsi-lio-server/dialogs.rb:430
 msgid "iSCSI LIO Target Overview"
 msgstr "iSCSI LIO ターゲットの概要"
 
 #. expert dialog
 #. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:436
+#: src/include/iscsi-lio-server/dialogs.rb:438
 #: src/include/iscsi-lio-server/helps.rb:178
 #: src/include/iscsi-lio-server/helps.rb:183
 msgid "<h1>iSCSI Target</h1>"
 msgstr "<h1>iSCSI ターゲット</h1>"
 
 #. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:471
+#: src/include/iscsi-lio-server/dialogs.rb:473
 msgid "Add iSCSI Target"
 msgstr "iSCSI ターゲットの追加"
 
 #. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:505
+#: src/include/iscsi-lio-server/dialogs.rb:507
 msgid "Modify iSCSI Target Client Setup"
 msgstr "iSCSI ターゲットクライアントの設定変更"
 
 #. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:539
+#: src/include/iscsi-lio-server/dialogs.rb:541
 msgid "Modify iSCSI Target Lun Setup"
 msgstr "iSCSI ターゲットにおける LUN 設定の変更"
 
 #. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:572
+#: src/include/iscsi-lio-server/dialogs.rb:574
 msgid "iSCSI Target Expert Settings"
 msgstr "iSCSI ターゲット熟練者設定"
 
@@ -546,119 +552,118 @@
 msgid "Need to enable at least one Authentification!"
 msgstr "少なくとも 1 つの認証方法を設定する必要があります。"
 
-#: src/include/iscsi-lio-server/widgets.rb:620
+#: src/include/iscsi-lio-server/widgets.rb:619
 msgid "Client name:"
 msgstr "クライアント名:"
 
-#: src/include/iscsi-lio-server/widgets.rb:623
+#: src/include/iscsi-lio-server/widgets.rb:622
 msgid "Import LUNs from TPG"
 msgstr "TPG から LUN をインポート"
 
-#: src/include/iscsi-lio-server/widgets.rb:639
-#: src/include/iscsi-lio-server/widgets.rb:695
+#: src/include/iscsi-lio-server/widgets.rb:638
+#: src/include/iscsi-lio-server/widgets.rb:694
 msgid "Client name must not be empty!"
 msgstr "クライアント名を指定する必要があります！"
 
 #. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
 #. client name. It's allowed to have several LUNs accessable for same client.
 #. TODO: verify whether it's necessary to check @changed_lun here?
-#: src/include/iscsi-lio-server/widgets.rb:645
-#: src/include/iscsi-lio-server/widgets.rb:701
+#: src/include/iscsi-lio-server/widgets.rb:644
+#: src/include/iscsi-lio-server/widgets.rb:700
 msgid "Client name already exists!"
 msgstr "そのクライアント名は既に存在しています！"
 
 #. Copy exisiting LUN, i.e. give additional client access to the LUN
 #. (which is allowed, makes sense e.g. with multipath)
-#: src/include/iscsi-lio-server/widgets.rb:678
+#: src/include/iscsi-lio-server/widgets.rb:677
 msgid "New client name:"
 msgstr "新しいクライアントの名前:"
 
-#: src/include/iscsi-lio-server/widgets.rb:724
+#: src/include/iscsi-lio-server/widgets.rb:723
 msgid "OK"
 msgstr "OK"
 
-#: src/include/iscsi-lio-server/widgets.rb:725
+#: src/include/iscsi-lio-server/widgets.rb:724
 msgid "Cancel"
 msgstr "キャンセル"
 
 #. remove a item
 #. **************** Edit Dialog	*****************************
 #. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1292
+#: src/include/iscsi-lio-server/widgets.rb:819
+#: src/include/iscsi-lio-server/widgets.rb:933
+#: src/include/iscsi-lio-server/widgets.rb:1291
 msgid "Really delete the selected item?"
 msgstr "選択した項目を削除してよろしいですか？"
 
-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1001
 msgid "Problem creating target %1 with tpg %2"
 msgstr "ターゲット %1 を TPG %2 で作成する際の問題"
 
-#. brackets needed around IPv6
-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1023
 msgid "Problem setting network portal to %1"
 msgstr "ネットワークポータルを %1 に設定する際の問題"
 
-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1044
 msgid "Problem removing lun %1"
 msgstr "LUN %1 の削除時の問題"
 
-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1069
 msgid "Problem setting lun %1 (name:%2) to path %3"
 msgstr "LUN %1 (名前: %2) をパス %3 に設定する際の問題"
 
-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1083
 msgid "Problem setting auth on %1:%2 to %3"
 msgstr "%1:%2 上の認証を %3 に設定する際の問題"
 
 #. validate function checks if target/tpg are unique and not empty
-#: src/include/iscsi-lio-server/widgets.rb:1202
+#: src/include/iscsi-lio-server/widgets.rb:1201
 msgid "The target cannot be empty."
 msgstr "ターゲットを指定する必要があります。"
 
-#: src/include/iscsi-lio-server/widgets.rb:1206
+#: src/include/iscsi-lio-server/widgets.rb:1205
 msgid "The target portal group cannot be empty."
 msgstr "ターゲットのポータルグループを指定する必要があります。"
 
-#: src/include/iscsi-lio-server/widgets.rb:1217
+#: src/include/iscsi-lio-server/widgets.rb:1216
 msgid "The target already exists."
 msgstr "ターゲットは既に存在しています。"
 
-#: src/include/iscsi-lio-server/widgets.rb:1237
+#: src/include/iscsi-lio-server/widgets.rb:1236
 msgid "Incoming"
 msgstr "受信"
 
-#: src/include/iscsi-lio-server/widgets.rb:1240
+#: src/include/iscsi-lio-server/widgets.rb:1239
 msgid "Outgoing"
 msgstr "発信"
 
-#: src/include/iscsi-lio-server/widgets.rb:1242
+#: src/include/iscsi-lio-server/widgets.rb:1241
 msgid "None"
 msgstr "なし"
 
-#: src/include/iscsi-lio-server/widgets.rb:1265
-#: src/include/iscsi-lio-server/widgets.rb:1368
-#: src/include/iscsi-lio-server/widgets.rb:1405
+#: src/include/iscsi-lio-server/widgets.rb:1264
+#: src/include/iscsi-lio-server/widgets.rb:1367
+#: src/include/iscsi-lio-server/widgets.rb:1404
 msgid "Disabled"
 msgstr "無効"
 
-#: src/include/iscsi-lio-server/widgets.rb:1457
+#: src/include/iscsi-lio-server/widgets.rb:1456
 msgid "Problem removing lun %4 for client %3 in %1:%2"
 msgstr "%1:%2 内のクライアント %3 に対する LUN %4 の削除時の問題"
 
-#: src/include/iscsi-lio-server/widgets.rb:1472
+#: src/include/iscsi-lio-server/widgets.rb:1471
 msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
 msgstr "%1:%2 内のクライアント %3 に対する LUN %4:%5 の追加時の問題"
 
-#: src/include/iscsi-lio-server/widgets.rb:1493
+#: src/include/iscsi-lio-server/widgets.rb:1492
 msgid "Problem removing client %3 from %1:%2"
 msgstr "%1:%2 からクライアント %3 を削除する際の問題"
 
-#: src/include/iscsi-lio-server/widgets.rb:1517
+#: src/include/iscsi-lio-server/widgets.rb:1516
 msgid "Problem creating client %3 for %1:%2"
 msgstr "%1:%2 に対してクライアント %3 を作成する際の問題"
 
-#: src/include/iscsi-lio-server/widgets.rb:1553
+#: src/include/iscsi-lio-server/widgets.rb:1551
 msgid "Problem changing auth for client %3 in %1:%2"
 msgstr "%1:%2 内のクライアント %3 の認証設定変更時の問題"
 
@@ -673,11 +678,11 @@
 msgstr "準備しています..."
 
 #. local IPv6
-#: src/modules/IscsiLioData.rb:1409
+#: src/modules/IscsiLioData.rb:1420
 msgid "Cannot save lio setup"
 msgstr "lio の設定を保存できません"
 
-#: src/modules/IscsiLioData.rb:1413
+#: src/modules/IscsiLioData.rb:1424
 msgid "Cannot save tcm setup"
 msgstr "tcm の設定を保存できません"
 

Modified: trunk/yast/ja/po/isns.ja.po
===================================================================
--- trunk/yast/ja/po/isns.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/isns.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: isns\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2012-04-02 20:09+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -47,105 +47,78 @@
 msgstr "サービス"
 
 #. second tab - iSCSI Nodes
-#: src/include/isns/dialogs.rb:57 src/include/isns/dialogs.rb:132
+#: src/include/isns/dialogs.rb:55 src/include/isns/dialogs.rb:102
 msgid "iSCSI Nodes"
 msgstr "iSCSI ノード"
 
 #. third tab - Discovery Domains
-#: src/include/isns/dialogs.rb:67 src/include/isns/dialogs.rb:150
+#: src/include/isns/dialogs.rb:65 src/include/isns/dialogs.rb:120
 msgid "Discovery Domains"
 msgstr "検出ドメイン"
 
-#. fourth tab - discovery domain sets
-#: src/include/isns/dialogs.rb:77 src/include/isns/dialogs.rb:211
-msgid "Discovery Domains Sets"
-msgstr "検出ドメインセット"
-
-#: src/include/isns/dialogs.rb:99
+#: src/include/isns/dialogs.rb:87
 msgid "When &Booting"
 msgstr "システム起動時 (&B)"
 
-#: src/include/isns/dialogs.rb:100
+#: src/include/isns/dialogs.rb:88
 msgid "&Manually"
 msgstr "手動 (&M)"
 
-#: src/include/isns/dialogs.rb:103
+#: src/include/isns/dialogs.rb:91
 msgid "When Booting"
 msgstr "システム起動時"
 
-#: src/include/isns/dialogs.rb:104
+#: src/include/isns/dialogs.rb:92
 msgid "Manually"
 msgstr "手動"
 
-#: src/include/isns/dialogs.rb:115
-msgid "Address of iSNS Server"
-msgstr "ISNS サーバのアドレス"
-
-#: src/include/isns/dialogs.rb:135 src/include/isns/dialogs.rb:186
-#: src/include/isns/widgets.rb:164
+#: src/include/isns/dialogs.rb:105 src/include/isns/dialogs.rb:156
+#: src/include/isns/widgets.rb:66
 msgid "iSCSI Node Name"
 msgstr "iSCSI ノード名"
 
-#: src/include/isns/dialogs.rb:135 src/include/isns/dialogs.rb:186
-#: src/include/isns/widgets.rb:206
+#: src/include/isns/dialogs.rb:105 src/include/isns/dialogs.rb:156
+#: src/include/isns/widgets.rb:108
 msgid "Node Type"
 msgstr "ノード種類"
 
-#: src/include/isns/dialogs.rb:138 src/include/isns/dialogs.rb:163
-#: src/include/isns/dialogs.rb:224
+#: src/include/isns/dialogs.rb:108 src/include/isns/dialogs.rb:133
 msgid "Delete"
 msgstr "削除"
 
-#: src/include/isns/dialogs.rb:156 src/include/isns/dialogs.rb:247
-#: src/include/isns/widgets.rb:32
+#: src/include/isns/dialogs.rb:126 src/include/isns/widgets.rb:29
 msgid "Discovery Domain Name"
 msgstr "検出ドメイン名"
 
-#: src/include/isns/dialogs.rb:162
+#: src/include/isns/dialogs.rb:132
 msgid "Create Discovery Domain"
 msgstr "検出ドメインの作成"
 
-#: src/include/isns/dialogs.rb:181
+#: src/include/isns/dialogs.rb:151
 msgid "Discovery Domain Members"
 msgstr "検出ドメインメンバー"
 
-#: src/include/isns/dialogs.rb:192
+#: src/include/isns/dialogs.rb:162
 msgid "Add Existing iSCSI Node"
 msgstr "既存の iSCSI ノードの追加"
 
-#: src/include/isns/dialogs.rb:193
+#: src/include/isns/dialogs.rb:163
 msgid "Create iSCSI Node Member"
 msgstr "iSCSI ノードメンバーの作成"
 
-#: src/include/isns/dialogs.rb:194 src/include/isns/dialogs.rb:254
+#: src/include/isns/dialogs.rb:164
 msgid "Remove"
 msgstr "削除"
 
-#: src/include/isns/dialogs.rb:217 src/include/isns/widgets.rb:122
-msgid "Discovery Domain Set Name"
-msgstr "検出ドメインセットの名前"
-
-#: src/include/isns/dialogs.rb:223
-msgid "Create Discovery Domain Set"
-msgstr "検出ドメインセットの作成"
-
-#: src/include/isns/dialogs.rb:242
-msgid "Discovery Domain Set Members"
-msgstr "検出ドメインセットのメンバー"
-
-#: src/include/isns/dialogs.rb:253 src/include/isns/widgets.rb:252
-msgid "Add Discovery Domain"
-msgstr "検出ドメインの追加"
-
 #. Summary dialog
 #. @return dialog result
 #. Main dialog - tabbed
-#: src/include/isns/dialogs.rb:275
+#: src/include/isns/dialogs.rb:185
 msgid "iSNS Service"
 msgstr "iSNS サービス"
 
 #. curr_target = "";
-#: src/include/isns/dialogs.rb:289
+#: src/include/isns/dialogs.rb:198
 msgid "<h1>iSNS Service</h1>"
 msgstr "<h1>iSNS サービス</h1>"
 
@@ -199,89 +172,70 @@
 "ここでは iSNS サーバを設定することができます。<br></p>\n"
 
 #: src/include/isns/helps.rb:39
-msgid "<b><big>iSNS Server location</big></b><br>The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n"
-msgstr "<b><big>iSNS サーバの場所</big></b><br>iSNS サービスに入ることのできる DNS 名または IP アドレスを指定します。\n"
-
-#: src/include/isns/helps.rb:42
 msgid "<p>The list of all available iSCSI nodes registered with the iSNS service are displayed.</p> <p>Nodes are registered by iSCSI initiators and iSCSI targets.</p> <p> It is only possible to <b>delete</b> them.  Deleting a node removes it from the iSNS database.</p>"
 msgstr "<p>iSNS サービスに登録された全ての利用可能な iSCSI ノードの一覧が表示されています。</p> <p>ノードは iSCSI イニシエータと iSCSI ターゲットによって登録されたものです。</p> <p> ここではそれらを <b>削除</b> することだけができます。ノードから削除すると、 iSNS データベースからも削除されます。</p>"
 
 #. discovery domains
-#: src/include/isns/helps.rb:46
+#: src/include/isns/helps.rb:43
 msgid "A list of all discovery domains is displayed. It is possible to <b>Create</b> a discovery domain or <b>Delete</b> one. <p>Deleting a domain removes the members from the domain but does not delete the iSCSI node members.</p>"
 msgstr "全ての検出ドメインの一覧が表示されています。検出ドメインを <b>作成</b> したり <b>削除</b> したりすることができます。 <p>ドメインを削除すると、ドメインからメンバーを削除することにもなりますが、 iSCSI ノードメンバーは削除しません。</p>"
 
-#: src/include/isns/helps.rb:49
+#: src/include/isns/helps.rb:46
 msgid "A list of all iSCSI nodes are displayed by discovery domain.  Selecting another discovery domain refreshes the list with members from that discovery domain.  It is possible to <b>Add</b> an iSCSI node to a discovery domain or <b>Delete</b> the node.  <p>Deleting a node removes it from the domain but does not delete the iSCSI node</p> <p>Creating an iSCSI node allows a not yet registered node to be added as a member of the discovery domain.  When the initiator or target registers this node then it becomes part of this domain</p>  <p>When an iSCSI initiator does a discovery request, the iSNS service returns all iSCSI node targets that are members of the same Discovery Domains.</p> "
 msgstr "検出ドメインによって検出された全ての iSCSI ノードの一覧が表示されています。他の検出ドメインを選択するとメンバー表示も更新されます。検出ドメインに iSCSI ノードを <b>追加</b> したり、ノードを <b>削除</b> したりすることができます。 <p>ノードを削除すると、そのノードはドメインからも削除されますが、 iSCSI ノードは削除されません。</p> <p> iSCSI ノードを作成すると、未登録のノードを検出ドメインのメンバーとして追加することができます。イニシエータまたはターゲットがこのノードを登録すると、このドメインの一部になります。</p>  <p> iSCSI イニシエータが検出要求を発信すると、 iSNS サービスは同じ検出ドメインのメンバーである全ての iSCSI ノードを応答します。</p> "
 
 #. dds table dialog
-#: src/include/isns/helps.rb:53
+#: src/include/isns/helps.rb:50
 msgid "At the top a list of all Discovery Domain Sets are displayed.  Discovery Domains belong to Discovery Domain Sets. <p>A Discovery Domain must be a member of a Discovery Domain Set in order to be active. </p><p>In an iSNS database, a Discovery Domain Set contains Discovery Domains and Discovery Domains contain iSCSI Node members.</p>"
 msgstr "一番上には全ての検出ドメインセットが表示されています。検出ドメインは検出ドメインセットに属しています。<p>検出ドメインは動作中になるため、検出ドメインセットのメンバーにならなければなりません。</p> <p> iSNS データベース内では、検出ドメインセットには検出ドメインが含まれ、検出ドメインには iSCSI ノードメンバーが含まれています。</p>"
 
-#: src/include/isns/helps.rb:56
+#: src/include/isns/helps.rb:53
 msgid "<p>The discovery domain set members list is refreshed whenever a different discovery domain set is selected.</p>"
 msgstr "<p>検出ドメインセットのメンバー一覧の表示は、異なる検出ドメインセットを選択したときに更新されます。</p>"
 
 #. **************** global funcions and variables *****
-#: src/include/isns/widgets.rb:28
+#: src/include/isns/widgets.rb:25
 msgid "Create New Discovery Domain"
 msgstr "新しい検出ドメインの作成"
 
-#: src/include/isns/widgets.rb:39
-msgid "Select discovery domain set to which discovery domain will be added."
-msgstr "検出ドメインを追加する先の、検出ドメインセットを選択してください。"
-
-#: src/include/isns/widgets.rb:43
-msgid "Discovery Domain Name Set"
-msgstr "検出ドメイン名前セット"
-
-#: src/include/isns/widgets.rb:200
+#: src/include/isns/widgets.rb:102
 msgid "Add iSCSI node to discovery domain"
 msgstr "検出ドメインに iSCSI ノードを追加"
 
-#: src/include/isns/widgets.rb:203
+#: src/include/isns/widgets.rb:105
 msgid "Available Nodes to Add"
 msgstr "追加することができるノード"
 
-#: src/include/isns/widgets.rb:206 src/include/isns/widgets.rb:249
+#: src/include/isns/widgets.rb:108
 msgid "Name"
 msgstr "名前"
 
-#: src/include/isns/widgets.rb:210
+#: src/include/isns/widgets.rb:112
 msgid "Add Node"
 msgstr "ノードの追加"
 
-#: src/include/isns/widgets.rb:211 src/include/isns/widgets.rb:253
+#: src/include/isns/widgets.rb:113
 msgid "Done"
 msgstr "完了"
 
-#: src/include/isns/widgets.rb:245
-msgid "Add Discovery Domain to Set"
-msgstr "検出ドメインを検出ドメインセットに追加"
-
-#: src/include/isns/widgets.rb:248
-msgid "Available Discovery Domains"
-msgstr "利用可能な検出ドメイン"
-
-#: src/include/isns/widgets.rb:297 src/include/isns/widgets.rb:320
+#: src/include/isns/widgets.rb:145 src/include/isns/widgets.rb:168
 msgid "Target or Initiator"
 msgstr "ターゲットまたはイニシエータ"
 
-#. IsnsServer::addDD(address, add_map["VALUE"]:"");
-#: src/include/isns/widgets.rb:506 src/include/isns/widgets.rb:586
+#: src/include/isns/widgets.rb:241
 msgid "Really delete the selected item?"
 msgstr "選択した項目を削除してよろしいですか？"
 
-#: src/include/isns/widgets.rb:541
+#: src/include/isns/widgets.rb:270
 msgid "Really delete this domain?"
 msgstr "このドメインを削除してよろしいですか？"
 
 #. boolean display = true;
 #. Report::DisplayErrors(display,10);
-#: src/include/isns/widgets.rb:711
-msgid "Unable to connect to iSNS server. Check iSNS server address."
+#: src/include/isns/widgets.rb:351
+#, fuzzy
+#| msgid "Unable to connect to iSNS server. Check iSNS server address."
+msgid "Unable to connect to iSNS server. Check if iSNS server is running."
 msgstr "iSNS サーバへの接続ができません。 iSNS サーバのアドレスを確認してください。"
 
 #. Initialization dialog caption
@@ -295,81 +249,89 @@
 msgstr "初期化しています..."
 
 #. test if required package ("open-isns") is installed
-#: src/modules/IsnsServer.rb:172
+#: src/modules/IsnsServer.rb:149
 msgid "<p>To configure the isns service, the <b>%1</b> package must be installed.</p>"
 msgstr "<p>isns サービスを設定するには、 <b>%1</b> パッケージをインストールする必要があります。</p>"
 
-#: src/modules/IsnsServer.rb:175
+#: src/modules/IsnsServer.rb:152
 msgid "<p>Install it now?</p>"
 msgstr "<p>今すぐインストールしますか？</p>"
 
 #. IsnsServer read dialog caption
-#: src/modules/IsnsServer.rb:569
+#: src/modules/IsnsServer.rb:277
 msgid "Initializing isns daemon configuration"
 msgstr "isns デーモン設定を準備しています"
 
-#. Progress stage 1/3
-#: src/modules/IsnsServer.rb:585
-msgid "Read the database"
-msgstr "データベースの読み込み"
+#. IsnsServer write dialog caption
+#: src/modules/IsnsServer.rb:300
+msgid "Saving isns Configuration"
+msgstr "isns 設定を保存しています"
 
-#. Progress stage 2/3
-#: src/modules/IsnsServer.rb:587
-msgid "Read the previous settings"
-msgstr "以前の設定を読み込み"
+#~ msgid "Discovery Domains Sets"
+#~ msgstr "検出ドメインセット"
 
-#. Progress stage 3/3
-#: src/modules/IsnsServer.rb:589
-msgid "Detect the devices"
-msgstr "デバイスの検出"
+#~ msgid "Address of iSNS Server"
+#~ msgstr "ISNS サーバのアドレス"
 
-#. Progress step 1/3
-#: src/modules/IsnsServer.rb:593
-msgid "Reading the database..."
-msgstr "データベースを読み込んでいます..."
+#~ msgid "Discovery Domain Set Name"
+#~ msgstr "検出ドメインセットの名前"
 
-#. Progress step 2/3
-#: src/modules/IsnsServer.rb:595
-msgid "Reading the previous settings..."
-msgstr "以前の設定を読み込んでいます..."
+#~ msgid "Create Discovery Domain Set"
+#~ msgstr "検出ドメインセットの作成"
 
-#. Progress step 3/3
-#: src/modules/IsnsServer.rb:597
-msgid "Detecting the devices..."
-msgstr "デバイスを検出しています..."
+#~ msgid "Discovery Domain Set Members"
+#~ msgstr "検出ドメインセットのメンバー"
 
-#. Progress finished
-#. Progress finished
-#: src/modules/IsnsServer.rb:599 src/modules/IsnsServer.rb:677
-msgid "Finished"
-msgstr "完了"
+#~ msgid "Add Discovery Domain"
+#~ msgstr "検出ドメインの追加"
 
-#. IsnsServer write dialog caption
-#: src/modules/IsnsServer.rb:651
-msgid "Saving isns Configuration"
-msgstr "isns 設定を保存しています"
+#~ msgid "<b><big>iSNS Server location</big></b><br>The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n"
+#~ msgstr "<b><big>iSNS サーバの場所</big></b><br>iSNS サービスに入ることのできる DNS 名または IP アドレスを指定します。\n"
 
-#. Progress stage 1/2
-#: src/modules/IsnsServer.rb:667
-msgid "Write the settings"
-msgstr "設定の書き込み"
+#~ msgid "Select discovery domain set to which discovery domain will be added."
+#~ msgstr "検出ドメインを追加する先の、検出ドメインセットを選択してください。"
 
-#. Progress stage 2/2
-#: src/modules/IsnsServer.rb:669
-msgid "Run SuSEconfig"
-msgstr "SuSEconfig の実行"
+#~ msgid "Discovery Domain Name Set"
+#~ msgstr "検出ドメイン名前セット"
 
-#. Progress step 1/2
-#: src/modules/IsnsServer.rb:673
-msgid "Writing the settings..."
-msgstr "設定を書き込んでいます..."
+#~ msgid "Add Discovery Domain to Set"
+#~ msgstr "検出ドメインを検出ドメインセットに追加"
 
-#. Progress step 2/2
-#: src/modules/IsnsServer.rb:675
-msgid "Running SuSEconfig..."
-msgstr "SuSEconfig を実行しています..."
+#~ msgid "Available Discovery Domains"
+#~ msgstr "利用可能な検出ドメイン"
 
-#. write configuration (/etc/isns.conf)
-#: src/modules/IsnsServer.rb:689
-msgid "Cannot write settings."
-msgstr "設定を書き込むことができませんでした。"
+#~ msgid "Read the database"
+#~ msgstr "データベースの読み込み"
+
+#~ msgid "Read the previous settings"
+#~ msgstr "以前の設定を読み込み"
+
+#~ msgid "Detect the devices"
+#~ msgstr "デバイスの検出"
+
+#~ msgid "Reading the database..."
+#~ msgstr "データベースを読み込んでいます..."
+
+#~ msgid "Reading the previous settings..."
+#~ msgstr "以前の設定を読み込んでいます..."
+
+#~ msgid "Detecting the devices..."
+#~ msgstr "デバイスを検出しています..."
+
+#~ msgid "Finished"
+#~ msgstr "完了"
+
+#~ msgid "Write the settings"
+#~ msgstr "設定の書き込み"
+
+#~ msgid "Run SuSEconfig"
+#~ msgstr "SuSEconfig の実行"
+
+#~ msgid "Writing the settings..."
+#~ msgstr "設定を書き込んでいます..."
+
+#~ msgid "Running SuSEconfig..."
+#~ msgstr "SuSEconfig を実行しています..."
+
+#~ msgid "Cannot write settings."
+#~ msgstr "設定を書き込むことができませんでした。"

Modified: trunk/yast/ja/po/ldap.ja.po
===================================================================
--- trunk/yast/ja/po/ldap.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/ldap.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:20+0100\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -184,8 +184,17 @@
 "存在しません。指定された DN の\n"
 "オブジェクトを作成できません。\n"
 
+#. error message
+#: src/Ldap.rb:1431
+msgid ""
+"An object with the selected DN exists, but it is not a template object.\n"
+"Select another one.\n"
+msgstr ""
+"指定された DN を持つオブジェクトは存在しますが、テンプレートオブジェクトではありません。\n"
+"別の DN を選択してください。\n"
+
 #. yes/no popup, %1 is value of DN
-#: src/Ldap.rb:1634
+#: src/Ldap.rb:1717
 msgid ""
 "No entry with DN '%1'\n"
 "exists on the LDAP server. Create it now?\n"

Modified: trunk/yast/ja/po/mail.ja.po
===================================================================
--- trunk/yast/ja/po/mail.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/mail.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: mail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:52+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-05-27 09:22+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -351,6 +351,18 @@
 msgid "Start &fetchmail"
 msgstr "fetchmail の開始 (&F)"
 
+#: src/include/mail/ui.rb:523
+#, fuzzy
+#| msgid "[manually set]"
+msgid "manual"
+msgstr "[手動設定]"
+
+#: src/include/mail/ui.rb:523
+#, fuzzy
+#| msgid "FTP daemon"
+msgid "daemon"
+msgstr "FTP デーモン"
+
 #. frame label: mail downloading (fetchmail)
 #: src/include/mail/ui.rb:529
 msgid "&Downloading"

Modified: trunk/yast/ja/po/network.ja.po
===================================================================
--- trunk/yast/ja/po/network.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/network.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: network\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-10 11:10+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-10-14 08:10+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -2165,7 +2165,7 @@
 "</p>\n"
 
 #. Network setup method help
-#. NetworkManager and wicked are programs
+#. NetworkManager and ifup are programs
 #: src/include/network/lan/help.rb:51
 msgid ""
 "<p><b><big>Network Setup Method</big></b></p>\n"
@@ -2178,7 +2178,9 @@
 "管理することができるデスクトップアプレットです。このアプレットは、\n"
 "有線 LAN と無線 LAN の切り替えを行なうのに最適です。</p>\n"
 
-#: src/include/network/lan/help.rb:57
+#. Network setup method help
+#. NetworkManager and wicked are programs
+#: src/include/network/lan/help.rb:59
 msgid ""
 "<p>Use <b>wicked</b> if you do not run a desktop environment\n"
 "or need to use multiple interfaces at the same time.</p>\n"
@@ -2186,21 +2188,8 @@
 "<p> デスクトップ環境を動作させない場合や、同時に複数の\n"
 "インターフェイスを利用する必要がある場合は、 <b>wicked</b>  をお使いください。 </p>\n"
 
-#. For systems not including NetworkManager by default (bnc#892678)
-#: src/include/network/lan/help.rb:62
+#: src/include/network/lan/help.rb:63
 msgid ""
-"<p><b>NetworkManager</b> is not part of every base\n"
-"installation repository. For example, to enable it on SUSE\n"
-"Linux Enterprise Server add the Workstation Extension\n"
-"repository and install the 'NetworkManager' package.</p>\n"
-msgstr ""
-"<p><b>NetworkManager</b> は基本インストールのリポジトリ内には\n"
-"用意されていません。たとえば SUSE Linux Enterprise Server の場合は、\n"
-"Workstation 拡張リポジトリを追加したあと、 'NetworkManager' \n"
-"パッケージをインストールしてください。</p>\n"
-
-#: src/include/network/lan/help.rb:68
-msgid ""
 "<p><b><big>Network Card Overview</big></b><br>\n"
 "Obtain an overview of installed network cards. Additionally,\n"
 "edit their configuration.<br></p>\n"
@@ -2209,7 +2198,7 @@
 "インストールされているネットワークカードの概要が表示されます。ここから\n"
 "設定を編集することもできます。<br></p>\n"
 
-#: src/include/network/lan/help.rb:73
+#: src/include/network/lan/help.rb:68
 msgid ""
 "<p><b><big>Adding a Network Card:</big></b><br>\n"
 "Press <b>Add</b> to configure a new network card manually.</p>\n"
@@ -2217,7 +2206,7 @@
 "<p><b><big>ネットワークカードの追加:</big></b><br>\n"
 "<b>追加</b> を押すと、ネットワークカードを手動で設定することができます。</p>\n"
 
-#: src/include/network/lan/help.rb:76
+#: src/include/network/lan/help.rb:71
 msgid ""
 "<p><b><big>Configuring or Deleting:</big></b><br>\n"
 "Choose a network card to change or remove.\n"
@@ -2228,7 +2217,7 @@
 "<b>編集</b> または <b>削除</b> ボタンを押してください。</p>\n"
 
 #. IPv6 help
-#: src/include/network/lan/help.rb:83
+#: src/include/network/lan/help.rb:78
 msgid ""
 "<p><b><big>IPv6 Protocol Settings</big></b></p>\n"
 "<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.\n"
@@ -2244,12 +2233,12 @@
 "ブラックリストに登録されます。 IPv6 プロトコルをお使いでない場合、\n"
 "応答時間がより早くなります。</p>\n"
 
-#: src/include/network/lan/help.rb:91
+#: src/include/network/lan/help.rb:86
 msgid "<p>All changes will be applied after reboot.</p>"
 msgstr "<p>すべての変更は再起動後に適用されます。</p>"
 
 #. Routing dialog help 1/2
-#: src/include/network/lan/help.rb:94
+#: src/include/network/lan/help.rb:89
 msgid ""
 "<p>The routing can be set up in this dialog.\n"
 "The <b>Default Gateway</b> matches every possible destination, but poorly. \n"
@@ -2263,7 +2252,7 @@
 "優先して使われます。デフォルトゲートウエイの考え方を\n"
 "わかりやすく言うと \"その他の送信先\" です。</p>\n"
 
-#: src/include/network/lan/help.rb:101
+#: src/include/network/lan/help.rb:96
 msgid ""
 "<p>For each route, enter destination network IP address, gateway address,\n"
 "and netmask. To omit any of these values, use a dash sign \"-\". Select\n"
@@ -2275,7 +2264,7 @@
 " (\"-\" を指定すると、どのインターフェイスでも構わないという意味になります) 。</p>\n"
 
 #. Routing dialog help 2/2
-#: src/include/network/lan/help.rb:107
+#: src/include/network/lan/help.rb:102
 msgid ""
 "<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n"
 "to the internal one) if this system is a router.\n"
@@ -2283,7 +2272,7 @@
 "<p>お使いのシステムをルータとして動作させる場合は、 <b>IPv4 転送</b> (外部のネットワークから\n"
 "内部のネットワークにパケットを転送する) を有効にしてください。\n"
 
-#: src/include/network/lan/help.rb:111
+#: src/include/network/lan/help.rb:106
 msgid ""
 "<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n"
 "to the internal one) if this system is a router.\n"
@@ -2295,7 +2284,7 @@
 "<b>警告:</b> IPv6 転送を設定すると、 IPv6 stateless address autoconfiguration (SLAAC)\n"
 "が無効化されます。"
 
-#: src/include/network/lan/help.rb:117
+#: src/include/network/lan/help.rb:112
 msgid ""
 "<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is not enough. \n"
 "You should enable masquerading and/or set at least one redirect rule in the\n"
@@ -2305,7 +2294,7 @@
 "転送を許可したあと、ファイアウオールの設定でアドレス変換を設定するか、少なくとも\n"
 "1 つ以上の転送ルールを追加する必要があります。 YaST ファイアウオールモジュールをお使いください。</p>\n"
 
-#: src/include/network/lan/help.rb:122
+#: src/include/network/lan/help.rb:117
 msgid ""
 "<p>If you are using DHCP to get an IP address, check whether you get\n"
 "also a hostname via DHCP.  The hostname will be set automatically by the DHCP client.\n"
@@ -2319,7 +2308,7 @@
 "そのため、異なるホスト名が割り当てられる複数のネットワークに接続する場合は、\n"
 "この設定を無効にしておくのがよいでしょう。</p> "
 
-#: src/include/network/lan/help.rb:129
+#: src/include/network/lan/help.rb:124
 msgid ""
 "<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n"
 "the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n"
@@ -2333,7 +2322,7 @@
 "それ以外の場合、特に複数のネットワークサービスを提供している場合などは、\n"
 "注意してお使いください。</p>\n"
 
-#: src/include/network/lan/help.rb:136
+#: src/include/network/lan/help.rb:131
 msgid ""
 "<p>Enter the name servers and domain search list for resolving \n"
 "hostnames. Usually they can be obtained by DHCP.</p>\n"
@@ -2342,7 +2331,7 @@
 "入力してください。通常それらは DHCP で取得できます。</p>\n"
 
 #. resolver dialog help
-#: src/include/network/lan/help.rb:140
+#: src/include/network/lan/help.rb:135
 msgid ""
 "<p>A name server is a computer that translates hostnames into\n"
 "IP addresses. This value must be entered as an <b>IP address</b>\n"
@@ -2353,7 +2342,7 @@
 " (例 192.168.0.42) で入力しなければなりません。</p>\n"
 
 #. resolver dialog help
-#: src/include/network/lan/help.rb:146
+#: src/include/network/lan/help.rb:141
 msgid ""
 "<p>Search domain is the domain name where hostname searching starts.\n"
 "The primary search domain is usually the same as the domain name of\n"
@@ -2365,7 +2354,7 @@
 "(例 suse.de) と同じです。追加の検索ドメイン (例 suse.com) を追加することも\n"
 "できます。複数を指定する場合はカンマかスペースで区切ります。</p>\n"
 
-#: src/include/network/lan/help.rb:152
+#: src/include/network/lan/help.rb:147
 msgid ""
 "<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS domain\n"
 "(e.g. <i>example.com</i>) that it belongs to. The domain is especially important if this \n"
@@ -2377,7 +2366,7 @@
 "重要な設定となります。お使いのコンピュータでホスト名を確認するには、 <i>hostname</i> コマンドを\n"
 "利用します。</p>"
 
-#: src/include/network/lan/help.rb:158
+#: src/include/network/lan/help.rb:153
 msgid ""
 "<p>Select the way how the DNS configuration will be modified (name servers,\n"
 "search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled\n"
@@ -2392,7 +2381,7 @@
 "を合わせて使用します。これが既定値 <b>既定のポリシーを使用する</b> オプションの動作で、\n"
 "ほとんどの場合に十分な設定です。</p>\n"
 
-#: src/include/network/lan/help.rb:166
+#: src/include/network/lan/help.rb:161
 msgid ""
 "<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be\n"
 "allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file\n"
@@ -2415,7 +2404,7 @@
 
 #. Address dialog help 1-6/8: dynamic address preferred
 #. Address dialog help 1/8
-#: src/include/network/lan/help.rb:179
+#: src/include/network/lan/help.rb:174
 msgid ""
 "<p><b><big>Address Setup</big></b></p>\n"
 "<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n"
@@ -2425,12 +2414,12 @@
 "<p> このデバイスに対して IP アドレスを設定しない場合は、 <b>アドレスを設定しない</b> を選んでください。\n"
 "この設定は Ethernet デバイスに対してボンド機能を利用する場合などに利用します。</p>\n"
 
-#: src/include/network/lan/help.rb:184
+#: src/include/network/lan/help.rb:179
 msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your BIOS.</p>\n"
 msgstr "<p>お使いの BIOS で指定したネットワーク設定を利用する場合は、 <b>iBFT</b> を選択してください。</p>\n"
 
 #. Address dialog help 2/8
-#: src/include/network/lan/help.rb:188
+#: src/include/network/lan/help.rb:183
 msgid ""
 "<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n"
 "assigned by the system administrator or your Internet provider.</p>\n"
@@ -2439,7 +2428,7 @@
 "<b>可変 IP アドレス</b> を選択してください。</p>\n"
 
 #. Address dialog help 3/8
-#: src/include/network/lan/help.rb:192
+#: src/include/network/lan/help.rb:187
 msgid ""
 "<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n"
 "if you have a DHCP server running on your local network. Network addresses \n"
@@ -2450,7 +2439,7 @@
 "設定するようになります。</p>\n"
 
 #. Address dialog help 4/8
-#: src/include/network/lan/help.rb:198
+#: src/include/network/lan/help.rb:193
 msgid ""
 "<p>To search for an IP address and assign it statically, select \n"
 "<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf\n"
@@ -2461,7 +2450,7 @@
 "Zeroconf を利用する場合は <b>DHCP + Zeroconf</b> を選択してください。それ以外の場合は <b>固定 IP アドレス</b> を選択してアドレスを設定してください。</p>\n"
 
 #. Address dialog help 5/8
-#: src/include/network/lan/help.rb:204
+#: src/include/network/lan/help.rb:199
 msgid ""
 "<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the \n"
 " <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n"
@@ -2472,7 +2461,7 @@
 "入力してください。</p>\n"
 
 #. Address dialog help 6/8
-#: src/include/network/lan/help.rb:210
+#: src/include/network/lan/help.rb:205
 msgid ""
 "<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and\n"
 "the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter\n"
@@ -2483,7 +2472,7 @@
 "を入力することもできます。この値は <tt>/etc/hosts</tt> に書き込まれます。</p>\n"
 
 #. Address dialog help 8/8
-#: src/include/network/lan/help.rb:216
+#: src/include/network/lan/help.rb:211
 msgid ""
 "<p>Contact your <b>network administrator</b> for more information about\n"
 "the network configuration.</p>"
@@ -2491,7 +2480,7 @@
 "<p>ネットワーク設定の詳細は <b>ネットワーク管理者</b> に\n"
 "お尋ねください。</p>"
 
-#: src/include/network/lan/help.rb:219
+#: src/include/network/lan/help.rb:214
 msgid ""
 "<p>DHCP configuration is not recommended for this product.\n"
 "Components of this product might not work with DHCP.</p>"
@@ -2499,7 +2488,7 @@
 "<p>この製品では DHCP 設定はお勧めできません。\n"
 "この製品のコンポーネントは DHCP では動作しません。</p>"
 
-#: src/include/network/lan/help.rb:222
+#: src/include/network/lan/help.rb:217
 msgid ""
 "<p><b><big>Firewall Zone</big></b></p>\n"
 "<p>Select the firewall zone to put the interface into. If you\n"
@@ -2517,11 +2506,11 @@
 "全てのインターフェイスでゾーンを選択しない場合は、ファイアウオールが\n"
 "起動されなくなります。</p>"
 
-#: src/include/network/lan/help.rb:231
+#: src/include/network/lan/help.rb:226
 msgid "<p><b>Mandatory Interface</b> specifies whether the network service reports failure if the interface fails to start at boot time.</p>"
 msgstr "<p><b>必須のインターフェイス</b> では、システム起動時にインターフェイスを開始できなかった場合にネットワークサービスが障害を報告するかどうかを指定します。</p>"
 
-#: src/include/network/lan/help.rb:234
+#: src/include/network/lan/help.rb:229
 msgid ""
 "<p><b><big>Maximum Transfer Unit</big></b></p>\n"
 "<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n"
@@ -2537,7 +2526,7 @@
 "ネットワークのパフォーマンスが上がる場合があります。お勧めの値からいずれかを選択するか、\n"
 "独自の値を設定してください。</p>\n"
 
-#: src/include/network/lan/help.rb:242
+#: src/include/network/lan/help.rb:237
 msgid ""
 "<p>Select the slave devices for the bond device.\n"
 "Only devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>"
@@ -2546,12 +2535,12 @@
 "<b>デバイスの起動</b> が <b>起動しない</b> で、かつ <b>アドレス設定</b> が <b>アドレスを設定しない</b> になっているデバイスだけが指定可能です。</p>"
 
 #. DHCP dialog help 1/7
-#: src/include/network/lan/help.rb:247
+#: src/include/network/lan/help.rb:242
 msgid "<p><b><big>DHCP Client Options</big></b></p>"
 msgstr "<p><b><big>DHCP クライアントオプション</big></b></p>"
 
 #. DHCP dialog help 2/7
-#: src/include/network/lan/help.rb:249
+#: src/include/network/lan/help.rb:244
 msgid ""
 "<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n"
 "the hardware address of the network interface. It must be different for each\n"
@@ -2566,7 +2555,7 @@
 "識別子を設定してください。</p>"
 
 #. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:257
+#: src/include/network/lan/help.rb:252
 msgid ""
 "<p>The <b>Hostname to Send</b> specifies a string used for the\n"
 "hostname option field when the DHCP client sends messages to the DHCP server. Some \n"
@@ -2586,7 +2575,7 @@
 "ホスト名を送信したくない場合は、何も指定しないでください。</p>\n"
 
 #. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:269
+#: src/include/network/lan/help.rb:264
 msgid ""
 "<p><b><big>Additional Addresses</big></b></p>\n"
 "<p>Configure additional addresses of an interface in this table.</p>\n"
@@ -2595,7 +2584,7 @@
 "<p>この表では、インターフェイスに指定する追加のアドレスを設定します。</p>\n"
 
 #. Aliases dialog help 2/4
-#: src/include/network/lan/help.rb:273
+#: src/include/network/lan/help.rb:268
 msgid ""
 "<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n"
 "the <b>Netmask</b>.</p>"
@@ -2604,7 +2593,7 @@
 "<b>ネットマスク</b> をそれぞれ入力してください。</p>"
 
 #. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb:277
+#: src/include/network/lan/help.rb:272
 msgid ""
 "<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and legacy. The total\n"
 "              length of interface name (inclusive of the colon and label) is\n"
@@ -2615,14 +2604,14 @@
 "              最大で 15 文字以内にする必要があります。また、古いバージョンの ifconfig ユーティリティでは、 9 文字目以降を削除してしまいます。</p>"
 
 #. Aliases dialog help 3/4, #83766
-#: src/include/network/lan/help.rb:283
+#: src/include/network/lan/help.rb:278
 msgid "<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>"
 msgstr "<p>別名にはインターフェイス名は含めないでください。たとえば <b>eth0:foo</b> ではなく <b>foo</b> のように指定します。</p>"
 
 #. shared between WirelessDialog and WirelessKeyPopup
 #. this is suited to the button-switched key typing
 #. Translators: dialog help
-#: src/include/network/lan/help.rb:289
+#: src/include/network/lan/help.rb:284
 msgid ""
 "<p>Choose between three <b>Key Input Types</b> for your key.\n"
 "<br><b>Passphrase</b>: The key is generated from the phrase entered.\n"
@@ -2651,7 +2640,7 @@
 "</p> \n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:304
+#: src/include/network/lan/help.rb:299
 msgid ""
 "<p>Here, set the most important settings\n"
 "for wireless networking.</p>"
@@ -2661,7 +2650,7 @@
 
 #  Wireless dialog help
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:308
+#: src/include/network/lan/help.rb:303
 msgid ""
 "<p>The <b>Operating Mode</b> depends on the network topology. The mode\n"
 "can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),\n"
@@ -2676,7 +2665,7 @@
 "動作させる)</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:316
+#: src/include/network/lan/help.rb:311
 msgid ""
 "<p>Set the <b>Network Name (ESSID)</b> used to identify\n"
 "cells that are part of the same virtual network. All stations in a\n"
@@ -2695,7 +2684,7 @@
 "</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:326
+#: src/include/network/lan/help.rb:321
 msgid ""
 "<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
 "It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n"
@@ -2733,7 +2722,7 @@
 
 #  Wireless dialog help
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:345
+#: src/include/network/lan/help.rb:340
 msgid ""
 "<p>To use WEP, enter the\n"
 "WEP encryption key to use. It can have a key\n"
@@ -2749,7 +2738,7 @@
 
 #  Wireless dialog help
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:353
+#: src/include/network/lan/help.rb:348
 msgid ""
 "<p>To use WPA-PSK (sometimes referred to as WPA Home),\n"
 "enter the preshared key. This\n"
@@ -2766,7 +2755,7 @@
 "パスフレーズとして使用しないでください。</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:362
+#: src/include/network/lan/help.rb:357
 msgid ""
 "<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n"
 "enter some additional parameters in the next dialog.</p>\n"
@@ -2775,7 +2764,7 @@
 "次のダイアログで追加のパラメータを入力してください。</p>\n"
 
 #. Wireless dialog help
-#: src/include/network/lan/help.rb:366
+#: src/include/network/lan/help.rb:361
 msgid ""
 "<p>These values will be written to the interface configuration file\n"
 "'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"
@@ -4694,3 +4683,14 @@
 #: src/modules/SuSEFirewall4Network.rb:139
 msgid "(Unprotected)"
 msgstr "(保護しない)"
+
+#~ msgid ""
+#~ "<p><b>NetworkManager</b> is not part of every base\n"
+#~ "installation repository. For example, to enable it on SUSE\n"
+#~ "Linux Enterprise Server add the Workstation Extension\n"
+#~ "repository and install the 'NetworkManager' package.</p>\n"
+#~ msgstr ""
+#~ "<p><b>NetworkManager</b> は基本インストールのリポジトリ内には\n"
+#~ "用意されていません。たとえば SUSE Linux Enterprise Server の場合は、\n"
+#~ "Workstation 拡張リポジトリを追加したあと、 'NetworkManager' \n"
+#~ "パッケージをインストールしてください。</p>\n"

Modified: trunk/yast/ja/po/packager.ja.po
===================================================================
--- trunk/yast/ja/po/packager.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/packager.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: packager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-15 15:57+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-08-16 08:08+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -171,8 +171,8 @@
 #. an error popup
 #. an error popup
 #. an error popup
-#: src/clients/inst_kickoff.rb:490 src/clients/inst_kickoff.rb:573
-#: src/clients/inst_kickoff.rb:649 src/clients/inst_kickoff.rb:706
+#: src/clients/inst_kickoff.rb:461 src/clients/inst_kickoff.rb:544
+#: src/clients/inst_kickoff.rb:620 src/clients/inst_kickoff.rb:677
 msgid "Backup of %1 failed. See %2 for details."
 msgstr "%1 のバックアップに失敗しました。詳しくは %2 をご覧ください。"
 
@@ -845,7 +845,7 @@
 
 #. popup message part 2 followed by other info
 #. popup message, after message header, header of details
-#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1326
+#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1323
 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
 msgid "Details:"
 msgstr "詳細: "
@@ -853,7 +853,7 @@
 #. popup message part 3
 #. end of popup message, question
 #. end of popup message, question
-#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1334
+#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1331
 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
 msgid "Try again?"
 msgstr "もう一度試してみますか？"
@@ -1469,7 +1469,7 @@
 #. popup message part 1
 #. Import GPG keys found in the inst-sys
 #: src/include/packager/repositories_include.rb:319
-#: src/modules/Packages.rb:1321 src/modules/SourceManager.rb:306
+#: src/modules/Packages.rb:1318 src/modules/SourceManager.rb:306
 msgid ""
 "Unable to create repository\n"
 "from URL '%1'."
@@ -1508,7 +1508,7 @@
 #. popup error
 #. popup error
 #: src/modules/AddOnProduct.rb:517 src/modules/AddOnProduct.rb:619
-#: src/modules/ProductLicense.rb:538 src/modules/ProductLicense.rb:729
+#: src/modules/ProductLicense.rb:534 src/modules/ProductLicense.rb:725
 msgid "An error occurred while preparing the installation system."
 msgstr "インストールシステムの準備中にエラーが発生しました。"
 
@@ -1573,7 +1573,7 @@
 #. adding the product to the list of products (BNC #269625)
 #. no such products
 #: src/modules/AddOnProduct.rb:1754 src/modules/AddOnProduct.rb:1760
-#: src/modules/Packages.rb:463
+#: src/modules/Packages.rb:469
 msgid "Unknown Product"
 msgstr "不明な製品"
 
@@ -1707,23 +1707,23 @@
 msgstr "差分 RPM を適用しています: %1"
 
 #. warning text
-#: src/modules/Packages.rb:303
+#: src/modules/Packages.rb:309
 msgid "Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution."
 msgstr "お使いのコンピュータは 64 ビットの x86-64 システムですが、 32 ビット用のディストリビューションをインストールしようとしています。"
 
 #. help text for software proposal
-#: src/modules/Packages.rb:319
+#: src/modules/Packages.rb:325
 msgid "<P>The pattern list states which functionality will be available after installing the system.</P>"
 msgstr "<P>パターンの一覧は、インストール後にどのような機能が利用できるようになるのかを示しています。</P>"
 
 #. (see bnc#178357 why these numbers)
 #. translators: help text for software proposal
-#: src/modules/Packages.rb:331
+#: src/modules/Packages.rb:337
 msgid "<P>The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.</P>"
 msgstr "<P>提案にはシステムにインストールされる合計サイズが表示されていますが、一時ファイルや作業用ファイルなど追加で使用されるファイルがあるため、提案で表示されたサイズよりも少し多くなります。そのため、インストールが始まる前の段階で、 25% (またはおおよそ 300MB) 程度の空き領域を確保しておくのが望ましいと思われます。</P>"
 
 #. help text for software proposal
-#: src/modules/Packages.rb:336
+#: src/modules/Packages.rb:342
 msgid ""
 "<P>The total 'size to download' is the size of the packages which will be\n"
 "downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading.</P>\n"
@@ -1732,107 +1732,107 @@
 "リポジトリからダウンロードするパッケージのサイズです。この値は、接続が遅かったりダウンロード量に制限があったりするような場合には、重要な項目です。</P>\n"
 
 #. help text for software proposal - header
-#: src/modules/Packages.rb:345
+#: src/modules/Packages.rb:351
 msgid "<P><B>Software Proposal</B></P>"
 msgstr "<P><B>ソフトウエアの提案</B></P>"
 
 #. installation proposal - SW summary, %1 is name of the installed product
 #. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...)
-#: src/modules/Packages.rb:362
+#: src/modules/Packages.rb:368
 msgid "Product: %1"
 msgstr "製品: %1"
 
 #. installation proposal - SW summary, %1 is name of the selected desktop or system type (e.g. KDE)
-#: src/modules/Packages.rb:376
+#: src/modules/Packages.rb:382
 msgid "System Type: %1"
 msgstr "システム種類: %1"
 
-#: src/modules/Packages.rb:387
+#: src/modules/Packages.rb:393
 msgid "Patterns:<br>"
 msgstr "パターン:<br>"
 
 #. installation proposal - SW summary, %1 is size of the selected packages (in MB or GB)
-#: src/modules/Packages.rb:397
+#: src/modules/Packages.rb:403
 msgid "Size of Packages to Install: %1"
 msgstr "インストールするパッケージのサイズ: %1"
 
 #. installation proposal - SW summary, %1 is download size of the selected packages
 #. which will be installed from an ftp or http repository (in MB or GB)
-#: src/modules/Packages.rb:410
+#: src/modules/Packages.rb:416
 msgid "Downloading from Remote Repositories: %1"
 msgstr "リモートリポジトリからのダウンロード: %1"
 
-#: src/modules/Packages.rb:472
+#: src/modules/Packages.rb:478
 msgid "These add-on products have been marked for auto-removal: %1"
 msgstr "以下のアドオン製品は自動削除の対象としてマークされています: %1"
 
 #. Warning message when some add-ons are marked to be removed automatically
-#: src/modules/Packages.rb:496
+#: src/modules/Packages.rb:502
 msgid "Contact the vendors of these add-ons to provide you with new installation media."
 msgstr "新しいインストールメディアの提供を受けるため、これらのアドオンの製造元に連絡を取ってください。"
 
 #. Warning message when some add-ons are marked to be removed automatically
-#: src/modules/Packages.rb:500
+#: src/modules/Packages.rb:506
 msgid "Contact the vendor of the add-on to provide you with a new installation media."
 msgstr "新しいインストールメディアの提供を受けるため、アドオンの製造元に連絡を取ってください。"
 
 #. error message: %1: e.g. "/usr", %2: "/dev/sda2"
-#: src/modules/Packages.rb:541
+#: src/modules/Packages.rb:547
 msgid "Error: Cannot check free space in basic directory %1 (device %2), cannot start installation."
 msgstr "エラー: 基本ディレクトリ %1 (デバイス %2) の空き容量を確認できません。インストールを開始することができません。"
 
 #. error message: %1: e.g. "/local", %2: "/dev/sda2"
-#: src/modules/Packages.rb:561
+#: src/modules/Packages.rb:567
 msgid "Warning: Cannot check free space in directory %1 (device %2)."
 msgstr "警告: ディレクトリ %1 (デバイス %2) の空き容量を確認できません。"
 
 #. summary warning
-#: src/modules/Packages.rb:604
+#: src/modules/Packages.rb:610
 msgid "Not enough disk space."
 msgstr "ディスクの残り容量が不足しています。"
 
 #. summary warning
-#: src/modules/Packages.rb:606
+#: src/modules/Packages.rb:612
 msgid "Not enough disk space. Remove some packages in the single selection."
 msgstr "ディスクの使用可能な容量が不足しています。一度で選択するパッケージを減らしてください。"
 
 #. add a backslash if it's missing
-#: src/modules/Packages.rb:627
+#: src/modules/Packages.rb:633
 msgid "Only %1 (%2%%) free space available on partition %3.<BR>"
 msgstr "パーティション %3 には %1 (%2%%) の空き容量しか残っていません。<BR>"
 
 #. newly installed products
-#: src/modules/Packages.rb:696
+#: src/modules/Packages.rb:702
 msgid "New product <b>%s</b> will be installed"
 msgstr "新しい製品 <b>%s</b> をインストールします"
 
 #. product update: %s is a product name
-#: src/modules/Packages.rb:706
+#: src/modules/Packages.rb:712
 msgid "Product <b>%s</b> will be updated"
 msgstr "製品 <b>%s</b> を更新します"
 
 #. product update: %{old_product} is an old product, %{new_product} is the new one
-#: src/modules/Packages.rb:708
+#: src/modules/Packages.rb:714
 msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>"
 msgstr "製品 <b>%{old_product}</b> を <b>%{new_product}</b> に更新します"
 
-#: src/modules/Packages.rb:715
+#: src/modules/Packages.rb:721
 msgid "Product <b>%s</b> will stay installed"
 msgstr "製品 <b>%s</b> をインストールしたままにします"
 
 #. Removing another product might be an issue
 #. (just warn if removed by user or by YaST)
-#: src/modules/Packages.rb:725
+#: src/modules/Packages.rb:731
 msgid "<b>Warning:</b> Product <b>%s</b> will be removed."
 msgstr "<b>警告:</b> 製品 <b>%s</b> を削除します"
 
-#: src/modules/Packages.rb:726
+#: src/modules/Packages.rb:732
 msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>"
 msgstr "<b>エラー:</b> 製品 <b>%s</b> を自動的に削除します</font>"
 
 #. TRANSLATORS: update proposal warning, do NOT translate "-release",
 #. it is part of a package name (like "sles-release")
-#: src/modules/Packages.rb:752
+#: src/modules/Packages.rb:758
 msgid ""
 "<ul><li><b>Some products are marked for automatic removal.</b></li>\n"
 "<ul><li>Contact the vendor of the removed add-on to provide you with a new\n"
@@ -1849,12 +1849,12 @@
 "</li></ul></li></ul>"
 
 #. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1342
+#: src/modules/Packages.rb:1339
 msgid "No repository found at '%1'."
 msgstr "'%1' にはリポジトリが見つかりませんでした。"
 
 #. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1615
+#: src/modules/Packages.rb:1612
 msgid ""
 "<p><b>The release notes for the initial release are part of the installation\n"
 "media. If an Internet connection is available during configuration, you can\n"
@@ -1866,31 +1866,31 @@
 "</b></p>\n"
 
 #. popup - information label
-#: src/modules/Packages.rb:1642
+#: src/modules/Packages.rb:1639
 msgid "Integrating booted media..."
 msgstr "起動したメディアを統合しています..."
 
 #. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1664
+#: src/modules/Packages.rb:1661
 msgid "Failed to integrate the service pack repository."
 msgstr "サービスパックリポジトリの統合に失敗しました。"
 
 #. popup - information label
-#: src/modules/Packages.rb:1697
+#: src/modules/Packages.rb:1694
 msgid "Initializing repositories..."
 msgstr "リポジトリを準備しています..."
 
 #. message popup, %1 is product name
-#: src/modules/Packages.rb:1929
+#: src/modules/Packages.rb:1926
 msgid "Insert %1 CD 1"
 msgstr "%1 CD 1 を挿入してください"
 
-#: src/modules/Packages.rb:1931
+#: src/modules/Packages.rb:1928
 msgid "%1 CD 1 not found"
 msgstr "%1 CD 1 が見つかりませんでした"
 
 #. an error message
-#: src/modules/Packages.rb:2041
+#: src/modules/Packages.rb:2038
 msgid ""
 "Error while initializing package descriptions.\n"
 "Check the log file %1 for more details."
@@ -1899,7 +1899,7 @@
 "詳しくはログファイル %1 をお読みください。"
 
 #. bnc #436925
-#: src/modules/Packages.rb:2302
+#: src/modules/Packages.rb:2299
 msgid ""
 "The software selection has been changed externally.\n"
 "Software proposal will be called again."
@@ -1908,12 +1908,12 @@
 "ソフトウエアの提案処理が再度呼び出されます。"
 
 #. popup label
-#: src/modules/Packages.rb:2320
+#: src/modules/Packages.rb:2317
 msgid "Evaluating package selection..."
 msgstr "パッケージ選択を確認しています..."
 
 #. Error message, %{pattern_name} is replaced with the missing pattern name in runtime
-#: src/modules/Packages.rb:2595
+#: src/modules/Packages.rb:2615
 msgid ""
 "Failed to select default product pattern %{pattern_name}.\n"
 "Pattern has not been found."
@@ -1924,16 +1924,16 @@
 #. Sets that the license (file) has been already accepted
 #.
 #. @param string filename
-#: src/modules/ProductLicense.rb:148 src/modules/ProductLicense.rb:155
+#: src/modules/ProductLicense.rb:150 src/modules/ProductLicense.rb:157
 msgid "Cannot read license file %1"
 msgstr "ライセンスファイル %1 を読み込めません"
 
-#: src/modules/ProductLicense.rb:149
+#: src/modules/ProductLicense.rb:151
 msgid "To show the product license properly, put the license.tar.gz file to the root of the live media when building the image."
 msgstr "製品のライセンス情報を正しく表示するには、イメージの構築の際、ライブメディアのルートディレクトリに license.tar.gz ファイルを配置してください。"
 
 #. combo box
-#: src/modules/ProductLicense.rb:293
+#: src/modules/ProductLicense.rb:295
 msgid "&Language"
 msgstr "言語 (&L)"
 
@@ -1942,18 +1942,9 @@
 msgid "I &Agree to the License Terms."
 msgstr "ライセンス条件に同意します (&A)"
 
-#. %{license_url} is an URL where the displayed license can be found
-#: src/modules/ProductLicense.rb:385
-msgid ""
-"If you want to print this EULA, you can download it from\n"
-"%{license_url}"
-msgstr ""
-"ライセンス契約を印刷したい場合は、 %{license_url}\n"
-"からダウンロードしてください"
-
 #. TRANSLATORS: addition license information
 #. %1 is replaced with the filename
-#: src/modules/ProductLicense.rb:391
+#: src/modules/ProductLicense.rb:383
 msgid ""
 "If you want to print this EULA, you can find it\n"
 "on the first media in the file %1"
@@ -1962,7 +1953,7 @@
 "にあるファイル %1 をご覧ください"
 
 #. help text
-#: src/modules/ProductLicense.rb:407
+#: src/modules/ProductLicense.rb:400
 msgid ""
 "<p>Read the license agreement carefully and select\n"
 "one of the available options. If you do not agree to the license agreement,\n"
@@ -1974,17 +1965,17 @@
 
 #. dialog title
 #. dialog caption
-#: src/modules/ProductLicense.rb:417 src/modules/ProductLicense.rb:1212
+#: src/modules/ProductLicense.rb:410 src/modules/ProductLicense.rb:1211
 msgid "License Agreement"
 msgstr "ライセンス同意"
 
 #. popup question
-#: src/modules/ProductLicense.rb:1017
+#: src/modules/ProductLicense.rb:1016
 msgid "Really abort the add-on product installation?"
 msgstr "アドオン製品のインストールを中止してよろしいですか？"
 
 #. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1041
+#: src/modules/ProductLicense.rb:1040
 msgid ""
 "Refusing the license agreement cancels the installation.\n"
 "Really refuse the agreement?"
@@ -1993,7 +1984,7 @@
 "本当にライセンス同意を拒否しますか？"
 
 #. text asking whether to refuse a license (Yes-No popup)
-#: src/modules/ProductLicense.rb:1044
+#: src/modules/ProductLicense.rb:1043
 msgid ""
 "Refusing the license agreement cancels the add-on\n"
 "product installation. Really refuse the agreement?"
@@ -2002,10 +1993,19 @@
 "キャンセルされます。本当にライセンス同意を拒否しますか？"
 
 #. timed ok/cancel popup
-#: src/modules/ProductLicense.rb:1054
+#: src/modules/ProductLicense.rb:1053
 msgid "The system is shutting down..."
 msgstr "システムをチャットダウンしています..."
 
+#. TRANSLATORS: %{license_url} is an URL where the displayed license can be found
+#: src/modules/ProductLicense.rb:1577
+msgid ""
+"If you want to print this EULA, you can download it from\n"
+"%{license_url}"
+msgstr ""
+"ライセンス契約を印刷したい場合は、 %{license_url}\n"
+"からダウンロードしてください"
+
 #. popup yes-no
 #: src/modules/SlideShowCallbacks.rb:59
 msgid ""
@@ -2078,88 +2078,88 @@
 msgstr "修正 RPM のダウンロードに失敗しました: %1"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:30
+#: src/modules/SourceDialogs.rb:31
 msgid "&Scan Using SLP..."
 msgstr "SLP を使用したスキャン (&S)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:32
+#: src/modules/SourceDialogs.rb:33
 msgid "Commun&ity Repositories"
 msgstr "コミュニティリポジトリ (&I)"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:34
+#: src/modules/SourceDialogs.rb:35
 msgid "&Extensions and Modules from Registration Server..."
 msgstr "登録サーバからの拡張やモジュール (&E)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:36
+#: src/modules/SourceDialogs.rb:37
 msgid "Specify &URL..."
 msgstr "URLの指定 (&U)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:38
+#: src/modules/SourceDialogs.rb:39
 msgid "&FTP..."
 msgstr "FTP (&F)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:40
+#: src/modules/SourceDialogs.rb:41
 msgid "&HTTP..."
 msgstr "HTTP (&H)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:42
+#: src/modules/SourceDialogs.rb:43
 msgid "HTT&PS..."
 msgstr "HTTPS (&P)..."
 
 #. radio button
 #. radio button
-#: src/modules/SourceDialogs.rb:44 src/modules/SourceDialogs.rb:1719
+#: src/modules/SourceDialogs.rb:45 src/modules/SourceDialogs.rb:1720
 msgid "&SMB/CIFS"
 msgstr "SMB/CIFS (&S)"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:46
+#: src/modules/SourceDialogs.rb:47
 msgid "&NFS..."
 msgstr "NFS (&N)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:48
+#: src/modules/SourceDialogs.rb:49
 msgid "&CD..."
 msgstr "CD (&C)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:50
+#: src/modules/SourceDialogs.rb:51
 msgid "&DVD..."
 msgstr "DVD (&D)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:52
+#: src/modules/SourceDialogs.rb:53
 msgid "&Hard Disk..."
 msgstr "ハードディスク (&H)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:54
+#: src/modules/SourceDialogs.rb:55
 msgid "&USB Mass Storage (USB Stick, Disk)..."
 msgstr "USB 大容量ディスク (USB スティック、ディスク等) (&U)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:56
+#: src/modules/SourceDialogs.rb:57
 msgid "&Local Directory..."
 msgstr "ローカルディレクトリ (&L)..."
 
 #. radio button
-#: src/modules/SourceDialogs.rb:58
+#: src/modules/SourceDialogs.rb:59
 msgid "&Local ISO Image..."
 msgstr "ローカル ISO イメージ (&L)..."
 
 #. check box
-#: src/modules/SourceDialogs.rb:60
+#: src/modules/SourceDialogs.rb:61
 msgid "&Download repository description files"
 msgstr "リポジトリの説明をダウンロード (&D)"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:109
+#: src/modules/SourceDialogs.rb:110
 msgid ""
 "<p>If the location is a file holding an ISO image\n"
 "of the media, set <b>ISO Image</b>.</p>"
@@ -2168,7 +2168,7 @@
 "<b>ISO イメージ</b> を設定してください。</p>"
 
 #. Help text suffix for some types of the media
-#: src/modules/SourceDialogs.rb:114
+#: src/modules/SourceDialogs.rb:115
 msgid ""
 "<p>If the repository is on multiple media,\n"
 "set the location of the first media of the set.</p>\n"
@@ -2177,86 +2177,86 @@
 "それらのうちの 1 枚目の場所を指定してください。</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:128
+#: src/modules/SourceDialogs.rb:129
 msgid "&Server Name"
 msgstr "サーバ名 (&S)"
 
 #. text entry
 #. text entry
-#: src/modules/SourceDialogs.rb:136 src/modules/SourceDialogs.rb:1583
+#: src/modules/SourceDialogs.rb:137 src/modules/SourceDialogs.rb:1584
 msgid "&Path to Directory or ISO Image"
 msgstr "ディレクトリまたは ISO イメージへのパス (&P)"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:144
+#: src/modules/SourceDialogs.rb:145
 msgid "&ISO Image"
 msgstr "ISO イメージ (&I)"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:146
+#: src/modules/SourceDialogs.rb:147
 msgid "N&FS v4 Protocol"
 msgstr "NFS v4 プロトコル (&F)"
 
-#: src/modules/SourceDialogs.rb:152
+#: src/modules/SourceDialogs.rb:153
 msgid "Mount Options"
 msgstr "マウントオプション"
 
 #. TRANSLATORS: "(default)" - is a combobox value and means default libzypp
 #. NFS mount option (users can change it to anything else, the field is editable)
-#: src/modules/SourceDialogs.rb:156
+#: src/modules/SourceDialogs.rb:157
 msgid "(default)"
 msgstr "(既定)"
 
-#: src/modules/SourceDialogs.rb:167
+#: src/modules/SourceDialogs.rb:168
 msgid "URL of the Repository"
 msgstr "リポジトリの URL"
 
 #. frame
-#: src/modules/SourceDialogs.rb:176
+#: src/modules/SourceDialogs.rb:177
 msgid "P&rotocol"
 msgstr "プロトコル (&R)"
 
 #. input field label
-#: src/modules/SourceDialogs.rb:186
+#: src/modules/SourceDialogs.rb:187
 msgid "&URL of the Repository"
 msgstr "リポジトリの URL (&U)"
 
 #. label / dialog caption
 #. bugzilla #219759
 #. service label can be empty (not defined)
-#: src/modules/SourceDialogs.rb:201 src/modules/SourceManagerSLP.rb:323
+#: src/modules/SourceDialogs.rb:202 src/modules/SourceManagerSLP.rb:323
 msgid "Repository URL"
 msgstr "リポジトリ URL"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:203
+#: src/modules/SourceDialogs.rb:204
 msgid "NFS Server"
 msgstr "NFS サーバ"
 
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:205 src/modules/SourceDialogs.rb:207
+#: src/modules/SourceDialogs.rb:206 src/modules/SourceDialogs.rb:208
 msgid "CD or DVD Media"
 msgstr "CD または DVD メディア"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:209
+#: src/modules/SourceDialogs.rb:210
 msgid "Hard Disk"
 msgstr "ハードディスク"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:211
+#: src/modules/SourceDialogs.rb:212
 msgid "USB Stick or Disk"
 msgstr "USB スティックまたはディスク"
 
 #. label / dialog caption
 #. dialog caption
-#: src/modules/SourceDialogs.rb:213 src/modules/SourceDialogs.rb:888
+#: src/modules/SourceDialogs.rb:214 src/modules/SourceDialogs.rb:889
 msgid "Local Directory"
 msgstr "ローカルディレクトリ"
 
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:215
+#: src/modules/SourceDialogs.rb:216
 msgid "Local ISO Image"
 msgstr "ローカル ISO イメージ"
 
@@ -2265,24 +2265,24 @@
 #. label / dialog caption
 #. label / dialog caption
 #. label / dialog caption
-#: src/modules/SourceDialogs.rb:217 src/modules/SourceDialogs.rb:219
-#: src/modules/SourceDialogs.rb:221 src/modules/SourceDialogs.rb:223
-#: src/modules/SourceDialogs.rb:225
+#: src/modules/SourceDialogs.rb:218 src/modules/SourceDialogs.rb:220
+#: src/modules/SourceDialogs.rb:222 src/modules/SourceDialogs.rb:224
+#: src/modules/SourceDialogs.rb:226
 msgid "Server and Directory"
 msgstr "サーバとディレクトリ"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:440
+#: src/modules/SourceDialogs.rb:441
 msgid "The name of the repository cannot be empty."
 msgstr "リポジトリの名前を入力する必要があります。"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:452
+#: src/modules/SourceDialogs.rb:453
 msgid "&Repository Name"
 msgstr "リポジトリ名 (&R)"
 
 #. help text
-#: src/modules/SourceDialogs.rb:467
+#: src/modules/SourceDialogs.rb:468
 msgid ""
 "<p><big><b>Repository Name</b></big><br>\n"
 "Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
@@ -2291,12 +2291,12 @@
 "<b>リポジトリ名</b> にはリポジトリの名前を入力します。入力がない場合はリポジトリが提供する製品名、もしくは URL そのものを名前として採用します。</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:481
+#: src/modules/SourceDialogs.rb:482
 msgid "&Service Name"
 msgstr "サービス名 (&S)"
 
 #. help text
-#: src/modules/SourceDialogs.rb:489
+#: src/modules/SourceDialogs.rb:490
 msgid ""
 "<p><big><b>Service Name</b></big><br>\n"
 "Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
@@ -2305,17 +2305,17 @@
 "<b>サービス名</b> にはサービスの名前を入力します。入力がない場合はサービス URL の一部を名前として採用します。</p>\n"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:524
+#: src/modules/SourceDialogs.rb:525
 msgid "URL cannot be empty."
 msgstr "URL　は必ず指定してください。"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:537
+#: src/modules/SourceDialogs.rb:538
 msgid "&URL"
 msgstr "URL (&U)"
 
 #. help text
-#: src/modules/SourceDialogs.rb:551
+#: src/modules/SourceDialogs.rb:552
 msgid ""
 "<p><big><b>Repository URL</b></big><br>\n"
 "Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2327,16 +2327,16 @@
 #. @return widget description map
 #. Get widget description map
 #. @return widget description map
-#: src/modules/SourceDialogs.rb:724 src/modules/SourceDialogs.rb:1851
+#: src/modules/SourceDialogs.rb:725 src/modules/SourceDialogs.rb:1852
 msgid "Edit Parts of the URL"
 msgstr "URL を部分的に編集"
 
-#: src/modules/SourceDialogs.rb:731 src/modules/SourceDialogs.rb:1858
+#: src/modules/SourceDialogs.rb:732 src/modules/SourceDialogs.rb:1859
 msgid "Edit Complete URL"
 msgstr "URL 全体を編集"
 
 #. help text
-#: src/modules/SourceDialogs.rb:743
+#: src/modules/SourceDialogs.rb:744
 msgid ""
 "<p><big><b>NFS Server</b></big><br>\n"
 "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2346,7 +2346,7 @@
 "<b>サーバ名</b> と <b>ディレクトリまたは ISO イメージへのパス</b>\n"
 "では、それぞれ NFS サーバのホスト名とパスを指定します。</p>"
 
-#: src/modules/SourceDialogs.rb:750
+#: src/modules/SourceDialogs.rb:751
 msgid ""
 "<p><big><b>Mount Options</b></big><br>\n"
 "You can specify extra options used for mounting the NFS volume.\n"
@@ -2359,16 +2359,16 @@
 "対応するオプションの一覧については、 <b>man 5 nfs</b> をお読みください。"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:805
+#: src/modules/SourceDialogs.rb:806
 msgid "&CD-ROM"
 msgstr "CD-ROM (&C)"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:807
+#: src/modules/SourceDialogs.rb:808
 msgid "&DVD-ROM"
 msgstr "DVD-ROM (&D)"
 
-#: src/modules/SourceDialogs.rb:812
+#: src/modules/SourceDialogs.rb:813
 msgid ""
 "<p><big><b>CD or DVD Media</b></big><br>\n"
 "Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
@@ -2377,12 +2377,12 @@
 "メディアの種類として <b>CD-ROM</b> または <b>DVD-ROM</b> を指定してください。</p>"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:903
+#: src/modules/SourceDialogs.rb:904
 msgid "ISO Image File"
 msgstr "ISO イメージファイル"
 
 #. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:926
+#: src/modules/SourceDialogs.rb:927
 msgid ""
 "The entered path is not a directory\n"
 "or the directory does not exist.\n"
@@ -2391,7 +2391,7 @@
 "もしくはディレクトリが存在しません。\n"
 
 #. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:956
+#: src/modules/SourceDialogs.rb:957
 msgid ""
 "The entered path is not a file\n"
 "or the file does not exist.\n"
@@ -2400,7 +2400,7 @@
 "もしくはファイルが存在しません。\n"
 
 #. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:980
+#: src/modules/SourceDialogs.rb:981
 msgid ""
 "File '%1'\n"
 "does not seem to be an ISO image.\n"
@@ -2411,17 +2411,17 @@
 "このファイルを本当に使いますか？\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1001
+#: src/modules/SourceDialogs.rb:1002
 msgid "&Path to Directory"
 msgstr "ディレクトリへのパス (&P)"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1009 src/modules/SourceDialogs.rb:1267
-#: src/modules/SourceDialogs.rb:1334
+#: src/modules/SourceDialogs.rb:1010 src/modules/SourceDialogs.rb:1268
+#: src/modules/SourceDialogs.rb:1335
 msgid "&Plain RPM Directory"
 msgstr "RPM パッケージだけのディレクトリ (&P)"
 
-#: src/modules/SourceDialogs.rb:1024
+#: src/modules/SourceDialogs.rb:1025
 msgid ""
 "<p><big><b>Local Directory</b></big><br>\n"
 "Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2436,20 +2436,20 @@
 "を選択してください。</p>\n"
 
 #. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1260
+#: src/modules/SourceDialogs.rb:1261
 msgid "&USB Mass Storage Device"
 msgstr "USB 大容量記憶域デバイス (&U)"
 
 #. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1265 src/modules/SourceDialogs.rb:1332
+#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333
 msgid "&File System"
 msgstr "ファイルシステム (&F)"
 
-#: src/modules/SourceDialogs.rb:1266 src/modules/SourceDialogs.rb:1333
+#: src/modules/SourceDialogs.rb:1267 src/modules/SourceDialogs.rb:1334
 msgid "Dire&ctory"
 msgstr "ディレクトリ (&C)"
 
-#: src/modules/SourceDialogs.rb:1271
+#: src/modules/SourceDialogs.rb:1272
 msgid ""
 "<p><big><b>USB Stick or Disk</b></big><br>\n"
 "Select the USB device on which the repository is located.\n"
@@ -2469,7 +2469,7 @@
 
 #. 'auto' is a value in the combo box widget, do not translate it!
 #. 'auto' is a value in the combo box widget, do not translate it!
-#: src/modules/SourceDialogs.rb:1281 src/modules/SourceDialogs.rb:1348
+#: src/modules/SourceDialogs.rb:1282 src/modules/SourceDialogs.rb:1349
 msgid ""
 "<p>The file system used on the device will be detected automatically\n"
 "if you select file system 'auto'. If the detection fails or you\n"
@@ -2480,11 +2480,11 @@
 "どのファイルシステムが使われているのかを知っている場合は、一覧から選択してください。</p>\n"
 
 #. combobox title
-#: src/modules/SourceDialogs.rb:1331
+#: src/modules/SourceDialogs.rb:1332
 msgid "&Disk Device"
 msgstr "ディスクデバイス (&D)"
 
-#: src/modules/SourceDialogs.rb:1338
+#: src/modules/SourceDialogs.rb:1339
 msgid ""
 "<p><big><b>Disk</b></big><br>\n"
 "Select the disk on which the repository is located.\n"
@@ -2503,12 +2503,12 @@
 "を選択してください。</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1364
+#: src/modules/SourceDialogs.rb:1365
 msgid "&Path to ISO Image"
 msgstr "ISO イメージへのパス (&P)"
 
 #. push button
-#: src/modules/SourceDialogs.rb:1384
+#: src/modules/SourceDialogs.rb:1385
 msgid ""
 "<p><big><b>Local ISO Image</b></big><br>\n"
 "Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2519,71 +2519,71 @@
 "を指定することができます。</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1565
+#: src/modules/SourceDialogs.rb:1566
 msgid "Server &Name"
 msgstr "サーバ名 (&N)"
 
-#: src/modules/SourceDialogs.rb:1569
+#: src/modules/SourceDialogs.rb:1570
 msgid "&Port"
 msgstr "ポート (&P)"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1574
+#: src/modules/SourceDialogs.rb:1575
 msgid "&Share"
 msgstr "共有 (&S)"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1587
+#: src/modules/SourceDialogs.rb:1588
 msgid "ISO &Image"
 msgstr "ISO イメージ (&I)"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1590
+#: src/modules/SourceDialogs.rb:1591
 msgid "&Directory on Server"
 msgstr "サーバ内のディレクトリ (&D)"
 
 #. frame
-#: src/modules/SourceDialogs.rb:1595
+#: src/modules/SourceDialogs.rb:1596
 msgid "Au&thentication"
 msgstr "認証 (&T)"
 
 #. check box
-#: src/modules/SourceDialogs.rb:1602
+#: src/modules/SourceDialogs.rb:1603
 msgid "&Anonymous"
 msgstr "匿名 (&A)"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1611
+#: src/modules/SourceDialogs.rb:1612
 msgid "&Workgroup or Domain"
 msgstr "ワークグループまたはドメイン (&W)"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1620
+#: src/modules/SourceDialogs.rb:1621
 msgid "&User Name"
 msgstr "ユーザ名 (&U)"
 
 #. password entry
-#: src/modules/SourceDialogs.rb:1627
+#: src/modules/SourceDialogs.rb:1628
 msgid "&Password"
 msgstr "パスワード (&P)"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1702
+#: src/modules/SourceDialogs.rb:1703
 msgid "&FTP"
 msgstr "FTP (&F)"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1705
+#: src/modules/SourceDialogs.rb:1706
 msgid "H&TTP"
 msgstr "HTTP (&T)"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1712
+#: src/modules/SourceDialogs.rb:1713
 msgid "HTT&PS"
 msgstr "HTTPS (&P)"
 
 #. help text - server dialog
-#: src/modules/SourceDialogs.rb:1882
+#: src/modules/SourceDialogs.rb:1883
 msgid ""
 "<p><big><b>Server and Directory</b></big><br>\n"
 "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2608,7 +2608,7 @@
 "を設定してください。</p>\n"
 
 #. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1895
+#: src/modules/SourceDialogs.rb:1896
 msgid ""
 "<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n"
 "Leave it empty to use the default port.</p>\n"
@@ -2619,12 +2619,12 @@
 #. Returns whether Community Repositories are defined in the control file.
 #.
 #. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1957
+#: src/modules/SourceDialogs.rb:1958
 msgid "I would like to install an additional Add On Product"
 msgstr "追加のアドオン製品をインストールする"
 
 #. help text
-#: src/modules/SourceDialogs.rb:2076
+#: src/modules/SourceDialogs.rb:2085
 msgid ""
 "<p><big><b>Media Type</b></big><br>\n"
 "The software repository can be located on CD, on a network server,\n"
@@ -2635,7 +2635,7 @@
 "上に設定可能です。</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2085
+#: src/modules/SourceDialogs.rb:2094
 msgid ""
 "<p>\n"
 "To add  <b>CD</b> or <b>DVD</b>,\n"
@@ -2646,7 +2646,7 @@
 "製品の CD セットまたは DVD を用意してください。</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2095
+#: src/modules/SourceDialogs.rb:2104
 msgid ""
 "<p>\n"
 "The product CDs can be copied to the hard disk.\n"
@@ -2662,7 +2662,7 @@
 "各メディアのサブディレクトリの親を指定してください。</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2107
+#: src/modules/SourceDialogs.rb:2116
 msgid ""
 "<p>\n"
 "Network installation requires a working network connection.\n"
@@ -2675,25 +2675,25 @@
 "を指定してください。</p>\n"
 
 #. error popup
-#: src/modules/SourceDialogs.rb:2122
+#: src/modules/SourceDialogs.rb:2131
 msgid "Select the media type"
 msgstr "メディア種類を選択してください。"
 
-#: src/modules/SourceDialogs.rb:2128
+#: src/modules/SourceDialogs.rb:2137
 msgid "Insert the add-on product CD"
 msgstr "アドオン製品の CD を挿入してください"
 
-#: src/modules/SourceDialogs.rb:2129
+#: src/modules/SourceDialogs.rb:2138
 msgid "Insert the add-on product DVD"
 msgstr "アドオン製品の DVD を挿入してください"
 
 #. ask for a medium
-#: src/modules/SourceDialogs.rb:2147
+#: src/modules/SourceDialogs.rb:2156
 msgid "No USB disk was detected."
 msgstr "USB ディスクは検出されませんでした"
 
 #. TODO: disable "download" option when CD or DVD source is selected
-#: src/modules/SourceDialogs.rb:2344
+#: src/modules/SourceDialogs.rb:2359
 msgid ""
 "<p><b>Download Files</b><br>\n"
 "Each repository has description files which describe the content of the\n"
@@ -2708,12 +2708,12 @@
 "必要に応じて後からそれらを自動でダウンロードします。</p>\n"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2563
+#: src/modules/SourceDialogs.rb:2578
 msgid "Media Type"
 msgstr "メディア種類"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2587
+#: src/modules/SourceDialogs.rb:2602
 msgid "Add On Product"
 msgstr "アドオン製品"
 
@@ -2905,12 +2905,12 @@
 msgstr "ネットワーク上には SLP カタログが見つかりませんでした。"
 
 #. Warning message, e.g.: Partition /usr needs 35 MB more disk space
-#: src/modules/SpaceCalculation.rb:936
+#: src/modules/SpaceCalculation.rb:869
 msgid "Partition \"%1\" needs %2 more disk space."
 msgstr "パーティション \"%1\" には %2 の追加のディスク容量が必要です。"
 
 #. popup message
-#: src/modules/SpaceCalculation.rb:956
+#: src/modules/SpaceCalculation.rb:889
 msgid ""
 "Deselect packages or delete data or temporary files\n"
 "before updating the system.\n"
@@ -2919,6 +2919,6 @@
 "必要のないデータや一時ファイルを削除してください。\n"
 
 #. popup message
-#: src/modules/SpaceCalculation.rb:965
+#: src/modules/SpaceCalculation.rb:898
 msgid "Deselect some packages."
 msgstr "いくつかのパッケージ選択を解除してください。"

Modified: trunk/yast/ja/po/proxy.ja.po
===================================================================
--- trunk/yast/ja/po/proxy.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/proxy.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: proxy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2012-10-26 08:00+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -23,9 +23,7 @@
 
 #. Commandline help title
 #. Proxy dialog caption
-#. Proxy dialog caption
-#: src/clients/proxy.rb:32 src/clients/proxy_proposal.rb:448
-#: src/include/proxy/dialogs.rb:398
+#: src/clients/proxy.rb:32 src/include/proxy/dialogs.rb:399
 msgid "Proxy Configuration"
 msgstr "プロキシの設定"
 
@@ -118,36 +116,30 @@
 msgstr "FTP"
 
 #. Informative label
-#. Informative label
-#: src/clients/proxy_proposal.rb:100 src/include/proxy/dialogs.rb:101
+#: src/include/proxy/dialogs.rb:101
 msgid "No details available."
 msgstr "詳細情報を取得できません。"
 
 #. A push button
-#. A push button
-#: src/clients/proxy_proposal.rb:103 src/include/proxy/dialogs.rb:104
+#: src/include/proxy/dialogs.rb:104
 msgid "&Details <<"
 msgstr "詳細 (&D) <<"
 
+#. avoid confusing Emacs
 #. A push button
-#. A push button
-#: src/clients/proxy_proposal.rb:105 src/include/proxy/dialogs.rb:106
+#: src/include/proxy/dialogs.rb:106
 msgid "&Details >>"
 msgstr "詳細 (&D) >>"
 
 #. The default error code, replaced with the current error code got from proxy if any code found
-#. The default error code, replaced with the current error code got from proxy if any code found
-#: src/clients/proxy_proposal.rb:220 src/include/proxy/dialogs.rb:172
+#: src/include/proxy/dialogs.rb:173
 msgid "Unknown Error Code"
 msgstr "不明なエラーコード"
 
 #. Error message,
 #. %1 is a string "HTTP", "HTTPS" or "FTP"
 #. %2 is an error string such as "HTTP/1.0 403 Forbidden"
-#. Error message,
-#. %1 is a string "HTTP", "HTTPS" or "FTP"
-#. %2 is an error string such as "HTTP/1.0 403 Forbidden"
-#: src/clients/proxy_proposal.rb:238 src/include/proxy/dialogs.rb:190
+#: src/include/proxy/dialogs.rb:191
 msgid ""
 "An error occurred during the %1 proxy test.\n"
 "Proxy return code: %2.\n"
@@ -158,10 +150,7 @@
 #. Unknown return code,
 #. %1 is the string HTTP, "HTTPS" or FTP,
 #. %2 is an error string such as "HTTP/1.0 403 Forbidden"
-#. Unknown return code,
-#. %1 is the string HTTP, "HTTPS" or FTP,
-#. %2 is an error string such as "HTTP/1.0 403 Forbidden"
-#: src/clients/proxy_proposal.rb:253 src/include/proxy/dialogs.rb:205
+#: src/include/proxy/dialogs.rb:206
 msgid ""
 "An unknown error occurred during the %1 proxy test.\n"
 "Proxy return code: %2.\n"
@@ -170,38 +159,32 @@
 "プロキシの返却値: %2.\n"
 
 #. An informative popup label diring the proxy testings
-#. An informative popup label diring the proxy testings
-#: src/clients/proxy_proposal.rb:274 src/include/proxy/dialogs.rb:226
+#: src/include/proxy/dialogs.rb:227
 msgid "Testing the current proxy settings..."
 msgstr "現在のプロキシ設定をテストしています..."
 
 #. TRANSLATORS: Error popup message
-#. TRANSLATORS: Error popup message
-#: src/clients/proxy_proposal.rb:284 src/include/proxy/dialogs.rb:236
+#: src/include/proxy/dialogs.rb:237
 msgid "An error occurred during the HTTP proxy test."
 msgstr "HTTP プロキシのテスト中にエラーが発生しました。"
 
 #. TRANSLATORS: Error popup message
-#. TRANSLATORS: Error popup message
-#: src/clients/proxy_proposal.rb:306 src/include/proxy/dialogs.rb:258
+#: src/include/proxy/dialogs.rb:259
 msgid "An error occurred during the HTTPS proxy test."
 msgstr "HTTPS プロキシのテスト中にエラーが発生しました。"
 
 #. TRANSLATORS: Error popup message
-#. TRANSLATORS: Error popup message
-#: src/clients/proxy_proposal.rb:328 src/include/proxy/dialogs.rb:280
+#: src/include/proxy/dialogs.rb:281
 msgid "An error occurred during the FTP proxy test."
 msgstr "FTP プロキシのテスト中にエラーが発生しました。"
 
 #. Popup message
-#. Popup message
-#: src/clients/proxy_proposal.rb:346 src/include/proxy/dialogs.rb:298
+#: src/include/proxy/dialogs.rb:299
 msgid "Proxy settings work correctly."
 msgstr "プロキシの設定は正しく動作しました。"
 
 #. Proxy dialog help 1/8
-#. Proxy dialog help 1/8
-#: src/clients/proxy_proposal.rb:454 src/include/proxy/dialogs.rb:404
+#: src/include/proxy/dialogs.rb:405
 msgid ""
 "<p>Configure your Internet proxy (caching) settings here.</p>\n"
 "<p><b>Note:</b> It is generally recommended to relogin for the settings to take effect, \n"
@@ -214,8 +197,7 @@
 "お使いのアプリケーションでの対応をご確認ください (Web ブラウザ, ftp クライアントなど) 。</p>"
 
 #. Proxy dialog help 2/8
-#. Proxy dialog help 2/8
-#: src/clients/proxy_proposal.rb:461 src/include/proxy/dialogs.rb:411
+#: src/include/proxy/dialogs.rb:412
 msgid ""
 "<p><b>HTTP Proxy URL</b> is the name of the proxy server for your access\n"
 "to the World Wide Web (WWW).</p>\n"
@@ -224,8 +206,7 @@
 "プロキシサーバの名前を入力します。</p>\n"
 
 #. Proxy dialog help 3/8
-#. Proxy dialog help 3/8
-#: src/clients/proxy_proposal.rb:465 src/include/proxy/dialogs.rb:415
+#: src/include/proxy/dialogs.rb:416
 msgid ""
 "<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your secured access\n"
 "to the World Wide Web (WWW).</p>\n"
@@ -234,14 +215,12 @@
 "プロキシサーバの名前を入力します。</p>\n"
 
 #. Proxy dialog help 3.5/8
-#. Proxy dialog help 3.5/8
-#: src/clients/proxy_proposal.rb:469 src/include/proxy/dialogs.rb:419
+#: src/include/proxy/dialogs.rb:420
 msgid "<p>Example: <i>http://proxy.example.com:3128/</i></p>"
 msgstr "<p>例: http://proxy.example.com:3128/</p>"
 
 #. Proxy dialog help 4/8
-#. Proxy dialog help 4/8
-#: src/clients/proxy_proposal.rb:471 src/include/proxy/dialogs.rb:421
+#: src/include/proxy/dialogs.rb:422
 msgid ""
 "<p><b>FTP Proxy URL</b> is the name of the proxy server for your access\n"
 "to the file transfer services (FTP).</p>"
@@ -250,8 +229,7 @@
 "プロキシサーバの名前を入力します。</p>"
 
 #. Proxy dialog help 5/8
-#. Proxy dialog help 5/8
-#: src/clients/proxy_proposal.rb:475 src/include/proxy/dialogs.rb:425
+#: src/include/proxy/dialogs.rb:426
 msgid ""
 "<p>If you check <b>Use the Same Proxy for All Protocols</b>, it is\n"
 "enough to fill in the HTTP proxy URL. It will be used for all protocols\n"
@@ -262,8 +240,7 @@
 "に対して同じサーバを使うように設定できます。\n"
 
 #. Proxy dialog help 6/8
-#. Proxy dialog help 6/8
-#: src/clients/proxy_proposal.rb:482 src/include/proxy/dialogs.rb:432
+#: src/include/proxy/dialogs.rb:433
 msgid ""
 "<p><b>No Proxy Domains</b> is a comma-separated list of domains\n"
 "for which the requests should be made directly without caching,\n"
@@ -274,8 +251,7 @@
 "たとえば <i>%1</i> のように指定します。</p>\n"
 
 #. Proxy dialog help 7/8
-#. Proxy dialog help 7/8
-#: src/clients/proxy_proposal.rb:491 src/include/proxy/dialogs.rb:441
+#: src/include/proxy/dialogs.rb:442
 msgid ""
 "<p>If you are using a proxy server with authorization, enter\n"
 "the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
@@ -286,8 +262,7 @@
 "ユーザ名は引用符 (\") を除く表示可能な文字だけで設定します。</p>\n"
 
 #. Proxy dialog help 8/8
-#. Proxy dialog help 8/8
-#: src/clients/proxy_proposal.rb:499 src/include/proxy/dialogs.rb:449
+#: src/include/proxy/dialogs.rb:450
 msgid ""
 "<p>Press <b>Test Proxy Settings</b> to test\n"
 "the current configuration for HTTP, HTTPS, and FTP proxy.</p> \n"
@@ -296,70 +271,60 @@
 "現在の HTTP, HTTPS, FTP プロキシの設定が正しいかどうかをテストします。</p> \n"
 
 #. CheckBox entry label
-#. CheckBox entry label
-#: src/clients/proxy_proposal.rb:519 src/include/proxy/dialogs.rb:466
+#: src/include/proxy/dialogs.rb:467
 msgid "&Enable Proxy"
 msgstr "プロキシを有効にする(&E)"
 
 #. Frame label
-#. Frame label
-#: src/clients/proxy_proposal.rb:527 src/include/proxy/dialogs.rb:472
+#: src/include/proxy/dialogs.rb:473
 msgid "Proxy Settings"
 msgstr "プロキシの設定"
 
 #. Text entry label
-#. Text entry label
-#: src/clients/proxy_proposal.rb:533 src/include/proxy/dialogs.rb:478
+#: src/include/proxy/dialogs.rb:479
 msgid "&HTTP Proxy URL"
 msgstr "HTTP プロキシ URL (&H)"
 
-#: src/clients/proxy_proposal.rb:535 src/include/proxy/dialogs.rb:480
+#: src/include/proxy/dialogs.rb:481
 msgid "HTTP&S Proxy URL"
 msgstr "HTTPS プロキシ URL (&S)"
 
 #. Text entry label
-#. Text entry label
-#: src/clients/proxy_proposal.rb:538 src/include/proxy/dialogs.rb:483
+#: src/include/proxy/dialogs.rb:484
 msgid "F&TP Proxy URL"
 msgstr "FTP プロキシ URL (&T)"
 
-#: src/clients/proxy_proposal.rb:544 src/include/proxy/dialogs.rb:489
+#: src/include/proxy/dialogs.rb:490
 msgid "Us&e the Same Proxy for All Protocols"
 msgstr "全てのプロトコルに対して同じプロキシを使用する (&E)"
 
 #. Text entry label
 #. domains without proxying
-#. Text entry label
-#. domains without proxying
-#: src/clients/proxy_proposal.rb:549 src/include/proxy/dialogs.rb:494
+#: src/include/proxy/dialogs.rb:495
 msgid "No Proxy &Domains"
 msgstr "プロキシ不使用ドメイン (&D)"
 
-#: src/clients/proxy_proposal.rb:558 src/include/proxy/dialogs.rb:503
+#: src/include/proxy/dialogs.rb:504
 msgid "Proxy Authentication"
 msgstr "プロキシ認証"
 
 #. Text entry label
-#. Text entry label
-#: src/clients/proxy_proposal.rb:567 src/include/proxy/dialogs.rb:512
+#: src/include/proxy/dialogs.rb:513
 msgid "Proxy &User Name"
 msgstr "プロキシユーザ名 (&U)"
 
 #. Password entry label
-#. Password entry label
-#: src/clients/proxy_proposal.rb:575 src/include/proxy/dialogs.rb:520
+#: src/include/proxy/dialogs.rb:521
 msgid "Proxy &Password"
 msgstr "プロキシパスワード (&P)"
 
 #. Test Proxy Settings - push button
-#. Test Proxy Settings - push button
-#: src/clients/proxy_proposal.rb:587 src/include/proxy/dialogs.rb:532
+#: src/include/proxy/dialogs.rb:533
 msgid "Test Pr&oxy Settings"
 msgstr "プロキシ設定のテスト (&O)"
 
 #. Popup error text - http, https and ftp proxy URLs are blank
-#. Popup error text - http, https and ftp proxy URLs are blank
-#: src/clients/proxy_proposal.rb:673 src/include/proxy/dialogs.rb:618
+#: src/include/proxy/dialogs.rb:619
 msgid ""
 "Proxy is enabled, but no proxy URL has been specified.\n"
 "Really use these settings?"
@@ -367,7 +332,7 @@
 "プロキシは有効になっていますが、 URL が指定されていません。\n"
 "この設定でよろしいですか？"
 
-#: src/clients/proxy_proposal.rb:686 src/include/proxy/dialogs.rb:631
+#: src/include/proxy/dialogs.rb:632
 msgid ""
 "Security warning:\n"
 "Username and password will be stored unencrypted\n"
@@ -380,50 +345,42 @@
 "よろしいですか？"
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:701 src/include/proxy/dialogs.rb:646
+#: src/include/proxy/dialogs.rb:647
 msgid "You cannot enter a password and leave the user name empty."
 msgstr "パスワードを入力する場合は、ユーザ名を指定してください。"
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:711 src/include/proxy/dialogs.rb:654
+#: src/include/proxy/dialogs.rb:655
 msgid "HTTP proxy URL is invalid."
 msgstr "HTTP プロキシ URL が正しくありません。"
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:719 src/include/proxy/dialogs.rb:662
+#: src/include/proxy/dialogs.rb:663
 msgid "HTTP proxy URL must contain a scheme specification (http)."
 msgstr "HTTP プロキシ URL には、スキーム指定 (http) が必要です。"
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:730 src/include/proxy/dialogs.rb:671
+#: src/include/proxy/dialogs.rb:672
 msgid "The HTTPS proxy URL is invalid."
 msgstr "HTTPS プロキシ URL が正しくありません。"
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:738 src/include/proxy/dialogs.rb:679
+#: src/include/proxy/dialogs.rb:680
 msgid "The HTTPS proxy URL must contain a scheme specification (http)."
 msgstr "HTTPS プロキシ URL には、スキーム指定 (http) が必要です。"
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:749 src/include/proxy/dialogs.rb:690
+#: src/include/proxy/dialogs.rb:691
 msgid "FTP proxy URL is invalid."
 msgstr "FTP プロキシ URL が正しくありません。"
 
 #. Popup::Error text
-#. Popup::Error text
-#: src/clients/proxy_proposal.rb:757 src/include/proxy/dialogs.rb:698
+#: src/include/proxy/dialogs.rb:699
 msgid "FTP proxy URL must contain a scheme specification (http)."
 msgstr "FTP プロキシ URL には、スキーム指定 (http) が必要です。"
 
 #. Translators: no proxy domain is a domain that can be accessed without proxy
-#. Translators: no proxy domain is a domain that can be accessed without proxy
-#: src/clients/proxy_proposal.rb:769 src/include/proxy/dialogs.rb:708
+#: src/include/proxy/dialogs.rb:709
 msgid ""
 "One or more no proxy domains are invalid. \n"
 "Check if all domains match one of the following:\n"
@@ -439,16 +396,6 @@
 "* 完全修飾ドメイン名\n"
 "* 冒頭に '.' を付けたドメイン名"
 
-#. Rich text title
-#: src/clients/proxy_proposal.rb:839
-msgid "Proxy"
-msgstr "プロキシ"
-
-#. MenuButton title
-#: src/clients/proxy_proposal.rb:841
-msgid "&Proxy"
-msgstr "プロキシ (&P)"
-
 #. Popup headline
 #: src/modules/Proxy.rb:45
 msgid "Proxy Configuration Successfully Saved"
@@ -498,3 +445,9 @@
 #: src/modules/Proxy.rb:466
 msgid "FTP Proxy: %1"
 msgstr "FTP プロキシ: %1"
+
+#~ msgid "Proxy"
+#~ msgstr "プロキシ"
+
+#~ msgid "&Proxy"
+#~ msgstr "プロキシ (&P)"

Modified: trunk/yast/ja/po/registration.ja.po
===================================================================
--- trunk/yast/ja/po/registration.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/registration.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: registration\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-15 15:56+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-08-16 08:01+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -22,11 +22,11 @@
 "X-Generator: KBabel 1.11.4\n"
 
 #. popup heading (in bold)
-#: src/clients/discover_registration_services.rb:35
+#: src/clients/discover_registration_services.rb:40
 msgid "Local Registration Servers"
 msgstr "ローカルの登録サーバ"
 
-#: src/clients/discover_registration_services.rb:37
+#: src/clients/discover_registration_services.rb:42
 msgid ""
 "Select a detected registration server from the list\n"
 "or the default SUSE registration server."
@@ -35,62 +35,43 @@
 "もしくは既定の SUSE 登録サーバを選択してください。"
 
 #. error popup
-#: src/clients/discover_registration_services.rb:65
+#: src/clients/discover_registration_services.rb:66
 msgid "No registration server selected."
 msgstr "登録サーバが選択されていません。"
 
 #. %s is the default SCC URL
-#: src/clients/discover_registration_services.rb:100
+#: src/clients/discover_registration_services.rb:112
 msgid "SUSE Customer Center (%s)"
 msgstr "SUSE カスタマーセンター (%s)"
 
 #. popup message
 #. popup message
-#: src/clients/inst_scc.rb:52 src/clients/scc_auto.rb:48
+#. popup message
+#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49
+#: src/lib/registration/registration_ui.rb:39
 msgid "Contacting the Registration Server"
 msgstr "登録サーバと通信しています"
 
-#. reset the user input in case an exception is raised
-#. nil = use the default URL
-#: src/clients/inst_scc.rb:147 src/clients/scc_auto.rb:169
-msgid "Registering the System..."
-msgstr "システムを登録しています..."
-
-#. then register the product(s)
-#. %s is name of given product
-#. register the base product
-#. %s is name of given product
-#: src/clients/inst_scc.rb:156 src/clients/inst_scc.rb:427
-#: src/clients/scc_auto.rb:177 src/clients/scc_auto.rb:192
-msgid "Registering %s ..."
-msgstr "%s を登録しています..."
-
-#. updating base product registration, %s is a new base product name
-#. updating registered addon/extension, %s is an extension name
-#: src/clients/inst_scc.rb:206 src/clients/inst_scc.rb:236
-msgid "Updating to %s ..."
-msgstr "%s に更新しています..."
-
 #. display the registration update dialog
 #. dialog title
 #. dialog title
 #. Translators: Text for UI Label - capitalized
-#: src/clients/inst_scc.rb:260 src/clients/inst_scc.rb:352
-#: src/clients/inst_scc.rb:504 src/clients/inst_scc.rb:552
+#: src/clients/inst_scc.rb:215 src/clients/inst_scc.rb:310
+#: src/clients/inst_scc.rb:467 src/clients/inst_scc.rb:515
 #: src/lib/registration/ui/autoyast_config_dialog.rb:92
 msgid "Registration"
 msgstr "登録"
 
-#: src/clients/inst_scc.rb:261
+#: src/clients/inst_scc.rb:216
 msgid "Registration is being updated..."
 msgstr "登録を更新しています..."
 
-#: src/clients/inst_scc.rb:262
+#: src/clients/inst_scc.rb:217
 msgid "The previous registration is being updated."
 msgstr "以前の登録を更新しようとしています。"
 
 #. automatic registration refresh during system upgrade failed, register from scratch
-#: src/clients/inst_scc.rb:275
+#: src/clients/inst_scc.rb:233
 msgid ""
 "Automatic registration upgrade failed.\n"
 "You can manually register the system from scratch."
@@ -100,7 +81,7 @@
 
 #. label text describing the registration (1/2)
 #. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/clients/inst_scc.rb:289
+#: src/clients/inst_scc.rb:247
 msgid ""
 "Please enter a registration or evaluation code for this product and your\n"
 "User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
@@ -115,49 +96,49 @@
 #. label text describing the registration (2/2),
 #. not displayed in installed system
 #. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/clients/inst_scc.rb:301
+#: src/clients/inst_scc.rb:259
 msgid ""
 "If you skip product registration now, remember to register after\n"
 "installation has completed."
 msgstr "ここで登録処理を飛ばす場合は、インストール完了後に忘れずに実施してください。"
 
-#: src/clients/inst_scc.rb:309
+#: src/clients/inst_scc.rb:267
 msgid "Network Configuration..."
 msgstr "ネットワークの設定..."
 
-#: src/clients/inst_scc.rb:318 src/clients/inst_scc.rb:491
+#: src/clients/inst_scc.rb:276 src/clients/inst_scc.rb:452
 msgid "The system is already registered."
 msgstr "システムは登録済みです。"
 
-#: src/clients/inst_scc.rb:325
+#: src/clients/inst_scc.rb:283
 #: src/lib/registration/ui/autoyast_config_dialog.rb:94
 msgid "&E-mail Address"
 msgstr "電子メールアドレス (&E)"
 
 #. handle nil specifically, it cannot be stored in XML profile
-#: src/clients/inst_scc.rb:327
+#: src/clients/inst_scc.rb:285
 #: src/lib/registration/ui/autoyast_addon_dialog.rb:167
 #: src/lib/registration/ui/autoyast_config_dialog.rb:96
 msgid "Registration &Code"
 msgstr "登録コード (&C)"
 
 #. button label
-#: src/clients/inst_scc.rb:332
+#: src/clients/inst_scc.rb:290
 msgid "&Local Registration Server..."
 msgstr "ローカルの登録サーバ (&L)..."
 
 #. button label
-#: src/clients/inst_scc.rb:335
+#: src/clients/inst_scc.rb:293
 msgid "&Skip Registration"
 msgstr "登録を行なわずに飛ばす (&S)"
 
 #. help text
-#: src/clients/inst_scc.rb:343
+#: src/clients/inst_scc.rb:301
 msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
 msgstr "更新や拡張を取得する目的でシステム登録を行なうため、 SUSE カスタマーセンターの資格情報を入力してください。"
 
 #. not set yet?
-#: src/clients/inst_scc.rb:377
+#: src/clients/inst_scc.rb:334
 msgid ""
 "Registration added some update repositories.\n"
 "\n"
@@ -169,25 +150,26 @@
 "インストール時に、利用可能な最新のオンライン更新を\n"
 "適用しますか？"
 
-#. cache the available addons
-#. create a new dialog for accepting and importing a SSL certificate and run it
-#: src/clients/inst_scc.rb:406
-#: src/lib/registration/ui/autoyast_config_workflow.rb:101
-msgid "Loading Available Extensions and Modules..."
-msgstr "利用可能な拡張とモジュールを読み込んでいます..."
+#. %s is name of given product
+#. %s is name of given product
+#. then register the product(s)
+#: src/clients/inst_scc.rb:385 src/clients/scc_auto.rb:284
+#: src/lib/registration/registration_ui.rb:71
+msgid "Registering %s ..."
+msgstr "%s を登録しています..."
 
 #. dialog title
-#: src/clients/inst_scc.rb:458
+#: src/clients/inst_scc.rb:419
 msgid "Register Extensions and Modules"
 msgstr "拡張とモジュールの登録"
 
 #. help text
-#: src/clients/inst_scc.rb:462
+#: src/clients/inst_scc.rb:423
 msgid "<p>Extensions and Modules are being registered.</p>"
 msgstr "<p>拡張とモジュールを登録しようとしています。</p>"
 
 #. Popup question: confirm skipping the registration
-#: src/clients/inst_scc.rb:480
+#: src/clients/inst_scc.rb:441
 msgid ""
 "If you do not register your system we will not be able\n"
 "to grant you access to the update repositories.\n"
@@ -206,30 +188,30 @@
 "この時点での登録作業を飛ばしてよろしいですか？"
 
 #. button label
-#: src/clients/inst_scc.rb:494
+#: src/clients/inst_scc.rb:455
 msgid "Register Again"
 msgstr "再度登録する"
 
 #. button label
-#: src/clients/inst_scc.rb:497
+#: src/clients/inst_scc.rb:458
 msgid "Select Extensions"
 msgstr "拡張の選択"
 
 #. help text
-#: src/clients/inst_scc.rb:507
+#: src/clients/inst_scc.rb:470
 msgid "<p>The system is already registered.</p>"
 msgstr "<p>システムは既に登録されています。</p>"
 
-#: src/clients/inst_scc.rb:508
+#: src/clients/inst_scc.rb:471
 msgid "<p>You can re-register it again or you can register additional extension or modules to enhance the functionality of the system.</p>"
 msgstr "<p>システムを再登録したり、システムの機能を高めるために追加の拡張やモジュールを登録したりすることができます。</p>"
 
-#: src/clients/inst_scc.rb:510
+#: src/clients/inst_scc.rb:473
 msgid "<p>If you want to deregister your system you need to log into the SUSE Customer Center and remove the system manually there.</p>"
 msgstr "<p>お使いのシステムの登録を解除したい場合は、 SUSE カスタマーセンターにログインしてから、手作業で削除してください。</p>"
 
 #. error message
-#: src/clients/inst_scc.rb:534
+#: src/clients/inst_scc.rb:497
 msgid ""
 "The base product was not found,\n"
 "check your system."
@@ -238,7 +220,7 @@
 "システムをご確認ください。"
 
 #. TRANSLATORS: %s = bugzilla URL
-#: src/clients/inst_scc.rb:538
+#: src/clients/inst_scc.rb:501
 msgid ""
 "The installation medium or the installer itself is seriously broken.\n"
 "Report a bug at %s."
@@ -246,7 +228,7 @@
 "インストールメディア、もしくはインストーラそれ自身が壊れてしまっています。\n"
 "%s でバグを報告してください。"
 
-#: src/clients/inst_scc.rb:541
+#: src/clients/inst_scc.rb:504
 msgid ""
 "Make sure a product is installed and /etc/products.d/baseproduct\n"
 "is a symlink pointing to the base product .prod file."
@@ -260,23 +242,23 @@
 msgstr "この YaST モジュールではなく、 '%s' をお使いください。"
 
 #. popup message: registration finished properly
-#: src/clients/scc_auto.rb:208
+#: src/clients/scc_auto.rb:184
 msgid "Registration was successfull."
 msgstr "登録が成功しました。"
 
 #. remove possible duplicates
-#: src/clients/scc_auto.rb:243
+#: src/clients/scc_auto.rb:212
 msgid "SLP discovery failed, no server found"
 msgstr "SLP 検索が失敗しました。サーバが見つかりません。"
 
 #. more than one server found: let the user select, we cannot automatically
 #. decide which one to use, asking user in AutoYast mode is not nice
 #. but better than aborting the installation...
-#: src/clients/scc_auto.rb:259
+#: src/clients/scc_auto.rb:228
 msgid "Downloading SSL Certificate"
 msgstr "SSL 証明書をダウンロードしています"
 
-#: src/clients/scc_auto.rb:263
+#: src/clients/scc_auto.rb:232
 msgid "Importing SSL Certificate"
 msgstr "SSL 証明書を取り込んでいます"
 
@@ -414,7 +396,7 @@
 msgstr "SHA256 拇印: "
 
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:71
+#: src/lib/registration/connect_helpers.rb:72
 msgid ""
 "Network is not configured, the registration server cannot be reached.\n"
 "Do you want to configure the network now?"
@@ -422,22 +404,22 @@
 "ネットワークが設定されていないため、登録サーバへの接続を行なうことができません。\n"
 "今すぐネットワークを設定しますか？"
 
-#: src/lib/registration/connect_helpers.rb:77
+#: src/lib/registration/connect_helpers.rb:78
 msgid "Network error, check the network configuration."
 msgstr "ネットワークエラーです。ネットワークの設定をご確認ください。"
 
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:82
+#: src/lib/registration/connect_helpers.rb:83
 msgid "Connection time out."
 msgstr "接続が時間切れになりました。"
 
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:90
+#: src/lib/registration/connect_helpers.rb:91
 msgid "Check that this system is known to the registration server."
 msgstr "このシステムが登録サーバに対して既知のものであるかどうか、ご確認ください。"
 
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:96
+#: src/lib/registration/connect_helpers.rb:97
 msgid ""
 "If you are upgrading from SLE11 make sure the SCC server\n"
 "knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -457,19 +439,23 @@
 "ログインして数分程度待ったあと、アップグレードを再実行してください。"
 
 #. add the hint to the error details
+#. update the message when an old SMT server is found
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:110
-#: src/lib/registration/connect_helpers.rb:113
+#. update the message when an old SMT server is found
+#: src/lib/registration/connect_helpers.rb:111
+#: src/lib/registration/connect_helpers.rb:116
 #: src/lib/registration/connect_helpers.rb:119
-#: src/lib/registration/connect_helpers.rb:167
+#: src/lib/registration/connect_helpers.rb:125
+#: src/lib/registration/connect_helpers.rb:175
+#: src/lib/registration/connect_helpers.rb:178
 msgid "Registration failed."
 msgstr "登録が失敗しました。"
 
-#: src/lib/registration/connect_helpers.rb:115
+#: src/lib/registration/connect_helpers.rb:121
 msgid "Registration client error."
 msgstr "登録クライアントのエラーです。"
 
-#: src/lib/registration/connect_helpers.rb:117
+#: src/lib/registration/connect_helpers.rb:123
 msgid ""
 "Registration server error.\n"
 "Retry registration later."
@@ -478,46 +464,73 @@
 "あとで登録をやり直してください。"
 
 #. error message
-#: src/lib/registration/connect_helpers.rb:158
+#: src/lib/registration/connect_helpers.rb:164
 msgid "Received SSL Certificate does not match the expected certificate."
 msgstr "受信した SSL 証明書は、期待する証明書に合致していません。"
 
 #. %s are error details
-#: src/lib/registration/connect_helpers.rb:184
+#: src/lib/registration/connect_helpers.rb:195
 msgid "Details: %s"
 msgstr "詳細: %s"
 
 #. progress label
-#: src/lib/registration/connect_helpers.rb:209
+#: src/lib/registration/connect_helpers.rb:220
 msgid "Importing the SSL certificate"
 msgstr "SSL 証明書を取り込んでいます"
 
-#: src/lib/registration/connect_helpers.rb:210
+#: src/lib/registration/connect_helpers.rb:221
 msgid "Importing '%s' certificate..."
 msgstr "'%s' の証明書を取り込んでいます..."
 
 #. try to use a translatable message first, if not found then use
 #. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:228
+#: src/lib/registration/connect_helpers.rb:241
 msgid "Secure connection error: %s"
 msgstr "機密保持接続のエラーです: %s"
 
+#. TRANSLATORS: error message, %s is a server URL,
+#. e.g. https://smt.example.com
+#: src/lib/registration/connect_helpers.rb:260
+msgid ""
+"An old registration server was detected at\n"
+"%s.\n"
+"Make sure the latest product supporting the new registration\n"
+"protocol is installed at the server."
+msgstr ""
+
 #. progress step title
-#: src/lib/registration/finish_dialog.rb:34
+#: src/lib/registration/finish_dialog.rb:35
 msgid "Storing Registration Configuration..."
 msgstr "登録設定を保存しています..."
 
-#. this is just a placeholder for texts which will/might be needed after the text freeze
-#. TODO FIXME: remove this file before GM!
-#: src/lib/registration/new_messages.rb:8
-msgid "SSL Certificate"
-msgstr "SSL 証明書"
+#. register the system and the base product
+#. @return [Array<Boolean, SUSE::Connect::Remote::Service>] array with two
+#. items: boolean (true on success), remote service (or nil)
+#. TODO FIXME: split to two separate parts
+#. TODO FIXME: reused an existing message due to text freeze
+#. (later use a better text, it's system update actually...)
+#: src/lib/registration/registration_ui.rb:62
+#: src/lib/registration/registration_ui.rb:95
+msgid "Registering the System..."
+msgstr "システムを登録しています..."
 
-#. checkbox: use SLP discovery later again in the installed system
-#: src/lib/registration/new_messages.rb:10
-msgid "Use SLP Discovery Also Later in Installed System"
-msgstr "インストール後のシステムでも SLP 検出を使用する"
+#. updating base product registration, %s is a new base product name
+#. updating registered addon/extension, %s is an extension name
+#: src/lib/registration/registration_ui.rb:121
+#: src/lib/registration/registration_ui.rb:146
+msgid "Updating to %s ..."
+msgstr "%s に更新しています..."
 
+#. load available addons from SCC server
+#. the result is cached to avoid reloading when going back and forth in the
+#. installation workflow
+#. @return [Array<Registration::Addon>] available addons
+#. create a new dialog for accepting and importing a SSL certificate and run it
+#: src/lib/registration/registration_ui.rb:174
+#: src/lib/registration/ui/autoyast_config_workflow.rb:101
+msgid "Loading Available Extensions and Modules..."
+msgstr "利用可能な拡張とモジュールを読み込んでいます..."
+
 #. indent size used in summary text
 #: src/lib/registration/ssl_certificate_details.rb:35
 msgid "Certificate:"
@@ -526,33 +539,33 @@
 #. create UI label for a base product
 #. @param [Hash] Product (hash from pkg-bindings)
 #. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:119
+#: src/lib/registration/sw_mgmt.rb:120
 msgid "Unknown product"
 msgstr "不明な製品"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:152
+#: src/lib/registration/sw_mgmt.rb:153
 msgid "Saving repository configuration failed."
 msgstr "リポジトリ設定の保存に失敗しました。"
 
 #. # error message
 #. error message
-#: src/lib/registration/sw_mgmt.rb:190 src/lib/registration/sw_mgmt.rb:201
+#: src/lib/registration/sw_mgmt.rb:191 src/lib/registration/sw_mgmt.rb:202
 msgid "Updating service '%s' failed."
 msgstr "サービス '%s' の更新に失敗しました。"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:196
+#: src/lib/registration/sw_mgmt.rb:197
 msgid "Adding service '%s' failed."
 msgstr "サービス '%s' の追加に失敗しました。"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:208
+#: src/lib/registration/sw_mgmt.rb:209
 msgid "Saving service '%s' failed."
 msgstr "サービス '%s' の保存に失敗しました。"
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:213
+#: src/lib/registration/sw_mgmt.rb:214
 msgid "Refreshing service '%s' failed."
 msgstr "サービス '%s' の更新に失敗しました。"
 
@@ -565,10 +578,10 @@
 msgid "Downloading Licenses..."
 msgstr "ライセンスをダウンロードしています..."
 
-#. ask user to accept an addon EULA
-#. @param addon [SUSE::Connect::Product] the addon
-#. @return [Symbol] :accepted, :back, :abort, :halt
-#: src/lib/registration/ui/addon_eula_dialog.rb:73
+#. download the addon EULAs to a temp dir
+#. @param [SUSE::Connect::Product] addon the addon
+#. @param [String] tmpdir target where to download the files
+#: src/lib/registration/ui/addon_eula_dialog.rb:72
 msgid "Downloading License Agreement..."
 msgstr "ライセンス同意をダウンロードしています..."
 
@@ -583,7 +596,7 @@
 "に失敗しました。"
 
 #. %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
-#: src/lib/registration/ui/addon_eula_dialog.rb:94
+#: src/lib/registration/ui/addon_eula_dialog.rb:100
 msgid "%s License Agreement"
 msgstr "%s ライセンス同意"
 
@@ -613,46 +626,46 @@
 msgstr[0] "下記の項目に登録コードを入力してください。"
 
 #. dialog title
-#: src/lib/registration/ui/addon_selection_dialog.rb:39
+#: src/lib/registration/ui/addon_selection_dialog.rb:44
 msgid "Extension and Module Selection"
 msgstr "拡張とモジュールの選択"
 
 #. help text (1/3)
-#: src/lib/registration/ui/addon_selection_dialog.rb:42
+#: src/lib/registration/ui/addon_selection_dialog.rb:47
 msgid "<p>Here you can select available extensions and modules for yoursystem.</p>"
 msgstr "<p>ここでは、お使いのシステムで利用可能な拡張とモジュールを選択することができます。</p>"
 
 #. help text (2/3)
-#: src/lib/registration/ui/addon_selection_dialog.rb:45
+#: src/lib/registration/ui/addon_selection_dialog.rb:50
 msgid "<p>Please note, that some extensions or modules might need specific registration code.</p>"
 msgstr "<p>拡張やモジュールによっては、特定の登録コードを必要とするものがありますので、ご注意ください。</p>"
 
 #. help text (3/3)
-#: src/lib/registration/ui/addon_selection_dialog.rb:48
+#: src/lib/registration/ui/addon_selection_dialog.rb:53
 msgid "<p>If you want to remove any extension or module you need to loginto the SUSE Customer Center and remove them manually there.</p>"
 msgstr "<p>拡張やモジュールを削除したい場合は、 SUSE カスタマーセンターにログインしてから、手作業で削除してください。</p>"
 
 #. always enable Back/Next, the dialog cannot be the first in workflow
-#: src/lib/registration/ui/addon_selection_dialog.rb:67
+#: src/lib/registration/ui/addon_selection_dialog.rb:72
 msgid "Available Extensions and Modules"
 msgstr "利用可能な拡張とモジュール"
 
-#: src/lib/registration/ui/addon_selection_dialog.rb:69
+#: src/lib/registration/ui/addon_selection_dialog.rb:74
 msgid "Details"
 msgstr "詳細"
 
-#: src/lib/registration/ui/addon_selection_dialog.rb:72
+#: src/lib/registration/ui/addon_selection_dialog.rb:77
 msgid "Select an extension or a module to show details here"
 msgstr "詳細を表示する拡張またはモジュールを選択してください"
 
 #. checkbox label for an unavailable extension
 #. (%s is an extension name)
-#: src/lib/registration/ui/addon_selection_dialog.rb:131
+#: src/lib/registration/ui/addon_selection_dialog.rb:136
 msgid "%s (not available)"
 msgstr "%s (利用できません)"
 
 #. check the addons requiring a reg. code
-#: src/lib/registration/ui/addon_selection_dialog.rb:212
+#: src/lib/registration/ui/addon_selection_dialog.rb:217
 msgid "YaST allows to select at most %s extensions or modules."
 msgstr "YaST は最大で %s 個までの拡張またはモジュールに対応しています。"
 
@@ -791,50 +804,56 @@
 msgstr "証明書のチェイン内の自己署名証明書"
 
 #. push button
-#: src/lib/registration/ui/import_certificate_dialog.rb:90
+#: src/lib/registration/ui/import_certificate_dialog.rb:73
 msgid "&Trust and Import"
 msgstr "信用して取り込む (&T)"
 
 #. help text (RichText) for importing a SSL certificate (1/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:118
+#: src/lib/registration/ui/import_certificate_dialog.rb:119
 msgid "<p>Secure connection (HTTPS) uses SSL certificates for verifying the authenticity of the server and for encrypting the transferred data.</p>"
 msgstr "<p>機密を保持するタイプの接続 (HTTPS) では、サーバの正当性を確認してデータを暗号化する際、 SSL 証明書を使用します。</p>"
 
 #. help text (RichText) for importing a SSL certificate (2/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:122
+#: src/lib/registration/ui/import_certificate_dialog.rb:123
 msgid "<p>You can choose to import the certificate it into the list of known certificate autohorities (CA), meaning that you trust the subject and the issuer of the unknown certificate.</p>"
 msgstr "<p>既知の証明機関 (CA) の一覧に証明書を取り込むこともできます。この場合、未知の証明書の発行先と発行者を信頼することになります。</p>"
 
 #. help text (RichText) for importing a SSL certificate (3/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:127
+#: src/lib/registration/ui/import_certificate_dialog.rb:128
 msgid "<p>Importing a certificate will allow to use for example a self-signed certificate.</p>"
 msgstr "<p>また、証明書の取り込みを行なうと、たとえば自己署名証明書の使用も許可することになります。</p>"
 
 #. help text (RichText) for importing a SSL certificate (4/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:131
+#: src/lib/registration/ui/import_certificate_dialog.rb:132
 msgid "<p><b>Important:</b> You should verify the fingerprint of the certificate to be sure you import the genuine certificate from the requested server.</p>"
 msgstr "<p><b>重要:</b> 証明書の拇印を確認して、正規の発行者から証明書が発行されていることを必ず確認してください。 </p>"
 
 #. help text (RichText) for importing a SSL certificate (5/5)
-#: src/lib/registration/ui/import_certificate_dialog.rb:136
+#: src/lib/registration/ui/import_certificate_dialog.rb:137
 msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>"
 msgstr "<p><b>よく検証せずに証明書を取り込むと、それは巨大なセキュリティリスクとなりえます。</b></p>"
 
 #. error message, the entered URL is not valid
-#: src/lib/registration/ui/local_server_dialog.rb:51
+#: src/lib/registration/ui/local_server_dialog.rb:60
 msgid "Invalid URL."
 msgstr "URL が正しくありません。"
 
 #. input field label
-#: src/lib/registration/ui/local_server_dialog.rb:78
+#: src/lib/registration/ui/local_server_dialog.rb:97
 msgid "&Local Registration Server URL"
 msgstr "ローカルの登録サーバの URL (&L)"
 
-#. return the boot command line parameter
-#: src/lib/registration/url_helpers.rb:205
+#. ignore SUSE manager registration servers (bnc#894470)
+#: src/lib/registration/url_helpers.rb:213
 msgid "Searching..."
 msgstr "検索しています..."
 
-#: src/lib/registration/url_helpers.rb:205
+#: src/lib/registration/url_helpers.rb:213
 msgid "Looking up local registration servers..."
 msgstr "ローカルの登録サーバを検索しています..."
+
+#~ msgid "SSL Certificate"
+#~ msgstr "SSL 証明書"
+
+#~ msgid "Use SLP Discovery Also Later in Installed System"
+#~ msgstr "インストール後のシステムでも SLP 検出を使用する"

Modified: trunk/yast/ja/po/s390.ja.po
===================================================================
--- trunk/yast/ja/po/s390.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/s390.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: s390\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-05-21 20:17+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -146,46 +146,46 @@
 msgid "Set Format Off"
 msgstr "フォーマット無効"
 
+#. integer field (count of disks formatted parallel)
+#: src/include/s390/dasd/dialogs.rb:201
+msgid "&Parallel Formatted Disks"
+msgstr "ディスクを並行してフォーマット (&P)"
+
 #. error popup message
 #. error popup message
 #. error popup message
-#: src/include/s390/dasd/dialogs.rb:200 src/include/s390/dasd/dialogs.rb:677
+#: src/include/s390/dasd/dialogs.rb:225 src/include/s390/dasd/dialogs.rb:687
 #: src/include/s390/zfcp/dialogs.rb:471
 msgid "No disk selected."
 msgstr "ディスクが選択されていません。"
 
 #. 8 means disk is not formatted
 #. unformtted disk, manual (not AutoYaS)
-#: src/include/s390/dasd/dialogs.rb:229 src/modules/DASDController.rb:161
+#: src/include/s390/dasd/dialogs.rb:254 src/modules/DASDController.rb:161
 msgid "Device %1 is not formatted. Format device now?"
 msgstr "デバイス %1 はフォーマットされていません。今すぐフォーマットしますか？"
 
-#: src/include/s390/dasd/dialogs.rb:231 src/modules/DASDController.rb:163
+#: src/include/s390/dasd/dialogs.rb:256 src/modules/DASDController.rb:163
 msgid "There are %1 unformatted devices. Format them now?"
 msgstr "%1 個の未フォーマットデバイスがあります。今すぐこれらをフォーマットしますか？"
 
 #. for autoinst, format unformatted disks later
-#: src/include/s390/dasd/dialogs.rb:242
+#: src/include/s390/dasd/dialogs.rb:267
 msgid "Couldn't find device for channel %1."
 msgstr "チャンネル %1 に対するデバイスが見つかりません。"
 
 #. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:294
+#: src/include/s390/dasd/dialogs.rb:321
 msgid "Disk %1 is not active."
 msgstr "ディスク '%1' はアクティブではありません。"
 
 #. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:300
+#: src/include/s390/dasd/dialogs.rb:327
 msgid "Disk %1 is not accessible for writing."
 msgstr "ディスク '%1' に書き込みアクセスできません。"
 
-#. integer field (count of disks formatted at parallely)
-#: src/include/s390/dasd/dialogs.rb:318
-msgid "&Parallel Formatted Disks"
-msgstr "ディスクを並行してフォーマット (&P)"
-
 #. popup question
-#: src/include/s390/dasd/dialogs.rb:343
+#: src/include/s390/dasd/dialogs.rb:353
 msgid ""
 "Formatting these disks destroys all data on them.<br>\n"
 "Really format the following disks?<br>\n"
@@ -196,7 +196,7 @@
 " %1"
 
 #. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:406
+#: src/include/s390/dasd/dialogs.rb:416
 msgid "DASD Disk Management"
 msgstr "DASD ディスク管理"
 
@@ -204,111 +204,111 @@
 #. table header
 #. table header
 #. table header
-#: src/include/s390/dasd/dialogs.rb:413 src/include/s390/dasd/dialogs.rb:422
+#: src/include/s390/dasd/dialogs.rb:423 src/include/s390/dasd/dialogs.rb:432
 #: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129
 msgid "Channel ID"
 msgstr "チャネル ID"
 
 #. table header
-#: src/include/s390/dasd/dialogs.rb:415
+#: src/include/s390/dasd/dialogs.rb:425
 msgid "Format"
 msgstr "フォーマットする"
 
 #. table header
 #. table header
-#: src/include/s390/dasd/dialogs.rb:417 src/include/s390/dasd/dialogs.rb:430
+#: src/include/s390/dasd/dialogs.rb:427 src/include/s390/dasd/dialogs.rb:440
 msgid "Use DIAG"
 msgstr "DIAG を使用"
 
 #. table header
 #. table header
-#: src/include/s390/dasd/dialogs.rb:424 src/include/s390/zfcp/dialogs.rb:135
+#: src/include/s390/dasd/dialogs.rb:434 src/include/s390/zfcp/dialogs.rb:135
 msgid "Device"
 msgstr "デバイス"
 
 #. table header
 #. table header
-#: src/include/s390/dasd/dialogs.rb:426
+#: src/include/s390/dasd/dialogs.rb:436
 #: src/include/s390/iucvterminal-server/ui.rb:242
 msgid "Type"
 msgstr "種類"
 
 #. table header
-#: src/include/s390/dasd/dialogs.rb:428
+#: src/include/s390/dasd/dialogs.rb:438
 msgid "Access Type"
 msgstr "アクセス種類"
 
 #. table header
-#: src/include/s390/dasd/dialogs.rb:432
+#: src/include/s390/dasd/dialogs.rb:442
 msgid "Formatted"
 msgstr "フォーマット済み"
 
 #. table header
-#: src/include/s390/dasd/dialogs.rb:434
+#: src/include/s390/dasd/dialogs.rb:444
 msgid "Partition Information"
 msgstr "パーティション情報"
 
 #. text entry
 #. text entry
-#: src/include/s390/dasd/dialogs.rb:445 src/include/s390/zfcp/dialogs.rb:146
+#: src/include/s390/dasd/dialogs.rb:455 src/include/s390/zfcp/dialogs.rb:146
 msgid "Mi&nimum Channel ID"
 msgstr "チャネル ID の最小値 (&N)"
 
 #. text entry
 #. text entry
-#: src/include/s390/dasd/dialogs.rb:452 src/include/s390/zfcp/dialogs.rb:153
+#: src/include/s390/dasd/dialogs.rb:462 src/include/s390/zfcp/dialogs.rb:153
 msgid "Ma&ximum Channel ID"
 msgstr "チャネル ID の最大値 (&X)"
 
 #. push button
 #. push button
-#: src/include/s390/dasd/dialogs.rb:458 src/include/s390/zfcp/dialogs.rb:159
+#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/zfcp/dialogs.rb:159
 msgid "&Filter"
 msgstr "フィルタ (&F)"
 
 #. menu button
 #. menu button
-#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/dasd/dialogs.rb:475
+#: src/include/s390/dasd/dialogs.rb:478 src/include/s390/dasd/dialogs.rb:485
 msgid "Perform &Action"
 msgstr "アクションの実行 (&A)"
 
-#: src/include/s390/dasd/dialogs.rb:471
+#: src/include/s390/dasd/dialogs.rb:481
 msgid "&Select All"
 msgstr "すべてを選択 (&S)"
 
-#: src/include/s390/dasd/dialogs.rb:472
+#: src/include/s390/dasd/dialogs.rb:482
 msgid "&Deselect All"
 msgstr "すべてを選択解除 (&D)"
 
 #. error popup
 #. error popup
-#: src/include/s390/dasd/dialogs.rb:543 src/include/s390/zfcp/dialogs.rb:221
+#: src/include/s390/dasd/dialogs.rb:553 src/include/s390/zfcp/dialogs.rb:221
 msgid "Invalid filter channel IDs."
 msgstr "チャネル ID のフィルタが正しくありません。"
 
 #. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:587
+#: src/include/s390/dasd/dialogs.rb:597
 msgid "Add New DASD Disk"
 msgstr "新しい DASD ディスクの追加"
 
 #. text entry
 #. combo box
-#: src/include/s390/dasd/dialogs.rb:598 src/include/s390/zfcp/dialogs.rb:301
+#: src/include/s390/dasd/dialogs.rb:608 src/include/s390/zfcp/dialogs.rb:301
 msgid "&Channel ID"
 msgstr "チャネル ID (&C)"
 
 #. check box
-#: src/include/s390/dasd/dialogs.rb:602
+#: src/include/s390/dasd/dialogs.rb:612
 msgid "Format the Disk"
 msgstr "ディスクをフォーマットする"
 
 #. check box
-#: src/include/s390/dasd/dialogs.rb:605
+#: src/include/s390/dasd/dialogs.rb:615
 msgid "Use &DIAG"
 msgstr "DIAG を使用する (&D)"
 
 #. yes-no popup
-#: src/include/s390/dasd/dialogs.rb:627
+#: src/include/s390/dasd/dialogs.rb:637
 msgid ""
 "Really leave the DASD disk configuration without saving?\n"
 "All changes will be lost."
@@ -320,14 +320,14 @@
 #. error popup
 #. error popup
 #. error popup
-#: src/include/s390/dasd/dialogs.rb:638 src/include/s390/zfcp/dialogs.rb:347
+#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:347
 #: src/include/s390/zfcp/dialogs.rb:364 src/include/s390/zfcp/dialogs.rb:400
 msgid "Not a valid channel ID."
 msgstr "チャネル ID が正しくありません。"
 
 #. error popup
 #. error popup
-#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:428
+#: src/include/s390/dasd/dialogs.rb:658 src/include/s390/zfcp/dialogs.rb:428
 msgid "Device already exists."
 msgstr "デバイスは既に存在します。"
 
@@ -1333,23 +1333,23 @@
 
 #. Create a textual summary and a list of configured devices
 #. @return summary of the current configuration
-#: src/modules/DASDController.rb:318
+#: src/modules/DASDController.rb:334
 msgid "Channel ID: %1, Format: %2, DIAG: %3"
 msgstr "チャネル ID: %1, フォーマット: %2, DIAG: %3"
 
-#: src/modules/DASDController.rb:331
+#: src/modules/DASDController.rb:347
 msgid "Channel ID: %1, Device: %2, DIAG: %3"
 msgstr "チャネル ID: %1, デバイス: %2, DIAG: %3"
 
 #. popup label
-#: src/modules/DASDController.rb:366
+#: src/modules/DASDController.rb:382
 msgid "Reading Configured DASD Disks"
 msgstr "設定した DASD ディスクを読み込んでいます"
 
 #. error report, %1 is device identification
 #. error report, %1 is device identification
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:457 src/modules/ZFCPController.rb:422
+#: src/modules/DASDController.rb:473 src/modules/ZFCPController.rb:422
 #: src/modules/ZFCPController.rb:516
 msgid "%1: sysfs not mounted."
 msgstr "%1: sysfs がマウントされていません。"
@@ -1357,65 +1357,65 @@
 #. error report, %1 is device identification
 #. error report, %1 is device identification
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:465 src/modules/ZFCPController.rb:430
+#: src/modules/DASDController.rb:481 src/modules/ZFCPController.rb:430
 #: src/modules/ZFCPController.rb:524
 msgid "%1: Invalid status for <online>."
 msgstr "%1: <online> の正しくないステータスです。"
 
 #. error report, %1 is device identification
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:473 src/modules/ZFCPController.rb:438
+#: src/modules/DASDController.rb:489 src/modules/ZFCPController.rb:438
 msgid "%1: No device found for <ccwid>."
 msgstr "%1: <ccwid> のデバイスが見つかりませんでした。"
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:481
+#: src/modules/DASDController.rb:497
 msgid "%1: Could not change state of the device."
 msgstr "%1: デバイスの状態を変更できませんでした。"
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:490
+#: src/modules/DASDController.rb:506
 msgid "%1: Device is not a DASD."
 msgstr "%1: デバイスは DASD ではありません"
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:499
+#: src/modules/DASDController.rb:515
 msgid "%1: Could not load module."
 msgstr "%1: モジュールをロードできませんでした。"
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:508
+#: src/modules/DASDController.rb:524
 msgid "%1: Failed to activate DASD."
 msgstr "%1: DASD の有効化に失敗しました。"
 
 #. error report, %1 is device identification
-#: src/modules/DASDController.rb:517
+#: src/modules/DASDController.rb:533
 msgid "%1: DASD is not formatted."
 msgstr "%1: DASD はフォーマットされていません。"
 
 #. error report, %1 is device identification, %2 is integer code
 #. error report, %1 is device identification, %2 is integer code
 #. error report, %1 is device identification, %2 is integer code
-#: src/modules/DASDController.rb:525 src/modules/ZFCPController.rb:494
+#: src/modules/DASDController.rb:541 src/modules/ZFCPController.rb:494
 #: src/modules/ZFCPController.rb:564
 msgid "%1: Unknown error %2."
 msgstr "%1: 不明なエラー %2。"
 
 #. progress bar
-#: src/modules/DASDController.rb:638
+#: src/modules/DASDController.rb:654
 msgid "Formatting %1:"
 msgstr "%1 をフォーマットしています:"
 
 #. error report, %1 is exit code of the command (integer)
 #. error report, %1 is exit code of the command (integer)
-#: src/modules/DASDController.rb:667 src/modules/DASDController.rb:764
+#: src/modules/DASDController.rb:683 src/modules/DASDController.rb:780
 msgid "Disks formatting failed. Exit code: %1."
 msgstr "ディスクのフォーマットに失敗しました。終了コード: %1 "
 
 #. progress bar, %1 is device name, %2 and %3
 #. integers,
 #. eg. Formatting /dev/dasda: cylinder 123 of 12334 done
-#: src/modules/DASDController.rb:735
+#: src/modules/DASDController.rb:751
 msgid "Formatting %1: cylinder %2 of %3 done"
 msgstr "%1 をフォーマットしています: %2/%3 シリンダが完了"
 

Modified: trunk/yast/ja/po/samba-server.ja.po
===================================================================
--- trunk/yast/ja/po/samba-server.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/samba-server.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: samba-server\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-05-21 20:17+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -737,10 +737,6 @@
 msgid "Start-&Up"
 msgstr "起動 (&U)"
 
-#: src/include/samba-server/dialogs.rb:1250
-msgid "Firewall Settings"
-msgstr "ファイアウオールの設定"
-
 #: src/include/samba-server/dialogs.rb:1259
 msgid "&Shares"
 msgstr "共有 (&S)"
@@ -1644,183 +1640,186 @@
 msgstr "ドメインメンバーサーバ"
 
 #. Samba-server read dialog caption
-#: src/modules/SambaServer.pm:120
+#: src/modules/SambaServer.pm:138
 msgid "Initializing Samba Server Configuration"
 msgstr "Samba サーバの設定を準備しています"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:125
+#: src/modules/SambaServer.pm:143
 msgid "Read global Samba settings"
 msgstr "Samba グローバル設定の読み込み"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:127
+#: src/modules/SambaServer.pm:145
 msgid "Read Samba secrets"
 msgstr "Samba 機密情報の読み込み"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:129
+#: src/modules/SambaServer.pm:147
 msgid "Read Samba service settings"
 msgstr "Samba サービス設定の読み込み"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:131
+#: src/modules/SambaServer.pm:149
 msgid "Read Samba accounts"
 msgstr "Samba アカウントの読み込み"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:133
+#: src/modules/SambaServer.pm:151
 msgid "Read the back-end settings"
 msgstr "バックエンド設定の読み込み"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:135
+#: src/modules/SambaServer.pm:153
 msgid "Read the firewall settings"
 msgstr "ファイアウオール設定の読み込み"
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:137
+#: src/modules/SambaServer.pm:155
 msgid "Read Samba service role settings"
 msgstr "Samba サービスの役割設定の読み込み"
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:140
+#: src/modules/SambaServer.pm:158
 msgid "Reading global Samba settings..."
 msgstr "Samba グローバル設定を読み込んでいます..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:142
+#: src/modules/SambaServer.pm:160
 msgid "Reading Samba secrets..."
 msgstr "Samba の機密情報を読み込んでいます..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:144
+#: src/modules/SambaServer.pm:162
 msgid "Reading Samba service settings..."
 msgstr "Samba サービスの設定を読み込んでいます..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:146
+#: src/modules/SambaServer.pm:164
 msgid "Reading Samba accounts..."
 msgstr "Samba アカウントを読み込んでいます..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:148
+#: src/modules/SambaServer.pm:166
 msgid "Reading the back-end settings..."
 msgstr "バックエンドの設定を読み込んでいます..."
 
 #. translators: progress step
-#: src/modules/SambaServer.pm:150
+#: src/modules/SambaServer.pm:168
 msgid "Reading the firewall settings..."
 msgstr "ファイアウオール設定を読み込んでいます..."
 
 #. translators: progress stage
-#: src/modules/SambaServer.pm:152
+#: src/modules/SambaServer.pm:170
 msgid "Reading Samba service role settings..."
 msgstr "Samba サービスの役割設定を読み込んでいます..."
 
 #. translators: progress finished
 #. translators: write progress step
-#: src/modules/SambaServer.pm:154 src/modules/SambaServer.pm:264
+#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:285
 msgid "Finished"
 msgstr "完了"
 
 #. Samba-server read dialog caption
-#: src/modules/SambaServer.pm:234
+#: src/modules/SambaServer.pm:255
 msgid "Saving Samba Server Configuration"
 msgstr "Samba サーバの設定を保存しています"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:239
+#: src/modules/SambaServer.pm:260
 msgid "Write global settings"
 msgstr "グローバル設定の書き込み"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:241
+#: src/modules/SambaServer.pm:262
 msgid "Disable Samba services"
 msgstr "Samba サービスを無効にする"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:243
+#: src/modules/SambaServer.pm:264
 msgid "Enable Samba services"
 msgstr "Samba サービスを有効にする"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:245
+#: src/modules/SambaServer.pm:266
 msgid "Write back-end settings"
 msgstr "バックエンドの設定の書き込み"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:247
+#: src/modules/SambaServer.pm:268
 msgid "Write Samba accounts"
 msgstr "Samba アカウントの書き込み"
 
 #. translators: write progress stage
-#: src/modules/SambaServer.pm:249
+#: src/modules/SambaServer.pm:270
 msgid "Save firewall settings"
 msgstr "ファイアウオール設定の保存"
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:252
+#: src/modules/SambaServer.pm:273
 msgid "Writing global settings..."
 msgstr "グローバル設定を書き込んでいます..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:254
+#: src/modules/SambaServer.pm:275
 msgid "Disabling Samba services..."
 msgstr "Samba サービスを無効にしています..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:256
+#: src/modules/SambaServer.pm:277
 msgid "Enabling Samba services..."
 msgstr "Samba サービスを有効にしています..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:258
+#: src/modules/SambaServer.pm:279
 msgid "Writing back-end settings..."
 msgstr "バックエンドの設定を書き込んでいます..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:260
+#: src/modules/SambaServer.pm:281
 msgid "Writing Samba accounts..."
 msgstr "Samba のアカウントを書き込んでいます..."
 
 #. translators: write progress step
-#: src/modules/SambaServer.pm:262
+#: src/modules/SambaServer.pm:283
 msgid "Saving firewall settings..."
 msgstr "ファイアウオール設定を保存しています..."
 
 #. /etc/samba/smb.conf is filename
-#: src/modules/SambaServer.pm:288
+#: src/modules/SambaServer.pm:309
 msgid "Cannot write settings to /etc/samba/smb.conf."
 msgstr "/etc/samba/smb.conf に設定を書き込めません。"
 
 #. summary item: configured workgroup/domain
-#: src/modules/SambaServer.pm:385
+#: src/modules/SambaServer.pm:406
 msgid "Global Configuration:"
 msgstr "グローバル設定:"
 
-#: src/modules/SambaServer.pm:387
+#: src/modules/SambaServer.pm:408
 #, perl-format
 msgid "Workgroup or Domain: %s"
 msgstr "ワークグループまたはドメイン: %s"
 
 #. summary item: selected role for the samba server
-#: src/modules/SambaServer.pm:391
+#: src/modules/SambaServer.pm:412
 #, perl-format
 msgid "Role: %s"
 msgstr "役割: %s"
 
 #. summary item: status of the samba service
-#: src/modules/SambaServer.pm:394
+#: src/modules/SambaServer.pm:415
 msgid "Samba server is disabled"
 msgstr "Samba サーバは無効です。"
 
 #. summary heading: configured shares
-#: src/modules/SambaServer.pm:398
+#: src/modules/SambaServer.pm:419
 msgid "Share Configuration:"
 msgstr "共有設定:"
 
 #. summary item: no configured shares
-#: src/modules/SambaServer.pm:404
+#: src/modules/SambaServer.pm:425
 msgid "None"
 msgstr "なし"
+
+#~ msgid "Firewall Settings"
+#~ msgstr "ファイアウオールの設定"

Modified: trunk/yast/ja/po/security.ja.po
===================================================================
--- trunk/yast/ja/po/security.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/security.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: security\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-04-05 11:51+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -222,102 +222,103 @@
 
 #. table header
 #. table header
-#: src/include/security/dialogs.rb:186 src/include/security/dialogs.rb:476
+#: src/include/security/dialogs.rb:186 src/include/security/dialogs.rb:470
 msgid "Security Setting"
 msgstr "セキュリティ設定"
 
-#: src/include/security/dialogs.rb:187 src/include/security/dialogs.rb:477
+#: src/include/security/dialogs.rb:187 src/include/security/dialogs.rb:471
 msgid "Status"
 msgstr "状態"
 
-#: src/include/security/dialogs.rb:188 src/include/security/dialogs.rb:478
+#: src/include/security/dialogs.rb:188 src/include/security/dialogs.rb:472
 msgid "Security Status"
 msgstr "セキュリティ状態"
 
 #. add one line for each security setting
-#: src/include/security/dialogs.rb:356
+#: src/include/security/dialogs.rb:348
 msgid "Help"
 msgstr "ヘルプ"
 
 #. this is a separator between service names
 #. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:402
+#: src/include/security/dialogs.rb:395
 msgid " or "
 msgstr " または "
 
 #. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:404
 msgid "<P>These basic system services are not enabled in runlevel %1:<BR><B>%2</B></P>"
 msgstr "<P>ランレベル %1 では以下の基本システムサービスが起動しません:<BR><B>%2</B></P>"
 
-#: src/include/security/dialogs.rb:419
+#: src/include/security/dialogs.rb:412
 msgid "<P>All basic services are enabled.</P>"
 msgstr "<P>全ての基本システムサービスが有効になっています。</P>"
 
-#: src/include/security/dialogs.rb:431
+#. TODO: runlevel is not longer needed (read above)
+#: src/include/security/dialogs.rb:425
 msgid "<P>These extra services are enabled in runlevel %1:<BR><B>%2</B></P>"
 msgstr "<P>ランレベル %1 では、これらの追加サービスが起動します:<BR><B>%2</B></P>"
 
-#: src/include/security/dialogs.rb:440
+#: src/include/security/dialogs.rb:434
 msgid "<P>Check the list of services and disable all unused services.</P>"
 msgstr "<P>サービス一覧を確認し、不要なサービスについては無効に設定してください。</P>"
 
-#: src/include/security/dialogs.rb:447
+#: src/include/security/dialogs.rb:441
 msgid "<P>Only basic system services are enabled.</P>"
 msgstr "<P>基本システムサービスのみが有効になっています。</P>"
 
-#: src/include/security/dialogs.rb:454
+#: src/include/security/dialogs.rb:448
 msgid "Description"
 msgstr "説明"
 
 #. Overview dialog caption
 #. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:466 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:460 src/include/security/wizards.rb:49
 msgid "Security Overview"
 msgstr "セキュリティの概要"
 
 #. push button label
-#: src/include/security/dialogs.rb:491
+#: src/include/security/dialogs.rb:485
 msgid "Change &Status"
 msgstr "状態の変更 (&S)"
 
 #. push button label
-#: src/include/security/dialogs.rb:494
+#: src/include/security/dialogs.rb:488
 msgid "&Description"
 msgstr "説明 (&D)"
 
 #. Boot dialog caption
-#: src/include/security/dialogs.rb:640 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:634 src/include/security/wizards.rb:57
 msgid "Boot Settings"
 msgstr "起動設定"
 
 #. Frame label
-#: src/include/security/dialogs.rb:652
+#: src/include/security/dialogs.rb:646
 msgid "Boot Permissions"
 msgstr "起動許可設定"
 
 #. Misc dialog caption
-#: src/include/security/dialogs.rb:729 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:723 src/include/security/wizards.rb:60
 msgid "Miscellaneous Settings"
 msgstr "その他の設定"
 
 #. Password dialog caption
-#: src/include/security/dialogs.rb:815 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:803 src/include/security/wizards.rb:56
 msgid "Password Settings"
 msgstr "パスワード設定"
 
 #. Frame label
-#: src/include/security/dialogs.rb:824
+#: src/include/security/dialogs.rb:812
 msgid "Checks"
 msgstr "チェック"
 
 #. Frame label
-#: src/include/security/dialogs.rb:839
+#: src/include/security/dialogs.rb:827
 msgid "Password Age"
 msgstr "パスワード有効日数"
 
 #. Popup text
-#: src/include/security/dialogs.rb:917
+#: src/include/security/dialogs.rb:905
 msgid ""
 "The minimum number of days cannot be larger\n"
 "than the maximum."
@@ -326,7 +327,7 @@
 "できません"
 
 #. Popup text, %1 is number
-#: src/include/security/dialogs.rb:934
+#: src/include/security/dialogs.rb:922
 msgid ""
 "The minimum password length cannot be larger than the maximum.\n"
 "The maximum password length for the selected encryption method is %1."
@@ -335,12 +336,12 @@
 "選択された暗号化方式の最大パスワード文字数は %1 です。"
 
 #. Login dialog caption
-#: src/include/security/dialogs.rb:966 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:954 src/include/security/wizards.rb:58
 msgid "Login Settings"
 msgstr "ログイン設定"
 
 #. Frame label
-#: src/include/security/dialogs.rb:975
+#: src/include/security/dialogs.rb:963
 msgid "Login"
 msgstr "ログイン"
 
@@ -1020,155 +1021,145 @@
 
 #. CheckBox label
 #: src/include/security/widgets.rb:116
-msgid "&Current Directory in root's Path"
-msgstr "root の PATH 環境変数にカレントディレクトリを含める (&C)"
-
-#. CheckBox label
-#: src/include/security/widgets.rb:122
-msgid "Curr&ent Directory in Path of Regular Users"
-msgstr "通常ユーザの PATH 環境変数にカレントディレクトリを含める (&E)"
-
-#. CheckBox label
-#: src/include/security/widgets.rb:130
 msgid "Allow Remote &Graphical Login"
 msgstr "リモートのグラフィカルログインを許可 (&G)"
 
 #. CheckBox label
-#: src/include/security/widgets.rb:136
+#: src/include/security/widgets.rb:122
 msgid "&Magic SysRq Keys"
 msgstr "マジック SysRq キー (&M)"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:139
+#: src/include/security/widgets.rb:125
 msgid "Disable"
 msgstr "無効"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:141
+#: src/include/security/widgets.rb:127
 msgid "Enable All Functions"
 msgstr "すべての機能を有効にする"
 
 #. IntField label
-#: src/include/security/widgets.rb:148
+#: src/include/security/widgets.rb:134
 msgid "&Delay after Incorrect Login Attempt"
 msgstr "ログイン失敗後の待機時間 (&D)"
 
 #. IntField label
 #. IntField label
-#: src/include/security/widgets.rb:156 src/include/security/widgets.rb:223
+#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:209
 msgid "Maxim&um"
 msgstr "最大値 (&U)"
 
 #. IntField label
 #. IntField label
-#: src/include/security/widgets.rb:162 src/include/security/widgets.rb:236
+#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:222
 msgid "M&inimum"
 msgstr "最小値 (&I)"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:168
+#: src/include/security/widgets.rb:154
 msgid "&Shutdown Behaviour of KDM Login Manager:"
 msgstr "KDM ログインマネージャのシャットダウン動作 (&S):"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:173
+#: src/include/security/widgets.rb:159
 msgid "Only root"
 msgstr "ルートのみに許可する"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:175
+#: src/include/security/widgets.rb:161
 msgid "All Users"
 msgstr "全てのユーザに許可する"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:177
+#: src/include/security/widgets.rb:163
 msgid "Nobody"
 msgstr "全てのユーザに許可しない"
 
 #. ComboBox value
 #. ["local",_("Local Users")],
 #. ComboBox value
-#: src/include/security/widgets.rb:181
+#: src/include/security/widgets.rb:167
 msgid "Automatic"
 msgstr "自動"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:188
+#: src/include/security/widgets.rb:174
 msgid "System Hybernation"
 msgstr "システムの休止"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:191
+#: src/include/security/widgets.rb:177
 msgid "User on the active console"
 msgstr "有効なコンソール上にいるユーザ"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:193
+#: src/include/security/widgets.rb:179
 msgid "Anyone can hibernate"
 msgstr "誰にでも休止できる"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:195
+#: src/include/security/widgets.rb:181
 msgid "Authentication always required"
 msgstr "常に認証を必要とする"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:202
+#: src/include/security/widgets.rb:188
 msgid "P&assword Encryption Method"
 msgstr "パスワードの暗号化方法 (&A)"
 
 #. CheckBox label
-#: src/include/security/widgets.rb:216
+#: src/include/security/widgets.rb:202
 msgid "&Check New Passwords"
 msgstr "新しいパスワードのチェック (&C)"
 
 #. IntField label
-#: src/include/security/widgets.rb:229
+#: src/include/security/widgets.rb:215
 msgid "Numb&er of Passwords to Remember"
 msgstr "記録するパスワードの数 (&E)"
 
 #. IntField label
-#: src/include/security/widgets.rb:242
+#: src/include/security/widgets.rb:228
 msgid "&Minimum Acceptable Password Length"
 msgstr "最小パスワード文字数 (&M)"
 
 #. IntField label
-#: src/include/security/widgets.rb:250
+#: src/include/security/widgets.rb:236
 msgid "&Days before Password Expires Warning"
 msgstr "パスワード失効警告日数 (&D)"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:258
+#: src/include/security/widgets.rb:244
 msgid "&File Permissions"
 msgstr "ファイルのアクセス権 (&F)"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:247
 msgid "Easy"
 msgstr "簡易"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:263
+#: src/include/security/widgets.rb:249
 msgid "Secure"
 msgstr "厳格"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:265
+#: src/include/security/widgets.rb:251
 msgid "Paranoid"
 msgstr "偏執"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:272
+#: src/include/security/widgets.rb:258
 msgid "&User Launching updatedb"
 msgstr "updatedb を実行するユーザ (&U)"
 
 #. IntField label
-#: src/include/security/widgets.rb:279
+#: src/include/security/widgets.rb:265
 msgid "Ma&ximum"
 msgstr "最大値 (&X)"
 
 #. IntField label
-#: src/include/security/widgets.rb:285
+#: src/include/security/widgets.rb:271
 msgid "&Minimum"
 msgstr "最小値 (&M)"
 
@@ -1187,61 +1178,67 @@
 msgstr "初期化しています..."
 
 #. Security read dialog caption
-#: src/modules/Security.rb:640
+#: src/modules/Security.rb:608
 msgid "Saving Security Configuration"
 msgstr "セキュリティの設定を保存しています"
 
 #. Progress stage 1/4
-#: src/modules/Security.rb:649
+#: src/modules/Security.rb:617
 msgid "Write security settings"
 msgstr "セキュリティ設定の書き込み"
 
 #. Progress stage 2/4
-#: src/modules/Security.rb:651
+#: src/modules/Security.rb:619
 msgid "Write inittab settings"
 msgstr "inittab 設定の書き込み"
 
 #. Progress stage 3/4
-#: src/modules/Security.rb:653
+#: src/modules/Security.rb:621
 msgid "Write PAM settings"
 msgstr "PAM 設定の書き込み"
 
 #. Progress stage 4/4
-#: src/modules/Security.rb:655
+#: src/modules/Security.rb:623
 msgid "Update system settings"
 msgstr "システム設定の更新"
 
 #. Progress step 1/5
-#: src/modules/Security.rb:659
+#: src/modules/Security.rb:627
 msgid "Writing security settings..."
 msgstr "セキュリティの設定を書き込んでいます..."
 
 #. Progress step 2/5
-#: src/modules/Security.rb:661
+#: src/modules/Security.rb:629
 msgid "Writing inittab settings..."
 msgstr "inittab の設定を書き込んでいます..."
 
 #. Progress step 3/5
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:631
 msgid "Writing PAM settings..."
 msgstr "PAM の設定を書き込んでいます..."
 
 #. Progress step 4/5
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:633
 msgid "Updating system settings..."
 msgstr "システム設定を更新しています..."
 
 #. Progress step 5/5
-#: src/modules/Security.rb:667
+#: src/modules/Security.rb:635
 msgid "Finished"
 msgstr "完了"
 
 #. Summary text
-#: src/modules/Security.rb:901
+#: src/modules/Security.rb:869
 msgid "Current Security Level: Custom settings"
 msgstr "現在のセキュリティレベル: カスタム設定"
 
 #. Summary text
-#: src/modules/Security.rb:905
+#: src/modules/Security.rb:873
 msgid "Current Security Level: %1"
 msgstr "現在のセキュリティレベル: %1"
+
+#~ msgid "&Current Directory in root's Path"
+#~ msgstr "root の PATH 環境変数にカレントディレクトリを含める (&C)"
+
+#~ msgid "Curr&ent Directory in Path of Regular Users"
+#~ msgstr "通常ユーザの PATH 環境変数にカレントディレクトリを含める (&E)"

Modified: trunk/yast/ja/po/services-manager.ja.po
===================================================================
--- trunk/yast/ja/po/services-manager.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/services-manager.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: services-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-18 16:19+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-08-19 07:56+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -20,186 +20,7 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/clients/default_target_finish.rb:33
-msgid "Saving default systemd target..."
-msgstr "既定の systemd ターゲットを保存しています..."
-
-#: src/clients/default_target_proposal.rb:26
-msgid "VNC needs graphical system to be available"
-msgstr "VNC を利用するには、グラフィカルシステムを有効化する必要があります"
-
 #. TODO implement behaviour if force_reset parameter provided
-#: src/clients/default_target_proposal.rb:51
-msgid "&Default systemd target"
-msgstr "既定の systemd ターゲット (&D)"
-
-#: src/clients/default_target_proposal.rb:52
-msgid "Default systemd target"
-msgstr "既定の systemd ターゲット"
-
-#. create the proposal dialog and get the sequence symbol from block
-#: src/clients/default_target_proposal.rb:116
-msgid "Set Default Systemd Target"
-msgstr "既定の systemd ターゲットに設定"
-
-#: src/clients/default_target_proposal.rb:134
-msgid "Selecting the Default Systemd Target"
-msgstr "既定の systemd ターゲットの選択"
-
-#: src/clients/default_target_proposal.rb:136
-msgid "Systemd is a system and service manager for Linux. It consists of units whose job is to activate services and other units."
-msgstr "systemd は Linux 向けのシステム／サービスマネージャです。特定のサービスを有効にするためのジョブから構成される、ユニットと呼ばれる仕組みを利用します。"
-
-#: src/clients/default_target_proposal.rb:139
-msgid "Default target unit is activated on boot by default. Usually it is a symlink located in path/etc/systemd/system/default.target . See more on systemd man page."
-msgstr "既定のターゲットユニットとは、起動時に既定で有効化されるものです。通常は/etc/systemd/system/default.target としてシンボリックリンクで設定します。詳しくは systemd のマニュアルページをお読みください。"
-
-#: src/clients/default_target_proposal.rb:143
-msgid "Multi-User target is for setting up a non-graphical multi-user system with network suitable for server (similar to runlevel 3)."
-msgstr "マルチユーザターゲットとは、サーバに適した、ネットワーク機能付きのマルチユーザ環境を設定するためのものです (ランレベル 3 に似た構成です) 。"
-
-#: src/clients/default_target_proposal.rb:146
-msgid "Graphical target for setting up a graphical login screen with network which is typical for workstations (similar to runlevel 5)."
-msgstr "グラフィカルターゲットとは、ワークステーションに適した、ネットワーク機能付きのグラフィカルログイン環境を設定するためのものです (ランレベル 5 に似た構成です) 。"
-
-#: src/clients/default_target_proposal.rb:149
-msgid "When you are not sure what would be the best option for you then go with graphical target."
-msgstr "どれを選択したらよいのか分からない場合は、グラフィカルターゲットを選択して進めてください。"
-
-#: src/clients/default_target_proposal.rb:160
-msgid "Available Targets"
-msgstr "利用可能なターゲット"
-
-#. Check if the user forced a particular target before; if he did and the
-#. autodetection recommends a different one now, warn the user about this
-#. and keep the default target unchanged.
-#: src/clients/default_target_proposal.rb:219
-msgid "The installer is recommending you the default target '%s' "
-msgstr "インストーラは既定のターゲットとして '%s' を推奨します。"
-
-#: src/clients/default_target_proposal.rb:231
-msgid "X11 packages have been selected for installation"
-msgstr "X11 パッケージをインストールするように選択しました"
-
-#: src/clients/default_target_proposal.rb:234
-msgid "Live Installation is typically used for full GUI in target system"
-msgstr "ライブメディアからのインストールは、ターゲットシステムを完全に GUI 対応させるために使用します"
-
-#: src/clients/default_target_proposal.rb:237
-msgid "Serial connection does typically not support GUI"
-msgstr "シリアル接続は通常、 GUI には対応していません"
-
-#: src/clients/default_target_proposal.rb:241
-msgid "Text mode installation assumes no GUI on the target system"
-msgstr "テキストモードのインストールでは、ターゲットシステムに GUI が存在しないものとして扱われます"
-
-#: src/clients/default_target_proposal.rb:244
-#: src/clients/default_target_proposal.rb:248
-msgid "Using VNC assumes a GUI on the target system"
-msgstr "VNC を使用する場合は、ターゲットシステムに GUI が存在するものとして扱われます"
-
-#: src/clients/default_target_proposal.rb:251
-msgid "SSH installation mode assumes no GUI on the target system"
-msgstr "SSH を使用する場合は、ターゲットシステムに GUI が存在しないものとして扱われます"
-
-#: src/clients/default_target_proposal.rb:254
-msgid "X11 packages have not been selected for installation"
-msgstr "X11 パッケージをインストールするようには選択していません"
-
-#: src/clients/default_target_proposal.rb:257
-msgid "This recommendation is based on the analysis of other installation settings"
-msgstr "この推奨値は、他のインストール設定からの分析をベースにしています"
-
-#. Default for double-click in the table
-#. Default for double-click in the table
-#: src/clients/services-manager.rb:71 src/clients/services.rb:71
-msgid "Writing configuration..."
-msgstr "設定を書き込んでいます..."
-
-#: src/clients/services-manager.rb:76 src/clients/services.rb:76
-msgid "Writing the configuration failed:\n"
-msgstr "設定ファイルの書き込みに失敗しました:\n"
-
-#. Fills the dialog contents
-#. Fills the dialog contents
-#: src/clients/services-manager.rb:91 src/clients/services.rb:91
-msgid "Default System &Target"
-msgstr "既定のシステムターゲット (&T)"
-
-#: src/clients/services-manager.rb:99 src/clients/services.rb:99
-msgid "Service"
-msgstr "サービス"
-
-#: src/clients/services-manager.rb:100 src/clients/services-manager.rb:130
-#: src/clients/services-manager.rb:146 src/clients/services.rb:100
-#: src/clients/services.rb:130 src/clients/services.rb:146
-#: src/data/services-manager/autoyast_summary.erb:16
-msgid "Enabled"
-msgstr "有効"
-
-#. The current state matches the futural state
-#. The current state matches the futural state
-#: src/clients/services-manager.rb:101 src/clients/services-manager.rb:131
-#: src/clients/services-manager.rb:156 src/clients/services.rb:101
-#: src/clients/services.rb:131 src/clients/services.rb:156
-msgid "Active"
-msgstr "有効"
-
-#: src/clients/services-manager.rb:102 src/clients/services.rb:102
-msgid "Description"
-msgstr "説明"
-
-#: src/clients/services-manager.rb:107 src/clients/services.rb:107
-msgid "&Start/Stop"
-msgstr "開始／停止 (&S)"
-
-#: src/clients/services-manager.rb:109 src/clients/services.rb:109
-msgid "&Enable/Disable"
-msgstr "有効／無効 (&E)"
-
-#: src/clients/services-manager.rb:111 src/clients/services.rb:111
-msgid "Show &Details"
-msgstr "詳細の表示 (&D)"
-
-#: src/clients/services-manager.rb:114 src/clients/services.rb:114
-#: src/data/services-manager/autoyast_summary.erb:5
-msgid "Services Manager"
-msgstr "サービスマネージャ"
-
-#. Redraws the services dialog
-#. Redraws the services dialog
-#: src/clients/services-manager.rb:126 src/clients/services.rb:126
-msgid "Reading services status..."
-msgstr "サービスの状態を読み込んでいます..."
-
-#: src/clients/services-manager.rb:130 src/clients/services-manager.rb:146
-#: src/clients/services.rb:130 src/clients/services.rb:146
-#: src/data/services-manager/autoyast_summary.erb:23
-msgid "Disabled"
-msgstr "無効"
-
-#: src/clients/services-manager.rb:131 src/clients/services-manager.rb:156
-#: src/clients/services.rb:131 src/clients/services.rb:156
-msgid "Inactive"
-msgstr "無効"
-
-#. The current state differs the the futural state
-#. The current state differs the the futural state
-#: src/clients/services-manager.rb:163 src/clients/services.rb:163
-msgid "Active (will start)"
-msgstr "有効 (開始します)"
-
-#: src/clients/services-manager.rb:163 src/clients/services.rb:163
-msgid "Inactive (will stop)"
-msgstr "無効 (停止します)"
-
-#. Opens up a popup with details about the currently selected service
-#. Opens up a popup with details about the currently selected service
-#: src/clients/services-manager.rb:190 src/clients/services.rb:190
-msgid "Service %{service} Full Info"
-msgstr "サービス %{service} の詳しい情報"
-
-#. TODO implement behaviour if force_reset parameter provided
 #: src/clients/services_proposal.rb:52
 msgid "&Services"
 msgstr "サービス (&S)"
@@ -255,62 +76,162 @@
 msgid "Cannot enable service %1"
 msgstr "サービス %1 を有効化できません"
 
+#: src/data/services-manager/autoyast_summary.erb:5
+msgid "Services Manager"
+msgstr "サービスマネージャ"
+
 #: src/data/services-manager/autoyast_summary.erb:6
 msgid "Default Target"
 msgstr "既定のターゲット"
 
+#: src/data/services-manager/autoyast_summary.erb:16
+msgid "Enabled"
+msgstr "有効"
+
+#: src/data/services-manager/autoyast_summary.erb:23
+msgid "Disabled"
+msgstr "無効"
+
 #. Name of the systemd default target unit. Suffix '.target' is optional.
 #. @return [String] if the target has been specified in the profile. Can be nil.
 #: src/lib/services-manager/services_manager_profile.rb:104
 msgid "Unknown autoyast services profile schema for 'services-manager'"
 msgstr "'services-manager' に対する AutoYaST のサービスプロファイルスキーマが不明です"
 
-#. AutoYast summary
-#: src/modules/services_manager.rb:29
-msgid "Not configured yet."
-msgstr "まだ設定されていません。"
+#~ msgid "Saving default systemd target..."
+#~ msgstr "既定の systemd ターゲットを保存しています..."
 
-#. Do not start or stop services that are already in the desired state
-#. they might be coming from AutoYast import and thus they are :modified.
-#: src/modules/services_manager_service.rb:407
-msgid "Could not %{change} %{service} which is currently %{status}. "
-msgstr "%{service} を %{change} することができません。現在の状態は %{status} です。"
+#~ msgid "VNC needs graphical system to be available"
+#~ msgstr "VNC を利用するには、グラフィカルシステムを有効化する必要があります"
 
-#: src/modules/services_manager_service.rb:426
-msgid "Could not %{change} %{service}. "
-msgstr "%{service} を %{change} することができません。"
+#~ msgid "&Default systemd target"
+#~ msgstr "既定の systemd ターゲット (&D)"
 
-#. Default systemd target (previously: runlevel 5) option #1
-#: src/modules/services_manager_target.rb:22
-msgid "Graphical mode"
-msgstr "グラフィカルモード"
+#~ msgid "Default systemd target"
+#~ msgstr "既定の systemd ターゲット"
 
-#. Default systemd target (previously: runlevel 3) option #2
-#: src/modules/services_manager_target.rb:24
-msgid "Text mode"
-msgstr "テキストモード"
+#~ msgid "Set Default Systemd Target"
+#~ msgstr "既定の systemd ターゲットに設定"
 
-#. Systemd targets
-#: src/modules/services_manager_target.rb:27
-msgid "Graphical Interface"
-msgstr "グラフィカルインターフェイス"
+#~ msgid "Selecting the Default Systemd Target"
+#~ msgstr "既定の systemd ターゲットの選択"
 
-#: src/modules/services_manager_target.rb:28
-msgid "Emergency Mode"
-msgstr "緊急モード"
+#~ msgid "Systemd is a system and service manager for Linux. It consists of units whose job is to activate services and other units."
+#~ msgstr "systemd は Linux 向けのシステム／サービスマネージャです。特定のサービスを有効にするためのジョブから構成される、ユニットと呼ばれる仕組みを利用します。"
 
-#: src/modules/services_manager_target.rb:29
-msgid "Switch Root"
-msgstr "ルート切り替え"
+#~ msgid "Default target unit is activated on boot by default. Usually it is a symlink located in path/etc/systemd/system/default.target . See more on systemd man page."
+#~ msgstr "既定のターゲットユニットとは、起動時に既定で有効化されるものです。通常は/etc/systemd/system/default.target としてシンボリックリンクで設定します。詳しくは systemd のマニュアルページをお読みください。"
 
-#: src/modules/services_manager_target.rb:30
-msgid "Initrd Default Target"
-msgstr "initrd 既定のターゲット"
+#~ msgid "Multi-User target is for setting up a non-graphical multi-user system with network suitable for server (similar to runlevel 3)."
+#~ msgstr "マルチユーザターゲットとは、サーバに適した、ネットワーク機能付きのマルチユーザ環境を設定するためのものです (ランレベル 3 に似た構成です) 。"
 
-#: src/modules/services_manager_target.rb:31
-msgid "Multi-User System"
-msgstr "マルチユーザシステム"
+#~ msgid "Graphical target for setting up a graphical login screen with network which is typical for workstations (similar to runlevel 5)."
+#~ msgstr "グラフィカルターゲットとは、ワークステーションに適した、ネットワーク機能付きのグラフィカルログイン環境を設定するためのものです (ランレベル 5 に似た構成です) 。"
 
-#: src/modules/services_manager_target.rb:32
-msgid "Rescue Mode"
-msgstr "レスキューモード"
+#~ msgid "When you are not sure what would be the best option for you then go with graphical target."
+#~ msgstr "どれを選択したらよいのか分からない場合は、グラフィカルターゲットを選択して進めてください。"
+
+#~ msgid "Available Targets"
+#~ msgstr "利用可能なターゲット"
+
+#~ msgid "The installer is recommending you the default target '%s' "
+#~ msgstr "インストーラは既定のターゲットとして '%s' を推奨します。"
+
+#~ msgid "X11 packages have been selected for installation"
+#~ msgstr "X11 パッケージをインストールするように選択しました"
+
+#~ msgid "Live Installation is typically used for full GUI in target system"
+#~ msgstr "ライブメディアからのインストールは、ターゲットシステムを完全に GUI 対応させるために使用します"
+
+#~ msgid "Serial connection does typically not support GUI"
+#~ msgstr "シリアル接続は通常、 GUI には対応していません"
+
+#~ msgid "Text mode installation assumes no GUI on the target system"
+#~ msgstr "テキストモードのインストールでは、ターゲットシステムに GUI が存在しないものとして扱われます"
+
+#~ msgid "Using VNC assumes a GUI on the target system"
+#~ msgstr "VNC を使用する場合は、ターゲットシステムに GUI が存在するものとして扱われます"
+
+#~ msgid "SSH installation mode assumes no GUI on the target system"
+#~ msgstr "SSH を使用する場合は、ターゲットシステムに GUI が存在しないものとして扱われます"
+
+#~ msgid "X11 packages have not been selected for installation"
+#~ msgstr "X11 パッケージをインストールするようには選択していません"
+
+#~ msgid "This recommendation is based on the analysis of other installation settings"
+#~ msgstr "この推奨値は、他のインストール設定からの分析をベースにしています"
+
+#~ msgid "Writing configuration..."
+#~ msgstr "設定を書き込んでいます..."
+
+#~ msgid "Writing the configuration failed:\n"
+#~ msgstr "設定ファイルの書き込みに失敗しました:\n"
+
+#~ msgid "Default System &Target"
+#~ msgstr "既定のシステムターゲット (&T)"
+
+#~ msgid "Service"
+#~ msgstr "サービス"
+
+#~ msgid "Active"
+#~ msgstr "有効"
+
+#~ msgid "Description"
+#~ msgstr "説明"
+
+#~ msgid "&Start/Stop"
+#~ msgstr "開始／停止 (&S)"
+
+#~ msgid "&Enable/Disable"
+#~ msgstr "有効／無効 (&E)"
+
+#~ msgid "Show &Details"
+#~ msgstr "詳細の表示 (&D)"
+
+#~ msgid "Reading services status..."
+#~ msgstr "サービスの状態を読み込んでいます..."
+
+#~ msgid "Inactive"
+#~ msgstr "無効"
+
+#~ msgid "Active (will start)"
+#~ msgstr "有効 (開始します)"
+
+#~ msgid "Inactive (will stop)"
+#~ msgstr "無効 (停止します)"
+
+#~ msgid "Service %{service} Full Info"
+#~ msgstr "サービス %{service} の詳しい情報"
+
+#~ msgid "Not configured yet."
+#~ msgstr "まだ設定されていません。"
+
+#~ msgid "Could not %{change} %{service} which is currently %{status}. "
+#~ msgstr "%{service} を %{change} することができません。現在の状態は %{status} です。"
+
+#~ msgid "Could not %{change} %{service}. "
+#~ msgstr "%{service} を %{change} することができません。"
+
+#~ msgid "Graphical mode"
+#~ msgstr "グラフィカルモード"
+
+#~ msgid "Text mode"
+#~ msgstr "テキストモード"
+
+#~ msgid "Graphical Interface"
+#~ msgstr "グラフィカルインターフェイス"
+
+#~ msgid "Emergency Mode"
+#~ msgstr "緊急モード"
+
+#~ msgid "Switch Root"
+#~ msgstr "ルート切り替え"
+
+#~ msgid "Initrd Default Target"
+#~ msgstr "initrd 既定のターゲット"
+
+#~ msgid "Multi-User System"
+#~ msgstr "マルチユーザシステム"
+
+#~ msgid "Rescue Mode"
+#~ msgstr "レスキューモード"

Modified: trunk/yast/ja/po/storage.ja.po
===================================================================
--- trunk/yast/ja/po/storage.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/storage.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: storage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-29 18:07+0200\n"
+"POT-Creation-Date: 2014-10-29 16:21+0100\n"
 "PO-Revision-Date: 2014-08-01 07:44+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -1567,6 +1567,13 @@
 msgstr "ボリュームラベル (&L)"
 
 #. label text
+#: src/include/partitioning/custom_part_dialogs.rb:516
+#, fuzzy
+#| msgid "UUID"
+msgid "&UUID"
+msgstr "UUID"
+
+#. label text
 #: src/include/partitioning/custom_part_dialogs.rb:526
 msgid "Device &ID"
 msgstr "デバイス ID (&I)"
@@ -1757,28 +1764,8 @@
 "\n"
 "今すぐサイズを縮小しますか？"
 
-#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1410
-msgid "No unsaved changes exist."
-msgstr "保存されていない変更内容があります。"
-
-#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1417
-msgid "Changes:"
-msgstr "変更内容:"
-
-#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1429
-msgid " Do you really want to execute these changes?"
-msgstr " これらの変更を実行しますか？"
-
-#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1435
-msgid "&Apply"
-msgstr "適用 (&A)"
-
 #. popup text, %1 is replaced by device name
-#: src/include/partitioning/custom_part_dialogs.rb:1495
+#: src/include/partitioning/custom_part_dialogs.rb:1441
 msgid ""
 "The selected device contains partitions that are currently mounted:\n"
 "%1\n"
@@ -1791,7 +1778,7 @@
 "また、特別な事情がない限り、キャンセルを押してください。\n"
 
 #. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_dialogs.rb:1518
+#: src/include/partitioning/custom_part_dialogs.rb:1464
 msgid ""
 "\n"
 "The selected device contains at least one LVM partition\n"
@@ -1806,7 +1793,7 @@
 "取り除いてください。\n"
 
 #. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_dialogs.rb:1529
+#: src/include/partitioning/custom_part_dialogs.rb:1475
 msgid ""
 "\n"
 "The selected device contains at least one partition\n"
@@ -1820,7 +1807,7 @@
 "パーティションを取り除いてください。\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1540
+#: src/include/partitioning/custom_part_dialogs.rb:1486
 msgid ""
 "\n"
 "The selected device contains at least one partition\n"
@@ -1833,55 +1820,55 @@
 "ボリュームを削除してください。\n"
 
 #. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:1601
+#: src/include/partitioning/custom_part_dialogs.rb:1547
 msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n"
 msgstr "<p>btrfs ファイルシステムからサブボリュームを作成したり、サブボリュームを削除したりすることができます。</p>\n"
 
-#: src/include/partitioning/custom_part_dialogs.rb:1606
+#: src/include/partitioning/custom_part_dialogs.rb:1552
 msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>"
 msgstr "<p>snapper を利用して btrfs ファイルシステムの自動スナップショットを有効にします。</p>"
 
 #. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1620
+#: src/include/partitioning/custom_part_dialogs.rb:1566
 msgid "Existing Subvolumes:"
 msgstr "既存のサブボリューム:"
 
 #. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1626
+#: src/include/partitioning/custom_part_dialogs.rb:1572
 msgid "New Subvolume"
 msgstr "新しいサブボリューム"
 
 #. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1632
+#: src/include/partitioning/custom_part_dialogs.rb:1578
 msgid "Add new"
 msgstr "新規追加"
 
 #. button text
 #. push button text
-#: src/include/partitioning/custom_part_dialogs.rb:1638
+#: src/include/partitioning/custom_part_dialogs.rb:1584
 #: src/modules/DualMultiSelectionBox.rb:147
 msgid "Remove"
 msgstr "削除"
 
 #. TRANSLATOR: checkbox text
 #. TRANSLATORS: checkbox text
-#: src/include/partitioning/custom_part_dialogs.rb:1650
+#: src/include/partitioning/custom_part_dialogs.rb:1596
 #: src/modules/StorageProposal.rb:6211
 msgid "Enable Snapshots"
 msgstr "スナップショットの有効化"
 
 #. heading text
 #. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1661
+#: src/include/partitioning/custom_part_dialogs.rb:1607
 #: src/include/partitioning/custom_part_lib.rb:420
 msgid "Subvolume Handling"
 msgstr "サブボリュームの処理"
 
-#: src/include/partitioning/custom_part_dialogs.rb:1724
+#: src/include/partitioning/custom_part_dialogs.rb:1670
 msgid "Empty subvolume name not allowed."
 msgstr "サブボリューム名には何らかの名前を指定する必要があります。"
 
-#: src/include/partitioning/custom_part_dialogs.rb:1728
+#: src/include/partitioning/custom_part_dialogs.rb:1674
 msgid ""
 "Only subvolume names starting with \"%1\" currently allowed!\n"
 "Automatically prepending \"%1\" to name of subvolume."
@@ -1889,11 +1876,11 @@
 "現時点では、サブボリューム名は \"%1\" で始まるもののみが許されます。\n"
 "サブボリューム名の頭には、自動的に \"%1\" が付けられます。"
 
-#: src/include/partitioning/custom_part_dialogs.rb:1738
+#: src/include/partitioning/custom_part_dialogs.rb:1684
 msgid "Subvolume name %1 already exists."
 msgstr "サブボリューム名 %1 は既に存在します。"
 
-#: src/include/partitioning/custom_part_dialogs.rb:1767
+#: src/include/partitioning/custom_part_dialogs.rb:1713
 msgid "Modifications done so far in this dialog will be lost."
 msgstr "このダイアログ内での変更点は失われてしまいます。"
 
@@ -2241,12 +2228,12 @@
 
 #. //////////////////////////////////////////////
 #. modify map new
-#: src/include/partitioning/custom_part_lib.rb:954
-#: src/include/partitioning/custom_part_lib.rb:981
+#: src/include/partitioning/custom_part_lib.rb:948
+#: src/include/partitioning/custom_part_lib.rb:975
 msgid "The file system is currently mounted on %1."
 msgstr "ファイルシステムは現在、 %1 にマウントされています。"
 
-#: src/include/partitioning/custom_part_lib.rb:959
+#: src/include/partitioning/custom_part_lib.rb:953
 msgid ""
 "You can try to unmount it now, continue without unmounting or cancel.\n"
 "Click Cancel unless you know exactly what you are doing."
@@ -2257,12 +2244,12 @@
 
 #. button text
 #. button text
-#: src/include/partitioning/custom_part_lib.rb:970
-#: src/include/partitioning/custom_part_lib.rb:995
+#: src/include/partitioning/custom_part_lib.rb:964
+#: src/include/partitioning/custom_part_lib.rb:989
 msgid "Unmount"
 msgstr "マウント解除"
 
-#: src/include/partitioning/custom_part_lib.rb:986
+#: src/include/partitioning/custom_part_lib.rb:980
 msgid ""
 "You can try to unmount it now or cancel.\n"
 "Click Cancel unless you know exactly what you are doing."
@@ -2270,15 +2257,15 @@
 "今すぐにマウントを解除しようとすることもできますし、キャンセルすることもできます。\n"
 "特別な事情がある場合を除き、ここではキャンセルを押してください。"
 
-#: src/include/partitioning/custom_part_lib.rb:1032
+#: src/include/partitioning/custom_part_lib.rb:1026
 msgid "It is not possible to shrink the file system while it is mounted."
 msgstr "対象のファイルシステムがマウント中の場合、そのファイルシステムを縮小することはできません。"
 
-#: src/include/partitioning/custom_part_lib.rb:1045
+#: src/include/partitioning/custom_part_lib.rb:1039
 msgid "It is not possible to extend the file system while it is mounted."
 msgstr "対象のファイルシステムがマウント中の場合、そのファイルシステムを拡張することはできません。"
 
-#: src/include/partitioning/custom_part_lib.rb:1056
+#: src/include/partitioning/custom_part_lib.rb:1050
 msgid "It is not possible to resize the file system while it is mounted."
 msgstr "対象のファイルシステムがマウント中の場合、そのファイルシステムのサイズを変更することはできません。"
 
@@ -3234,7 +3221,7 @@
 
 #. error popup
 #. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5164
+#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5165
 msgid "The disk is in use and cannot be modified."
 msgstr "ディスクは現在使用中であるため、変更できません。"
 
@@ -5283,12 +5270,12 @@
 msgstr "パターンファイル"
 
 #. label text
-#: src/modules/FileSystems.rb:276
+#: src/modules/FileSystems.rb:278
 msgid "Tmpfs &Size"
 msgstr "tmpfs サイズ (&S)"
 
 #. popup text
-#: src/modules/FileSystems.rb:285
+#: src/modules/FileSystems.rb:287
 msgid ""
 "Invalid Size specified. Use number followed by K, M, G or %.\n"
 "Value must be above 100k or between 1% and 200%. Try again."
@@ -5296,12 +5283,12 @@
 "サイズの指定が正しくありません。数字に続いて K, M, G, % などを指定してください。\n"
 "値は 100k 以上、もしくは 1% ～ 200% の間で指定します。もう一度入力してください。"
 
-#: src/modules/FileSystems.rb:288
+#: src/modules/FileSystems.rb:290
 msgid "Value must be between 1% and 200%. Try again."
 msgstr "1% から 200% までの値を指定します。もう一度入力してください。"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:295
+#: src/modules/FileSystems.rb:297
 msgid ""
 "<p><b>Tmpfs Size:</b>\n"
 "Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or Gigabyte or\n"
@@ -5312,17 +5299,17 @@
 "ができます。また、パーセント記号を付けると、メモリに対する割合を指定することもできます。</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:309
+#: src/modules/FileSystems.rb:311
 msgid "Swap &Priority"
 msgstr "スワップ優先度 (&P)"
 
 #. popup text
-#: src/modules/FileSystems.rb:317
+#: src/modules/FileSystems.rb:319
 msgid "Value must be between 0 and 32767. Try again."
 msgstr "0 ～ 32767 の間で指定してください。もう一度入力してください。"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:324
+#: src/modules/FileSystems.rb:326
 msgid ""
 "<p><b>Swap Priority:</b>\n"
 "Enter the swap priority. Higher numbers mean higher priority.</p>\n"
@@ -5331,12 +5318,12 @@
 "スワップ優先度を入力します。大きい数値ほどより高い優先度を意味します。</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:479
+#: src/modules/FileSystems.rb:481
 msgid "Mount &Read-Only"
 msgstr "読み込み専用でマウント (&R)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:483
+#: src/modules/FileSystems.rb:485
 msgid ""
 "<p><b>Mount Read-Only:</b>\n"
 "Writing to the file system is not possible. Default is false. During installation\n"
@@ -5346,12 +5333,12 @@
 "ファイルシステムに書き込むことができなくなります。既定は 'false' (いいえ) です。インストールの際は、ファイルシステムは常に読み書き可能な状態でマウントされます。</p>"
 
 #. button text
-#: src/modules/FileSystems.rb:495
+#: src/modules/FileSystems.rb:497
 msgid "No &Access Time"
 msgstr "アクセスタイムを使用しない (&A)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:499
+#: src/modules/FileSystems.rb:501
 msgid ""
 "<p><b>No Access Time:</b>\n"
 "Access times are not updated when a file is read. Default is false.</p>\n"
@@ -5360,12 +5347,14 @@
 "ファイルを読み込むときアクセスタイムを更新しません。既定は 'false' (いいえ) です。</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:509
-msgid "Mountable by &User"
+#: src/modules/FileSystems.rb:511
+#, fuzzy
+#| msgid "Mountable by &User"
+msgid "Mountable by User"
 msgstr "ユーザによるマウントを許可 (&U)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:513
+#: src/modules/FileSystems.rb:515
 msgid ""
 "<p><b>Mountable by User:</b>\n"
 "The file system may be mounted by an ordinary user. Default is false.</p>\n"
@@ -5374,12 +5363,12 @@
 "一般ユーザがそのファイルシステムをマウントできるようになります。既定は 'false' (いいえ) です。</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:526
+#: src/modules/FileSystems.rb:528
 msgid "Do Not Mount at System &Start-up"
 msgstr "システム起動時にマウントしない (&S)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:532
+#: src/modules/FileSystems.rb:534
 msgid ""
 "<p><b>Do Not Mount at System Start-up:</b>\n"
 "The file system is not automatically mounted when the system starts.\n"
@@ -5395,12 +5384,12 @@
 "既定は 'false' (いいえ) です。</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:549
+#: src/modules/FileSystems.rb:551
 msgid "Enable &Quota Support"
 msgstr "クォータサポートを有効にする (&Q)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:555
+#: src/modules/FileSystems.rb:557
 msgid ""
 "<p><b>Enable Quota Support:</b>\n"
 "The file system is mounted with user quotas enabled.\n"
@@ -5411,12 +5400,12 @@
 "既定ではクォータは無効になっています。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:574
+#: src/modules/FileSystems.rb:576
 msgid "Data &Journaling Mode"
 msgstr "データジャーナリングモード (&J)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:583
+#: src/modules/FileSystems.rb:585
 msgid ""
 "<p><b>Data Journaling Mode:</b>\n"
 "Specifies the journaling mode for file data.\n"
@@ -5435,12 +5424,12 @@
 "<tt>writeback</tt> -- データの順序性を保持しません。パフォーマンスへの影響はありません。</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:604
+#: src/modules/FileSystems.rb:606
 msgid "&Access Control Lists (ACL)"
 msgstr "アクセス制御リスト (ACL) (&A)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:608
+#: src/modules/FileSystems.rb:610
 msgid ""
 "<p><b>Access Control Lists (ACL):</b>\n"
 "Enable access control lists on the file system.</p>\n"
@@ -5449,12 +5438,12 @@
 "ファイルシステム上のアクセス制御リストを有効にします。</p>\n"
 
 #. button text
-#: src/modules/FileSystems.rb:619
+#: src/modules/FileSystems.rb:621
 msgid "&Extended User Attributes"
 msgstr "拡張ユーザ属性 (&E)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:623
+#: src/modules/FileSystems.rb:625
 msgid ""
 "<p><b>Extended User Attributes:</b>\n"
 "Allow extended user attributes on the file system.</p>\n"
@@ -5463,16 +5452,16 @@
 "ファイルシステム上の拡張ユーザ属性を使用できるようにします。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:640
+#: src/modules/FileSystems.rb:642
 msgid "Arbitrary Option &Value"
 msgstr "その他のオプション値 (&V)"
 
-#: src/modules/FileSystems.rb:645
+#: src/modules/FileSystems.rb:647
 msgid "Invalid characters in arbitrary option value. Do not use spaces or tabs. Try again."
 msgstr "その他のオプション値に、正しくない文字が含まれています。スペースやタブを含めないでください。"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:649
+#: src/modules/FileSystems.rb:651
 msgid ""
 "<p><b>Arbitrary Option Value:</b>\n"
 "In this field, type any legal mount option allowed in the fourth field of /etc/fstab.\n"
@@ -5483,12 +5472,12 @@
 "複数のオプションはカンマで区切ります。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:666
+#: src/modules/FileSystems.rb:668
 msgid "Char&set for file names"
 msgstr "ファイル名のキャラクタセット (&S)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:687
+#: src/modules/FileSystems.rb:689
 msgid ""
 "<p><b>Charset for File Names:</b>\n"
 "Set the charset used for display of file names in Windows partitions.</p>\n"
@@ -5497,12 +5486,12 @@
 "Windows パーティション内でファイル名の表示を行なう際に利用するキャラクタセットを指定します。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:698
+#: src/modules/FileSystems.rb:700
 msgid "Code&page for short FAT names"
 msgstr "FAT の短縮ファイル名に使用するコードページ (&P)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:704
+#: src/modules/FileSystems.rb:706
 msgid ""
 "<p><b>Codepage for Short FAT Names:</b>\n"
 "This codepage is used for converting to shortname characters on FAT file systems.</p>\n"
@@ -5511,12 +5500,12 @@
 "このコードページは、 FAT ファイルシステム内の短縮ファイル名に対して、その文字を変換する際に利用するコードページを指定します。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:718
+#: src/modules/FileSystems.rb:720
 msgid "Number of &FATs"
 msgstr "FAT の数 (&F)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:724
+#: src/modules/FileSystems.rb:726
 msgid ""
 "<p><b>Number of FATs:</b>\n"
 "Specify the number of file allocation tables in the file system. The default is 2.</p>"
@@ -5525,12 +5514,12 @@
 "ファイルシステム内のファイルアロケーションテーブルの数を指定します。既定は 2 です。</p>"
 
 #. label text
-#: src/modules/FileSystems.rb:733
+#: src/modules/FileSystems.rb:735
 msgid "FAT &Size"
 msgstr "FAT サイズ (&S)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:744
+#: src/modules/FileSystems.rb:746
 msgid ""
 "<p><b>FAT Size:</b>\n"
 "Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p>\n"
@@ -5539,17 +5528,17 @@
 "使用するファイルアロケーションテーブルの種類 (12, 16, 32 ビット) を指定します。 '自動' を選択すると、そのファイルシステムに最も適した値を YaST が自動的に選択します。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:753
+#: src/modules/FileSystems.rb:755
 msgid "Root &Dir Entries"
 msgstr "ルートディレクトリの項目数 (&D)"
 
 #. popup text
-#: src/modules/FileSystems.rb:761
+#: src/modules/FileSystems.rb:763
 msgid "The minimum size for \"Root Dir Entries\" is 112. Try again."
 msgstr "\"ルートディレクトリの項目数\" の最小サイズは 112 です。再度入力してください。"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:765
+#: src/modules/FileSystems.rb:767
 msgid ""
 "<p><b>Root Dir Entries:</b>\n"
 "Select the number of entries available in the root directory.</p>\n"
@@ -5558,12 +5547,12 @@
 "ルートディレクトリの項目の数を指定します。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:778
+#: src/modules/FileSystems.rb:780
 msgid "Hash &Function"
 msgstr "ハッシュ関数 (&F)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:785
+#: src/modules/FileSystems.rb:787
 msgid ""
 "<p><b>Hash Function:</b>\n"
 "This specifies the name of the hash function to use to sort the file names in directories.</p>\n"
@@ -5572,12 +5561,12 @@
 "ディレクトリ内のファイル名を並べ替える際に利用する、ハッシュ関数の名前を指定します。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:794
+#: src/modules/FileSystems.rb:796
 msgid "FS &Revision"
 msgstr "ファイルシステムリビジョン (&R)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:801
+#: src/modules/FileSystems.rb:803
 msgid ""
 "<p><b>FS Revision:</b>\n"
 "This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.</p>\n"
@@ -5587,12 +5576,12 @@
 
 #. label text
 #. label text
-#: src/modules/FileSystems.rb:814 src/modules/FileSystems.rb:978
+#: src/modules/FileSystems.rb:816 src/modules/FileSystems.rb:980
 msgid "Block &Size in Bytes"
 msgstr "ブロックサイズ (バイト単位) (&S)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:821
+#: src/modules/FileSystems.rb:823
 msgid ""
 "<p><b>Block Size:</b>\n"
 "Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048 and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.</p>\n"
@@ -5602,13 +5591,13 @@
 
 #. label text
 #. label text
-#: src/modules/FileSystems.rb:830 src/modules/FileSystems.rb:1060
+#: src/modules/FileSystems.rb:832 src/modules/FileSystems.rb:1062
 msgid "&Inode Size"
 msgstr "inode のサイズ (&I)"
 
 #. help text, richtext format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:836 src/modules/FileSystems.rb:1066
+#: src/modules/FileSystems.rb:838 src/modules/FileSystems.rb:1068
 msgid ""
 "<p><b>Inode Size:</b>\n"
 "This option specifies the inode size of the file system.</p>\n"
@@ -5617,12 +5606,12 @@
 "このオプションではファイルシステム内での inode のサイズを指定します。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:845
+#: src/modules/FileSystems.rb:847
 msgid "&Percentage of Inode Space"
 msgstr "inode 領域の割合 (&P)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:873
+#: src/modules/FileSystems.rb:875
 msgid ""
 "<p><b>Percentage of Inode Space:</b>\n"
 "The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n"
@@ -5631,12 +5620,12 @@
 "このオプションは、ファイルシステム内で inode に割り当てる最大容量を、パーセント単位で指定します。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:882
+#: src/modules/FileSystems.rb:884
 msgid "Inode &Aligned"
 msgstr "inode の整列 (&A)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:888
+#: src/modules/FileSystems.rb:890
 msgid ""
 "<p><b>Inode Aligned:</b>\n"
 "The option \"Inode Aligned\" is used to specify whether inode allocation is or\n"
@@ -5649,12 +5638,12 @@
 "未整列のものよりもより効果的にアクセスすることができます。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:918
+#: src/modules/FileSystems.rb:920
 msgid "&Log Size in Megabytes"
 msgstr "ログサイズ (メガバイト単位) (&L)"
 
 #. popup text
-#: src/modules/FileSystems.rb:927
+#: src/modules/FileSystems.rb:929
 msgid ""
 "The \"Log Size\" value is incorrect.\n"
 "Enter a value greater than zero.\n"
@@ -5664,7 +5653,7 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:932
+#: src/modules/FileSystems.rb:934
 msgid ""
 "<p><b>Log Size</b>\n"
 "Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>\n"
@@ -5673,17 +5662,17 @@
 "ログサイズをメガバイト単位で設定します。自動に設定している場合、既定値は全体のサイズの 40% です。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:940
+#: src/modules/FileSystems.rb:942
 msgid "Invoke Bad Blocks List &Utility"
 msgstr "Bad Blocks リストユーティリティの起動 (&U)"
 
 #. label text
-#: src/modules/FileSystems.rb:954
+#: src/modules/FileSystems.rb:956
 msgid "Stride &Length in Blocks"
 msgstr "ストライド長 (ブロック単位) (&L)"
 
 #. popup text
-#: src/modules/FileSystems.rb:962
+#: src/modules/FileSystems.rb:964
 msgid ""
 "The \"Stride Length in Blocks\" value is invalid.\n"
 "Select a value greater than 1.\n"
@@ -5692,7 +5681,7 @@
 "1 より大きい値を指定してください。\n"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:966
+#: src/modules/FileSystems.rb:968
 msgid ""
 "<p><b>Stride Length in Blocks:</b>\n"
 "Set RAID-related options for the file system. Currently, the only supported\n"
@@ -5705,7 +5694,7 @@
 "指定します。</p>\n"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:985
+#: src/modules/FileSystems.rb:987
 msgid ""
 "<p><b>Block Size:</b>\n"
 "Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n"
@@ -5714,12 +5703,12 @@
 "ブロックの大きさをバイト単位で指定します。選択可能なブロックサイズは 1024, 2048, 4096 のいずれかです。 '自動' を選択すると、ブロックサイズをファイルシステムサイズと想定される用途から決定します。 </p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:994
+#: src/modules/FileSystems.rb:996
 msgid "Bytes per &Inode"
 msgstr "inode ごとのバイト数 (&B)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1000
+#: src/modules/FileSystems.rb:1002
 msgid ""
 "<p><b>Bytes per Inode:</b> \n"
 "Specify the bytes to inode ratio. YaST creates an inode for every\n"
@@ -5736,12 +5725,12 @@
 " inode の数を増やすことはできません。従って、このパラメータには適切な値を入力してください。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:1016
+#: src/modules/FileSystems.rb:1018
 msgid "Percentage of Blocks &Reserved for root"
 msgstr "root 用に予約するブロックの割合 (&R)"
 
 #. popup text
-#: src/modules/FileSystems.rb:1026
+#: src/modules/FileSystems.rb:1028
 msgid ""
 "The \"Percentage of Blocks Reserved for root\" value is incorrect.\n"
 "Allowed are float numbers no larger than 99 (e.g. 0.5).\n"
@@ -5751,17 +5740,17 @@
 
 #. xgettext: no-c-format
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1031
+#: src/modules/FileSystems.rb:1033
 msgid "<p><b>Percentage of Blocks Reserved for root:</b> Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.</p>"
 msgstr "<p><b>root 用に予約するブロックの割合:</b> スーパーユーザ用に予約するブロック数をパーセント単位で指定します。既定では自動的にサイズが計算され、通常は 1 ギガバイトが予約されます。既定での予約上限は 5.0 で、下限は 0.1 です。</p>"
 
 #. checkbox text
-#: src/modules/FileSystems.rb:1040
+#: src/modules/FileSystems.rb:1042
 msgid "Disable Regular Checks"
 msgstr "通常のチェックを無効にする"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1048
+#: src/modules/FileSystems.rb:1050
 msgid ""
 "<p><b>Disable Regular Checks:</b>\n"
 "Disable regular file system check at booting.</p>\n"
@@ -5770,12 +5759,12 @@
 "起動時に通常のファイルシステムチェックを行なわないようにします。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:1075
+#: src/modules/FileSystems.rb:1077
 msgid "&Directory Index Feature"
 msgstr "ディレクトリインデックス機能 (&D)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1082
+#: src/modules/FileSystems.rb:1084
 msgid ""
 "<p><b>Directory Index:</b>\n"
 "Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
@@ -5784,12 +5773,12 @@
 "項目数の多いディレクトリ内で検索速度を上げるため、 B ツリーというハッシュ機能を有効にします。</p>\n"
 
 #. label text
-#: src/modules/FileSystems.rb:1094
+#: src/modules/FileSystems.rb:1096
 msgid "&No Journal"
 msgstr "ジャーナル無し (&N)"
 
 #. help text, richtext format
-#: src/modules/FileSystems.rb:1101
+#: src/modules/FileSystems.rb:1103
 msgid ""
 "<p><b>No Journal:</b>\n"
 "Suppressed use of journaling on filesystem. Only activate this when you really\n"
@@ -6021,11 +6010,11 @@
 msgstr "MD RAID"
 
 #. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5176
+#: src/modules/Storage.rb:5177
 msgid "Partitions cannot be created since other partitions on the disk are used."
 msgstr "ディスク上にある他のパーティションが使用中であるため、パーティションを削除することができません。"
 
-#: src/modules/Storage.rb:5202
+#: src/modules/Storage.rb:5203
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains activated swap\n"
@@ -6035,7 +6024,7 @@
 "デバイス %1 にはインストール作業中に必要なスワップが含まれているため、\n"
 "設定を変更することができません。\n"
 
-#: src/modules/Storage.rb:5216
+#: src/modules/Storage.rb:5217
 msgid ""
 "\n"
 "Device %1 cannot be modified because it contains the installation\n"
@@ -6045,7 +6034,7 @@
 "デバイス %1 にはインストール作業に必要なインストールデータが含まれているため、\n"
 "設定を変更することができません。\n"
 
-#: src/modules/Storage.rb:5245
+#: src/modules/Storage.rb:5246
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains activated swap\n"
@@ -6055,7 +6044,7 @@
 "デバイス %1 にはインストール作業中に必要なスワップが含まれているため、\n"
 "削除することができません。\n"
 
-#: src/modules/Storage.rb:5254
+#: src/modules/Storage.rb:5255
 msgid ""
 "\n"
 "Device %1 cannot be removed because it contains the installation\n"
@@ -6065,7 +6054,7 @@
 "デバイス %1 にはインストール作業に必要なインストールデータが含まれているため、\n"
 "削除することができません。\n"
 
-#: src/modules/Storage.rb:5283
+#: src/modules/Storage.rb:5284
 msgid ""
 "\n"
 "Device %1 cannot be removed because this would indirectly change\n"
@@ -6076,7 +6065,7 @@
 "デバイス %1 を削除することは、デバイス %2 を間接的に変更することになります。\n"
 "ここにはインストール作業に必要なスワップが含まれています。\n"
 
-#: src/modules/Storage.rb:5294
+#: src/modules/Storage.rb:5295
 msgid ""
 "\n"
 "Device %1 cannot be removed because this would indirectly change\n"
@@ -6087,7 +6076,7 @@
 "ここにはインストールを実行するのに必要なデータが含まれています。\n"
 
 #. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5316
+#: src/modules/Storage.rb:5317
 msgid ""
 "\n"
 "Partition %1 cannot be removed since other partitions on the\n"
@@ -6098,18 +6087,18 @@
 "パーティション %1 を削除することができません。\n"
 
 #. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5405
+#: src/modules/Storage.rb:5406
 msgid "Nothing assigned as root filesystem!"
 msgstr "ルートファイルシステムの割り当てがありません！"
 
-#: src/modules/Storage.rb:5406
+#: src/modules/Storage.rb:5407
 msgid "Installation will most certainly fail fatally!"
 msgstr "インストールは、ほぼ間違いなく致命的なエラーになります！"
 
 #. Set rather than Add, there might be some packs left over
 #. from previous 'MakeProposal' we don't need now
 #. This also covers the case when AddPackagesList returns [] or nil
-#: src/modules/Storage.rb:6008
+#: src/modules/Storage.rb:6009
 msgid "Adding the following resolvables failed: %1"
 msgstr "下記の解決方法を追加することができませんでした: %1"
 
@@ -6897,6 +6886,18 @@
 msgid "Visible Information on Storage Devices:"
 msgstr "ストレージデバイスの情報表示:"
 
+#~ msgid "No unsaved changes exist."
+#~ msgstr "保存されていない変更内容があります。"
+
+#~ msgid "Changes:"
+#~ msgstr "変更内容:"
+
+#~ msgid " Do you really want to execute these changes?"
+#~ msgstr " これらの変更を実行しますか？"
+
+#~ msgid "&Apply"
+#~ msgstr "適用 (&A)"
+
 #~ msgid ""
 #~ "Warning: With your current setup, your %1 installation\n"
 #~ "will encounter problems when booting, because you have no \"boot\"\n"

Modified: trunk/yast/ja/po/vm.ja.po
===================================================================
--- trunk/yast/ja/po/vm.ja.po	2014-10-29 15:37:46 UTC (rev 90385)
+++ trunk/yast/ja/po/vm.ja.po	2014-10-29 15:38:48 UTC (rev 90386)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: vm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-04 15:53+0200\n"
+"POT-Creation-Date: 2014-10-29 16:22+0100\n"
 "PO-Revision-Date: 2014-06-02 20:02+0900\n"
 "Last-Translator: Yasuhiko Kamata <belphegor@belbel.or.jp>\n"
 "Language-Team: Japanese <opensuse-ja@opensuse.org>\n"
@@ -22,24 +22,24 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#. Main
+#. Definition of command line mode options
+#: src/clients/virtualization.rb:54
+msgid "Install Hypervisor and Tools"
+msgstr "ハイパーバイザとツールのインストール"
+
 #. progress step title
 #: src/clients/vm_finish.rb:69
 msgid "Configuring the virtual machine..."
 msgstr "仮想マシンを設定しています..."
 
-#. Main
-#. Definition of command line mode options
-#: src/clients/xen.rb:54
-msgid "Install Hypervisor and Tools"
-msgstr "ハイパーバイザとツールのインストール"
-
 #. check for kernel-bigsmp
-#: src/modules/VM_XEN.rb:157
+#: src/modules/VirtConfig.rb:158
 msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
 msgstr "x86_64 は仮想マシンをホスティングすることのできる唯一のアーキテクチャです。お使いのアーキテクチャは "
 
 #. we are already in UML, nested virtual machine is not supported
-#: src/modules/VM_XEN.rb:176
+#: src/modules/VirtConfig.rb:177
 msgid ""
 "Virtual machine installation cannot be started inside the UML machine.\n"
 "Start installation in the host system.\n"
@@ -49,151 +49,151 @@
 
 #. progress stage 1/2
 #. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VM_XEN.rb:193 src/modules/VM_XEN.rb:281
+#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
 msgid "Verify Installed Packages"
 msgstr "インストールされているパッケージの確認"
 
 #. progress stage 2/2
-#: src/modules/VM_XEN.rb:195
+#: src/modules/VirtConfig.rb:196
 msgid "Network Bridge Configuration"
 msgstr "ネットワークブリッジの設定"
 
 #. Headline for management domain installation
-#: src/modules/VM_XEN.rb:210
+#: src/modules/VirtConfig.rb:211
 msgid "Configuring the VM Server (domain 0)"
 msgstr "VMサーバ (ドメイン 0) を設定しています"
 
 #. xen domain0 installation help text - 1/4
-#: src/modules/VM_XEN.rb:213
+#: src/modules/VirtConfig.rb:214
 msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
 msgstr "<p><big><b>VM サーバの設定</b></big></p><p>VM サーバ (ドメイン 0) の設定には 2 つのパートがあります。</p>"
 
 #. xen domain0 installation help text - 2/4
-#: src/modules/VM_XEN.rb:217
+#: src/modules/VirtConfig.rb:218
 msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
 msgstr "<p>最初にシステムに対して必要なパッケージをインストールします。 その後 GRUB が使用されていない場合はブートローダを GRUB に切り替え、 Xen セクションがない場合はブートローダメニューに追加します。</p>"
 
 #. xen domain0 installation help text - 3/4
-#: src/modules/VM_XEN.rb:221
+#: src/modules/VirtConfig.rb:222
 msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
 msgstr "<p> GRUB は Xen および Linux カーネルを起動するのに必要なマルチブート標準をサポートしているため、必要となります。</p>"
 
 #. xen domain0 installation help text - 4/4
-#: src/modules/VM_XEN.rb:225
+#: src/modules/VirtConfig.rb:226
 msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
 msgstr "<p>設定が問題なく完了したら、ブートローダメニューから VM サーバを起動できます。</p>"
 
 #. error popup
-#: src/modules/VM_XEN.rb:230
+#: src/modules/VirtConfig.rb:231
 msgid "The installation will be aborted."
 msgstr "インストールを中断します。"
 
-#: src/modules/VM_XEN.rb:233
+#: src/modules/VirtConfig.rb:234
 msgid "Choose Hypervisor(s) to install"
 msgstr "インストールするハイパーバイザを選択してください"
 
-#: src/modules/VM_XEN.rb:236
+#: src/modules/VirtConfig.rb:237
 msgid "Server: Minimal system to get a running Hypervisor"
 msgstr "サーバ: ハイパーバイザを動作させるための最小限のシステム"
 
-#: src/modules/VM_XEN.rb:237
+#: src/modules/VirtConfig.rb:238
 msgid "Tools: Configure, manage and monitor virtual machines"
 msgstr "ツール: 仮想マシンを設定／管理／監視するためのツール"
 
-#: src/modules/VM_XEN.rb:250
+#: src/modules/VirtConfig.rb:251
 msgid "KVM Hypervisor"
 msgstr "KVM ハイパーバイザ"
 
-#: src/modules/VM_XEN.rb:252
+#: src/modules/VirtConfig.rb:253
 msgid "KVM server"
 msgstr "KVM サーバ"
 
-#: src/modules/VM_XEN.rb:253
+#: src/modules/VirtConfig.rb:254
 msgid "KVM tools"
 msgstr "KVM ツール"
 
-#: src/modules/VM_XEN.rb:258
+#: src/modules/VirtConfig.rb:259
 msgid "libvirt LXC containers"
 msgstr "libvirt LXC コンテナ"
 
-#: src/modules/VM_XEN.rb:260
+#: src/modules/VirtConfig.rb:261
 msgid "libvirt LXC daemon"
 msgstr "libvirt LXC デーモン"
 
-#: src/modules/VM_XEN.rb:288
+#: src/modules/VirtConfig.rb:289
 msgid "Software to connect to Virtualization server"
 msgstr "仮想化サーバに接続するためのソフトウエア"
 
-#: src/modules/VM_XEN.rb:290
+#: src/modules/VirtConfig.rb:291
 msgid "Virtualization client tools"
 msgstr "仮想化クライアントツール"
 
-#: src/modules/VM_XEN.rb:306
+#: src/modules/VirtConfig.rb:307
 msgid "Xen Hypervisor"
 msgstr "Xen ハイパーバイザ"
 
-#: src/modules/VM_XEN.rb:308
+#: src/modules/VirtConfig.rb:309
 msgid "Xen server"
 msgstr "Xen サーバ"
 
-#: src/modules/VM_XEN.rb:309
+#: src/modules/VirtConfig.rb:310
 msgid "Xen tools"
 msgstr "Xen ツール"
 
 #. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VM_XEN.rb:384
+#: src/modules/VirtConfig.rb:388
 msgid "Package installation failed\n"
 msgstr "パッケージのインストールに失敗しました\n"
 
-#: src/modules/VM_XEN.rb:392
+#: src/modules/VirtConfig.rb:396
 msgid "Package installation failed for lxc\n"
 msgstr "lxc に対するパッケージのインストールが失敗しました\n"
 
-#: src/modules/VM_XEN.rb:399
+#: src/modules/VirtConfig.rb:403
 msgid "Package installation failed for sled client pattern\n"
 msgstr "sled クライアントパターンに対するパッケージのインストールが失敗しました\n"
 
-#: src/modules/VM_XEN.rb:410
+#: src/modules/VirtConfig.rb:413
 msgid "Package installation failed for sles patterns\n"
 msgstr "sles パターンに対するパッケージのインストールが失敗しました\n"
 
 #. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VM_XEN.rb:423
+#: src/modules/VirtConfig.rb:426
 msgid "Running in text mode. Install graphical components anyway?"
 msgstr "テキストモードで起動しています。グラフィカルコンポーネントをインストールしてもよろしいですか？"
 
 #. progressbar title - check whether Xen packages are installed
-#: src/modules/VM_XEN.rb:436
+#: src/modules/VirtConfig.rb:439
 msgid "Checking packages..."
 msgstr "パッケージを確認しています..."
 
 #. progressbar title - install the required packages
-#: src/modules/VM_XEN.rb:439
+#: src/modules/VirtConfig.rb:442
 msgid "Installing packages..."
 msgstr "パッケージをインストールしています..."
 
 #. error popup
 #. Now see if they really were installed (bnc#508347)
-#: src/modules/VM_XEN.rb:444 src/modules/VM_XEN.rb:451
+#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
 msgid "Cannot install required packages."
 msgstr "必要なパッケージをインストールできません。"
 
 #. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VM_XEN.rb:461
+#: src/modules/VirtConfig.rb:464
 msgid "Updating grub2 configuration files..."
 msgstr "grub2 の設定ファイルを更新しています..."
 
 #. Default Bridge stage
-#: src/modules/VM_XEN.rb:474
+#: src/modules/VirtConfig.rb:484
 msgid "Configuring Default Network Bridge..."
 msgstr "既定のネットワークブリッジを設定しています..."
 
 #. Popup yes/no dialog
-#: src/modules/VM_XEN.rb:495
+#: src/modules/VirtConfig.rb:505
 msgid "Network Bridge."
 msgstr "ネットワークブリッジ"
 
-#: src/modules/VM_XEN.rb:496
+#: src/modules/VirtConfig.rb:506
 msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
 msgstr "<p>仮想マシンをホスティングする通常のネットワーク設定では、ネットワークブリッジをお勧めします。</p><p>既定のネットワークブリッジを設定しますか？</p>"
 
@@ -206,26 +206,26 @@
 #. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
 #. return false;
 #. }
-#: src/modules/VM_XEN.rb:557
+#: src/modules/VirtConfig.rb:567
 msgid "KVM components are installed. Your host is ready to install KVM guests."
 msgstr "KVM コンポーネントをインストールしました。お使いのホストに KVM ゲストをインストールする準備が整いました。"
 
-#: src/modules/VM_XEN.rb:560
+#: src/modules/VirtConfig.rb:570
 msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
 msgstr "KVM コンポーネントをインストールしました。 KVM ゲストをインストールするにはマシンを再起動し、ブートローダメニューでネイティブカーネルを選択してください。"
 
-#: src/modules/VM_XEN.rb:563
+#: src/modules/VirtConfig.rb:573
 msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
 msgstr "Xen ゲストをインストールするには、マシンを再起動してブートローダの Xen セクションを選択する必要があります。"
 
-#: src/modules/VM_XEN.rb:566
+#: src/modules/VirtConfig.rb:576
 msgid "Xen Hypervisor and tools are installed."
 msgstr "Xen ハイパーバイザとツールをインストールしました。"
 
-#: src/modules/VM_XEN.rb:567
+#: src/modules/VirtConfig.rb:577
 msgid "Virtualization client tools are installed."
 msgstr "仮想化クライアントツールをインストールしました。"
 
-#: src/modules/VM_XEN.rb:568
+#: src/modules/VirtConfig.rb:578
 msgid "Libvirt LXC components are installed."
 msgstr "libvirt LXC コンポーネントをインストールしました。"

-- 
To unsubscribe, e-mail: opensuse-translation-commit+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-translation-commit+owner@opensuse.org

    

[opensuse-translation-commit] r90386 - trunk/yast/ja/po

keichwa＠svn2.opensuse.org

tags

participants (1)