Mailinglist Archive: opensuse-translation-commit (61 mails)

< Previous Next >
[opensuse-translation-commit] r97359 - branches/SLE12-SP3/yast/ja/po
Author: keichwa
Date: 2017-05-23 07:06:46 +0000 (Tue, 23 May 2017)
New Revision: 97359

Modified:
branches/SLE12-SP3/yast/ja/po/add-on.ja.po
branches/SLE12-SP3/yast/ja/po/autoinst.ja.po
branches/SLE12-SP3/yast/ja/po/bootloader.ja.po
branches/SLE12-SP3/yast/ja/po/cio.ja.po
branches/SLE12-SP3/yast/ja/po/cluster.ja.po
branches/SLE12-SP3/yast/ja/po/control.ja.po
branches/SLE12-SP3/yast/ja/po/country.ja.po
branches/SLE12-SP3/yast/ja/po/firewall.ja.po
branches/SLE12-SP3/yast/ja/po/firstboot.ja.po
branches/SLE12-SP3/yast/ja/po/installation.ja.po
branches/SLE12-SP3/yast/ja/po/iscsi-lio-server.ja.po
branches/SLE12-SP3/yast/ja/po/kdump.ja.po
branches/SLE12-SP3/yast/ja/po/network.ja.po
branches/SLE12-SP3/yast/ja/po/packager.ja.po
branches/SLE12-SP3/yast/ja/po/registration.ja.po
branches/SLE12-SP3/yast/ja/po/reipl.ja.po
branches/SLE12-SP3/yast/ja/po/rpm-groups.ja.po
branches/SLE12-SP3/yast/ja/po/s390.ja.po
branches/SLE12-SP3/yast/ja/po/samba-server.ja.po
branches/SLE12-SP3/yast/ja/po/scanner.ja.po
branches/SLE12-SP3/yast/ja/po/smt.ja.po
branches/SLE12-SP3/yast/ja/po/storage.ja.po
branches/SLE12-SP3/yast/ja/po/update.ja.po
branches/SLE12-SP3/yast/ja/po/vm.ja.po
branches/SLE12-SP3/yast/ja/po/xpram.ja.po
branches/SLE12-SP3/yast/ja/po/yast2-apparmor.ja.po
Log:
merged

Modified: branches/SLE12-SP3/yast/ja/po/add-on.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/add-on.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/add-on.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: add-on\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2017-05-17 17:45+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -81,13 +81,14 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li>メディア: %1、パス: %2、製品: %3</li>\n"

-#. set addon specific sig-handling
-#: src/clients/add-on_auto.rb:186
+#. revert back to the unexpanded URL to have the original URL
+#. in the saved /etc/zypp/repos.d file
+#: src/clients/add-on_auto.rb:191
msgid "Make the add-on \"%1\" available via \"%2\"."
msgstr "アドオン「%1」を「%2」から利用できるようにしてください。"

#. just report error
-#: src/clients/add-on_auto.rb:193
+#: src/clients/add-on_auto.rb:198
msgid "Failed to add add-on product."
msgstr "アドオン製品の追加に失敗しました。"

@@ -475,6 +476,5 @@
"\n"
"アドオン製品の設定を飛ばしますか?"

-#: control/installation.glade.translations.glade:4
-msgid "Language Installation"
-msgstr "言語のインストール"
+#~ msgid "Language Installation"
+#~ msgstr "言語のインストール"

Modified: branches/SLE12-SP3/yast/ja/po/autoinst.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/autoinst.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/autoinst.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-09 02:27+0000\n"
+"POT-Creation-Date: 2017-04-19 02:27+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -53,7 +53,7 @@
#. 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:184 src/clients/inst_autosetup.rb:463
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:476
#: src/clients/inst_autosetup_upgrade.rb:485
#: src/modules/AutoInstallRules.rb:997
msgid ""
@@ -596,7 +596,7 @@

#. Adding selections (defined in PackageAI) to libzypp and solving
#. package dependencies.
-#: src/clients/inst_autosetup.rb:361
+#: src/clients/inst_autosetup.rb:374
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"

Modified: branches/SLE12-SP3/yast/ja/po/bootloader.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/bootloader.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/bootloader.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-25 02:27+0000\n"
+"POT-Creation-Date: 2017-04-19 02:27+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -159,74 +159,76 @@
#. @return a list of summary lines
#. Display bootloader summary
#. @return a list of summary lines
-#: src/lib/bootloader/grub2.rb:106 src/lib/bootloader/grub2efi.rb:76
+#: src/lib/bootloader/grub2.rb:99 src/lib/bootloader/grub2efi.rb:76
msgid "Boot Loader Type: %1"
msgstr "ブートローダのタイプ: %1"

-#: src/lib/bootloader/grub2.rb:110
+#: src/lib/bootloader/grub2.rb:103 src/lib/bootloader/grub2efi.rb:84
msgid "Enable Trusted Boot: %1"
msgstr "Trusted Bootを有効にする: %1"

-#: src/lib/bootloader/grub2.rb:111 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2efi.rb:85
msgid "yes"
msgstr "はい"

-#: src/lib/bootloader/grub2.rb:111 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2efi.rb:85
msgid "no"
msgstr "いいえ"

-#: src/lib/bootloader/grub2.rb:117
+#: src/lib/bootloader/grub2.rb:110
msgid "Status Location: %1"
msgstr "ステータスの場所: %1"

#. part of summary, %1 is a list of hard disks device names
-#: src/lib/bootloader/grub2.rb:181
+#: src/lib/bootloader/grub2.rb:174
msgid "Order of Hard Disks: %1"
msgstr "ハードディスクの順序: %1"

#. TRANSLATORS: extended is here for extended partition. Keep translation
short.
-#: src/lib/bootloader/grub2.rb:193
+#: src/lib/bootloader/grub2.rb:186
msgid " (extended)"
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/lib/bootloader/grub2.rb:198
+#: src/lib/bootloader/grub2.rb:191
msgid " (MBR)"
msgstr " (MBR)"

-#: src/lib/bootloader/grub2.rb:219
+#: src/lib/bootloader/grub2.rb:212
msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not
install</a>)"
msgstr "MBRにブートコードをインストールする(<a href=\"disable_boot_mbr\">インストールしない</a>)"

-#: src/lib/bootloader/grub2.rb:223
+#: src/lib/bootloader/grub2.rb:216
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
-#: src/lib/bootloader/grub2.rb:233
+#: src/lib/bootloader/grub2.rb:226
msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do
not install</a>)"
msgstr "/bootパーティションにブートコードをインストールする(<a
href=\"disable_boot_boot\">インストールしない</a>)"

-#: src/lib/bootloader/grub2.rb:238
+#: src/lib/bootloader/grub2.rb:231
msgid "Do not install bootcode into /boot partition (<a
href=\"enable_boot_boot\">install</a>)"
msgstr "/bootパーティションにブートコードをインストールしない(<a
href=\"enable_boot_boot\">インストールする</a>)"

-#: src/lib/bootloader/grub2.rb:244
+#: src/lib/bootloader/grub2.rb:237
msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do
not install</a>)"
msgstr "「/」パーティションにブートコードをインストールする(<a
href=\"disable_boot_root\">インストールしない</a>)"

-#: src/lib/bootloader/grub2.rb:249
+#: src/lib/bootloader/grub2.rb:242
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/lib/bootloader/grub2.rb:274
+#: src/lib/bootloader/grub2.rb:267
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/lib/bootloader/grub2.rb:282
+#: src/lib/bootloader/grub2.rb:275
msgid "Change Location: %s"
msgstr "場所の変更: %s"

@@ -344,14 +346,21 @@

#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
#: src/lib/bootloader/grub2_widgets.rb:301
+#, fuzzy
+#| msgid ""
+#| "<p><b>Trusted Boot</b> will install TrustedGRUB2\n"
+#| "instead of regular GRUB2.</p>\n"
+#| "<p>It means measuring the integrity of the boot process,\n"
+#| "with the help from the hardware (a TPM, Trusted Platform Module,\n"
+#| "chip).</p>\n"
+#| "<p>First you need to make sure Trusted Boot is enabled in the BIOS\n"
+#| "setup (the setting may be named Security Chip, for example).</p>\n"
msgid ""
"<p><b>Trusted Boot</b> will install TrustedGRUB2\n"
"instead of regular GRUB2.</p>\n"
"<p>It means measuring the integrity of the boot process,\n"
"with the help from the hardware (a TPM, Trusted Platform Module,\n"
"chip).</p>\n"
-"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n"
-"setup (the setting may be named Security Chip, for example).</p>\n"
msgstr ""
"<p><b>信頼できるブート</b>では、通常のGRUB2ではなく\n"
"信頼できるGRUB2がインストールされます。</p>\n"
@@ -361,10 +370,16 @@
"設定で有効になっていることを確認する必要が\n"
"あります(この設定はセキュリティチップなどと呼ばれる場合があります)。</p>\n"

+#: src/lib/bootloader/grub2_widgets.rb:307
+msgid ""
+"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n"
+"setup (the setting may be named Security Chip, for example).</p>\n"
+msgstr ""
+
#. check for file size does not work, since FS reports it 4096
#. even if the file is in fact empty and a single byte cannot
#. be read, therefore testing real reading (details: bsc#994556)
-#: src/lib/bootloader/grub2_widgets.rb:327
+#: src/lib/bootloader/grub2_widgets.rb:331
msgid ""
"Trusted Platform Module not found.\n"
"Make sure it is enabled in BIOS.\n"
@@ -375,30 +390,30 @@
"有効でない場合、システムがブートしません。"

#. Represents grub password protection widget
-#: src/lib/bootloader/grub2_widgets.rb:347
+#: src/lib/bootloader/grub2_widgets.rb:351
msgid "Prot&ect Boot Loader with Password"
msgstr "パスワードでブートローダを保護する(&E)"

#. TRANSLATORS: checkbox entry
-#: src/lib/bootloader/grub2_widgets.rb:353
+#: src/lib/bootloader/grub2_widgets.rb:357
msgid "P&rotect Entry Modification Only"
msgstr "エントリの変更のみを保護する(&R)"

#. TRANSLATORS: text entry, please keep it short
-#: src/lib/bootloader/grub2_widgets.rb:359
+#: src/lib/bootloader/grub2_widgets.rb:363
msgid "&Password for GRUB2 User 'root'"
msgstr "GRUB2ユーザ「root」のパスワード(&P)"

#. text entry
-#: src/lib/bootloader/grub2_widgets.rb:362
+#: src/lib/bootloader/grub2_widgets.rb:366
msgid "Re&type Password"
msgstr "もう一度パスワードを入力してください(&T)"

-#: src/lib/bootloader/grub2_widgets.rb:373
+#: src/lib/bootloader/grub2_widgets.rb:377
msgid "The password must not be empty."
msgstr "パスワードを設定してください。"

-#: src/lib/bootloader/grub2_widgets.rb:380
+#: src/lib/bootloader/grub2_widgets.rb:384
msgid ""
"'Password' and 'Retype password'\n"
"do not match. Retype the password."
@@ -407,7 +422,7 @@
"入力したパスワードが異なっています。もう一度入力してください。"

#. special value as we do not know password, so it mean user do not change it
-#: src/lib/bootloader/grub2_widgets.rb:433
+#: src/lib/bootloader/grub2_widgets.rb:437
msgid ""
"<p><b>Protect Boot Loader with Password</b><br>\n"
"At boot time, modifying or even booting any entry will require the password.
If <b>Protect Entry Modification Only</b> is checked then booting any entry is
not restricted but modifying entries requires the password (which is the way
GRUB 1 behaved). As side-effect of this option, rd.shell=0 is added to kernel
parameters, to prevent an unauthorized access to the initrd shell.<br>YaST will
only accept the password if you repeat it in <b>Retype Password</b>. The
password applies to the GRUB2 user 'root' which is distinct from the Linux
'root'. YaST currently does not supportother GRUB2 users. If you need them, use
a separate GRUB2 script.</p>"
@@ -416,7 +431,7 @@
"システムの起動時にパスワードの入力を求め、項目の修正だけでなく起動そのものも保護します。 <b>項目の修正のみを保護する</b>
にチェックを入れると、起動そのものにはパスワード入力が求められないものの、項目の内容を修正する際にはパスワードの入力を求めるようになります (GRUB 1
の動作です) 。このオプションを選択した場合、パスワード入力無しで initrd のシェルにアクセスされることのないよう、カーネルパラメータに
rd.shell=0 が追加されます。<br>なお YaST では、 <b>パスワードの再入力</b>
にも同じパスワードの入力を求めます。ここで入力したパスワードは、 GRUB2 のユーザ 'root' のパスワードとして適用されます。ただし、 YaST
ではその他の GRUB2 ユーザを作成することはできません。他のユーザを作成したい場合は、個
別の GRUB2 スクリプトをお使いください。</p>"

#. Translators: do not translate the quoted parts like "unit"
-#: src/lib/bootloader/grub2_widgets.rb:466
+#: src/lib/bootloader/grub2_widgets.rb:470
msgid ""
"<p>When a graphical console is used it allows to use various display
resolutions. The <tt>auto</tt> option tries to find the best one when booting
starts.</p>\n"
"<p>When a serial console is used the boot output will be printed to a serial
device like <tt>ttyS0</tt>. At least the <tt>--unit</tt> option has to be
specified, and the complete syntax is <tt>%s</tt>. Other parts are optional and
if not set, a default is used. <tt>NUM</tt> in commands stands for a positive
number like 8. Example parameters are <tt>serial --speed=38400
--unit=0</tt>.</p>"
@@ -425,12 +440,12 @@
"<p>シリアルコンソールを使用している場合は、起動時のメッセージは <tt>ttyS0</tt> 等のシリアルデバイスに出力されます。この場合、少なくとも
<tt>--unit</tt> オプション (書式: <tt>%s</tt>)
だけは設定しておかなければなりません。それ以外のものは必要に応じて設定してください。設定しない場合は既定値を利用します。また、 <tt>数値</tt> には
8 のように数字を入力してください。たとえば下記のように設定します: <tt>serial --speed=38400 --unit=0</tt>.</p>"

#. there's mode specified, use it
-#: src/lib/bootloader/grub2_widgets.rb:503
+#: src/lib/bootloader/grub2_widgets.rb:507
msgid "To enable serial console you must provide the corresponding arguments."
msgstr "シリアルコンソールを有効化するには、関連するパラメータを設定しなければなりません。"

#. Translators: do not translate "unit"
-#: src/lib/bootloader/grub2_widgets.rb:510
+#: src/lib/bootloader/grub2_widgets.rb:514
msgid ""
"To enable the serial console you must provide the corresponding arguments.\n"
"The \"unit\" argument is required, the complete syntax is:\n"
@@ -440,7 +455,7 @@
"少なくとも \"unit\" パラメータが必要です。書式は下記のとおりです:\n"
"%s"

-#: src/lib/bootloader/grub2_widgets.rb:551
+#: src/lib/bootloader/grub2_widgets.rb:555
msgid "Choose new graphical theme file"
msgstr "新しいグラフィカルなテーマファイルの選択"

@@ -448,40 +463,40 @@
#. to be substituted in a command like
#. "serial --unit=NUM --speed=NUM --parity={odd|even|no} --word=NUM --stop=NUM"
#. so do not use punctuation
-#: src/lib/bootloader/grub2_widgets.rb:567
+#: src/lib/bootloader/grub2_widgets.rb:571
msgid "NUM"
msgstr "数値"

-#: src/lib/bootloader/grub2_widgets.rb:574
+#: src/lib/bootloader/grub2_widgets.rb:578
msgid "Use &graphical console"
msgstr "グラフィカルコンソールを使用する(&G)"

-#: src/lib/bootloader/grub2_widgets.rb:579
+#: src/lib/bootloader/grub2_widgets.rb:583
msgid "&Console resolution"
msgstr "コンソールの解像度(&C)"

-#: src/lib/bootloader/grub2_widgets.rb:584
+#: src/lib/bootloader/grub2_widgets.rb:588
msgid "&Console theme"
msgstr "コンソールのテーマ(&C)"

-#: src/lib/bootloader/grub2_widgets.rb:615
+#: src/lib/bootloader/grub2_widgets.rb:619
msgid "Autodetect by grub2"
msgstr "grub2で自動検出"

-#: src/lib/bootloader/grub2_widgets.rb:623
+#: src/lib/bootloader/grub2_widgets.rb:627
msgid "Use &serial console"
msgstr "シリアルコンソールを使用する(&S)"

-#: src/lib/bootloader/grub2_widgets.rb:630
+#: src/lib/bootloader/grub2_widgets.rb:634
msgid "&Console arguments"
msgstr "コンソールの引数(&C)"

#. represent choosing default section to boot
-#: src/lib/bootloader/grub2_widgets.rb:647
+#: src/lib/bootloader/grub2_widgets.rb:651
msgid "&Default Boot Section"
msgstr "デフォルトのブートセクション(&D)"

-#: src/lib/bootloader/grub2_widgets.rb:651
+#: src/lib/bootloader/grub2_widgets.rb:655
msgid ""
"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
"the default. When booting, the boot loader will provide a boot menu and\n"
@@ -498,40 +513,40 @@
"[<b>下へ</b>]でそれぞれ変更することができます。</p>\n"

#. Represents stage1 location for bootloader
-#: src/lib/bootloader/grub2_widgets.rb:686
+#: src/lib/bootloader/grub2_widgets.rb:690
msgid "Boot Loader Location"
msgstr "ブートローダの場所"

-#: src/lib/bootloader/grub2_widgets.rb:740
+#: src/lib/bootloader/grub2_widgets.rb:744
msgid "Custom boot device have to be specied if checked"
msgstr "オンにした場合、カスタムブートデバイスを指定する必要があります"

-#: src/lib/bootloader/grub2_widgets.rb:768
+#: src/lib/bootloader/grub2_widgets.rb:772
msgid "Boo&t from Boot Partition"
msgstr "ブートパーティションからブート(&T)"

-#: src/lib/bootloader/grub2_widgets.rb:769
+#: src/lib/bootloader/grub2_widgets.rb:773
msgid "Boo&t from Root Partition"
msgstr "ルートパーティションからブート(&T)"

-#: src/lib/bootloader/grub2_widgets.rb:770
+#: src/lib/bootloader/grub2_widgets.rb:774
msgid "Boot from &Master Boot Record"
msgstr "マスタブートレコード(MBR)からブート(&M)"

-#: src/lib/bootloader/grub2_widgets.rb:771
+#: src/lib/bootloader/grub2_widgets.rb:775
msgid "Boot from &Extended Partition"
msgstr "拡張パーティションからブート(&E)"

-#: src/lib/bootloader/grub2_widgets.rb:782
+#: src/lib/bootloader/grub2_widgets.rb:786
msgid "C&ustom Boot Partition"
msgstr "カスタムブートパーティション(&U)"

#. Represents button that open Device Map edit dialog
-#: src/lib/bootloader/grub2_widgets.rb:795
+#: src/lib/bootloader/grub2_widgets.rb:799
msgid "&Edit Disk Boot Order"
msgstr "ディスクのブート順序を編集する(&E)"

-#: src/lib/bootloader/grub2_widgets.rb:801
+#: src/lib/bootloader/grub2_widgets.rb:805
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"
@@ -546,17 +561,17 @@
"ディスクを削除するには[<b>削除</b>]ボタンをそれぞれクリックします。</p>"

#. represents Tab with kernel related configuration
-#: src/lib/bootloader/grub2_widgets.rb:822
+#: src/lib/bootloader/grub2_widgets.rb:826
msgid "&Kernel Parameters"
msgstr "カーネルパラメータ(&K)"

#. Represent tab with options related to stage1 location and bootloader type
-#: src/lib/bootloader/grub2_widgets.rb:847
+#: src/lib/bootloader/grub2_widgets.rb:851
msgid "Boot Co&de Options"
msgstr "ブートコードオプション(&D)"

#. Represents bootloader specific options like its timeout, default section or
password protection
-#: src/lib/bootloader/grub2_widgets.rb:913
+#: src/lib/bootloader/grub2_widgets.rb:921
msgid "Boot&loader Options"
msgstr "ブートローダオプション(&L)"


Modified: branches/SLE12-SP3/yast/ja/po/cio.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/cio.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/cio.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: cio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-21 00:29+0000\n"
+"POT-Creation-Date: 2017-05-17 17:45+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -40,13 +40,13 @@
msgstr "使用領域"

#: src/lib/iochannel/channels_dialog.rb:142
+msgid "yes"
+msgstr "はい"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "no"
msgstr "いいえ"

-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "yes"
-msgstr "はい"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
msgid "Filter channels"

Modified: branches/SLE12-SP3/yast/ja/po/cluster.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/cluster.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/cluster.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: cluster\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2017-04-06 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -92,7 +92,7 @@
msgid "Redundant IP Address"
msgstr "冗長IPアドレス"

-#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:501
+#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:504
msgid "Node ID"
msgstr "ノードID"

@@ -124,7 +124,7 @@
msgstr "マルチキャスト転送を設定するときには[予想票数]を入力する必要があります"

#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1429
+#: src/include/cluster/dialogs.rb:1432
msgid "The Multicast Address has to be fulfilled"
msgstr "[マルチキャストアドレス]を入力する必要があります"

@@ -137,61 +137,61 @@
msgstr "複数のインタフェースを使用する場合、パッシブまたはアクティブのみを選択できます。パッシブに設定してください。"

#. BNC#871970, change member address struct to memberaddr
-#: src/include/cluster/dialogs.rb:441
+#: src/include/cluster/dialogs.rb:444
msgid "Transport:"
msgstr "トランスポート:"

-#: src/include/cluster/dialogs.rb:449
+#: src/include/cluster/dialogs.rb:452
msgid "Channel"
msgstr "チャネル"

-#: src/include/cluster/dialogs.rb:454 src/include/cluster/dialogs.rb:475
+#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:478
msgid "Bind Network Address:"
msgstr "バインドネットワークアドレス:"

-#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1365
+#: src/include/cluster/dialogs.rb:463 src/include/cluster/dialogs.rb:481
+#: src/include/cluster/dialogs.rb:1368
msgid "Multicast Address:"
msgstr "マルチキャストアドレス:"

-#: src/include/cluster/dialogs.rb:462 src/include/cluster/dialogs.rb:479
-msgid "Multicast Port:"
-msgstr "マルチキャストポート:"
+#: src/include/cluster/dialogs.rb:465 src/include/cluster/dialogs.rb:482
+msgid "Port:"
+msgstr "ポート:"

-#: src/include/cluster/dialogs.rb:469
+#: src/include/cluster/dialogs.rb:472
msgid "Redundant Channel"
msgstr "冗長チャンネル"

-#: src/include/cluster/dialogs.rb:485
+#: src/include/cluster/dialogs.rb:488
msgid "Cluster Name:"
msgstr "クラスタ名:"

-#: src/include/cluster/dialogs.rb:486
+#: src/include/cluster/dialogs.rb:489
msgid "Expected Votes:"
msgstr "予想票数:"

-#: src/include/cluster/dialogs.rb:490
+#: src/include/cluster/dialogs.rb:493
msgid "rrp mode:"
msgstr "rrpモード:"

-#: src/include/cluster/dialogs.rb:495
+#: src/include/cluster/dialogs.rb:498
msgid "Auto Generate Node ID"
msgstr "ノードIDの自動生成"

-#: src/include/cluster/dialogs.rb:500
+#: src/include/cluster/dialogs.rb:503
msgid "Member Address:"
msgstr "メンバーアドレス:"

-#: src/include/cluster/dialogs.rb:501
+#: src/include/cluster/dialogs.rb:504
msgid "IP"
msgstr "IP"

-#: src/include/cluster/dialogs.rb:501
+#: src/include/cluster/dialogs.rb:504
msgid "Redundant IP"
msgstr "冗長IP"

#. BNC#879596, check the corosync.conf format
-#: src/include/cluster/dialogs.rb:541
+#: src/include/cluster/dialogs.rb:544
msgid ""
" NOTICE: Detected old corosync configuration.\n"
" Please reconfigure the member list and confirm all other settings."
@@ -200,123 +200,123 @@
"メンバーリストを再設定し、他のすべての設定を確認してください。"

#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:717
+#: src/include/cluster/dialogs.rb:720
msgid "Enable Security Auth"
msgstr "セキュリティ認証を有効にする"

-#: src/include/cluster/dialogs.rb:721
+#: src/include/cluster/dialogs.rb:724
msgid "For a newly created cluster, push the button below to generate
/etc/corosync/authkey."
msgstr "新しく作成されたクラスタでは、下のボタンをクリックして/etc/corosync/authkeyを生成します。"

-#: src/include/cluster/dialogs.rb:726
+#: src/include/cluster/dialogs.rb:729
msgid "To join an existing cluster, please copy /etc/corosync/authkey from
other nodes manually."
msgstr "既存のクラスタに参加する場合は、他のノードから手動で/etc/corosync/authkeyをコピーしてください。"

-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:755
msgid "Failed to create /etc/corosync/authkey"
msgstr "/etc/corosync/authkeyを作成できませんでした"

-#: src/include/cluster/dialogs.rb:754
+#: src/include/cluster/dialogs.rb:757
msgid "Create /etc/corosync/authkey succeeded"
msgstr "/etc/corosync/authkeyが正常に作成されました"

-#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
+#: src/include/cluster/dialogs.rb:818 src/include/cluster/dialogs.rb:888
msgid "Running"
msgstr "実行中"

-#: src/include/cluster/dialogs.rb:817
+#: src/include/cluster/dialogs.rb:820
msgid "Not running"
msgstr "実行していません"

#. servie:cluster is the name of
/etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:853
+#: src/include/cluster/dialogs.rb:856
msgid "Booting"
msgstr "ブート"

-#: src/include/cluster/dialogs.rb:863
+#: src/include/cluster/dialogs.rb:866
msgid "On -- Start pacemaker during boot"
msgstr "オン -- ブート中にペースメーカーを開始する"

-#: src/include/cluster/dialogs.rb:870
+#: src/include/cluster/dialogs.rb:873
msgid "Off -- Start pacemaker manually"
msgstr "オフ -- 手動でペースメーカーを開始する"

-#: src/include/cluster/dialogs.rb:879
+#: src/include/cluster/dialogs.rb:882
msgid "Switch On and Off"
msgstr "起動/停止"

-#: src/include/cluster/dialogs.rb:884
+#: src/include/cluster/dialogs.rb:887
msgid "Current Status: "
msgstr "現在のステータス: "

-#: src/include/cluster/dialogs.rb:893
+#: src/include/cluster/dialogs.rb:896
msgid "Start pacemaker Now"
msgstr "ペースメーカーを開始する"

-#: src/include/cluster/dialogs.rb:894
+#: src/include/cluster/dialogs.rb:897
msgid "Stop pacemaker Now"
msgstr "ペースメーカーを停止する"

#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:992
+#: src/include/cluster/dialogs.rb:995
msgid "Sync Host"
msgstr "同期ホスト"

-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:999 src/include/cluster/dialogs.rb:1011
msgid "Add"
msgstr "追加"

-#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1000 src/include/cluster/dialogs.rb:1012
msgid "Del"
msgstr "削除"

-#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
+#: src/include/cluster/dialogs.rb:1001 src/include/cluster/dialogs.rb:1013
msgid "Edit"
msgstr "編集"

-#: src/include/cluster/dialogs.rb:1004
+#: src/include/cluster/dialogs.rb:1007
msgid "Sync File"
msgstr "同期ファイル"

-#: src/include/cluster/dialogs.rb:1011
+#: src/include/cluster/dialogs.rb:1014
msgid "Add Suggested Files"
msgstr "推奨されるファイルの追加"

-#: src/include/cluster/dialogs.rb:1020
+#: src/include/cluster/dialogs.rb:1023
msgid "Generate Pre-Shared-Keys"
msgstr "事前共有鍵の生成"

#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1145
+#: src/include/cluster/dialogs.rb:1148
msgid "Csync2 Status Unknown"
msgstr "Csync2のステータスは不明です"

-#: src/include/cluster/dialogs.rb:1148
+#: src/include/cluster/dialogs.rb:1151
msgid "Turn csync2 ON"
msgstr "Csync2をオンにする"

-#: src/include/cluster/dialogs.rb:1151
+#: src/include/cluster/dialogs.rb:1154
msgid "Turn csync2 OFF"
msgstr "Csync2をオフにする"

-#: src/include/cluster/dialogs.rb:1181
+#: src/include/cluster/dialogs.rb:1184
msgid "Enter a hostname"
msgstr "ホスト名を入力します"

-#: src/include/cluster/dialogs.rb:1195
+#: src/include/cluster/dialogs.rb:1198
msgid "Edit the hostname"
msgstr "ホスト名を編集します"

-#: src/include/cluster/dialogs.rb:1209
+#: src/include/cluster/dialogs.rb:1212
msgid "Enter a filename to synchronize"
msgstr "同期するファイルを選択します"

-#: src/include/cluster/dialogs.rb:1224
+#: src/include/cluster/dialogs.rb:1227
msgid "Edit the filename"
msgstr "ファイル名を編集します"

#. key file exist
-#: src/include/cluster/dialogs.rb:1256
+#: src/include/cluster/dialogs.rb:1259
msgid ""
"Key file %1 already exist.\n"
"Do you want to overwrite it?"
@@ -325,12 +325,12 @@
"上書きしますか?"

#. remove exist key file
-#: src/include/cluster/dialogs.rb:1266
+#: src/include/cluster/dialogs.rb:1269
msgid "Delete key file %1 failed."
msgstr "鍵ファイル %1 の削除に失敗しました。"

#. generate key file
-#: src/include/cluster/dialogs.rb:1280
+#: src/include/cluster/dialogs.rb:1283
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -338,12 +338,12 @@
"鍵ファイル %1 が生成されました。\n"
"[推奨されるファイルの追加]をクリックすると、同期リストに追加できます。"

-#: src/include/cluster/dialogs.rb:1287
+#: src/include/cluster/dialogs.rb:1290
msgid "Key generation failed."
msgstr "鍵の生成に失敗しました。"

#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1349
+#: src/include/cluster/dialogs.rb:1352
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"
@@ -353,23 +353,23 @@
"YaSTでは、conntrackdのいくつかの基本的な部分を設定できます。\n"
"conntrackdは、ocf:heartbeat:conntrackdで起動する必要があります。"

-#: src/include/cluster/dialogs.rb:1360
+#: src/include/cluster/dialogs.rb:1363
msgid "Dedicated Interface:"
msgstr "専用インタフェース:"

-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1366
msgid "IP:"
msgstr "IP:"

-#: src/include/cluster/dialogs.rb:1366
+#: src/include/cluster/dialogs.rb:1369
msgid "Group Number:"
msgstr "グループ番号:"

-#: src/include/cluster/dialogs.rb:1370
+#: src/include/cluster/dialogs.rb:1373
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr "/etc/conntrackd/conntrackd.confを生成します"

-#: src/include/cluster/dialogs.rb:1437
+#: src/include/cluster/dialogs.rb:1440
msgid "The Group Number must be a positive integer"
msgstr "[グループ番号]は正の整数である必要があります"

@@ -588,3 +588,6 @@
#: src/modules/Cluster.rb:536
msgid "Cannot write settings."
msgstr "設定が書き込めません。"
+
+#~ msgid "Multicast Port:"
+#~ msgstr "マルチキャストポート:"

Modified: branches/SLE12-SP3/yast/ja/po/control.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/control.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/control.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -58,10 +58,16 @@

#. TRANSLATORS: dialog help
#: control/control.SLES.glade.translations.glade:21
+#, fuzzy
+#| msgid ""
+#| "<p>The system roles adjustments are in the range from package selection up
\n"
+#| "to disk partitioning. By choosing a system role, the system is \n"
+#| "configured accordingly to match the use case of the role. The settings \n"
+#| "defined by a role can be overridden in the next steps if necessary.</p>"
msgid ""
-"<p>The system roles adjustments are in the range from package selection up \n"
-"to disk partitioning. By choosing a system role, the system is \n"
-"configured accordingly to match the use case of the role. The settings \n"
+"<p>The system roles adjustments are in the range from package selection up\n"
+"to disk partitioning. By choosing a system role, the system is\n"
+"configured accordingly to match the use case of the role. The settings\n"
"defined by a role can be overridden in the next steps if necessary.</p>"
msgstr ""
"<p>システムの役割の調整は、パッケージの選択からディスクの\n"
@@ -111,10 +117,8 @@
#: control/control.SLES.glade.translations.glade:37
#: control/control.SLES.glade.translations.glade:38
#: control/control.SLES.glade.translations.glade:39
+#: 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:82
-#: control/control.SLES.glade.translations.glade:83
msgid "Installation Settings"
msgstr "インストールの設定"

@@ -127,183 +131,167 @@
msgstr "エキスパート(E)"

#: control/control.SLES.glade.translations.glade:42
-msgid "Live Installation Settings"
-msgstr "ライブインストールの設定"
-
-#: control/control.SLES.glade.translations.glade:43
msgid "Update Settings"
msgstr "アップデートの設定"

+#: control/control.SLES.glade.translations.glade:45
#: control/control.SLES.glade.translations.glade:46
-#: control/control.SLES.glade.translations.glade:47
msgid "Network Configuration"
msgstr "ネットワーク設定"

-#: control/control.SLES.glade.translations.glade:48
+#: control/control.SLES.glade.translations.glade:47
msgid "Network Services Configuration"
msgstr "ネットワークサービス設定"

+#: 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:51
msgid "Hardware Configuration"
msgstr "ハードウェア設定"

-#: control/control.SLES.glade.translations.glade:52
-#: control/control.SLES.glade.translations.glade:89
-#: control/control.SLES.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:104
msgid "Preparation"
msgstr "準備"

-#: control/control.SLES.glade.translations.glade:53
-#: control/control.SLES.glade.translations.glade:76
-#: control/control.SLES.glade.translations.glade:90
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:75
msgid "Load Linuxrc Network Configuration"
msgstr "Linuxrcネットワーク設定のロード"

-#: control/control.SLES.glade.translations.glade:54
-#: control/control.SLES.glade.translations.glade:77
-#: control/control.SLES.glade.translations.glade:91
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
msgid "Network Autosetup"
msgstr "ネットワークの自動セットアップ"

-#: control/control.SLES.glade.translations.glade:55
-#: control/control.SLES.glade.translations.glade:92
-#: control/control.SLES.glade.translations.glade:108
-#: control/control.SLES.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.SLES.glade.translations.glade:105
msgid "Installer Update"
msgstr "インストーラのアップデート"

-#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:55
#: control/control.SLES.glade.translations.glade:78
-#: control/control.SLES.glade.translations.glade:93
msgid "Welcome"
msgstr "ようこそ"

-#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:56
#: control/control.SLES.glade.translations.glade:79
-#: control/control.SLES.glade.translations.glade:94
msgid "Network Activation"
msgstr "ネットワーク起動"

-#: control/control.SLES.glade.translations.glade:58
-#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:80
msgid "Disk Activation"
msgstr "ディスクの有効化"

+#: control/control.SLES.glade.translations.glade:58
#: control/control.SLES.glade.translations.glade:59
-#: control/control.SLES.glade.translations.glade:60
-#: control/control.SLES.glade.translations.glade:96
-#: control/control.SLES.glade.translations.glade:121
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.SLES.glade.translations.glade:106
msgid "System Analysis"
msgstr "システム分析"

-#: control/control.SLES.glade.translations.glade:61
-#: control/control.SLES.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:83
msgid "Add-On Products"
msgstr "アドオン製品"

-#: control/control.SLES.glade.translations.glade:62
-#: control/control.SLES.glade.translations.glade:80
+#: control/control.SLES.glade.translations.glade:61
msgid "Disk"
msgstr "ディスク"

-#: control/control.SLES.glade.translations.glade:63
-#: control/control.SLES.glade.translations.glade:81
+#: control/control.SLES.glade.translations.glade:62
msgid "Time Zone"
msgstr "時間帯"

-#: control/control.SLES.glade.translations.glade:64
-#: control/control.SLES.glade.translations.glade:75
+#: control/control.SLES.glade.translations.glade:63
msgid "Installation"
msgstr "インストール"

-#: control/control.SLES.glade.translations.glade:65
+#: control/control.SLES.glade.translations.glade:64
msgid "Installation Summary"
msgstr "インストールの概要"

+#: control/control.SLES.glade.translations.glade:65
#: control/control.SLES.glade.translations.glade:66
-#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:68
#: control/control.SLES.glade.translations.glade:69
#: control/control.SLES.glade.translations.glade:70
#: control/control.SLES.glade.translations.glade:71
#: control/control.SLES.glade.translations.glade:72
#: control/control.SLES.glade.translations.glade:73
-#: control/control.SLES.glade.translations.glade:74
-#: control/control.SLES.glade.translations.glade:84
-#: 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:112
-#: control/control.SLES.glade.translations.glade:113
-#: control/control.SLES.glade.translations.glade:115
-#: control/control.SLES.glade.translations.glade:116
-#: control/control.SLES.glade.translations.glade:117
-#: control/control.SLES.glade.translations.glade:118
-#: control/control.SLES.glade.translations.glade:135
-#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:98
+#: 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:120
+#: control/control.SLES.glade.translations.glade:121
msgid "Perform Installation"
msgstr "インストールの実行"

-#: control/control.SLES.glade.translations.glade:68
-#: control/control.SLES.glade.translations.glade:103
-#: control/control.SLES.glade.translations.glade:114
-#: control/control.SLES.glade.translations.glade:130
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:115
msgid "Installer Cleanup"
msgstr "インストーラのクリーンアップ"

-#: control/control.SLES.glade.translations.glade:97
-#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:107
msgid "System for Update"
msgstr "アップデートするシステム"

-#: control/control.SLES.glade.translations.glade:99
-#: control/control.SLES.glade.translations.glade:125
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:110
msgid "Update"
msgstr "アップデート"

-#: control/control.SLES.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:85
msgid "Update Summary"
msgstr "アップデートの概要"

-#: control/control.SLES.glade.translations.glade:101
-#: control/control.SLES.glade.translations.glade:102
-#: control/control.SLES.glade.translations.glade:104
-#: control/control.SLES.glade.translations.glade:105
-#: control/control.SLES.glade.translations.glade:106
-#: control/control.SLES.glade.translations.glade:127
-#: control/control.SLES.glade.translations.glade:128
-#: control/control.SLES.glade.translations.glade:129
-#: control/control.SLES.glade.translations.glade:131
-#: control/control.SLES.glade.translations.glade:132
-#: control/control.SLES.glade.translations.glade:133
-#: control/control.SLES.glade.translations.glade:134
-#: control/control.SLES.glade.translations.glade:139
-#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:90
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:125
msgid "Perform Update"
msgstr "アップデートの実行"

-#: control/control.SLES.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:92
msgid "Base Installation"
msgstr "基本インストール"

+#: control/control.SLES.glade.translations.glade:94
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:108
#: control/control.SLES.glade.translations.glade:109
-#: control/control.SLES.glade.translations.glade:110
#: control/control.SLES.glade.translations.glade:111
-#: control/control.SLES.glade.translations.glade:123
-#: control/control.SLES.glade.translations.glade:124
-#: control/control.SLES.glade.translations.glade:126
msgid "AutoYaST Settings"
msgstr "AutoYaSTの設定"

-#: control/control.SLES.glade.translations.glade:137
-#: control/control.SLES.glade.translations.glade:141
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:126
msgid "Configuration"
msgstr "環境設定"

-#: control/control.SLES.glade.translations.glade:138
-#: control/control.SLES.glade.translations.glade:142
+#: control/control.SLES.glade.translations.glade:123
+#: control/control.SLES.glade.translations.glade:127
msgid "System Configuration"
msgstr "システムの環境設定"

@@ -331,18 +319,17 @@
"</p>\n"
" "

-#: control/control.SLED.glade.translations.glade:26
-#: control/control.SLED.glade.translations.glade:52
-#: control/control.SLED.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:51
msgid "Load linuxrc Network Configuration"
msgstr "linuxrcネットワーク設定のロード"

+#: control/control.SLED.glade.translations.glade:36
#: control/control.SLED.glade.translations.glade:37
-#: control/control.SLED.glade.translations.glade:38
msgid "User Settings"
msgstr "ユーザ設定"

-#: control/control.SLED.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:38
msgid "Installation Overview"
msgstr "インストールの概要"

@@ -406,7 +393,9 @@
msgid "KDE Plasma Desktop"
msgstr "KDE Plasmaデスクトップ"

+#. TRANSLATORS: a label for a system role
#: control/control.openSUSE.glade.translations.glade:23
+#: control/control.openSUSE.glade.translations.glade:49
msgid "Server (Text Mode)"
msgstr "サーバ(テキストモード)"

@@ -426,11 +415,113 @@
msgid "Enlightenment Desktop"
msgstr "Enlightenmentデスクトップ"

+#. TRANSLATORS: dialog caption
+#: control/control.openSUSE.glade.translations.glade:29
+#: control/control.openSUSE.glade.translations.glade:72
+#, fuzzy
+#| msgid "Computer"
+msgid "Computer Role"
+msgstr "コンピュータ"
+
+#. TRANSLATORS: label in a dialog
+#: control/control.openSUSE.glade.translations.glade:31
+#, fuzzy
+#| msgid ""
+#| "System Roles are predefined use cases which tailor the system\n"
+#| "for the selected scenario."
+msgid ""
+"Computer Role is a predefined use case which tailor the system\n"
+"for the selected scenario."
+msgstr ""
+"システムの役割は選択したシナリオ用にシステムを調整する\n"
+"事前定義されたユースケースです。"
+
+#. TRANSLATORS: dialog help
+#: control/control.openSUSE.glade.translations.glade:34
+#, fuzzy
+#| msgid ""
+#| "<p>The system roles adjustments are in the range from package selection up
\n"
+#| "to disk partitioning. By choosing a system role, the system is \n"
+#| "configured accordingly to match the use case of the role. The settings \n"
+#| "defined by a role can be overridden in the next steps if necessary.</p>"
+msgid ""
+"<p>The computer role adjustments are in the range from package selection up\n"
+"to running additional services. By choosing a computer role, the system is\n"
+"configured accordingly to match the use case of the role. For the
<em>Custom</em> role\n"
+"an additional dialog is displayed which allows manual software pattern
selection. </p>"
+msgstr ""
+"<p>システムの役割の調整は、パッケージの選択からディスクの\n"
+"パーティション化に及びます。システムの役割を選択することによって、システムは\n"
+"それに応じて設定され、役割のユースケースに対応します。役割によって\n"
+"定義された設定は、必要に応じて次のステップで上書きできます。</p>"
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:39
+msgid "Workstation with KDE Plasma"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:40
+#, fuzzy
+#| msgid ""
+#| "KDE is a powerful and intuitive desktop\n"
+#| "environment that uses Kontact as mailer,\n"
+#| "Dolphin as file manager, and offers\n"
+#| "both Firefox and Konqueror as Web browsers.\n"
+msgid ""
+"KDE is a powerful and intuitive desktop environment that uses Kontact as
mailer,\n"
+"Dolphin as file manager, and offers both Firefox and Konqueror as Web
browsers.\n"
+" "
+msgstr ""
+"KDEは電子メールプログラムとしてKontactを、\n"
+"ファイルマネージャとしてDolphinを、\n"
+"ブラウザとしてFirefoxとKonquerorの両方を使用した\n"
+"強力で直感的なデスクトップ環境です。\n"
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:44
+msgid "Workstation with GNOME"
+msgstr ""
+
#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:71
+#, fuzzy
+#| msgid ""
+#| "GNOME is a powerful and intuitive desktop\n"
+#| "environment that uses Evolution as mailer,\n"
+#| "Firefox as browser, and Nautilus as file manager.\n"
+msgid ""
+"GNOME is a powerful and intuitive desktop environment that uses Evolution as
mailer,\n"
+"Firefox as browser, and Nautilus as file manager.\n"
+" "
+msgstr ""
+"GNOMEは電子メールプログラムとしてEvolutionを、\n"
+"ブラウザとしてFirefoxを、\n"
+"ファイルマネージャとしてNautilusを使用した強力で直感的なデスクトップ環境です。\n"
+
+#: control/control.openSUSE.glade.translations.glade:50
+msgid "Server is usefull when computer should not have interaction with user
and have only command line."
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:52
+msgid "Custom"
+msgstr "カスタム設定"
+
+#: control/control.openSUSE.glade.translations.glade:53
+msgid "Custom role runs additional dialog where user can select software that
fits his requirements."
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:74
+#, fuzzy
+#| msgid "Server Pattern Selection"
+msgid "Custom Pattern Selection"
+msgstr "サーバパターンの選択"
+
+#: control/control.openSUSE.glade.translations.glade:98
msgid "Online Repositories"
msgstr "オンラインリポジトリ"

-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "デスクトップの選択"
+#~ msgid "Live Installation Settings"
+#~ msgstr "ライブインストールの設定"
+
+#~ msgid "Desktop Selection"
+#~ msgstr "デスクトップの選択"

Modified: branches/SLE12-SP3/yast/ja/po/country.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/country.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/country.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: country\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-25 02:28+0000\n"
+"POT-Creation-Date: 2017-05-17 19:06+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -41,7 +41,7 @@

#. summary label
#. summary label
-#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1388
+#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1402
msgid "Current Keyboard Layout: %1"
msgstr "現在のキーボード配列: %1"

@@ -57,11 +57,9 @@

#. menue label text
#. title for selection box 'keyboard layout'
-#. widget label
#. menu button label
#: keyboard/src/clients/keyboard_proposal.rb:93
#: keyboard/src/include/keyboard/dialogs.rb:187
-#: keyboard/src/lib/y2country/widgets.rb:40
#: language/src/clients/country_simple_proposal.rb:78
msgid "&Keyboard Layout"
msgstr "キーボード配列(&K)"
@@ -204,25 +202,12 @@
msgid "System Keyboard Configuration"
msgstr "システムキーボード設定"

-#. help text for keyboard selection widget
-#: keyboard/src/lib/y2country/widgets.rb:80
-msgid ""
-"<p>\n"
-"Choose the <b>Keyboard layout</b> to be used during\n"
-"installation and on the installed system.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"インストール時およびインストール後に利用する <b>キーボードレイアウト</b> を\n"
-"選択してください。\n"
-"</p>\n"
-
#. label text: user can choose the keyboard from the updated system
#. or continue with the one defined by his language.
#. 2 radio-buttons follow this label.
#. Such keyboard layout is used only for the time of the update,
#. it is not saved to the system.
-#: keyboard/src/modules/Keyboard.rb:1299
+#: keyboard/src/modules/Keyboard.rb:1313
msgid ""
"You are currently using a keyboard layout\n"
"different from the one in the system to update.\n"
@@ -233,7 +218,7 @@

#. Executes the command to set the keyboard in X11, reporting
#. any error to the user
-#: keyboard/src/modules/Keyboard.rb:1498
+#: keyboard/src/modules/Keyboard.rb:1513
msgid "Failed to set X11 keyboard to '%s'"
msgstr "X11キーボードを「%s」に設定できませんでした"

@@ -341,8 +326,8 @@

#. summary label
#. summary label
-#: language/src/clients/language.rb:266 language/src/modules/Language.rb:851
-#: language/src/modules/Language.rb:885
+#: language/src/clients/language.rb:266 language/src/modules/Language.rb:850
+#: language/src/modules/Language.rb:884
msgid "Additional Languages: %1"
msgstr "追加言語: %1"

@@ -602,7 +587,7 @@

#. TRANSLATORS: Error message. Strings marked %{...} will be replaced
#. with variable content - do not translate them, please.
-#: language/src/modules/Language.rb:407
+#: language/src/modules/Language.rb:406
msgid ""
"Language '%{language}' was not found within the list of supported languages\n"
"available at %{directory}.\n"
@@ -616,19 +601,19 @@

#. summary label
#. summary label
-#: language/src/modules/Language.rb:795 language/src/modules/Language.rb:867
+#: language/src/modules/Language.rb:794 language/src/modules/Language.rb:866
msgid "Primary Language: %1"
msgstr "第一言語: %1"

#. work-around for following in order not to depend on yast2-packager
#. PackageSlideShow::InitPkgData (false);
#. "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes
-#: language/src/modules/Language.rb:1040
+#: language/src/modules/Language.rb:1039
msgid "Installing Packages..."
msgstr "パッケージをインストール中..."

#. continue/cancel message
-#: language/src/modules/Language.rb:1131
+#: language/src/modules/Language.rb:1130
msgid ""
"Translation of the primary language is not complete.\n"
"Some texts may be displayed in English.\n"
@@ -637,18 +622,18 @@
"一部のテキストは英語で表示されます。\n"

#. popup message
-#: language/src/modules/Language.rb:1345
+#: language/src/modules/Language.rb:1344
msgid ""
"Only minimal support for the selected language is included on this media.\n"
-"Enable online repositories later in order to get the appropriate support\n"
+"Add the Language add-on CD as an additional repository in order to get the
appropriate support\n"
"for this language.\n"
msgstr ""
-"このメディアには、選択した言語に対する最小限の対応しか含まれていません。\n"
-"この言語によりよく対応するよう設定するには、後ほどの手順でオンラインリポジトリを\n"
-"有効にしてください。\n"
+"このメディアには選択した言語に対する最小限の対応しか含まれていません。\n"
+"この言語によりよく対応するよう設定するには、追加のリポジトリとして[言語アドオンCD]を追加して\n"
+"ください。\n"

#. popup message (user selected CJK language in text mode)
-#: language/src/modules/Language.rb:1374
+#: language/src/modules/Language.rb:1373
msgid ""
"The selected language cannot be used in text mode. English is used for\n"
"installation, but the selected language will be used for the new system."
@@ -698,8 +683,8 @@
#. label text (Clock setting)
#. AutoYaST interface function: Return the summary of Timezone configuration
as a map.
#. @return summary string (html)
-#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:749
-#: timezone/src/modules/Timezone.rb:985
+#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:733
+#: timezone/src/modules/Timezone.rb:969
msgid "UTC"
msgstr "世界協定時間(UTC)"

@@ -956,315 +941,287 @@

#. label text, Clock setting: local time (not UTC)
#. label text, Clock setting: local time (not UTC)
-#: timezone/src/modules/Timezone.rb:753 timezone/src/modules/Timezone.rb:989
+#: timezone/src/modules/Timezone.rb:737 timezone/src/modules/Timezone.rb:973
msgid "Local Time"
msgstr "ローカルタイム"

#. label text
#. label text
-#: timezone/src/modules/Timezone.rb:757 timezone/src/modules/Timezone.rb:993
+#: timezone/src/modules/Timezone.rb:741 timezone/src/modules/Timezone.rb:977
msgid "Hardware Clock Set To"
msgstr "ハードウェアの時刻設定"

#. summary label
-#: timezone/src/modules/Timezone.rb:771
+#: timezone/src/modules/Timezone.rb:755
msgid "NTP configured"
msgstr "NTP 設定済み"

#. summary label
-#: timezone/src/modules/Timezone.rb:997
+#: timezone/src/modules/Timezone.rb:981
msgid "Current Time Zone: %1"
msgstr "現在のタイムゾーン: %1"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:46
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:46
+#: keyboard/src/data/keyboard_raw.ycp:35
msgid "English (US)"
msgstr "英語(米国)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:58
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:58
+#: keyboard/src/data/keyboard_raw.ycp:47
msgid "English (UK)"
msgstr "英語(英国)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:70
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:70
+#: keyboard/src/data/keyboard_raw.ycp:59
msgid "German"
msgstr "ドイツ語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:82
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:82
+#: keyboard/src/data/keyboard_raw.ycp:71
msgid "German (with deadkeys)"
msgstr "ドイツ語(デッドキー付き)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:94
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:94
+#: keyboard/src/data/keyboard_raw.ycp:83
msgid "German (Switzerland)"
msgstr "ドイツ語(スイス)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:106
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:106
+#: keyboard/src/data/keyboard_raw.ycp:95
msgid "French"
msgstr "フランス語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:118
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:118
+#: keyboard/src/data/keyboard_raw.ycp:107
msgid "French (Switzerland)"
msgstr "フランス語(スイス)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:130
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:130
+#: keyboard/src/data/keyboard_raw.ycp:119
msgid "French (Canada)"
msgstr "フランス語(カナダ)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:143
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:143
+#: keyboard/src/data/keyboard_raw.ycp:132
msgid "Canadian (Multilingual)"
msgstr "カナダ(多言語)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:157
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:156
+#: keyboard/src/data/keyboard_raw.ycp:145
msgid "Spanish"
msgstr "スペイン語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:169
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:168
+#: keyboard/src/data/keyboard_raw.ycp:157
msgid "Spanish (Latin America)"
msgstr "スペイン語(ラテンアメリカ)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:181
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:180
+#: keyboard/src/data/keyboard_raw.ycp:169
msgid "Spanish (CP 850)"
msgstr "スペイン語(CP 850)"

#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:181
+msgid "Spanish (Asturian variant)"
+msgstr "スペイン語(アストゥリアス地方の方言)"
+
+#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:193
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:204
msgid "Italian"
msgstr "イタリア語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:205
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:216
msgid "Portuguese"
msgstr "ポルトガル語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:217
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:228
msgid "Portuguese (Brazil)"
msgstr "ポルトガル語(ブラジル)"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:229
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:240
msgid "Portuguese (Brazil -- US accents)"
msgstr "ポルトガル語(ブラジル-米国アクセント)"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:241
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:252
msgid "Greek"
msgstr "ギリシャ語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:253
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:264
msgid "Dutch"
msgstr "オランダ語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:265
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:276
msgid "Danish"
msgstr "デンマーク語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:277
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:288
msgid "Norwegian"
msgstr "ノルウェー語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:289
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:300
msgid "Swedish"
msgstr "スウェーデン語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:301
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:312
msgid "Finnish"
msgstr "フィンランド語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:313
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:324
msgid "Czech"
msgstr "チェコ語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:328
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:336
msgid "Czech (qwerty)"
msgstr "チェコ語(qwerty)"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:343
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:348
msgid "Slovak"
msgstr "スロバキア語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:358
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:360
msgid "Slovak (qwerty)"
msgstr "スロバキア語(qwerty)"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:373
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:372
msgid "Slovene"
msgstr "スロベニア語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:388
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:384
+#: keyboard/src/data/keyboard_raw.ycp:387
msgid "Hungarian"
msgstr "ハンガリー語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:396
+#: keyboard/src/data/keyboard_raw.ycp:401
msgid "Polish"
msgstr "ポーランド語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:418
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:408
+#: keyboard/src/data/keyboard_raw.ycp:415
msgid "Russian"
msgstr "ロシア語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:432
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:420
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Serbian"
msgstr "セルビア語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:444
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:432
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Estonian"
msgstr "エストニア語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:456
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:444
+#: keyboard/src/data/keyboard_raw.ycp:453
msgid "Lithuanian"
msgstr "リトアニア語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:468
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:456
+#: keyboard/src/data/keyboard_raw.ycp:465
msgid "Turkish"
msgstr "トルコ語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:479
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:467
+#: keyboard/src/data/keyboard_raw.ycp:476
msgid "Croatian"
msgstr "クロアチア語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:502
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:479
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Japanese"
msgstr "日本語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:514
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:491
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Belgian"
msgstr "ベルギー語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:526
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:503
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Dvorak"
msgstr "Dvorak"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:538
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:515
+#: keyboard/src/data/keyboard_raw.ycp:534
msgid "Icelandic"
msgstr "アイスランド語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:550
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:527
+#: keyboard/src/data/keyboard_raw.ycp:546
msgid "Ukrainian"
msgstr "ウクライナ語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:572
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:539
+#: keyboard/src/data/keyboard_raw.ycp:568
msgid "Khmer"
msgstr "クメール語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:594
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:551
+#: keyboard/src/data/keyboard_raw.ycp:590
msgid "Korean"
msgstr "韓国語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:616
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:563
+#: keyboard/src/data/keyboard_raw.ycp:612
msgid "Arabic"
msgstr "アラビア語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:637
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:574
+#: keyboard/src/data/keyboard_raw.ycp:633
msgid "Tajik"
msgstr "タジク語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:651
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:586
+#: keyboard/src/data/keyboard_raw.ycp:647
msgid "Traditional Chinese"
msgstr "繁体字中国語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:673
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:598
+#: keyboard/src/data/keyboard_raw.ycp:669
msgid "Simplified Chinese"
msgstr "簡体字中国語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:695
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:610
+#: keyboard/src/data/keyboard_raw.ycp:691
msgid "Romanian"
msgstr "ルーマニア語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:716
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:712
msgid "US International"
msgstr "米国(国際)"

-#. keyboard layout
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:192
-msgid "Spanish (Asturian variant)"
-msgstr "スペイン語(アストゥリアス地方の方言)"
+#~ msgid ""
+#~ "<p>\n"
+#~ "Choose the <b>Keyboard layout</b> to be used during\n"
+#~ "installation and on the installed system.\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "インストール時およびインストール後に利用する <b>キーボードレイアウト</b> を\n"
+#~ "選択してください。\n"
+#~ "</p>\n"
+
+#~ msgid ""
+#~ "Only minimal support for the selected language is included on this
media.\n"
+#~ "Enable online repositories later in order to get the appropriate support\n"
+#~ "for this language.\n"
+#~ msgstr ""
+#~ "このメディアには、選択した言語に対する最小限の対応しか含まれていません。\n"
+#~ "この言語によりよく対応するよう設定するには、後ほどの手順でオンラインリポジトリを\n"
+#~ "有効にしてください。\n"

Modified: branches/SLE12-SP3/yast/ja/po/firewall.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/firewall.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/firewall.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firewall\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2017-04-11 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -670,7 +670,7 @@
#. TRANSLATORS: combo box
#. TRANSLATORS: select box
#: src/include/firewall/subdialogs.rb:280
-#: src/include/firewall/uifunctions.rb:865
+#: src/include/firewall/uifunctions.rb:886
msgid "&Service to Allow"
msgstr "許可するサービス(&S)"

@@ -819,7 +819,7 @@
#. TRANSLATORS: select box
#: src/include/firewall/subdialogs.rb:573
#: src/include/firewall/subdialogs.rb:1092
-#: src/include/firewall/uifunctions.rb:1980
+#: src/include/firewall/uifunctions.rb:2001
msgid "&Protocol"
msgstr "プロトコル(&P)"

@@ -1198,55 +1198,78 @@

#. Function stops Firewall services and sets firewall
#. to be stopped after exiting YaST
-#: src/include/firewall/uifunctions.rb:147
+#: src/include/firewall/uifunctions.rb:148
msgid "Stopping firewall..."
msgstr "ファイアウォールを停止しています..."

+#. TRANSLATORS: action which failed, used later
+#: src/include/firewall/uifunctions.rb:161
+#, fuzzy
+#| msgid "Device could not be opened."
+msgid "The firewall could not be stopped."
+msgstr "デバイスを開くことができませんでした。"
+
+#. TRANSLATORS: action which failed, used later
+#: src/include/firewall/uifunctions.rb:164
+#, fuzzy
+#| msgid "Firewall not running or would not be started."
+msgid "The firewall could not be started."
+msgstr "ファイアウォールが実行されていないか、または起動されていません。"
+
+#. TRANSLATORS: %s is action that failed
+#: src/include/firewall/uifunctions.rb:169
+#, fuzzy
+#| msgid "Please install yast2-registration and try again."
+msgid ""
+"%s\n"
+"Please verify your system and try again."
+msgstr "yast2-registration パッケージをインストールし、再度実行してください。"
+
#. TRANSLATORS: table item, connected with firewall zone of interface
-#: src/include/firewall/uifunctions.rb:184
+#: src/include/firewall/uifunctions.rb:205
msgid "No zone assigned"
msgstr "ゾーンが割り当てられていません"

#. TRANSLATORS: table item, "User defined string" instead of Device_name
-#: src/include/firewall/uifunctions.rb:224
+#: src/include/firewall/uifunctions.rb:245
msgid "Custom string"
msgstr "カスタム文字列"

#. interface could be unassigned
#. TRANSLATORAS: selection box item, connected with firewall zone of interface
-#: src/include/firewall/uifunctions.rb:288
+#: src/include/firewall/uifunctions.rb:309
msgid "No Zone Assigned"
msgstr "ゾーンが割り当てられていません"

#. TRANSLATORS: error message, %1 stands for the port number
-#: src/include/firewall/uifunctions.rb:487
+#: src/include/firewall/uifunctions.rb:508
msgid "Port number %1 is invalid."
msgstr "ポート番号 %1 は無効です。"

#. TRANSLATORS: error message, %1 stands for the port number,
#. %2 stands for, e.g., port range, where the wrong port definition %1 was
found
-#: src/include/firewall/uifunctions.rb:492
+#: src/include/firewall/uifunctions.rb:513
msgid "Port number %1 in definition %2 is invalid."
msgstr "定義 %2 のポート番号 %1 は無効です。"

#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:500
+#: src/include/firewall/uifunctions.rb:521
msgid "Invalid Port Definition"
msgstr "無効なポート定義"

#. TRANSLATORS: popup message, %1 stands for the maximal port number
#. that is possible to use in port-range
-#: src/include/firewall/uifunctions.rb:506
+#: src/include/firewall/uifunctions.rb:527
msgid "The port number must be in the interval from 1 to %1 (inclusive)."
msgstr "ポート番号は1から %1 の間である必要があります。"

#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:584
+#: src/include/firewall/uifunctions.rb:605
msgid "Invalid Port Range Definition"
msgstr "無効なポート範囲定義"

#. TRANSLATORS: popup message, %1 is a port-range defined by user
-#: src/include/firewall/uifunctions.rb:587
+#: src/include/firewall/uifunctions.rb:608
msgid ""
"Port range %1 is invalid.\n"
"It must be defined as the min_port_number:max_port_number and\n"
@@ -1254,12 +1277,12 @@
msgstr
"ポート範囲%1が無効です。これはmin_port_number:max_port_numberとして定義され、max_port_numberは
min_port_numberよりも大きくなければなりません。"

#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:604
+#: src/include/firewall/uifunctions.rb:625
msgid "Unknown Port Name"
msgstr "不明ポート名"

#. TRANSLATORS: popup message, %1 is a port-name
-#: src/include/firewall/uifunctions.rb:607
+#: src/include/firewall/uifunctions.rb:628
msgid ""
"Port name %1 is unknown in your current system.\n"
"It probably would not work.\n"
@@ -1270,12 +1293,12 @@
"このポートを使用しますか?\n"

#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:636
+#: src/include/firewall/uifunctions.rb:657
msgid "Invalid Additional Service Definition"
msgstr "無効な追加サービス定義"

#. TRANSLATORS: popup message, %1 stands for the wrong settings (might be
quite long)
-#: src/include/firewall/uifunctions.rb:639
+#: src/include/firewall/uifunctions.rb:660
msgid ""
"It appears that the additional service settings\n"
"%1\n"
@@ -1294,22 +1317,22 @@
#. )
#. (!IsThisExpertConfiguration() ?
#. TRANSLATORS: informative label
-#: src/include/firewall/uifunctions.rb:1035
+#: src/include/firewall/uifunctions.rb:1056
msgid "Masquerading needs at least one external interface and one other
interface."
msgstr "マスカレードには、少なくとも1つの外部インタフェースとその他のインタフェースが1つ必要です。"

#. TRANSLATORS: popup message
-#: src/include/firewall/uifunctions.rb:1056
+#: src/include/firewall/uifunctions.rb:1077
msgid "This entry must be completed."
msgstr "このエントリを完了する必要があります。"

#. TRANSLATORS: popup message, right port definition is two lines below this
message
-#: src/include/firewall/uifunctions.rb:1080
+#: src/include/firewall/uifunctions.rb:1101
msgid "Wrong port definition."
msgstr "ポート定義が正しくありません。"

#. TRANSLATORS: popup error message
-#: src/include/firewall/uifunctions.rb:1107
+#: src/include/firewall/uifunctions.rb:1128
msgid ""
"Wrong port definition.\n"
"No port number found for this port name.\n"
@@ -1320,17 +1343,17 @@
"ポート名の代わりにポート番号を使用してください。\n"

#. TRANSLATORS: popup message, right definition is two lines below this message
-#: src/include/firewall/uifunctions.rb:1136
+#: src/include/firewall/uifunctions.rb:1157
msgid "Invalid IP definition."
msgstr "無効なIPの定義です。"

#. TRANSLATORS: check box
-#: src/include/firewall/uifunctions.rb:1463
+#: src/include/firewall/uifunctions.rb:1484
msgid "&Log Not Accepted Broadcast Packets"
msgstr "受信しなかったブロードキャストパケットをログに記録する(&L)"

#. TRANSLATORS: popup question
-#: src/include/firewall/uifunctions.rb:1524
+#: src/include/firewall/uifunctions.rb:1545
msgid ""
"Firewall automatic starting has been disabled\n"
"but firewall is currently running.\n"
@@ -1343,71 +1366,71 @@
"設定書き込み後にファイアウォールを停止しますか?\n"

#. network is mandatory
-#: src/include/firewall/uifunctions.rb:1703
-#: src/include/firewall/uifunctions.rb:1910
+#: src/include/firewall/uifunctions.rb:1724
+#: src/include/firewall/uifunctions.rb:1931
msgid "Invalid network definition '%1'"
msgstr "ネットワーク設定が正しくありません '%1'"

#. destination port is optional
#. source port is optional
-#: src/include/firewall/uifunctions.rb:1721
-#: src/include/firewall/uifunctions.rb:1752
+#: src/include/firewall/uifunctions.rb:1742
+#: src/include/firewall/uifunctions.rb:1773
msgid "Invalid port range '%1'"
msgstr "ポート範囲が正しくありません '%1'"

-#: src/include/firewall/uifunctions.rb:1733
-#: src/include/firewall/uifunctions.rb:1764
-#: src/include/firewall/uifunctions.rb:1924
+#: src/include/firewall/uifunctions.rb:1754
+#: src/include/firewall/uifunctions.rb:1785
+#: src/include/firewall/uifunctions.rb:1945
msgid "Invalid port name or number '%1'"
msgstr "ポート名または番号が正しくありません '%1'"

-#: src/include/firewall/uifunctions.rb:1827
+#: src/include/firewall/uifunctions.rb:1848
msgid "All services using UDP"
msgstr "UDP を利用するすべてのサービス"

-#: src/include/firewall/uifunctions.rb:1829
+#: src/include/firewall/uifunctions.rb:1850
msgid "All services using TCP"
msgstr "TCP を利用するすべてのサービス"

-#: src/include/firewall/uifunctions.rb:1831
+#: src/include/firewall/uifunctions.rb:1852
msgid "Samba browsing"
msgstr "Samba 参照"

-#: src/include/firewall/uifunctions.rb:1833
+#: src/include/firewall/uifunctions.rb:1854
msgid "SLP browsing"
msgstr "SLP 参照"

-#: src/include/firewall/uifunctions.rb:1845
+#: src/include/firewall/uifunctions.rb:1866
msgid "All networks"
msgstr "すべてのネットワーク"

-#: src/include/firewall/uifunctions.rb:1847
+#: src/include/firewall/uifunctions.rb:1868
msgid "Subnet: %1"
msgstr "サブネット: %1"

#. hard-coded default
-#: src/include/firewall/uifunctions.rb:1952
+#: src/include/firewall/uifunctions.rb:1973
msgid "&Zone"
msgstr "ゾーン(&Z)"

-#: src/include/firewall/uifunctions.rb:1956
+#: src/include/firewall/uifunctions.rb:1977
msgid "&Network"
msgstr "ネットワーク(&N)"

-#: src/include/firewall/uifunctions.rb:1963
+#: src/include/firewall/uifunctions.rb:1984
msgid "&Service"
msgstr "サービス(&S)"

-#: src/include/firewall/uifunctions.rb:1969
+#: src/include/firewall/uifunctions.rb:1990
msgid "User-defined service"
msgstr "ユーザ定義サービス"

-#: src/include/firewall/uifunctions.rb:1994
+#: src/include/firewall/uifunctions.rb:2015
msgid "Po&rt"
msgstr "ポート(&R)"

#. redraw table
-#: src/include/firewall/uifunctions.rb:2089
+#: src/include/firewall/uifunctions.rb:2110
msgid "Select an item to delete."
msgstr "削除する項目を選択してください。"


Modified: branches/SLE12-SP3/yast/ja/po/firstboot.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/firstboot.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/firstboot.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firstboot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-21 00:29+0000\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -113,13 +113,13 @@
msgstr "ラベル"

#: src/clients/firstboot_config.rb:68
+msgid "Module Name"
+msgstr "モジュール名"
+
+#: src/clients/firstboot_config.rb:68
msgid "Status"
msgstr "状態"

-#: src/clients/firstboot_config.rb:68
-msgid "Module Name"
-msgstr "モジュール名"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""

Modified: branches/SLE12-SP3/yast/ja/po/installation.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/installation.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/installation.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-26 01:30+0000\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -14,6 +14,22 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

+#: src/lib/services-manager/clients/services-manager_finish.rb:11
+#, fuzzy
+#| msgid "Adapting system services ..."
+msgid "Setting default target and system services ..."
+msgstr "システムサービスを調整しています..."
+
+#. Proposal client for Network configuration
+#: src/lib/network/clients/network_proposal.rb:19
+#: src/lib/network/clients/network_proposal.rb:20
+msgid "Network Configuration"
+msgstr "ネットワーク設定"
+
+#: src/lib/network/clients/network_proposal.rb:25
+msgid "preformatted_proposal"
+msgstr ""
+
#. help for the dialog - busy message
#: src/include/installation/inst_inc_all.rb:52
msgid "<p>Initializing the installation...</p>"
@@ -512,7 +528,7 @@
#. download release notes now
#. push button
#: src/lib/installation/clients/inst_complex_welcome.rb:178
-#: src/lib/installation/clients/inst_download_release_notes.rb:137
+#: src/lib/installation/clients/inst_download_release_notes.rb:206
#: src/lib/installation/clients/inst_system_analysis.rb:294
msgid "Re&lease Notes..."
msgstr "リリースノート(&L)..."
@@ -849,14 +865,14 @@
#. FIXME: use a better title (reused existing texts because of text freeze)
#. TRANSLATORS: dialog caption
#. bug #302384
-#: src/lib/installation/clients/inst_download_release_notes.rb:145
+#: src/lib/installation/clients/inst_download_release_notes.rb:214
#: src/lib/installation/clients/inst_initialization.rb:56
#: src/lib/installation/clients/inst_installation_options.rb:149
msgid "Initializing"
msgstr "初期化中"

#. TRANSLATORS: dialog progress message
-#: src/lib/installation/clients/inst_download_release_notes.rb:145
+#: src/lib/installation/clients/inst_download_release_notes.rb:214
#: src/lib/installation/clients/inst_initialization.rb:44
msgid "Initializing the installation..."
msgstr "インストールを初期化しています..."
@@ -910,37 +926,37 @@
msgstr "完了"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:457
+#: src/lib/installation/clients/inst_finish.rb:460
msgid "Copy files to installed system"
msgstr "インストールしたシステムへファイルをコピーします"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:464
+#: src/lib/installation/clients/inst_finish.rb:467
msgid "Save configuration"
msgstr "設定を保存します"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:471
+#: src/lib/installation/clients/inst_finish.rb:474
msgid "Save installation settings"
msgstr "インストール設定を保存します"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:480
+#: src/lib/installation/clients/inst_finish.rb:483
msgid "Install boot manager"
msgstr "ブートローダをインストールします"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:487
+#: src/lib/installation/clients/inst_finish.rb:490
msgid "Prepare system for initial boot"
msgstr "最初の起動のために、システムを準備します"

#. some steps are called in live installer only
-#: src/lib/installation/clients/inst_finish.rb:550
+#: src/lib/installation/clients/inst_finish.rb:553
msgid "Client %1 returned invalid data."
msgstr "クライアント %1 は無効なデータを返しました。"

#. FIXME: looks like product specific finish steps are not used at all
-#: src/lib/installation/clients/inst_finish.rb:582
+#: src/lib/installation/clients/inst_finish.rb:585
msgid "Checking stage: %1..."
msgstr "ステージを確認しています: %1..."

@@ -964,6 +980,19 @@
msgid "Preparing the initial system configuration..."
msgstr "初期システム設定を準備しています..."

+#. Shows a dialog allowing the user to modify the invalid URL, modifying the
+#. /etc/install.inf file with the new value. In case of cancelled or empty,
+#. the URL will be completely removed.
+#.
+#. @param regurl [String]
+#: src/lib/installation/clients/inst_install_inf.rb:52
+msgid ""
+"If you decide to cancel, the custom URL\n"
+"will be completelly ignored.\n"
+"\n"
+"Really cancel URL modification?"
+msgstr ""
+
#. dialog caption
#: src/lib/installation/clients/inst_installation_options.rb:80
msgid "Installation Options"
@@ -1084,49 +1113,6 @@
"ネットワークの設定に失敗しました。\n"
"詳細については、ログファイル %1 を参照してください。"

-#. TRANSLATORS: help text, part 1
-#: src/lib/installation/clients/inst_new_desktop.rb:57
-msgid ""
-"<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number
\n"
-"of different desktop environments. Below you see a list of the 2 major ones
\n"
-"<b>GNOME</b> and <b>KDE</b>.</p>"
-msgstr ""
-"<p>Linux では<b></b>「選択」が最も重要です。<i>openSUSE</i>では複数の異なるデスクトップ環境を\n"
-"提供しています。次に、主要な2種類のデスクトップ環境である\n"
-"<b>GNOME</b>と<b>KDE</b>を示します。</p>"
-
-#. TRANSLATORS: help text, part 3
-#: src/lib/installation/clients/inst_new_desktop.rb:63
-msgid ""
-"<p>You may select alternative desktop environments (or one of minimal
installation patterns)\n"
-"that could fit your needs better using the <b>Other</b> option . Later in the
software \n"
-"selection or after installation, you can change your selection or add
additional desktop \n"
-"environments. This screen allows you to set the default.</p>"
-msgstr ""
-"<p>[<b>その他</b>]オプションを使用すると、よりニーズに適した別のデスクトップ環境(または最小インストールパターンの1つ)\n"
-"を選択できます。後でソフトウェアを選択する際やインストール後に、\n"
-"選択したデスクトップ環境を変更したり、デスクトップ環境を追加したりできます。\n"
-"この画面ではデフォルト値を設定できます。</p>"
-
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_new_desktop.rb:121
-msgid "Desktop Selection"
-msgstr "デスクトップの選択"
-
-#. UI wait loop
-#: src/lib/installation/clients/inst_new_desktop.rb:190
-msgid ""
-"No desktop type was selected.\n"
-"Select the desired desktop environment."
-msgstr ""
-"デスクトップの種類が選択されていません。インストールする\n"
-"デスクトップ環境を選択してください。"
-
-#. BNC #449818
-#: src/lib/installation/clients/inst_new_desktop.rb:383
-msgid "Other"
-msgstr "その他"
-
#. hide the RN button and set the release notes for SlideShow (bnc#871158)
#: src/lib/installation/clients/inst_prepareprogress.rb:56
msgid "Cannot find base product. Release notes will not be shown."
@@ -1330,36 +1316,22 @@
"ソフトウエアリポジトリの初期化に失敗しました。\n"
"インストールを中止します。"

-#. TRANSLATORS: error message
-#: src/lib/installation/clients/inst_update_installer.rb:232
-msgid ""
-"<p>Cannot obtain the installer update repository URL\n"
-"from the registration server.</p>"
-msgstr ""
-"<p>インストーラ更新リポジトリURLを登録サーバから\n"
-"取得できません。</p>"
-
-#. TRANSLATORS: part of an error message, %s is the default repository
-#. URL from control.xml
-#: src/lib/installation/clients/inst_update_installer.rb:238
-msgid "<p>The default URL %s will be used.<p>"
-msgstr "<p>デフォルトのURL %s が使用されます。<p>"
-
-#. Ask the user to chose a registration server
+#. Return the self-update URLs
#.
-#. @param services [Array<SlpServiceClass::Service>] Array of registration
servers
-#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc
if SCC is selected;
-#. :cancel if the dialog was dismissed.
-#: src/lib/installation/clients/inst_update_installer.rb:315
+#. @return [Array<URI>] self-update URLs
+#.
+#. @see #default_self_update_url
+#. @see #custom_self_update_url
+#: src/lib/installation/clients/inst_update_installer.rb:181
+#, fuzzy
+#| msgid "The registration module is not available."
msgid ""
-"Select a detected registration server from the list\n"
-"to search for installer updates."
-msgstr ""
-"リストから検出済みの登録サーバを選択して、\n"
-"インストーラ更新を検索します。"
+"The registration URL provided is not valid.\n"
+"Skipping installer update.\n"
+msgstr "登録モジュールが利用できません。"

#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:396
+#: src/lib/installation/clients/inst_update_installer.rb:233
msgid ""
"A valid update could not be found at\n"
"%s.\n"
@@ -1371,7 +1343,7 @@
"\n"

#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:402
+#: src/lib/installation/clients/inst_update_installer.rb:240
msgid ""
"Could not fetch update from\n"
"%s.\n"
@@ -1390,7 +1362,7 @@
#. @param reason [String] reason why user want to check his network
configuration
#. @return [Boolean] true if the network configuration client was launched;
#. false if the network is not configured.
-#: src/lib/installation/clients/inst_update_installer.rb:432
+#: src/lib/installation/clients/inst_update_installer.rb:264
msgid ""
"\n"
"Would you like to check your network configuration\n"
@@ -1403,7 +1375,7 @@
#. Note: the proxy cannot be configured in the YaST installer yet,
#. it needs to be set via the "proxy" boot option.
#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:477
+#: src/lib/installation/clients/inst_update_installer.rb:302
msgid ""
"Downloading the optional installer updates from \n"
"%s\n"
@@ -1426,26 +1398,26 @@
"「proxy」ブートパラメータを使用してください\n"

#. TRANSLATORS: progress label
-#: src/lib/installation/clients/inst_update_installer.rb:586
+#: src/lib/installation/clients/inst_update_installer.rb:388
msgid "Add Update Repository"
msgstr "更新リポジトリの追加"

-#: src/lib/installation/clients/inst_update_installer.rb:587
+#: src/lib/installation/clients/inst_update_installer.rb:389
msgid "Download the Packages"
msgstr "パッケージのダウンロード"

-#: src/lib/installation/clients/inst_update_installer.rb:588
+#: src/lib/installation/clients/inst_update_installer.rb:390
msgid "Apply the Packages"
msgstr "パッケージの適用"

-#: src/lib/installation/clients/inst_update_installer.rb:589
+#: src/lib/installation/clients/inst_update_installer.rb:391
msgid "Restart"
msgstr "再起動"

#. TRANSLATORS: dialog title
#. TRANSLATORS: progress title
-#: src/lib/installation/clients/inst_update_installer.rb:600
-#: src/lib/installation/clients/inst_update_installer.rb:602
+#: src/lib/installation/clients/inst_update_installer.rb:402
+#: src/lib/installation/clients/inst_update_installer.rb:404
msgid "Updating the Installer..."
msgstr "インストーラを更新しています..."

@@ -1454,7 +1426,7 @@
#. @return [Hash, nil] current profile if fetched or exists; nil otherwise
#.
#. @see Yast::Profile.current
-#: src/lib/installation/clients/inst_update_installer.rb:673
+#: src/lib/installation/clients/inst_update_installer.rb:475
msgid ""
"Error while parsing the control file.\n"
"\n"
@@ -1765,6 +1737,17 @@
msgid "Saving proxy configuration..."
msgstr "プロキシの環境設定を保存中..."

+#. This is a step of base installation finish and is responsible of write the
+#. specific configuration for the current system role.
+#.
+#. It has been added for CaaSP Roles (FATE#321754) and currently only
+#. the 'worker_role' has an special behavior.
+#: src/lib/installation/clients/roles_finish.rb:35
+#, fuzzy
+#| msgid "Writing device configuration..."
+msgid "Writing specific role configuration ..."
+msgstr "デバイスの環境設定を書き込んでいます..."
+
#. progress step title
#: src/lib/installation/clients/save_config_finish.rb:134
msgid "Saving time zone..."
@@ -1895,6 +1878,14 @@
msgid "Copying log files to installed system..."
msgstr "インストールしたシステムへログファイルをコピー中..."

+#. We do not need to create a wizard dialog in installation, but it's
+#. helpful when testing all manually on a running system
+#: src/lib/installation/dialogs/desktop_roles.rb:25
+#, fuzzy
+#| msgid "Computer"
+msgid "Computer Role"
+msgstr "コンピュータ"
+
#. Event callback for the 'ok' button
#: src/lib/installation/dialogs/ssh_import.rb:65
msgid "I would like to import SSH keys from a previous installation"
@@ -1919,20 +1910,6 @@
msgid "Import SSH Configuration"
msgstr "SSH設定のインポート"

-#. TODO: Add the registration process
-#: src/lib/installation/dialogs/worker_role.rb:45
-msgid "Dashboard U&RL"
-msgstr "ダッシュボードの URL (&R)"
-
-#: src/lib/installation/dialogs/worker_role.rb:52
-msgid "Worker Registration"
-msgstr "作業者の登録"
-
-#. FIXME: This client is a POC and still under definition
-#: src/lib/installation/dialogs/worker_role.rb:58
-msgid "Enter the url of the admin dashboard to register as a worker"
-msgstr "作業者として登録するための管理者ダッシュボードの URL を入力します"
-
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
msgid "Shrinking PREP partition..."
@@ -2176,7 +2153,7 @@
msgstr "リモート管理を有効にしています..."

#. A Continue-Cancel popup
-#: src/lib/installation/select_system_role.rb:97
+#: src/lib/installation/select_system_role.rb:92
msgid "Changing the system role may undo adjustments you may have done."
msgstr "システムの役割を変更すると、実行した調節が元に戻る場合があります。"

@@ -2230,6 +2207,26 @@
msgid "SSH host keys will be copied from %s"
msgstr "SSHホスト鍵は %s からコピーされます"

+#. Ask the user to chose a registration server
+#.
+#. @param services [Array<SlpServiceClass::Service>] Array of registration
servers
+#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc
if SCC is selected;
+#. :cancel if the dialog was dismissed.
+#: src/lib/installation/update_repositories_finder.rb:250
+msgid ""
+"Select a detected registration server from the list\n"
+"to search for installer updates."
+msgstr ""
+"リストから検出済みの登録サーバを選択して、\n"
+"インストーラ更新を検索します。"
+
+#. sets flag if online repositories dialog should be shown
+#: src/lib/installation/widgets/online_repos.rb:13
+#, fuzzy
+#| msgid "Configured Repositories"
+msgid "Configure On-line Repositories"
+msgstr "設定済みリポジトリ"
+
#. autoyast tried to read a file but had no success.
#: src/lib/transfer/file_from_url.rb:156
msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
@@ -2326,3 +2323,55 @@
msgstr ""
"インストール時にパッケージの依存関係を自動解決できませんでした。\n"
"手動で問題を解決できるよう、ソフトウェアマネージャが開きます。"
+
+#~ msgid ""
+#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a
number \n"
+#~ "of different desktop environments. Below you see a list of the 2 major
ones \n"
+#~ "<b>GNOME</b> and <b>KDE</b>.</p>"
+#~ msgstr ""
+#~ "<p>Linux では<b></b>「選択」が最も重要です。<i>openSUSE</i>では複数の異なるデスクトップ環境を\n"
+#~ "提供しています。次に、主要な2種類のデスクトップ環境である\n"
+#~ "<b>GNOME</b>と<b>KDE</b>を示します。</p>"
+
+#~ msgid ""
+#~ "<p>You may select alternative desktop environments (or one of minimal
installation patterns)\n"
+#~ "that could fit your needs better using the <b>Other</b> option . Later in
the software \n"
+#~ "selection or after installation, you can change your selection or add
additional desktop \n"
+#~ "environments. This screen allows you to set the default.</p>"
+#~ msgstr ""
+#~ "<p>[<b>その他</b>]オプションを使用すると、よりニーズに適した別のデスクトップ環境(または最小インストールパターンの1つ)\n"
+#~ "を選択できます。後でソフトウェアを選択する際やインストール後に、\n"
+#~ "選択したデスクトップ環境を変更したり、デスクトップ環境を追加したりできます。\n"
+#~ "この画面ではデフォルト値を設定できます。</p>"
+
+#~ msgid "Desktop Selection"
+#~ msgstr "デスクトップの選択"
+
+#~ msgid ""
+#~ "No desktop type was selected.\n"
+#~ "Select the desired desktop environment."
+#~ msgstr ""
+#~ "デスクトップの種類が選択されていません。インストールする\n"
+#~ "デスクトップ環境を選択してください。"
+
+#~ msgid "Other"
+#~ msgstr "その他"
+
+#~ msgid ""
+#~ "<p>Cannot obtain the installer update repository URL\n"
+#~ "from the registration server.</p>"
+#~ msgstr ""
+#~ "<p>インストーラ更新リポジトリURLを登録サーバから\n"
+#~ "取得できません。</p>"
+
+#~ msgid "<p>The default URL %s will be used.<p>"
+#~ msgstr "<p>デフォルトのURL %s が使用されます。<p>"
+
+#~ msgid "Dashboard U&RL"
+#~ msgstr "ダッシュボードの URL (&R)"
+
+#~ msgid "Worker Registration"
+#~ msgstr "作業者の登録"
+
+#~ msgid "Enter the url of the admin dashboard to register as a worker"
+#~ msgstr "作業者として登録するための管理者ダッシュボードの URL を入力します"

Modified: branches/SLE12-SP3/yast/ja/po/iscsi-lio-server.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/iscsi-lio-server.ja.po 2017-05-23
07:05:44 UTC (rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/iscsi-lio-server.ja.po 2017-05-23
07:06:46 UTC (rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: iscsi-lio-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 02:28+0000\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -90,6 +90,7 @@
msgstr "名前"

#: src/include/iscsi-lio-server/dialogs.rb:149
+#: src/include/iscsi-lio-server/widgets.rb:336
msgid "Path"
msgstr "パス"

@@ -546,14 +547,14 @@
msgid "Selected Path is already in use!"
msgstr "選択したパスはすでに使用されています。"

-#: src/include/iscsi-lio-server/widgets.rb:336
-msgid "Path:"
-msgstr "パス:"
-
#: src/include/iscsi-lio-server/widgets.rb:339
msgid "Browse"
msgstr "参照"

+#: src/include/iscsi-lio-server/widgets.rb:344
+msgid "Name (autogenerated when empty)"
+msgstr ""
+
#: src/include/iscsi-lio-server/widgets.rb:359
msgid "Select file or device"
msgstr "ファイルまたはデバイスを選択してください"
@@ -567,8 +568,8 @@
msgstr "ターゲット LUN"

#: src/include/iscsi-lio-server/widgets.rb:470
-msgid "Change:"
-msgstr "変更:"
+msgid "Change"
+msgstr "変更"

#: src/include/iscsi-lio-server/widgets.rb:563
msgid "Target LUN %1 used more than once!"
@@ -579,7 +580,9 @@
msgstr "少なくとも 1 つの認証を有効にする必要があります。"

#: src/include/iscsi-lio-server/widgets.rb:645
-msgid "Initiator name:"
+#, fuzzy
+#| msgid "Initiator name:"
+msgid "Initiator name"
msgstr "イニシエータ名:"

#: src/include/iscsi-lio-server/widgets.rb:648
@@ -602,7 +605,9 @@
#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
#: src/include/iscsi-lio-server/widgets.rb:704
-msgid "New initiator name:"
+#, fuzzy
+#| msgid "New initiator name:"
+msgid "New initiator name"
msgstr "新しいイニシエータ名:"

#: src/include/iscsi-lio-server/widgets.rb:750
@@ -828,3 +833,9 @@
#: src/modules/IscsiLioServer.rb:425
msgid "Configuration summary..."
msgstr "設定の概要..."
+
+#~ msgid "Path:"
+#~ msgstr "パス:"
+
+#~ msgid "Change:"
+#~ msgstr "変更:"

Modified: branches/SLE12-SP3/yast/ja/po/kdump.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/kdump.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/kdump.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kdump\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-16 02:29+0000\n"
+"POT-Creation-Date: 2017-03-31 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -362,7 +362,7 @@
#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:513
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:535
msgid "To apply changes a reboot is necessary."
msgstr "変更を適用するには再起動が必要です。"

@@ -1227,7 +1227,7 @@

#. @param update_command [String] a command for .target.bash
#. @return [Boolean] whether successful
-#: src/modules/Kdump.rb:414
+#: src/modules/Kdump.rb:427
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
@@ -1236,129 +1236,129 @@
"詳細については、%{log} を参照してください。"

#. Kdump read dialog caption
-#: src/modules/Kdump.rb:523
+#: src/modules/Kdump.rb:545
msgid "Initializing kdump Configuration"
msgstr "kdump設定を初期化しています"

#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:532 src/modules/Kdump.rb:540
+#: src/modules/Kdump.rb:554 src/modules/Kdump.rb:562
msgid "Reading the config file..."
msgstr "設定ファイルを読み込んでいます..."

#. Progress stage 3/4
-#: src/modules/Kdump.rb:534
+#: src/modules/Kdump.rb:556
msgid "Reading kernel boot options..."
msgstr "カーネルブートオプションを読み取っています..."

#. Progress stage 4/4
-#: src/modules/Kdump.rb:536
+#: src/modules/Kdump.rb:558
msgid "Calculating memory limits..."
msgstr "メモリ制限を計算しています..."

#. Progress step 2/4
-#: src/modules/Kdump.rb:542
+#: src/modules/Kdump.rb:564
msgid "Reading partitions of disks..."
msgstr "ディスク内のパーティションを読み込んでいます..."

#. Progress finished 3/4
-#: src/modules/Kdump.rb:544
+#: src/modules/Kdump.rb:566
msgid "Reading available memory and calibrating usage..."
msgstr "使用可能なメモリを読み込んで、その使用方法を調整しています..."

#. Error message
-#: src/modules/Kdump.rb:556
+#: src/modules/Kdump.rb:578
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "設定ファイル/etc/sysconfig/kdumpを読み込めません"

#. Error message
-#: src/modules/Kdump.rb:564
+#: src/modules/Kdump.rb:586
msgid "Cannot read kernel boot options."
msgstr "カーネルの起動オプションを読み込めません"

#. Error message
-#: src/modules/Kdump.rb:572
+#: src/modules/Kdump.rb:594
msgid "Cannot read available memory."
msgstr "利用可能なメモリを読み込めません"

#. Kdump read dialog caption
-#: src/modules/Kdump.rb:598
+#: src/modules/Kdump.rb:620
msgid "Saving kdump Configuration"
msgstr "kdump設定を保存しています"

#. Progress stage 1/2
-#: src/modules/Kdump.rb:627
+#: src/modules/Kdump.rb:649
msgid "Write the settings"
msgstr "設定を書き込む"

#. Progress stage 2/2
-#: src/modules/Kdump.rb:629
+#: src/modules/Kdump.rb:651
msgid "Update boot options"
msgstr "起動オプションの更新"

#. Progress step 1/2
-#: src/modules/Kdump.rb:633
+#: src/modules/Kdump.rb:655
msgid "Writing the settings..."
msgstr "設定を書き込んでいます..."

#. Progress step 2/2
-#: src/modules/Kdump.rb:635
+#: src/modules/Kdump.rb:657
msgid "Updating boot options..."
msgstr "起動オプションを更新しています..."

#. Progress finished
-#: src/modules/Kdump.rb:637
+#: src/modules/Kdump.rb:659
msgid "Finished"
msgstr "完了"

#. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:669
msgid "Cannot write settings."
msgstr "設定が書き込めません"

#. Error message
-#: src/modules/Kdump.rb:656
+#: src/modules/Kdump.rb:678
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "ブートローダへcrashkernelパラメータを追加するのに失敗しました。"

#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:774
+#: src/modules/Kdump.rb:796
msgid "Kdump status: %1"
msgstr "Kdump の状態: %1"

-#: src/modules/Kdump.rb:775
+#: src/modules/Kdump.rb:797
msgid "enabled"
msgstr "有効"

-#: src/modules/Kdump.rb:775
+#: src/modules/Kdump.rb:797
msgid "disabled"
msgstr "無効"

-#: src/modules/Kdump.rb:782
+#: src/modules/Kdump.rb:804
msgid "Value(s) of crashkernel option: %1"
msgstr "crashkernelオプションの値: %1"

-#: src/modules/Kdump.rb:789
+#: src/modules/Kdump.rb:811
msgid "Dump format: %1"
msgstr "ダンプ形式: %1"

-#: src/modules/Kdump.rb:796
+#: src/modules/Kdump.rb:818
msgid "Target of dumps: %1"
msgstr "ダンプ対象: %1"

-#: src/modules/Kdump.rb:803
+#: src/modules/Kdump.rb:825
msgid "Number of dumps: %1"
msgstr "ダンプ数: %1"

#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with
actual sizes later
-#: src/modules/Kdump.rb:895
+#: src/modules/Kdump.rb:917
msgid "Warning! There might not be enough free space. %{required} required,
but only %{available} are available."
msgstr "警告! 空き容量が十分でない可能性があります。%{required} が必要ですが、%{available} しかありません。"

#. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:992
+#: src/modules/Kdump.rb:1025
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."

Modified: branches/SLE12-SP3/yast/ja/po/network.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/network.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/network.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 02:29+0000\n"
+"POT-Creation-Date: 2017-04-08 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -574,7 +574,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:510
msgid "Routing Configuration"
msgstr "ルーティングの環境設定"

@@ -660,7 +660,9 @@
msgstr "ゲートウェイ"

#. Table header label
+#. Table header 3/4
#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
+#: src/include/network/services/routing.rb:89
msgid "Netmask"
msgstr "ネットマスク"

@@ -741,13 +743,13 @@

#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1458
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1456
msgid "Warning: no encryption is used."
msgstr "警告: 暗号化は使用されません。"

#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1460
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1458
msgid "Change."
msgstr "変更してください。"

@@ -2253,17 +2255,26 @@
"使用されます。 デフォルトルートは、「宛先指定のない場合の送信先」です。\"</p>\n"

#: src/include/network/lan/help.rb:99
+#, fuzzy
+#| 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"
+#| "the device through which the traffic to the defined network will be
routed.\"-\" is an alias for any interface.</p>\n"
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"
-"the device through which the traffic to the defined network will be
routed.\"-\" is an alias for any interface.</p>\n"
+"and netmask. You can use either IPv4 netmask or prefix length when defining\n"
+"network part of route. Prefix length has to be prefixed using '/'.\n"
+"To omit any of these values, use a dash sign \"-\". Select\n"
+"the device through which the traffic to the defined network will be
routed.\"-\" is an alias for any interface.\n"
+"Please note that in case of IPv6 networks only prefix length is accepted\n"
+"for netmask definition.</p>\n"
msgstr ""
"<p>それぞれの経路に対して、宛先のネットワークIPアドレス、ゲートウェイアドレス、\n"
"およびネットマスクを入力してください。これらの値を省略する場合はハイフン記号「-」\n"

"を入力しておいてください。また、どのデバイスを利用して通信を転送するのかを選択することもできます(「-」を指定すると、どのインタフェースでも構わないという意味になります)。</p>\n"

#. Routing dialog help 2/2
-#: src/include/network/lan/help.rb:105
+#: src/include/network/lan/help.rb:109
msgid ""
"<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n"
"to the internal one) if this system is a router.\n"
@@ -2271,7 +2282,7 @@
"<p>このシステムがルータの場合は、<b>IPv4転送</b>(外部ネットワークから内部ネットワークへの\n"
"パケットの転送)を有効にします。\n"

-#: src/include/network/lan/help.rb:109
+#: src/include/network/lan/help.rb:113
msgid ""
"<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n"
"to the internal one) if this system is a router.\n"
@@ -2283,7 +2294,7 @@
"<b>警告:</b> IPv6転送により、IPv6ステートレスアドレス自動設定(SLAAC)は\n"
"無効になります。"

-#: src/include/network/lan/help.rb:115
+#: src/include/network/lan/help.rb:119
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"
@@ -2293,7 +2304,7 @@
"マスカレードを有効にするか、ファイアウォール環境設定内に1つ以上の\n"
"リダイレクトルールを設定する必要があります。YaSTファイアウォールモジュールを使用します。</p>\n"

-#: src/include/network/lan/help.rb:121
+#: src/include/network/lan/help.rb:125
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"
@@ -2311,7 +2322,7 @@
"選択したりすることもできます。ただし、複数の DHCP ネットワークに接続するマルチホーム環境では、\n"
"このオプションを選択すると奇妙な動作になる場合もあります。</p>\n"

-#: src/include/network/lan/help.rb:131
+#: src/include/network/lan/help.rb:135
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"
@@ -2325,7 +2336,7 @@
"それ以外の場合、特に複数のネットワークサービスを提供している場合などは、\n"
"注意して使用してください。</p>\n"

-#: src/include/network/lan/help.rb:139
+#: src/include/network/lan/help.rb:143
msgid ""
"<p>Enter the name servers and domain search list for resolving \n"
"hostnames. Usually they can be obtained by DHCP.</p>\n"
@@ -2334,7 +2345,7 @@
"入力します。通常それらはDHCPで取得できます。</p>\n"

#. resolver dialog help
-#: src/include/network/lan/help.rb:143
+#: src/include/network/lan/help.rb:147
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"
@@ -2345,7 +2356,7 @@
"(例えば192.168.0.42)として入力する必要があります。</p>\n"

#. resolver dialog help
-#: src/include/network/lan/help.rb:149
+#: src/include/network/lan/help.rb:153
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"
@@ -2357,7 +2368,7 @@
"(suse.deなど)と同じです。追加の検索ドメインも設定できます\n"
"(suse.comなど)。ドメイン名はカンマまたは空白で区切ってください。</p>\n"

-#: src/include/network/lan/help.rb:156
+#: src/include/network/lan/help.rb:160
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"
@@ -2369,7 +2380,7 @@
"重要な設定です。お使いのコンピュータでホスト名を確認するには、 <i>hostname</i> コマンドを\n"
"お使いください。</p>"

-#: src/include/network/lan/help.rb:163
+#: src/include/network/lan/help.rb:167
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"
@@ -2385,7 +2396,7 @@
"やNetworkManagerなど)を合わせて使用します。\n"
"これがデフォルト値です。ほとんどの場合、[<b>既定のポリシーを使用する</b>]オプションの動作で十分です。</p>\n"

-#: src/include/network/lan/help.rb:171
+#: src/include/network/lan/help.rb:175
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"
@@ -2407,7 +2418,7 @@

#. Address dialog help 1-6/8: dynamic address preferred
#. Address dialog help 1/8
-#: src/include/network/lan/help.rb:183
+#: src/include/network/lan/help.rb:187
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"
@@ -2417,12 +2428,12 @@
"<p>このデバイスに対してIPアドレスを割り当てない場合は、[<b>アドレスを設定しない</b>]を選んでください。\n"
"この設定はEthernetデバイスに対してボンド機能を利用する場合などに利用します。</p>\n"

-#: src/include/network/lan/help.rb:188
+#: src/include/network/lan/help.rb:192
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:192
+#: src/include/network/lan/help.rb:196
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"
@@ -2431,7 +2442,7 @@
"[<b>可変 IP アドレス</b>]を選択してください。</p>\n"

#. Address dialog help 3/8
-#: src/include/network/lan/help.rb:196
+#: src/include/network/lan/help.rb:200
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"
@@ -2442,7 +2453,7 @@
"設定するようになります。</p>\n"

#. Address dialog help 4/8
-#: src/include/network/lan/help.rb:202
+#: src/include/network/lan/help.rb:206
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"
@@ -2453,7 +2464,7 @@
"Zeroconf を利用する場合は <b>DHCP + Zeroconf</b>
を選択してください。それ以外の場合はネットワークアドレスを<b>固定で</b>割り当てる必要があります。</p>\n"

#. Address dialog help 5/8
-#: src/include/network/lan/help.rb:209
+#: src/include/network/lan/help.rb:213
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"
@@ -2464,7 +2475,7 @@
"入力してください。</p>\n"

#. Address dialog help 6/8
-#: src/include/network/lan/help.rb:216
+#: src/include/network/lan/help.rb:220
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"
@@ -2475,7 +2486,7 @@
"を入力することもできます。この値は<tt>/etc/hosts</tt>に書き込まれます。</p>\n"

#. Address dialog help 8/8
-#: src/include/network/lan/help.rb:222
+#: src/include/network/lan/help.rb:226
msgid ""
"<p>Contact your <b>network administrator</b> for more information about\n"
"the network configuration.</p>"
@@ -2483,7 +2494,7 @@
"<p>ネットワークの環境設定の詳細については、ネットワーク管理者に\n"
"問い合わせてください。</p>"

-#: src/include/network/lan/help.rb:226
+#: src/include/network/lan/help.rb:230
msgid ""
"<p>DHCP configuration is not recommended for this product.\n"
"Components of this product might not work with DHCP.</p>"
@@ -2491,7 +2502,7 @@
"<p>この製品ではDHCPの設定をお勧めできません。\n"
"この製品のコンポーネントはDHCPでは動作しません。</p>"

-#: src/include/network/lan/help.rb:230
+#: src/include/network/lan/help.rb:234
msgid ""
"<p><b><big>Firewall Zone</big></b></p>\n"
"<p>Select the firewall zone to put the interface into. If you\n"
@@ -2509,11 +2520,11 @@
"全てのインタフェースでゾーンを選択しない場合はファイアウォールが\n"
"起動されません。</p>"

-#: src/include/network/lan/help.rb:240
+#: src/include/network/lan/help.rb:244
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:244
+#: src/include/network/lan/help.rb:248
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"
@@ -2529,7 +2540,7 @@
"ネットワークのパフォーマンスが上がる場合があります。お勧めの値からいずれかを選択するか、\n"
"独自の値を設定してください。</p>\n"

-#: src/include/network/lan/help.rb:253
+#: src/include/network/lan/help.rb:257
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>"
@@ -2538,12 +2549,12 @@
"「デバイスの起動」が「起動しない」で、かつ「アドレス設定」が「アドレスを設定しない」になっているデバイスだけが指定可能です。</p>"

#. DHCP dialog help 1/7
-#: src/include/network/lan/help.rb:257
+#: src/include/network/lan/help.rb:261
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:259
+#: src/include/network/lan/help.rb:263
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"
@@ -2558,7 +2569,7 @@
"同じになってしまうため、それぞれ異なる適当なIDを指定してください。</p>"

#. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:267
+#: src/include/network/lan/help.rb:271
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"
@@ -2579,7 +2590,7 @@
"ホスト名を送信しない場合は、フィールドを空のままにします。</p>\n"

#. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:278
+#: src/include/network/lan/help.rb:282
msgid ""
"<p><b><big>Additional Addresses</big></b></p>\n"
"<p>Configure additional addresses of an interface in this table.</p>\n"
@@ -2588,7 +2599,7 @@
"<p>このテーブルでインタフェースの追加アドレスを設定します。</p>\n"

#. Aliases dialog help 2/4
-#: src/include/network/lan/help.rb:282
+#: src/include/network/lan/help.rb:286
msgid ""
"<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n"
"the <b>Netmask</b>.</p>"
@@ -2597,7 +2608,7 @@
"[<b>ネットマスク</b>]に入力します。</p>"

#. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb:286
+#: src/include/network/lan/help.rb:290
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"
@@ -2608,14 +2619,14 @@
"15文字に制限されています。廃止されたifconfigユーティリティでは、この名前の9文字から後が切り捨てられます。</p>"

#. Aliases dialog help 3/4, #83766
-#: src/include/network/lan/help.rb:292
+#: src/include/network/lan/help.rb:296
msgid "<p>Do not include the interface name in the label. For example, enter
<b>foo</b> instead of <b>eth0:foo</b>.</p>"
msgstr
"<p>ラベルにインタフェース名を含めないでください。たとえば、<b></b>「eth0:foo」ではなく<b></b>「foo」と入力してください。</p>"

#. shared between WirelessDialog and WirelessKeyPopup
#. this is suited to the button-switched key typing
#. Translators: dialog help
-#: src/include/network/lan/help.rb:299
+#: src/include/network/lan/help.rb:303
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"
@@ -2644,7 +2655,7 @@
"</p> \n"

#. Wireless dialog help
-#: src/include/network/lan/help.rb:314
+#: src/include/network/lan/help.rb:318
msgid ""
"<p>Here, set the most important settings\n"
"for wireless networking.</p>"
@@ -2652,7 +2663,7 @@
"<p>ここでは、無線ネットワークに関する最も重要な設定を\n"
"行います。</p>"

-#: src/include/network/lan/help.rb:317
+#: src/include/network/lan/help.rb:321
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"
@@ -2666,7 +2677,7 @@
"とも呼ばれる)、アクセスポイントとして機能するネットワークカードの場合は[マスタ]\n"
"を指定できます。</p>\n"

-#: src/include/network/lan/help.rb:324
+#: src/include/network/lan/help.rb:328
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"
@@ -2684,7 +2695,7 @@
"WLANカードは、最も信号強度が大きいアクセスポイントに\n"
"接続します。</p>\n"

-#: src/include/network/lan/help.rb:333
+#: src/include/network/lan/help.rb:337
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"
@@ -2720,7 +2731,7 @@
"<b>WPA-EAP</b> を指定してください。 WPA は <b>動作モード</b> が <b>管理</b>\n"
"である場合にのみ使用できます。</p>\n"

-#: src/include/network/lan/help.rb:351
+#: src/include/network/lan/help.rb:355
msgid ""
"<p>To use WEP, enter the\n"
"WEP encryption key to use. It can have a key\n"
@@ -2735,7 +2746,7 @@
"は動的に生成されるため、実際には40ビットから232ビットのみ入力する必要があります。</p>\n"

#. Wireless dialog help
-#: src/include/network/lan/help.rb:359
+#: src/include/network/lan/help.rb:363
msgid ""
"<p>To use WPA-PSK (sometimes referred to as WPA Home),\n"
"enter the preshared key. This\n"
@@ -2751,7 +2762,7 @@
"辞書攻撃を受ける可能性があります。 推測が容易な単語を\n"
"パスフレーズとして使用しないでください。</p>\n"

-#: src/include/network/lan/help.rb:367
+#: src/include/network/lan/help.rb:371
msgid ""
"<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n"
"enter some additional parameters in the next dialog.</p>\n"
@@ -2759,7 +2770,7 @@
"<p>WPA-EAP (WPA Enterpriseとも呼ばれます)を使用するには、\n"
"次のダイアログで追加のパラメータを入力します。</p>\n"

-#: src/include/network/lan/help.rb:370
+#: src/include/network/lan/help.rb:374
msgid ""
"<p>These values will be written to the interface configuration file\n"
"'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"
@@ -3673,11 +3684,6 @@
msgid "Default IPv6 &Gateway"
msgstr "デフォルトIPv6ゲートウェイ(&G)"

-#. Table header 3/4
-#: src/include/network/services/routing.rb:89
-msgid "Genmask"
-msgstr "ネットマスク"
-
#. CheckBox label
#: src/include/network/services/routing.rb:110
msgid "Enable &IPv4 Forwarding"
@@ -3696,40 +3702,40 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:163
+#: src/include/network/services/routing.rb:181
msgid "&Destination"
msgstr "宛先(&D)"

-#: src/include/network/services/routing.rb:171
-msgid "Ge&nmask"
+#: src/include/network/services/routing.rb:189
+msgid "&Netmask"
msgstr "ネットマスク(&N)"

-#: src/include/network/services/routing.rb:180
+#: src/include/network/services/routing.rb:198
msgid "&Gateway"
msgstr "ゲートウェイ(&G)"

-#: src/include/network/services/routing.rb:188
+#: src/include/network/services/routing.rb:206
msgid "De&vice"
msgstr "デバイス(&V)"

#. Popup::Error text
-#: src/include/network/services/routing.rb:247
+#: src/include/network/services/routing.rb:261
msgid "Destination is invalid."
msgstr "宛先が無効です。"

#. Popup::Error text
-#: src/include/network/services/routing.rb:255
+#: src/include/network/services/routing.rb:269
msgid "Gateway IP address is invalid."
msgstr "ゲートウェイIPアドレスが無効です。"

#. Popup::Error text
-#: src/include/network/services/routing.rb:263
+#: src/include/network/services/routing.rb:277
msgid "Subnetmask is invalid."
msgstr "サブネットマスクが無効です。"

#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:422
+#: src/include/network/services/routing.rb:436
msgid "The default gateway is invalid."
msgstr "デフォルトゲートウェイが正しくありません。"

@@ -4398,27 +4404,27 @@
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1339 src/modules/LanItems.rb:1343
-#: src/modules/LanItems.rb:1347
+#: src/modules/LanItems.rb:1337 src/modules/LanItems.rb:1341
+#: src/modules/LanItems.rb:1345
msgid "Started automatically at boot"
msgstr "起動時に自動的に開始する"

#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1351
+#: src/modules/LanItems.rb:1349
msgid "Started automatically on cable connection"
msgstr "ケーブル接続時に自動的に開始"

#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1355
+#: src/modules/LanItems.rb:1353
msgid "Managed by NetworkManager"
msgstr "NetworkManagerによる管理"

#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1359
+#: src/modules/LanItems.rb:1357
msgid "Will not be started at all"
msgstr "開始しない"

-#: src/modules/LanItems.rb:1365
+#: src/modules/LanItems.rb:1363
msgid "Started manually"
msgstr "手動で開始する"

@@ -4430,50 +4436,50 @@
#.
#. @param [Hash] dev_map a device's sysconfig map (in form "option" => "value")
#. @return [Array] list of strings, one string is intended for one "bullet"
-#: src/modules/LanItems.rb:1395
+#: src/modules/LanItems.rb:1393
msgid "IP address assigned using"
msgstr "以下のものを使用して IP アドレスを割り当てる "

-#: src/modules/LanItems.rb:1399
+#: src/modules/LanItems.rb:1397
msgid "IP address: %s/%s"
msgstr "IPアドレス: %s/%s"

-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1400
msgid "IP address: %s, subnet mask %s"
msgstr "IPアドレス: %s、サブネットマスク %s"

#. FIXME: side effect: sets @type. No reason for that. It should only build
item
#. overview. Check and remove.
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1446 src/modules/LanItems.rb:1502
+#: src/modules/LanItems.rb:1444 src/modules/LanItems.rb:1500
msgid "Device Name: %s"
msgstr "デバイス名: %s"

-#: src/modules/LanItems.rb:1471
+#: src/modules/LanItems.rb:1469
msgid "Bonding master"
msgstr "ボンディングマスター"

-#: src/modules/LanItems.rb:1474
+#: src/modules/LanItems.rb:1472
msgid "Bridge"
msgstr "ブリッジ"

-#: src/modules/LanItems.rb:1476
+#: src/modules/LanItems.rb:1474
msgid "enslaved in %s"
msgstr "%s でスレーブ化"

-#: src/modules/LanItems.rb:1490
+#: src/modules/LanItems.rb:1488
msgid "Not connected"
msgstr "接続されていません"

-#: src/modules/LanItems.rb:1491
+#: src/modules/LanItems.rb:1489
msgid "No hwinfo"
msgstr "ハードウェア情報がありません"

-#: src/modules/LanItems.rb:1508
+#: src/modules/LanItems.rb:1506
msgid "Unable to configure the network card because the kernel device (eth0,
wlan0) is not present. This is mostly caused by missing firmware (for wlan
devices). See dmesg output for details."
msgstr
"カーネルデバイス(eth0、wlan0)が存在しないため、ネットワークカードを設定できません。多くの場合、ファームウェア(wlanデバイス用)がないことが原因です。詳細については、dmesg出力を参照してください。"

-#: src/modules/LanItems.rb:1514
+#: src/modules/LanItems.rb:1512
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
@@ -4481,11 +4487,11 @@
"デバイスが設定されていません。[<b>編集</b>]\n"
"をクリックして設定してください。\n"

-#: src/modules/LanItems.rb:1521
+#: src/modules/LanItems.rb:1519
msgid "Needed firmware"
msgstr "必要なファームウエア"

-#: src/modules/LanItems.rb:1521
+#: src/modules/LanItems.rb:1519
msgid "unknown"
msgstr "不明"

@@ -4495,11 +4501,11 @@
#. @param [String] ifcfg_type
#. @param [String] ifcfg_name
#. @return [String] formated string with the interface type and the interfaces
enslaved
-#: src/modules/LanItems.rb:2547
+#: src/modules/LanItems.rb:2545
msgid "Bonding slaves"
msgstr "ボンディングスレーブ"

-#: src/modules/LanItems.rb:2550
+#: src/modules/LanItems.rb:2548
msgid "Bridge Ports"
msgstr "ブリッジポート"

@@ -4565,21 +4571,21 @@
msgstr "リモート管理は無効です。"

#. Progress stage 1
-#: src/modules/Routing.rb:264
+#: src/modules/Routing.rb:312
msgid "Write IP forwarding settings"
msgstr "IP 転送設定の保存"

#. Progress stage 2
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:314
msgid "Write routing settings"
msgstr "ルーティング設定の保存"

-#: src/modules/Routing.rb:269
+#: src/modules/Routing.rb:317
msgid "Saving Routing Configuration"
msgstr "ルーティング設定を保存しています"

#. Progress stage 1/2
-#: src/modules/Routing.rb:274
+#: src/modules/Routing.rb:322
msgid "Writing IP forwarding settings..."
msgstr "IP 転送設定を書き込んでいます..."

@@ -4588,22 +4594,22 @@
#. sysconfig does not support restarting routes only,
#. so we let our caller do it together with other things
#. Progress stage 2/2
-#: src/modules/Routing.rb:284
+#: src/modules/Routing.rb:332
msgid "Writing routing settings..."
msgstr "ルーティング設定を書き込んでいます..."

#. Summary text
-#: src/modules/Routing.rb:454
+#: src/modules/Routing.rb:502
msgid "Gateway: %s"
msgstr "ゲートウェイ: %s"

#. Summary text
-#: src/modules/Routing.rb:458
+#: src/modules/Routing.rb:506
msgid "IP Forwarding for IPv4: %s"
msgstr "IPv4のIP転送: %s"

#. Summary text
-#: src/modules/Routing.rb:462
+#: src/modules/Routing.rb:510
msgid "IP Forwarding for IPv6: %s"
msgstr "IPv6のIP転送: %s"

@@ -4621,3 +4627,9 @@
#: src/modules/SuSEFirewall4Network.rb:139
msgid "(Unprotected)"
msgstr "(保護しない)"
+
+#~ msgid "Genmask"
+#~ msgstr "ネットマスク"
+
+#~ msgid "Ge&nmask"
+#~ msgstr "ネットマスク(&N)"

Modified: branches/SLE12-SP3/yast/ja/po/packager.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/packager.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/packager.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: packager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-29 02:28+0000\n"
+"POT-Creation-Date: 2017-04-29 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -957,7 +957,7 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
#: src/include/packager/repositories_include.rb:287
-#: src/modules/Packages.rb:1206 src/modules/SourceManager.rb:306
+#: src/modules/Packages.rb:1209 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
"from URL '%1'."
@@ -1299,7 +1299,7 @@

#. popup message part 2 followed by other info
#. popup message, after message header, header of details
-#: src/lib/packager/clients/repositories.rb:1056 src/modules/Packages.rb:1211
+#: src/lib/packager/clients/repositories.rb:1056 src/modules/Packages.rb:1214
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "詳細: "
@@ -1307,7 +1307,7 @@
#. popup message part 3
#. end of popup message, question
#. end of popup message, question
-#: src/lib/packager/clients/repositories.rb:1058 src/modules/Packages.rb:1219
+#: src/lib/packager/clients/repositories.rb:1058 src/modules/Packages.rb:1222
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "もう一度試してみますか?"
@@ -1467,7 +1467,7 @@
#. adding the product to the list of products (BNC #269625)
#. no such products
#: src/modules/AddOnProduct.rb:1154 src/modules/AddOnProduct.rb:1748
-#: src/modules/AddOnProduct.rb:1754 src/modules/Packages.rb:461
+#: src/modules/AddOnProduct.rb:1754 src/modules/Packages.rb:464
msgid "Unknown Product"
msgstr "不明な製品"

@@ -1659,23 +1659,23 @@
msgstr "デルタRPMを適用しています: %1"

#. warning text
-#: src/modules/Packages.rb:301
+#: src/modules/Packages.rb:304
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:317
+#: src/modules/Packages.rb:320
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:329
+#: src/modules/Packages.rb:332
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:334
+#: src/modules/Packages.rb:337
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"
@@ -1684,112 +1684,112 @@

"リポジトリからダウンロードするパッケージのサイズです。この値は、接続が遅かったりダウンロード量に制限があったりするような場合には、重要な項目です。</P>\n"

#. help text for software proposal - header
-#: src/modules/Packages.rb:343
+#: src/modules/Packages.rb:346
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:360
+#: src/modules/Packages.rb:363
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:374
+#: src/modules/Packages.rb:377
msgid "System Type: %1"
msgstr "システム種類: %1"

-#: src/modules/Packages.rb:385
+#: src/modules/Packages.rb:388
msgid "Patterns:<br>"
msgstr "パターン:<br>"

#. installation proposal - SW summary, %1 is size of the selected packages (in
MB or GB)
-#: src/modules/Packages.rb:395
+#: src/modules/Packages.rb:398
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:408
+#: src/modules/Packages.rb:411
msgid "Downloading from Remote Repositories: %1"
msgstr "リモートリポジトリの一覧をダウンロードしています: %1"

-#: src/modules/Packages.rb:470
+#: src/modules/Packages.rb:473
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:494
+#: src/modules/Packages.rb:497
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:498
+#: src/modules/Packages.rb:501
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:539
+#: src/modules/Packages.rb:542
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:559
+#: src/modules/Packages.rb:562
msgid "Warning: Cannot check free space in directory %1 (device %2)."
msgstr "警告: ディレクトリ %1 (デバイス %2)の空き容量を確認できません。"

#. summary warning
-#: src/modules/Packages.rb:602
+#: src/modules/Packages.rb:605
msgid "Not enough disk space."
msgstr "ディスクスペースが足りません。"

#. summary warning
-#: src/modules/Packages.rb:604
+#: src/modules/Packages.rb:607
msgid "Not enough disk space. Remove some packages in the single selection."
msgstr "ディスクの使用可能な領域が不足しています。1回に選択するパッケージを減らしてください。"

#. add a backslash if it's missing
-#: src/modules/Packages.rb:625
+#: src/modules/Packages.rb:628
msgid "Only %1 (%2%%) free space available on partition %3.<BR>"
msgstr "パーティション %3 には、%1(%2%%)のフリースペースしかありません。"

#. Check the YaST required packages.
-#: src/modules/Packages.rb:645
+#: src/modules/Packages.rb:648
msgid "Please manually select the needed items to install."
msgstr "インストールするものを手作業で選択してください。"

#. newly installed products
-#: src/modules/Packages.rb:707
+#: src/modules/Packages.rb:710
msgid "New product <b>%s</b> will be installed"
msgstr "新しい製品 <b>%s</b> がインストールされます"

#. product update: %s is a product name
-#: src/modules/Packages.rb:717
+#: src/modules/Packages.rb:720
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:719
+#: src/modules/Packages.rb:722
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:726
+#: src/modules/Packages.rb:729
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:736
+#: src/modules/Packages.rb:739
msgid "<b>Warning:</b> Product <b>%s</b> will be removed."
msgstr "<b>警告:</b> 製品 <b>%s</b> は削除されます。"

-#: src/modules/Packages.rb:737
+#: src/modules/Packages.rb:740
msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
msgstr "<b>エラー:</b> 製品 <b>%s</b> は自動的に削除されます。"

#. TRANSLATORS: update proposal warning, do NOT translate "-release",
#. it is part of a package name (like "sles-release")
-#: src/modules/Packages.rb:763
+#: src/modules/Packages.rb:766
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"
@@ -1806,12 +1806,12 @@
"</li></ul></li></ul>"

#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1227
+#: src/modules/Packages.rb:1230
msgid "No repository found at '%1'."
msgstr "'%1' にはリポジトリが見つかりませんでした。"

#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1500
+#: src/modules/Packages.rb:1503
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"
@@ -1822,31 +1822,31 @@
"SUSE LinuxのWebサーバから新しいリリースノートをダウンロードすることができます。</b></p>\n"

#. popup - information label
-#: src/modules/Packages.rb:1527
+#: src/modules/Packages.rb:1530
msgid "Integrating booted media..."
msgstr "ブートされたメディアを統合しています..."

#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1549
+#: src/modules/Packages.rb:1552
msgid "Failed to integrate the service pack repository."
msgstr "サービスパックリポジトリの統合に失敗しました。"

#. popup - information label
-#: src/modules/Packages.rb:1582
+#: src/modules/Packages.rb:1585
msgid "Initializing repositories..."
msgstr "リポジトリを初期化しています..."

#. message popup, %1 is product name
-#: src/modules/Packages.rb:1814
+#: src/modules/Packages.rb:1825
msgid "Insert %1 CD 1"
msgstr "%1 CD 1を挿入する"

-#: src/modules/Packages.rb:1816
+#: src/modules/Packages.rb:1827
msgid "%1 CD 1 not found"
msgstr "%1 CD1が見つかりませんでした"

#. an error message
-#: src/modules/Packages.rb:1926
+#: src/modules/Packages.rb:1937
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
@@ -1855,7 +1855,7 @@
"詳細はログファイル %1 で確認してください。"

#. bnc #436925
-#: src/modules/Packages.rb:2198
+#: src/modules/Packages.rb:2209
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
@@ -1864,12 +1864,12 @@
"ソフトウエアの提案処理が再度呼び出されます。"

#. popup label
-#: src/modules/Packages.rb:2216
+#: src/modules/Packages.rb:2227
msgid "Evaluating package selection..."
msgstr "パッケージ選択を検証中..."

#. Error message, %{pattern_name} is replaced with the missing pattern name in
runtime
-#: src/modules/Packages.rb:2559
+#: src/modules/Packages.rb:2570
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -1878,18 +1878,18 @@
"パターンが見つかりませんでした。"

#. TRANSLATORS: %s is a package list
-#: src/modules/Packages.rb:2732
+#: src/modules/Packages.rb:2743
msgid "These packages need to be selected to install: %s"
msgstr "下記のパッケージについてはインストールするよう選択する必要があります: %s"

#. TRANSLATORS: %s is a pattern list
-#: src/modules/Packages.rb:2735
+#: src/modules/Packages.rb:2746
msgid "These patterns need to be selected to install: %s"
msgstr "下記のパターンについてはインストールするよう選択する必要があります: %s"

#. TRANSLATORS: %{type} is a resolvable type, %{list} is a list of names
#. This is a fallback message for unknown types, normally it should not be
displayed
-#: src/modules/Packages.rb:2739
+#: src/modules/Packages.rb:2750
msgid "These items (%{type}) need to be selected to install: %{list}"
msgstr "下記の項目 (%{type}) についてはインストールするよう選択する必要があります: %{list}"


Modified: branches/SLE12-SP3/yast/ja/po/registration.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/registration.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/registration.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: registration\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -18,7 +18,7 @@
#. popup message
#. popup message
#. popup message
-#: src/clients/inst_scc.rb:54 src/clients/scc_auto.rb:49
+#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49
#: src/lib/registration/registration_ui.rb:40
msgid "Contacting the Registration Server"
msgstr "登録サーバに問い合わせ"
@@ -31,10 +31,10 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:189
+#: src/clients/inst_scc.rb:183
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
#: src/lib/registration/ui/base_system_registration_dialog.rb:61
-#: src/lib/registration/ui/migration_repos_workflow.rb:287
+#: src/lib/registration/ui/migration_repos_workflow.rb:317
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
msgid "Registration"
@@ -75,8 +75,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
-#: src/lib/registration/registration_ui.rb:319
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:317
+#: src/lib/registration/registration_ui.rb:350
msgid "Registering %s ..."
msgstr "%s を登録中..."

@@ -336,7 +336,7 @@
#. FIXME: use a better message, this one has been reused after the text freeze
#. error message, the entered URL is not valid.
#: src/lib/registration/connect_helpers.rb:295
-#: src/lib/registration/ui/base_system_registration_dialog.rb:544
+#: src/lib/registration/ui/base_system_registration_dialog.rb:537
msgid "Invalid URL."
msgstr "無効なURL。"

@@ -387,7 +387,7 @@
#. 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:80
-#: src/lib/registration/registration_ui.rb:272
+#: src/lib/registration/registration_ui.rb:303
msgid "Registering the System..."
msgstr "システムを登録中..."

@@ -397,8 +397,8 @@
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
#: src/lib/registration/registration_ui.rb:149
-#: src/lib/registration/registration_ui.rb:357
-#: src/lib/registration/ui/migration_repos_workflow.rb:304
+#: src/lib/registration/registration_ui.rb:388
+#: src/lib/registration/ui/migration_repos_workflow.rb:334
msgid "Updating to %s ..."
msgstr "%s にアップデートしています..."

@@ -460,6 +460,20 @@
"最新のアップデートを受信するため、\n"
"アップグレード中にこれらのリポジトリを有効にしますか。"

+#. TRANSLATORS: Popup question, add registered but not installed addons to
+#. the list of products that will be downgraded.
+#. %s are all the product names splited by '\n' e.g
+#. "SUSE Linux Enterprise Server 12\nSUSE Enterprise Storage 1 x86_64"
+#: src/lib/registration/registration_ui.rb:284
+msgid ""
+"The addons listed below are registered but not installed: \n"
+"\n"
+"%s\n"
+"\n"
+"Would you like to downgrade also them in the registration server? \n"
+"If not they will be deactivated. "
+msgstr ""
+
#. indent size used in summary text
#: src/lib/registration/ssl_certificate_details.rb:34
msgid "Certificate:"
@@ -589,38 +603,40 @@

#. create the main dialog definition
#. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:97
-msgid "&Filter Out Beta Versions"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:105
+#, fuzzy
+#| msgid "&Filter Out Beta Versions"
+msgid "&Hide Beta Versions"
msgstr "ベータバージョンをフィルタして除去する(&F)"

-#: src/lib/registration/ui/addon_selection_base_dialog.rb:99
-msgid "Details"
-msgstr "詳細情報"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:108
+msgid "Details (English only)"
+msgstr ""

#. addon description widget
#. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:109
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:117
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_base_dialog.rb:122
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:130
msgid "%s (not available)"
msgstr "%s (利用不可)"

#. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:261
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:269
msgid "YaST allows to select at most %s extensions or modules."
msgstr "YaSTでは最大 %s の拡張機能またはモジュールを選択できます。"

#. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:272
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:280
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_base_dialog.rb:275
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:283
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>"

@@ -639,21 +655,6 @@
msgid "Available Extensions and Modules"
msgstr "利用可能な拡張機能とモジュール"

-#. dialog title
-#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:37
-msgid "Extension and Module Re-registration"
-msgstr "拡張機能とモジュールの再登録"
-
-#. help text (1/3)
-#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:40
-msgid "<p>Here you can select extensions and modules which will be registered
again.</p>"
-msgstr "<p>ここでは再登録する拡張機能およびモジュールを選択できます。</p>"
-
-#. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:54
-msgid "Registered Extensions and Modules"
-msgstr "登録済みの拡張機能とモジュール"
-
#. help text
#: src/lib/registration/ui/autoyast_addon_dialog.rb:38
msgid "<p>Here you can select which extensions or moduleswill be registered
together with the base product.</p>"
@@ -716,7 +717,7 @@
#. handle nil specifically, it cannot be stored in XML profile
#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
#: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:266
+#: src/lib/registration/ui/base_system_registration_dialog.rb:269
msgid "Registration &Code"
msgstr "登録コード(&C)"

@@ -747,7 +748,7 @@
msgstr "製品を登録する"

#: src/lib/registration/ui/autoyast_config_dialog.rb:106
-#: src/lib/registration/ui/base_system_registration_dialog.rb:263
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
msgid "&E-mail Address"
msgstr "電子メールアドレス(&E)"

@@ -794,49 +795,54 @@
msgid "Register Extensions or Modules..."
msgstr "拡張機能またはモジュールの登録..."

+#. TRANSLATORS: Wrong url for registration provided, %s is an URL.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:232
+msgid ""
+"The registration URL provided by the command line is not valid.\n"
+"\n"
+"URL: %s\n"
+"\n"
+"The default one will be used instead."
+msgstr ""
+
#. TRANSLATORS: radio button; %s is a host name.
-#: src/lib/registration/ui/base_system_registration_dialog.rb:254
+#: src/lib/registration/ui/base_system_registration_dialog.rb:257
msgid "Register System via %s"
msgstr "%s を使用してシステムを登録する"

#. TRANSLATORS: radio button
-#: src/lib/registration/ui/base_system_registration_dialog.rb:297
+#: src/lib/registration/ui/base_system_registration_dialog.rb:300
msgid "Register System via local SMT Server"
msgstr "ローカルSMTサーバを使用してシステムを登録する"

-#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+#: src/lib/registration/ui/base_system_registration_dialog.rb:311
msgid "&Local Registration Server URL"
msgstr "ローカル登録サーバのURL(&L)"

-#: src/lib/registration/ui/base_system_registration_dialog.rb:322
+#: src/lib/registration/ui/base_system_registration_dialog.rb:325
msgid "&Skip Registration"
msgstr "登録をスキップする(&S)"

-#. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:334
-msgid "&Register Extensions or Modules Again"
-msgstr "拡張機能またはモジュールの再登録(&R)"
-
#. part of the main dialog definition - the base product details
#. @return [Yast::Term] UI term
#. the main dialog content
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/base_system_registration_dialog.rb:342
+#: src/lib/registration/ui/base_system_registration_dialog.rb:335
#: src/lib/registration/ui/registered_system_dialog.rb:67
msgid "The system is already registered."
msgstr "システムは登録済みです。"

-#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+#: src/lib/registration/ui/base_system_registration_dialog.rb:337
msgid "Please select your preferred method of registration."
msgstr "希望する登録方法を選択してください。"

#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:360
+#: src/lib/registration/ui/base_system_registration_dialog.rb:353
msgid "Enter SUSE Customer Center credentials here to register the system to
get updates and extensions."
msgstr "システムを登録してアップデートや拡張機能を入手するには、ここでSUSEカスタマーセンターの資格情報を入力します。"

#. Popup question: confirm skipping the registration
-#: src/lib/registration/ui/base_system_registration_dialog.rb:369
+#: src/lib/registration/ui/base_system_registration_dialog.rb:362
msgid ""
"If you do not register your system we will not be able\n"
"to grant you access to the update repositories.\n"
@@ -852,7 +858,7 @@

#. UI term for the network configuration button (or empty if not needed)
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/base_system_registration_dialog.rb:381
+#: src/lib/registration/ui/base_system_registration_dialog.rb:374
msgid "Net&work Configuration..."
msgstr "ネットワーク設定(&W)..."

@@ -950,7 +956,7 @@
#. TRANSLATORS: a popup message with [Continue] [Cancel] buttons,
#. pressing [Continue] starts the registration module, [Cancel] aborts
#. the online migration
-#: src/lib/registration/ui/migration_repos_workflow.rb:145
+#: src/lib/registration/ui/migration_repos_workflow.rb:154
msgid ""
"The system is not registered,\n"
"to run the online migration you need\n"
@@ -961,17 +967,28 @@
"まずシステムを登録する必要があります。"

#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:183
+#: src/lib/registration/ui/migration_repos_workflow.rb:198
msgid "No installed product found."
msgstr "インストール済みの製品が見つかりません。"

+#. TRANSLATORS: Popup question, merge this addon that are registered but not
+#. installed to the current migration products list.
+#. %s is an addon friendly name, e.g 'SUSE Enterprise Storage 2 x86_64'
+#: src/lib/registration/ui/migration_repos_workflow.rb:219
+msgid ""
+"The '%s' extension is registered but not installed.\n"
+"If you accept it will be added for be installed, in other case it will be
unregistered at the end of the migration.\n"
+"\n"
+"Do you want to add it?"
+msgstr ""
+
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:212
+#: src/lib/registration/ui/migration_repos_workflow.rb:242
msgid "No migration product found."
msgstr "マイグレーション製品が見つかりません。"

#. TRANSLATORS: progress message
-#: src/lib/registration/ui/migration_repos_workflow.rb:289
+#: src/lib/registration/ui/migration_repos_workflow.rb:319
msgid "Preparing Migration Repositories..."
msgstr "マイグレーションリポジトリを準備しています..."

@@ -1015,48 +1032,54 @@
msgstr "選択可能なマイグレーションターゲット"

#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:189
+#: src/lib/registration/ui/migration_selection_dialog.rb:199
msgid "Migration Summary"
msgstr "マイグレーションの概要"

+#. TRANSLATORS: Summary message in rich text format
+#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
+#: src/lib/registration/ui/migration_selection_dialog.rb:211
+msgid "The registration server does not offer migrations for Product <b>%s</b>
so it will <b>stay unchanged</b>. We recommend you to check if it's correct and
to configure the repositories manually in case of needed."
+msgstr ""
+
#. TRANSLATORS: An error message displayed in the migration details.
#. The product has not been mirrored to the SMT server and cannot be used
#. for migration. The SMT admin has to mirror the product to allow
#. using the selected migration.
#. %{url} is the URL of the registration server (SMT)
#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:212
+#: src/lib/registration/ui/migration_selection_dialog.rb:234
msgid "ERROR: Product <b>%{product}</b> is not available at the registration
server (%{url}). Make the product available to allow using this migration."
msgstr "エラー: 製品 <b>%{product}</b>
が登録サーバ(%{url})で利用できません。このマイグレーションを使用するには、製品を利用可能にしてください。"

#. this is rather a theoretical case, but anyway....
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:224
+#: src/lib/registration/ui/migration_selection_dialog.rb:246
msgid "%s <b>will be installed.</b>"
msgstr "%s <b></b>が「インストール」されます。"

#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:241
+#: src/lib/registration/ui/migration_selection_dialog.rb:263
msgid "%s <b>stays unchanged.</b>"
msgstr "%s <b></b>は「変更されません」。"

#. TRANSLATORS: Summary message, rich text format
#. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12"
#. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1
x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:251
+#: src/lib/registration/ui/migration_selection_dialog.rb:273
msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
msgstr "%{old_product} は %{new_product}> <b></b>に「アップグレード」されます。"

#. TRANSLATORS: Summary message, rich text format
#. %{old_product} and %{new_product} are product names
-#: src/lib/registration/ui/migration_selection_dialog.rb:256
+#: src/lib/registration/ui/migration_selection_dialog.rb:278
msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
msgstr "%{old_product} は %{new_product} <b></b>に「ダウングレード」されます。"

#. TRANSLATORS: an error popup message
-#: src/lib/registration/ui/migration_selection_dialog.rb:289
+#: src/lib/registration/ui/migration_selection_dialog.rb:311
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1070,6 +1093,57 @@
"別のマイグレーションターゲットを選択するか、存在しない製品\n"
"を登録サーバで利用可能にしてください。"

+#. this class displays and runs the dialog which check all the installed
+#. but not registered products warning the user about it and allowing him
+#. to take some actions over them.
+#: src/lib/registration/ui/not_installed_products_dialog.rb:45
+#, fuzzy
+#| msgid "Checking status..."
+msgid "Checking registration status"
+msgstr "ステータスを確認しています..."
+
+#. FIXME: Maybe we could remove this option and just warn the user
+#: src/lib/registration/ui/not_installed_products_dialog.rb:85
+#, fuzzy
+#| msgid "Installed Add-on Products"
+msgid "Ins&tall products"
+msgstr "インストール済みのアドオン製品"
+
+#: src/lib/registration/ui/not_installed_products_dialog.rb:86
+msgid "&Deactivate"
+msgstr "無効化(&D)"
+
+#: src/lib/registration/ui/not_installed_products_dialog.rb:87
+msgid "Continue"
+msgstr "続行する"
+
+#. TRANSLATORS: Popup error showing all the addons that weren't
+#. installed, %s is the addons identifiers.
+#: src/lib/registration/ui/not_installed_products_dialog.rb:102
+#, fuzzy
+#| msgid ""
+#| "These sources were not found:\n"
+#| "%1"
+msgid ""
+"These addons were not installed:\n"
+"\n"
+"%s"
+msgstr ""
+"次のソースが見つかりませんでした:\n"
+"%1"
+
+#. TRANSLATORS: A RichText warning about all the products registered but
+#. not installed. (1/2)
+#: src/lib/registration/ui/not_installed_products_dialog.rb:153
+msgid "<p>The addons listed below are registered but not installed: </p>"
+msgstr ""
+
+#. TRANSLATORS: A RichText warning about all the products registered but
+#. not installed. (2/2)
+#: src/lib/registration/ui/not_installed_products_dialog.rb:159
+msgid "<p>It's preferable to <b>deactivate</b> your products at your
registration server if you don't plan to use them anymore.</p>"
+msgstr ""
+
#. help text
#: src/lib/registration/ui/registered_system_dialog.rb:40
msgid "<p>The system is already registered.</p>"
@@ -1149,25 +1223,66 @@
msgid "Looking up local registration servers..."
msgstr "ローカル登録サーバを検索中..."

-#. Constructor
+#. encoding: utf-8
+#.
------------------------------------------------------------------------------
+#. Copyright (c) 2017 SUSE LLC
#.
-#. @param services [Array<SlpServiceClass::Service>] list of services
to show
-#. @param heading [String] Dialog's heading. If nil (or not
specified), a default
-#. heading will be used).
-#. @param description [String] Dialog's description (to be shown on top of
the list).
-#. If nil (or not specified) a default description will be used.
-#. @param no_selected_msg [String] Message to be shown when no service was
selected
-#. If nil (or not specified) a default description will be used.
-#. @param initial [SlpServiceClass::Service] initially selected
service. If nil
-#. (or not specified) the first service will be used.
-#: src/lib/slp/dialogs/service_selection.rb:78
-msgid "Service selection"
-msgstr "サービスの選択"
+#.
+#. 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 SUSE.
+#.
+#. To contact SUSE about this file by physical or electronic mail, you may find
+#. current contact information at www.suse.com.
+#.
------------------------------------------------------------------------------
+#: src/lib/registration/widgets/registration_code.rb:38
+#, fuzzy
+#| msgid "&Local Registration Server URL"
+msgid "Registration Code or SMT Server URL"
+msgstr "ローカル登録サーバのURL(&L)"

-#: src/lib/slp/dialogs/service_selection.rb:79
-msgid "Select a detected service from the list."
-msgstr "検出したサービスをリストから選択してください。"
+#. Error reports and logs about the registration are mostly handled
+#. by ConnectHelpers.catch_registration_errors and used by instances
+#. of RegistrationUI.
+#: src/lib/registration/widgets/registration_code.rb:92
+#, fuzzy
+#| msgid "Not a valid umask."
+msgid "Not valid url."
+msgstr "umaskが正しくありません。"

-#: src/lib/slp/dialogs/service_selection.rb:80
-msgid "No service was selected."
-msgstr "サービスが選択されませんでした。"
+#: src/lib/registration/widgets/registration_code.rb:96
+msgid ""
+"<p>\n"
+"The SMT Server URL must use http or https protocol, other schemes are not
supported.</p>\n"
+msgstr ""
+
+#~ msgid "Details"
+#~ msgstr "詳細情報"
+
+#~ msgid "Extension and Module Re-registration"
+#~ msgstr "拡張機能とモジュールの再登録"
+
+#~ msgid "<p>Here you can select extensions and modules which will be
registered again.</p>"
+#~ msgstr "<p>ここでは再登録する拡張機能およびモジュールを選択できます。</p>"
+
+#~ msgid "Registered Extensions and Modules"
+#~ msgstr "登録済みの拡張機能とモジュール"
+
+#~ msgid "&Register Extensions or Modules Again"
+#~ msgstr "拡張機能またはモジュールの再登録(&R)"
+
+#~ msgid "Service selection"
+#~ msgstr "サービスの選択"
+
+#~ msgid "Select a detected service from the list."
+#~ msgstr "検出したサービスをリストから選択してください。"
+
+#~ msgid "No service was selected."
+#~ msgstr "サービスが選択されませんでした。"

Modified: branches/SLE12-SP3/yast/ja/po/reipl.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/reipl.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/reipl.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: reipl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-07 01:29+0000\n"
+"POT-Creation-Date: 2017-04-11 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -15,63 +15,10 @@
"Content-Transfer-Encoding: 8bit\n"

#. Command line help text for the Xreipl module
-#: src/clients/reipl.rb:53
+#: src/clients/reipl.rb:52
msgid "Configuration of reipl"
msgstr "reipl の設定"

-#. TRANSLATORS: part of a shutdown message
-#. %1 is replaced with a device name
-#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:69
-msgid ""
-"\n"
-"After shutdown, reload the system\n"
-"with an IPL from device '%1'.\n"
-msgstr ""
-"\n"
-"シャットダウン後、デバイス「%1」から\n"
-"IPLとシステムを再読み込みします。\n"
-
-#. TRANSLATORS: part of a shutdown message
-#. %1 is replaced with a FCP name
-#. %2 is replaced with a WWPN name
-#. %3 is replaced with a LUN name
-#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:88
-msgid ""
-"\n"
-"After shutdown, reload the system\n"
-"with an IPL from FCP '%1'\n"
-"with WWPN '%2'\n"
-"and LUN '%3'.\n"
-msgstr ""
-"\n"
-"シャットダウン後、 WWPN「%2」および\n"
-"LUN「%3」によりFCP「%1」から\n"
-" IPLとシステムを再読み込みします。\n"
-
-#: src/clients/reipl_bootloader_finish.rb:102
-msgid ""
-"\n"
-"After shutdown, reload the system \n"
-"with an IPL from the device \n"
-"that contains /boot"
-msgstr ""
-"\n"
-"シャットダウン後、/bootを含むデバイスから\n"
-"IPLとシステムを再ロード\n"
-"します。"
-
-#. Rich text title for Reipl in proposals
-#: src/clients/reipl_proposal.rb:81
-msgid "Reipl"
-msgstr "reipl"
-
-#. Menu title for Reipl in proposals
-#: src/clients/reipl_proposal.rb:85
-msgid "&Reipl"
-msgstr "reipl(&R)"
-
#. Reipl configure dialog caption
#. Initialization dialog caption
#: src/include/reipl/dialogs.rb:59 src/include/reipl/wizards.rb:100
@@ -279,32 +226,61 @@
msgid "Initializing..."
msgstr "初期化中..."

-#. Create a textual summary and a list of unconfigured cards
-#. @return summary of the current configuration
-#: src/modules/Reipl.rb:323
-msgid "Configured reipl methods"
-msgstr "設定済みの reipl メソッド"
+#~ msgid ""
+#~ "\n"
+#~ "After shutdown, reload the system\n"
+#~ "with an IPL from device '%1'.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "シャットダウン後、デバイス「%1」から\n"
+#~ "IPLとシステムを再読み込みします。\n"

-#: src/modules/Reipl.rb:330
-msgid "The method ccw is configured and being used."
-msgstr "メソッド ccw が設定済みで使用されています。"
+#~ msgid ""
+#~ "\n"
+#~ "After shutdown, reload the system\n"
+#~ "with an IPL from FCP '%1'\n"
+#~ "with WWPN '%2'\n"
+#~ "and LUN '%3'.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "シャットダウン後、 WWPN「%2」および\n"
+#~ "LUN「%3」によりFCP「%1」から\n"
+#~ " IPLとシステムを再読み込みします。\n"

-#: src/modules/Reipl.rb:332
-msgid "The method ccw is configured."
-msgstr "メソッド ccw が設定されています。"
+#~ msgid ""
+#~ "\n"
+#~ "After shutdown, reload the system \n"
+#~ "with an IPL from the device \n"
+#~ "that contains /boot"
+#~ msgstr ""
+#~ "\n"
+#~ "シャットダウン後、/bootを含むデバイスから\n"
+#~ "IPLとシステムを再ロード\n"
+#~ "します。"

-#: src/modules/Reipl.rb:335
-msgid "The method ccw is not supported."
-msgstr "メソッド ccw には対応していません。"
+#~ msgid "Reipl"
+#~ msgstr "reipl"

-#: src/modules/Reipl.rb:343
-msgid "The method fcp is configured and being used."
-msgstr "メソッド fcp が設定済みで使用されています。"
+#~ msgid "&Reipl"
+#~ msgstr "reipl(&R)"

-#: src/modules/Reipl.rb:345
-msgid "The method fcp is configured."
-msgstr "メソッド fcp が設定されています。"
+#~ msgid "Configured reipl methods"
+#~ msgstr "設定済みの reipl メソッド"

-#: src/modules/Reipl.rb:348
-msgid "The method fcp is not supported."
-msgstr "メソッド fcp には対応していません。"
+#~ msgid "The method ccw is configured and being used."
+#~ msgstr "メソッド ccw が設定済みで使用されています。"
+
+#~ msgid "The method ccw is configured."
+#~ msgstr "メソッド ccw が設定されています。"
+
+#~ msgid "The method ccw is not supported."
+#~ msgstr "メソッド ccw には対応していません。"
+
+#~ msgid "The method fcp is configured and being used."
+#~ msgstr "メソッド fcp が設定済みで使用されています。"
+
+#~ msgid "The method fcp is configured."
+#~ msgstr "メソッド fcp が設定されています。"
+
+#~ msgid "The method fcp is not supported."
+#~ msgstr "メソッド fcp には対応していません。"

Modified: branches/SLE12-SP3/yast/ja/po/rpm-groups.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/rpm-groups.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/rpm-groups.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: rpm-groups\n"
"Report-Msgid-Bugs-To: bugzilla.opensuse.org\n"
-"POT-Creation-Date: 2016-10-09 12:27+0300\n"
+"POT-Creation-Date: 2017-05-15 17:26+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -71,6 +71,9 @@
msgid "Building"
msgstr "ビルディング"

+msgid "C++"
+msgstr ""
+
msgid "CAD"
msgstr "CAD"

@@ -116,9 +119,6 @@
msgid "Convertors"
msgstr "変換"

-msgid "Daemon"
-msgstr "デーモン"
-
msgid "Daemons"
msgstr "デーモン"

@@ -320,9 +320,6 @@
msgid "LXDE"
msgstr "LXDE"

-msgid "LXDE-Qt"
-msgstr "LXDE-Qt"
-
msgid "LXQt"
msgstr "LXQt"

@@ -356,6 +353,11 @@
msgid "Modem"
msgstr "モデム"

+#, fuzzy
+#| msgid "Monitoring"
+msgid "monitoring"
+msgstr "モニタリング"
+
msgid "Monitoring"
msgstr "モニタリング"

@@ -569,9 +571,6 @@
msgid "Terminals"
msgstr "端末"

-msgid "Tests"
-msgstr "テスト"
-
msgid "TeX"
msgstr "TeX"

@@ -655,3 +654,12 @@

msgid "YaST"
msgstr "YaST"
+
+#~ msgid "Daemon"
+#~ msgstr "デーモン"
+
+#~ msgid "LXDE-Qt"
+#~ msgstr "LXDE-Qt"
+
+#~ msgid "Tests"
+#~ msgstr "テスト"

Modified: branches/SLE12-SP3/yast/ja/po/s390.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/s390.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/s390.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: s390\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 17:53+0200\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -30,7 +30,7 @@
msgstr "DASD"

#. section name in proposal - menu item
-#: src/clients/dasd_proposal.rb:73 src/include/s390/dump/ui.rb:110
+#: src/clients/dasd_proposal.rb:73 src/include/s390/dump/ui.rb:111
msgid "&DASD"
msgstr "DASD(&D)"

@@ -60,24 +60,24 @@
msgstr "利用可能なコントローラを検出中"

#. Initialization dialog caption
-#: src/clients/s390-disk-controller.rb:72
+#: src/clients/s390-disk-controller.rb:71
msgid "S/390 Disk Controller Configuration"
msgstr "S/390 ディスクコントローラの設定"

#. push button
-#: src/clients/s390-disk-controller.rb:84
+#: src/clients/s390-disk-controller.rb:83
msgid "Configure &DASD Disks"
msgstr "DASDディスクの設定(&D)"

#. push button
-#: src/clients/s390-disk-controller.rb:94
+#: src/clients/s390-disk-controller.rb:93
msgid "Configure &ZFCP Disks"
msgstr "ZFCPディスクの設定(&Z)"

#. Initialization dialog contents
#. Initialization dialog contents
-#: src/clients/s390-disk-controller.rb:103
-#: src/include/s390/dasd/wizards.rb:102 src/include/s390/zfcp/wizards.rb:98
+#: src/clients/s390-disk-controller.rb:101 src/include/s390/dasd/wizards.rb:97
+#: src/include/s390/zfcp/wizards.rb:96
msgid "Initializing..."
msgstr "初期化中..."

@@ -102,82 +102,82 @@
msgstr "zFCP(&Z)"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:170
+#: src/include/s390/dasd/dialogs.rb:165
msgid "&Activate"
msgstr "有効化(&A)"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:172
+#: src/include/s390/dasd/dialogs.rb:167
msgid "&Deactivate"
msgstr "無効化(&D)"

#. menu button id
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:174 src/include/s390/dasd/dialogs.rb:183
+#: src/include/s390/dasd/dialogs.rb:169 src/include/s390/dasd/dialogs.rb:178
msgid "Set DIAG O&n"
msgstr "DIAGオン(&N)"

#. menu button id
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:176 src/include/s390/dasd/dialogs.rb:185
+#: src/include/s390/dasd/dialogs.rb:171 src/include/s390/dasd/dialogs.rb:180
msgid "Set DIAG O&ff"
msgstr "DISGオフ(&F)"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:178
+#: src/include/s390/dasd/dialogs.rb:173
msgid "&Format"
msgstr "フォーマット(&F)"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:187
+#: src/include/s390/dasd/dialogs.rb:182
msgid "Set Format On"
msgstr "フォーマット有効"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:189
+#: src/include/s390/dasd/dialogs.rb:184
msgid "Set Format Off"
msgstr "フォーマット無効"

#. integer field (count of disks formatted parallel)
-#: src/include/s390/dasd/dialogs.rb:201
+#: src/include/s390/dasd/dialogs.rb:194
msgid "&Parallel Formatted Disks"
msgstr "&パラレルフォーマットされたディスク"

#. error popup message
#. error popup message
#. error popup message
-#: src/include/s390/dasd/dialogs.rb:225 src/include/s390/dasd/dialogs.rb:687
-#: src/include/s390/zfcp/dialogs.rb:477
+#: src/include/s390/dasd/dialogs.rb:216 src/include/s390/dasd/dialogs.rb:673
+#: src/include/s390/zfcp/dialogs.rb:465
msgid "No disk selected."
msgstr "ディスクが選択されていません。"

#. 8 means disk is not formatted
#. unformtted disk, manual (not AutoYaST)
-#: src/include/s390/dasd/dialogs.rb:254 src/modules/DASDController.rb:160
+#: src/include/s390/dasd/dialogs.rb:243 src/modules/DASDController.rb:149
msgid "Device %1 is not formatted. Format device now?"
msgstr "デバイス %1 がフォーマットされていません。デバイスをフォーマットしますか?"

-#: src/include/s390/dasd/dialogs.rb:256 src/modules/DASDController.rb:162
+#: src/include/s390/dasd/dialogs.rb:246 src/modules/DASDController.rb:152
msgid "There are %1 unformatted devices. Format them now?"
msgstr "フォーマットされていないデバイスが %1 台あります。フォーマットしますか?"

#. for autoinst, format unformatted disks later
-#: src/include/s390/dasd/dialogs.rb:267
+#: src/include/s390/dasd/dialogs.rb:258
msgid "Couldn't find device for channel %1."
msgstr "チャネル %1 のデバイスが見つかりませんでした。"

#. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:321
+#: src/include/s390/dasd/dialogs.rb:312
msgid "Disk %1 is not active."
msgstr "ディスク「%1」はアクティブではありません。"

#. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:327
+#: src/include/s390/dasd/dialogs.rb:318
msgid "Disk %1 is not accessible for writing."
msgstr "ディスク「%1」に書き込みアクセスできません。"

#. popup question
-#: src/include/s390/dasd/dialogs.rb:353
+#: src/include/s390/dasd/dialogs.rb:342
msgid ""
"Formatting these disks destroys all data on them.<br>\n"
"Really format the following disks?<br>\n"
@@ -188,7 +188,7 @@
" %1"

#. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:416
+#: src/include/s390/dasd/dialogs.rb:404
msgid "DASD Disk Management"
msgstr "DASD ディスク管理"

@@ -196,111 +196,111 @@
#. table header
#. table header
#. table header
-#: 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
+#: src/include/s390/dasd/dialogs.rb:411 src/include/s390/dasd/dialogs.rb:420
+#: src/include/s390/zfcp/dialogs.rb:116 src/include/s390/zfcp/dialogs.rb:125
msgid "Channel ID"
msgstr "チャネルID"

#. table header
-#: src/include/s390/dasd/dialogs.rb:425
+#: src/include/s390/dasd/dialogs.rb:413
msgid "Format"
msgstr "フォーマットする"

#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:427 src/include/s390/dasd/dialogs.rb:440
+#: src/include/s390/dasd/dialogs.rb:415 src/include/s390/dasd/dialogs.rb:428
msgid "Use DIAG"
msgstr "DIAG を使用"

#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:434 src/include/s390/zfcp/dialogs.rb:135
+#: src/include/s390/dasd/dialogs.rb:422 src/include/s390/zfcp/dialogs.rb:131
msgid "Device"
msgstr "デバイス"

#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:436
+#: src/include/s390/dasd/dialogs.rb:424
#: src/include/s390/iucvterminal-server/ui.rb:242
msgid "Type"
msgstr "タイプ"

#. table header
-#: src/include/s390/dasd/dialogs.rb:438
+#: src/include/s390/dasd/dialogs.rb:426
msgid "Access Type"
msgstr "アクセスタイプ"

#. table header
-#: src/include/s390/dasd/dialogs.rb:442
+#: src/include/s390/dasd/dialogs.rb:430
msgid "Formatted"
msgstr "初期化済"

#. table header
-#: src/include/s390/dasd/dialogs.rb:444
+#: src/include/s390/dasd/dialogs.rb:432
msgid "Partition Information"
msgstr "パーティション情報"

#. text entry
#. text entry
-#: src/include/s390/dasd/dialogs.rb:455 src/include/s390/zfcp/dialogs.rb:146
+#: src/include/s390/dasd/dialogs.rb:443 src/include/s390/zfcp/dialogs.rb:142
msgid "Mi&nimum Channel ID"
msgstr "チャネルIDの最小値(&N)"

#. text entry
#. text entry
-#: src/include/s390/dasd/dialogs.rb:462 src/include/s390/zfcp/dialogs.rb:153
+#: src/include/s390/dasd/dialogs.rb:450 src/include/s390/zfcp/dialogs.rb:149
msgid "Ma&ximum Channel ID"
msgstr "チャネルIDの最大値(&X)"

#. push button
#. push button
-#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/zfcp/dialogs.rb:159
+#: src/include/s390/dasd/dialogs.rb:456 src/include/s390/zfcp/dialogs.rb:155
msgid "&Filter"
msgstr "フィルタ(&F)"

#. menu button
#. menu button
-#: src/include/s390/dasd/dialogs.rb:478 src/include/s390/dasd/dialogs.rb:485
+#: src/include/s390/dasd/dialogs.rb:466 src/include/s390/dasd/dialogs.rb:474
msgid "Perform &Action"
msgstr "アクションの実行(&A)"

-#: src/include/s390/dasd/dialogs.rb:481
+#: src/include/s390/dasd/dialogs.rb:470
msgid "&Select All"
msgstr "すべてを選択(&S)"

-#: src/include/s390/dasd/dialogs.rb:482
+#: src/include/s390/dasd/dialogs.rb:471
msgid "&Deselect All"
msgstr "全てを解除する(&D)"

#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:553 src/include/s390/zfcp/dialogs.rb:221
+#: src/include/s390/dasd/dialogs.rb:541 src/include/s390/zfcp/dialogs.rb:215
msgid "Invalid filter channel IDs."
msgstr "チャネルIDのフィルタが無効です。"

#. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:597
+#: src/include/s390/dasd/dialogs.rb:584
msgid "Add New DASD Disk"
msgstr "新しい DASD ディスクの追加"

#. text entry
#. combo box
-#: src/include/s390/dasd/dialogs.rb:608 src/include/s390/zfcp/dialogs.rb:301
+#: src/include/s390/dasd/dialogs.rb:595 src/include/s390/zfcp/dialogs.rb:294
msgid "&Channel ID"
msgstr "チャネルID(&C)"

#. check box
-#: src/include/s390/dasd/dialogs.rb:612
+#: src/include/s390/dasd/dialogs.rb:599
msgid "Format the Disk"
msgstr "ディスクを初期化する"

#. check box
-#: src/include/s390/dasd/dialogs.rb:615
+#: src/include/s390/dasd/dialogs.rb:602
msgid "Use &DIAG"
msgstr "DIAGを使用する(&D)"

#. yes-no popup
-#: src/include/s390/dasd/dialogs.rb:637
+#: src/include/s390/dasd/dialogs.rb:624
msgid ""
"Really leave the DASD disk configuration without saving?\n"
"All changes will be lost."
@@ -312,14 +312,14 @@
#. error popup
#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:351
-#: src/include/s390/zfcp/dialogs.rb:368 src/include/s390/zfcp/dialogs.rb:404
+#: src/include/s390/dasd/dialogs.rb:635 src/include/s390/zfcp/dialogs.rb:340
+#: src/include/s390/zfcp/dialogs.rb:357 src/include/s390/zfcp/dialogs.rb:393
msgid "Not a valid channel ID."
msgstr "チャネルIDが無効です。"

#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:658 src/include/s390/zfcp/dialogs.rb:434
+#: src/include/s390/dasd/dialogs.rb:645 src/include/s390/zfcp/dialogs.rb:423
msgid "Device already exists."
msgstr "デバイスはすでに存在します。"

@@ -343,7 +343,7 @@
"設定ユーティリティを安全に中止するには、[中止]をクリックしてください。</p>"

#. Write dialog help 1/2
-#: src/include/s390/dasd/helps.rb:44
+#: src/include/s390/dasd/helps.rb:45
msgid ""
"<p><b><big>Saving Controller Configuration</big></b><br>\n"
"</p>\n"
@@ -353,7 +353,7 @@

#. Write dialog help 2/2
#. Write dialog help 2/2
-#: src/include/s390/dasd/helps.rb:48 src/include/s390/zfcp/helps.rb:48
+#: src/include/s390/dasd/helps.rb:49 src/include/s390/zfcp/helps.rb:49
msgid ""
"<p><b><big>Aborting Saving:</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -365,7 +365,7 @@

#. Disk selection dialog help 1/4
#. Disk selection dialog help 1/4
-#: src/include/s390/dasd/helps.rb:54 src/include/s390/dasd/helps.rb:68
+#: src/include/s390/dasd/helps.rb:55 src/include/s390/dasd/helps.rb:71
msgid ""
"<p><b><big>Configured DASD Disks</big></b><br>\n"
"In this dialog, manage DASD disks on your system.</p>"
@@ -375,7 +375,7 @@

#. Disk selection dialog help 2/4
#. Disk selection dialog help 2/4
-#: src/include/s390/dasd/helps.rb:58 src/include/s390/dasd/helps.rb:72
+#: src/include/s390/dasd/helps.rb:60 src/include/s390/dasd/helps.rb:76
msgid ""
"<p>To filter the displayed disks, set the <b>Minimum Channel ID</b> and \n"
"the <b>Maximum Channel ID</b> and click <b>Filter</b>.</p>\n"
@@ -384,12 +384,12 @@
"[<b>チャネルIDの最大値</b>]を設定して[<b>フィルタ</b>]をクリックしてください。</p>\n"

#. Disk selection dialog help 4/4
-#: src/include/s390/dasd/helps.rb:62
+#: src/include/s390/dasd/helps.rb:65
msgid "<p>To configure a new DASD disk, click <b>Add</b>.</p>"
msgstr "<p>新しい DASD ディスクを設定するには、<b>「追加」</b>をクリックしてください</p>"

#. Disk selection dialog help 4/4
-#: src/include/s390/dasd/helps.rb:64
+#: src/include/s390/dasd/helps.rb:67
msgid ""
"<p>To remove a configured DASD disk, select it and click\n"
"<b>Delete</b>.</p>"
@@ -398,7 +398,7 @@
"ディスクを選択して<b>「削除」</b>をクリックしてください。</p>"

#. Disk selection dialog help 3/4
-#: src/include/s390/dasd/helps.rb:76
+#: src/include/s390/dasd/helps.rb:81
msgid ""
"<p>To perform actions on multiple disks at once, mark these disks. To select
all displayed disk (possibly after applying a filter), click\n"
"<b>Select All</b> or <b>Deselect All</b>.</p>\n"
@@ -407,7 +407,7 @@
"[<b>すべてを選択</b>]または[<b>全てを解除する</b>]をクリックします。</p>\n"

#. Disk selection dialog help 4/4
-#: src/include/s390/dasd/helps.rb:80
+#: src/include/s390/dasd/helps.rb:87
msgid ""
"<p>To perform an action on the selected disks, use <b>Perform Action</b>.\n"
"The action will be performed immediately!</p>"
@@ -416,7 +416,7 @@
"アクションは即時に実行されます。</p>"

#. Disk add help 1/3
-#: src/include/s390/dasd/helps.rb:84
+#: src/include/s390/dasd/helps.rb:92
msgid ""
"<p><b><big>Add New DASD Disk</big></b><br>\n"
"To add a disk, enter the <b>Channel ID</b> of the DASD disk as\n"
@@ -427,7 +427,7 @@
"を入力してください。</p>"

#. Disk add help 1/3
-#: src/include/s390/dasd/helps.rb:90
+#: src/include/s390/dasd/helps.rb:98
msgid ""
"<p>If the disk should be formatted,\n"
"use <b>Format the Disk</b>.</p>\n"
@@ -436,13 +436,13 @@
"[<b>ディスクを初期化する</b>]を使用してください。</p>\n"

#. Disk add help 3/3
-#: src/include/s390/dasd/helps.rb:94
+#: src/include/s390/dasd/helps.rb:102
msgid "<p>To use DIAG mode, select <b>Use DIAG</b>.</p>\n"
msgstr "<p>DIAGモードを使用するには、[<b>DIAGを使用する</b>]を選択してください。</p>\n"

#. Initialization dialog caption
#. Initialization dialog caption
-#: src/include/s390/dasd/wizards.rb:100 src/include/s390/zfcp/wizards.rb:96
+#: src/include/s390/dasd/wizards.rb:95 src/include/s390/zfcp/wizards.rb:94
msgid "Controller Configuration"
msgstr "コントローラの設定"

@@ -473,17 +473,17 @@
"互換性のあるフォーマットやパーティションでない場合は、[<b>ディスクの上書きを強制</b>]を選択してください。</p>"

#. Dump dialog help 4/8
-#: src/include/s390/dump/ui.rb:62
+#: src/include/s390/dump/ui.rb:63
msgid "<p>To use DASD and ZFCP devices activate them in the respective YaST
DASD or ZFCP dialog.<br>"
msgstr "<p>DASDとZFCPデバイスを使用するには、それぞれYaST DASDまたはZFCPダイアログで有効化する必要があります。<br>"

#. Dump dialog help 5/8
-#: src/include/s390/dump/ui.rb:66
+#: src/include/s390/dump/ui.rb:67
msgid "Devices which are in use or have mounted partitions will not be
shown.</p>"
msgstr "使用中またはパーティションをマウントしたデバイスは表示されません。</p>"

#. Dump dialog help 6/8
-#: src/include/s390/dump/ui.rb:70
+#: src/include/s390/dump/ui.rb:71
msgid ""
"<p><b>dumpdevice</b> after a disk indicates that it is a usable dump\n"
"device. Multi-volume dump devices are indicated by a list of DASD IDs.</p>"
@@ -492,31 +492,31 @@
"現時点で利用可能なダンプデバイスを示しています。マルチボリュームのダンプデバイスについては、DASD IDのリストに表示されています。</p>"

#. Dump dialog help 7/8
-#: src/include/s390/dump/ui.rb:74
+#: src/include/s390/dump/ui.rb:76
msgid "<p>ZFCP columns: Device, Size, ID, WWPN, LUN, Dump<br>"
msgstr "<p>ZFCP列: デバイス、サイズ、ID、WWPN、LUN、ダンプ<br>"

#. Dump dialog help 8/8
-#: src/include/s390/dump/ui.rb:76
+#: src/include/s390/dump/ui.rb:78
msgid "DASD columns: Device, Size, ID, Dump</p>"
msgstr "DASD列: デバイス、サイズ、ID、ダンプ</p>"

#. Dialog content
-#: src/include/s390/dump/ui.rb:95
+#: src/include/s390/dump/ui.rb:96
msgid "&ZFCP"
msgstr "ZFCP(&Z)"

-#: src/include/s390/dump/ui.rb:121
+#: src/include/s390/dump/ui.rb:122
msgid "&Force overwrite of disk"
msgstr "ディスクの上書きを強制(&F)"

#. prevent leading space
-#: src/include/s390/dump/ui.rb:185
+#: src/include/s390/dump/ui.rb:186
msgid "You haven't selected any device."
msgstr "いずれのデバイスも選択していません。"

#. warn only in case of force
-#: src/include/s390/dump/ui.rb:193
+#: src/include/s390/dump/ui.rb:191
msgid "The disk %1 will be formatted as a dump device. All data on this device
will be lost! Continue?"
msgstr "ディスク%1はダンプデバイスとしてフォーマットされます。このデバイスのすべてのデータが失われます。続行しますか?"

@@ -539,21 +539,21 @@
"<br>これらは1行に1つずつ指定してください。</p>\n"

#. TS-Shell dialog help 1/5
-#: src/include/s390/iucvterminal-server/helps.rb:43
+#: src/include/s390/iucvterminal-server/helps.rb:44
msgid "<p><b><big>TS-Shell</big></b></p>"
msgstr "<p><b><big>TS-シェル</big></b></p>"

-#: src/include/s390/iucvterminal-server/helps.rb:46
+#: src/include/s390/iucvterminal-server/helps.rb:47
msgid "<p>TS-Shell allows to specify <b>Authorization</b> for every TS-Shell
user and group. The rights of a group are inherited by its members.</p>"
msgstr
"<p>TS-Shellでは、それぞれのTS-Shellユーザとグループに対して、[<b>権限</b>]を設定することができます。グループに対して設定した権限は、それらのメンバーに継承されます。</p>"

#. TS-Shell dialog help 2/5
-#: src/include/s390/iucvterminal-server/helps.rb:50
+#: src/include/s390/iucvterminal-server/helps.rb:52
msgid "<p>Each allowed z/VM ID can be selected manually under
<b>Selection</b>, defined by a <b>Regex</b> or loaded from a <b>File</b> which
contains all allowed z/VM IDs separated by line breaks.</p>"
msgstr "<p>許可するz/VM
IDは、[<b>選択</b>]で手動で選択することができるほか、[<b>Regex</b>]を指定して選択したり、1行に1つずつ記述された複数のz/VM
IDを[<b>ファイル</b>]からロードすることもできます。</p>"

#. TS-Shell dialog help 3/5
-#: src/include/s390/iucvterminal-server/helps.rb:54
+#: src/include/s390/iucvterminal-server/helps.rb:58
msgid ""
"<p>Click on <b>New User</b> to create new TS-Shell users or <b>Delete\n"
"User</b> to remove users.</p>"
@@ -562,7 +562,7 @@
"[<b>ユーザの削除</b>]を使用することで削除できます。</p>"

#. TS-Shell dialog help 4/5
-#: src/include/s390/iucvterminal-server/helps.rb:58
+#: src/include/s390/iucvterminal-server/helps.rb:63
msgid ""
"<p>To add or remove groups from the TS-Shell authorization table or to
change\n"
"the membership of users, go to <b>Manage Groups</b>.</p>"
@@ -571,16 +571,16 @@
"それらのメンバー設定を変更するには、[<b>グループの管理</b>]を使用してください。</p>"

#. TS-Shell dialog help 5/5
-#: src/include/s390/iucvterminal-server/helps.rb:62
+#: src/include/s390/iucvterminal-server/helps.rb:68
msgid "<p>With <b>Audited IDs</b> specify the z/VM IDs from which transcripts
should be gathered.</p>"
msgstr "<p>また、[<b>監査ID</b>]を使用すると、処理内容を収集すべきz/VM IDを指定することができます。</p>"

#. TS-Shell User creation dialog help 1/3
-#: src/include/s390/iucvterminal-server/helps.rb:66
+#: src/include/s390/iucvterminal-server/helps.rb:72
msgid "<p><b><big>New TS-Shell User</big></b></p>"
msgstr "<p><b><big>新規TS-シェルユーザ</big></b></p>"

-#: src/include/s390/iucvterminal-server/helps.rb:69
+#: src/include/s390/iucvterminal-server/helps.rb:75
msgid ""
"<p>To create new TS-Shell user the <b>Username</b>, <b>Home Directory</b> and
<b>Password</b> has to be provided.\n"
"\t<br>It is also possible to specify <b>Additional Groups</b> by selecting
them on the right.</p>"
@@ -589,12 +589,12 @@
"\t<br>右側で[<b>追加グループ</b>]を選択することにより指定することもできます。</p>"

#. TS-Shell User creation dialog help 2/3
-#: src/include/s390/iucvterminal-server/helps.rb:73
+#: src/include/s390/iucvterminal-server/helps.rb:81
msgid "<p>To ensure that the user changes his password after the first login,
activate <b>Force Password Change</b>.</p>"
msgstr "<p>初回ログイン後にユーザに各自のパスワードを変更させるには、[<b>パスワード変更を強制する</b>]を有効にしてください。</p>"

#. TS-Shell User creation dialog help 3/3
-#: src/include/s390/iucvterminal-server/helps.rb:77
+#: src/include/s390/iucvterminal-server/helps.rb:86
msgid ""
"<p>You can specify the same home directory for every TS-Shell user since no\n"
"data will be stored there.</p>"
@@ -603,11 +603,11 @@
"同じホームディレクトリを設定することもできます。</p>"

#. TS-Shell Managing Groups dialog help 1/5
-#: src/include/s390/iucvterminal-server/helps.rb:81
+#: src/include/s390/iucvterminal-server/helps.rb:91
msgid "<p><b><big>Manage Groups for TS-Authorization</big></b></p>"
msgstr "<p><b><big>TS-認証のためのグループを管理する</big></b></p>"

-#: src/include/s390/iucvterminal-server/helps.rb:84
+#: src/include/s390/iucvterminal-server/helps.rb:94
msgid ""
"<p>Define TS-Shell authorizations per group if you want every TS-Shell \n"
"member of this groups to inherit the same rights.</p>"
@@ -616,7 +616,7 @@
"グループ単位でTS-Shell権限を定義してください。</p>"

#. TS-Shell Managing Groups dialog help 2/5
-#: src/include/s390/iucvterminal-server/helps.rb:88
+#: src/include/s390/iucvterminal-server/helps.rb:99
msgid ""
"<p>Existing groups can be added to or removed from the TS-Shell\n"
"authorization. Select the groups in the table and click on <b>Select or
Deselect</b>. The current status is shown in the column <b>TS-Auth</b>.</p>"
@@ -625,7 +625,7 @@
"テーブルでそれらを選択して[<b>選択/解除</b>]をクリックしてください。現在の状態は、[<b>TS-Auth</b>]の列に表示されます。</p>"

#. TS-Shell Managing Groups dialog help 3/5
-#: src/include/s390/iucvterminal-server/helps.rb:92
+#: src/include/s390/iucvterminal-server/helps.rb:105
msgid ""
"<p>Change TS-Shell members of a selected group in the <b>TS-Members</b>\n"
"selection.</p>"
@@ -634,7 +634,7 @@
"変更することができます。</p>"

#. TS-Shell Managing Groups dialog help 4/5
-#: src/include/s390/iucvterminal-server/helps.rb:96
+#: src/include/s390/iucvterminal-server/helps.rb:109
msgid ""
"<p>New groups could be created by entering the name in the <b>New Group</b>
input field and confirming with <b>Create</b>.\n"
"\t<br>To delete previously created groups the <b>YaST users</b> dialog has to
be used.</p>"
@@ -643,21 +643,21 @@
"\t<br>前に作成したグループを削除するには、[<b>YaSTユーザ</b>]ダイアログを使用してください。</p>"

#. TS-Shell Managing Groups dialog help 5/5
-#: src/include/s390/iucvterminal-server/helps.rb:100
+#: src/include/s390/iucvterminal-server/helps.rb:115
msgid "<p>Undo changes in this dialog by clicking the <b>Back</b> button.</p>"
msgstr "<p>このダイアログ内での変更は、[<b>戻る</b>]ボタンをクリックすることで元に戻すことができます。</p>"

#. IUCVConn on Login dialog help 1/2
-#: src/include/s390/iucvterminal-server/helps.rb:104
+#: src/include/s390/iucvterminal-server/helps.rb:119
msgid "<p><b><big>IUCVConn on Login</big></b></p>"
msgstr "<p><b><big>ログオン時のIUCVConn</big></b></p>"

-#: src/include/s390/iucvterminal-server/helps.rb:107
+#: src/include/s390/iucvterminal-server/helps.rb:122
msgid "<p>IUCVConn on Login needs one user for every z/VM ID. To create these
users a <b>password</b> and <b>home directory</b> has to be provided."
msgstr "<p>[ログイン時のIUCVConn]では、各z/VM
IDにつき1個のユーザが必要です。これらのユーザを作成するには、<b>パスワード</b>と<b>ホームディレクトリ</b>を指定する必要があります。"

#. IUCVConn on Login dialog help 2/2
-#: src/include/s390/iucvterminal-server/helps.rb:111
+#: src/include/s390/iucvterminal-server/helps.rb:127
msgid "<p>It is possible to sync the users manually by clicking on <b>Sync</b>
or just confirming the changes with <b>Ok</b> while <b>IUCVConn on Login</b> is
enabled. </p>"
msgstr
"<p>[<b>同期</b>]をクリックするか、[<b>ログイン時のIUCVConn</b>]が有効になっている間に[<b>OK</b>]をクリックして変更を確認するだけで、ユーザは同期を手動で行うことができます。</p>"

@@ -846,87 +846,87 @@
msgstr "TS-メンバー(&M)"

#. draw active tab
-#: src/include/s390/iucvterminal-server/ui.rb:595
+#: src/include/s390/iucvterminal-server/ui.rb:594
msgid "&z/VM IDs"
msgstr "z/VM ID(&Z)"

-#: src/include/s390/iucvterminal-server/ui.rb:596
+#: src/include/s390/iucvterminal-server/ui.rb:595
msgid "&TS-Shell"
msgstr "TS-シェル(&T)"

-#: src/include/s390/iucvterminal-server/ui.rb:597
+#: src/include/s390/iucvterminal-server/ui.rb:596
msgid "&IUCVConn"
msgstr "IUCVConn(&I)"

#. check and commit password
-#: src/include/s390/iucvterminal-server/ui.rb:711
+#: src/include/s390/iucvterminal-server/ui.rb:708
msgid "The passwords do not match or are invalid."
msgstr "パスワードが一致しないか、無効です。"

#. check if the user specifcation is valid and if the name does already exist
-#: src/include/s390/iucvterminal-server/ui.rb:717
+#: src/include/s390/iucvterminal-server/ui.rb:714
msgid "The username is not valid!"
msgstr "ユーザ名は無効です。"

-#: src/include/s390/iucvterminal-server/ui.rb:721
+#: src/include/s390/iucvterminal-server/ui.rb:718
msgid "A home directory has to be specified!"
msgstr "ホームディレクトリを指定してください。"

-#: src/include/s390/iucvterminal-server/ui.rb:757
+#: src/include/s390/iucvterminal-server/ui.rb:751
msgid "Adding the user has failed."
msgstr "ユーザの追加が失敗しました。"

#. delete group entry if disabled
-#: src/include/s390/iucvterminal-server/ui.rb:861
+#: src/include/s390/iucvterminal-server/ui.rb:843
msgid "Configure IUCV Terminal Server Settings"
msgstr "IUCV端末サーバの設定 "

#. update screen
-#: src/include/s390/iucvterminal-server/ui.rb:881
+#: src/include/s390/iucvterminal-server/ui.rb:863
msgid "New TS-Shell User"
msgstr "新規TS-シェルユーザ"

-#: src/include/s390/iucvterminal-server/ui.rb:894
+#: src/include/s390/iucvterminal-server/ui.rb:876
msgid "Manage Groups for TS-Authorization"
msgstr "TS-認証のグループの管理"

#. since alnum allows umlauts too the id is checked against the user name
specification
-#: src/include/s390/iucvterminal-server/ui.rb:1020
+#: src/include/s390/iucvterminal-server/ui.rb:1000
msgid "Wrong z/VM ID \"%1\" in line %2, only letters and numbers are allowed."
msgstr "行%2のz/VM ID「%1」が間違っています。文字と数値のみが許可されます。"

-#: src/include/s390/iucvterminal-server/ui.rb:1032
+#: src/include/s390/iucvterminal-server/ui.rb:1012
msgid "Wrong z/VM ID \"%1\" in line %2, numbers at the beginning are not
allowed."
msgstr "行%2のz/VM ID「%1」が間違っています。先頭には数字を使用できません。"

-#: src/include/s390/iucvterminal-server/ui.rb:1044
+#: src/include/s390/iucvterminal-server/ui.rb:1024
msgid "Wrong z/VM ID \"%1\" in line %2, more than eight characters are not
allowed."
msgstr "行%2のz/VM ID「%1」が間違っています。8文字を超える文字は使用できません。"

#. only the last entry is allowed to be empty
-#: src/include/s390/iucvterminal-server/ui.rb:1057
+#: src/include/s390/iucvterminal-server/ui.rb:1037
msgid "Wrong z/VM ID \"%1\" in line %2, at least one letter is required."
msgstr "行%2のz/VM ID「%1」が間違っています。少なくとも1文字が必要です。"

#. check password
-#: src/include/s390/iucvterminal-server/ui.rb:1081
+#: src/include/s390/iucvterminal-server/ui.rb:1061
msgid "A correctly entered password to sync IUCVConn users is required."
msgstr "IUCVConnユーザを同期するために正しく入力したパスワードが必要です。"

#. check home directory
-#: src/include/s390/iucvterminal-server/ui.rb:1087
+#: src/include/s390/iucvterminal-server/ui.rb:1067
msgid "The specified IUCVConn home directory is invalid."
msgstr "指定したIUCVConnホームディレクトリが無効です。"

#. update ts member selection
-#: src/include/s390/iucvterminal-server/ui.rb:1437
+#: src/include/s390/iucvterminal-server/ui.rb:1415
msgid "The group name is not valid!"
msgstr "グループ名は無効です。"

#. change tab selection back
#. check for z/VM ID entries
-#: src/include/s390/iucvterminal-server/ui.rb:1497
-#: src/include/s390/iucvterminal-server/ui.rb:1598
+#: src/include/s390/iucvterminal-server/ui.rb:1474
+#: src/include/s390/iucvterminal-server/ui.rb:1575
msgid "Cannot configure the terminal server without valid z/VM IDs."
msgstr "有効なz/VM IDなしでターミナルサーバを設定することはできません。"

@@ -969,32 +969,32 @@
msgstr
"<p>複数の[<b>IUVCttyインスタンス</b>]を実行し、複数のターミナルデバイスを提供することができます。インスタンスは、[<b>端末IDプレフィクス</b>]とそれに続く番号から構成される、端末IDで区別されます。<br>"

#. IUCVTerminal dialog help 4/11
-#: src/include/s390/iucvterminal/ui.rb:129
+#: src/include/s390/iucvterminal/ui.rb:131
msgid "For example, if you define ten instances with the prefix
&quot;<i>lxterm</i>&quot;, the terminal IDs from <i>lxterm0</i> to
<i>lxterm9</i> are available.</p>"
msgstr
"たとえば、プレフィックス「<i>lxterm</i>」を使用して10個のインスタンスを定義した場合、<i>lxterm0</i>から<i>lxterm9</i>の端末IDを利用できます。</p>"

#. IUCVTerminal dialog help 5/11
-#: src/include/s390/iucvterminal/ui.rb:133
+#: src/include/s390/iucvterminal/ui.rb:136
msgid "<p><b>HVC</b></p>"
msgstr "<p><b>HVC</b></p>"

#. IUCVTerminal dialog help 6/11
-#: src/include/s390/iucvterminal/ui.rb:135
+#: src/include/s390/iucvterminal/ui.rb:138
msgid "<p>The z/VM IUCV HVC device driver is a kernel module and uses device
nodes to enable up to eight HVC terminal devices to communicate with getty and
login programs.</p>"
msgstr "<p>z/VM IUCV
HVCデバイスドライバはカーネルモジュールであり、gettyやログインプログラムと通信できるHVCターミナルデバイスとして、最大8個までのデバイスノードを使用します。</p>"

#. IUCVTerminal dialog help 7/11
-#: src/include/s390/iucvterminal/ui.rb:139
+#: src/include/s390/iucvterminal/ui.rb:143
msgid "<p>With <b>restrict access</b>, allow only connections from certain
<b>terminal servers</b>.</p>"
msgstr "<p>[<b>アクセスの制限</b>]を使用すると、特定の[<b>ターミナルサーバ</b>]からの接続のみを許可します。</p>"

#. IUCVTerminal dialog help 8/11
-#: src/include/s390/iucvterminal/ui.rb:143
+#: src/include/s390/iucvterminal/ui.rb:147
msgid "<p>Define the emulation for all instances at once or for each one
separately.</p>"
msgstr "<p>また、エミュレーションをすべてのインスタンスに対して一括で定義できるほか、各デバイスに対して個別に設定することもできます。</p>"

#. IUCVTerminal dialog help 9/11
-#: src/include/s390/iucvterminal/ui.rb:147
+#: src/include/s390/iucvterminal/ui.rb:151
msgid ""
"<p>Activate <b>route kernel messages to hvc0</b> to route kernel messages
to\n"
"the hvc0 device instead of ttyS0.<br>"
@@ -1003,85 +1003,85 @@
"ttyS0ではなくhvc0にルーティングされます。<br>"

#. IUCVTerminal dialog help 10/11
-#: src/include/s390/iucvterminal/ui.rb:151
+#: src/include/s390/iucvterminal/ui.rb:156
msgid "Should kernel messages still be shown on ttyS0, manually add
<b>console=ttyS0</b> to the current boot selection kernel parameter in the
<b>YaST bootloader module</b>.</p>"
msgstr
"ttyS0に対してもカーネルメッセージを表示させたい場合は、[<b>YaSTブートローダモジュール</b>]を利用して、ブートに使用しているセクションのカーネルパラメータに対し、手動で<b>console=ttyS0</b>を追加してください。</p>"

#. IUCVTerminal dialog help 11/11
-#: src/include/s390/iucvterminal/ui.rb:155
+#: src/include/s390/iucvterminal/ui.rb:161
msgid "<h3>Warning: HVC Terminals stay logged on without a manual logout
through the shortcut: ctrl _ d</h3>"
msgstr "<h3>警告: HVC端末はショートカットを通じて手動ログアウトせずに、ログアウトされたままになります: ctrl _ d</h3>"

#. Dialog content
-#: src/include/s390/iucvterminal/ui.rb:168
+#: src/include/s390/iucvterminal/ui.rb:174
msgid "&IUCVtty"
msgstr "IUCVtty(&I)"

-#: src/include/s390/iucvterminal/ui.rb:176
+#: src/include/s390/iucvterminal/ui.rb:182
msgid "Terminal ID &Prefix"
msgstr "端末IDプレフィックス(&P)"

-#: src/include/s390/iucvterminal/ui.rb:182
+#: src/include/s390/iucvterminal/ui.rb:188
msgid "I&UCVtty instances"
msgstr "IUCVttyインスタンス(&U)"

-#: src/include/s390/iucvterminal/ui.rb:196
+#: src/include/s390/iucvterminal/ui.rb:202
msgid "HVC"
msgstr "HVC"

-#: src/include/s390/iucvterminal/ui.rb:206
+#: src/include/s390/iucvterminal/ui.rb:212
msgid "H&VC instances"
msgstr "HVCインスタンス(&V)"

-#: src/include/s390/iucvterminal/ui.rb:217
+#: src/include/s390/iucvterminal/ui.rb:223
msgid "Restrict &access to"
msgstr "制限アクセス(&A)"

-#: src/include/s390/iucvterminal/ui.rb:223
+#: src/include/s390/iucvterminal/ui.rb:229
msgid "Allowed Terminal &Servers"
msgstr "許可されている端末サーバ(&S)"

-#: src/include/s390/iucvterminal/ui.rb:231
+#: src/include/s390/iucvterminal/ui.rb:237
msgid "route &kernel messages to hvc0"
msgstr "HVC0へのカーネルメッセージをルート(&K)"

#. if settings were changed don't exit without asking
-#: src/include/s390/iucvterminal/ui.rb:324
+#: src/include/s390/iucvterminal/ui.rb:330
msgid "Really leave without saving?"
msgstr "保存しないで終了しますか?"

#. check iucv id
-#: src/include/s390/iucvterminal/ui.rb:333
+#: src/include/s390/iucvterminal/ui.rb:339
msgid "The IUCV ID is not valid."
msgstr "IUCV IDは無効です。"

#. check restrict_hvc_to_srvs and make sure they doesn't end with a comma
-#: src/include/s390/iucvterminal/ui.rb:343
+#: src/include/s390/iucvterminal/ui.rb:349
msgid "The Terminal Servers are not valid."
msgstr "端末サーバは有効ではありません。"

#. check if the bootloader settings need to be adjusted
-#: src/include/s390/iucvterminal/ui.rb:366
+#: src/include/s390/iucvterminal/ui.rb:380
msgid "The system has to be rebooted for some changes to take effect."
msgstr "変更を有効にするには、システムを再起動する必要があります。"

#. only five lines are allowed, remove every additional line
-#: src/include/s390/onpanic/ui.rb:63
+#: src/include/s390/onpanic/ui.rb:62
msgid "Only %1 lines are allowed for VMCMD."
msgstr "VMCMDに対しては %1 行だけが許可されます。"

#. For translators: Caption of the dialog
-#: src/include/s390/onpanic/ui.rb:109
+#: src/include/s390/onpanic/ui.rb:108
msgid "On Panic Configuration"
msgstr "On Panic設定"

#. OnPanic dialog help 1/11
-#: src/include/s390/onpanic/ui.rb:112
+#: src/include/s390/onpanic/ui.rb:111
msgid "<p><b>Configure the actions to be taken if a kernel panic
occurs</b></p>"
msgstr "<p><b>カーネルパニックが発生した場合にとられるアクションを設定してください</b></p>"

#. OnPanic dialog help 2/11
-#: src/include/s390/onpanic/ui.rb:116
+#: src/include/s390/onpanic/ui.rb:115
msgid "<p>The <b>Dumpconf</b> daemon needs to be enabled to influence the
behavior during kernel panics.</p>"
msgstr "<p>カーネルパニック中の動作に影響させるために、<b>Dumpconf</b>デーモンを有効にする必要があります。</p>"

@@ -1115,83 +1115,83 @@
"このオプションはz9 (r)マシン以上のLPAR、かつz/VMバージョン5.3以上でのみ利用できます。<br>"

#. OnPanic dialog help 8/11
-#: src/include/s390/onpanic/ui.rb:132
+#: src/include/s390/onpanic/ui.rb:133
msgid "<b>vmcmd</b> Execute specified CP commands and stop system.</p>"
msgstr "<b>vmcmd</b> 指定されたCPコマンドを実行し、システムを停止します。</p>"

#. OnPanic dialog help 9/11
-#: src/include/s390/onpanic/ui.rb:134
+#: src/include/s390/onpanic/ui.rb:135
msgid "<p>The time defined in <b>Delay Minutes</b> defers activating the
specified panic action for a newly started system to prevent loops. If the
system crashes before the time has elapsed the default action (stop) is
performed.</p>"
msgstr
"<p><b>遅延分数</b>で定義された時間は、ループを回避するために新しく開始したシステムに指定したパニックアクションのアクティブ化を遅延します。所定時間が経過する前にシステムがクラッシュした場合、デフォルトのアクション(stop)が実行されます。</p>"

#. OnPanic dialog help 10/11
-#: src/include/s390/onpanic/ui.rb:138
+#: src/include/s390/onpanic/ui.rb:141
msgid "<p>The device for dumping the memory can be set with <b>Dump
Device</b>. If no device is shown you have to create one with the <b>YaST Dump
Devices</b> dialog.</p>"
msgstr
"<p>メモリをダンプするデバイスは、[<b>デバイスのダンプ</b>]で設定できます。デバイスが何も示されない場合、[<b>YaSTダンプデバイス</b>]ダイアログで新しいものを作成してください。</p>"

#. OnPanic dialog help 11/11
-#: src/include/s390/onpanic/ui.rb:143
+#: src/include/s390/onpanic/ui.rb:147
msgid "<p>With <b>VMCMD</b> specify CP commands to be executed before the
Linux system is stopped. Only %1 lines and a total of %2 chars are allowed.</p>"
msgstr "<p>[<b>VMCMD</b>]では、Linuxシステムが停止する前に実行するCPコマンドを指定することができます。%1 行以内、かつ
%2 文字までを指定できます。</p>"

#. radio button label
-#: src/include/s390/onpanic/ui.rb:166
+#: src/include/s390/onpanic/ui.rb:171
msgid "Do No&t Start Dumpconf"
msgstr "Dumpconfを起動しない(&T)"

#. radio button label
-#: src/include/s390/onpanic/ui.rb:175
+#: src/include/s390/onpanic/ui.rb:180
msgid "&Start Dumpconf"
msgstr "Dumpconfを起動する(&S)"

#. combobox label
-#: src/include/s390/onpanic/ui.rb:189
+#: src/include/s390/onpanic/ui.rb:194
msgid "&Panic Action"
msgstr "パニックアクション(&P)"

-#: src/include/s390/onpanic/ui.rb:192
+#: src/include/s390/onpanic/ui.rb:197
msgid "Delay &Minutes"
msgstr "遅延分数(&M)"

#. combobox label
-#: src/include/s390/onpanic/ui.rb:202
+#: src/include/s390/onpanic/ui.rb:207
msgid "&Dump Device"
msgstr "デバイス(&D)"

-#: src/include/s390/onpanic/ui.rb:206
+#: src/include/s390/onpanic/ui.rb:211
msgid "&VMCMD"
msgstr "VMCMD(&V)"

#. don't allow dumps if no device is available
-#: src/include/s390/onpanic/ui.rb:267
+#: src/include/s390/onpanic/ui.rb:271
msgid "It is not possible to enable the dump process without a dump device."
msgstr "ダンプデバイスなしでは、ダンプ処理を有効にできません。"

#. don't allow vmcmd without at least one command
-#: src/include/s390/onpanic/ui.rb:281
+#: src/include/s390/onpanic/ui.rb:285
msgid "It is not possible to use vmcmd without defining at least one command."
msgstr "少なくとも1つのコマンドを定義しないで、vmcmdを使用できません。"

#. Dialog caption
-#: src/include/s390/zfcp/dialogs.rb:113
+#: src/include/s390/zfcp/dialogs.rb:109
msgid "Configured ZFCP Devices"
msgstr "設定済みのZFCPデバイス"

#. table header
#. table header
-#: src/include/s390/zfcp/dialogs.rb:122 src/include/s390/zfcp/dialogs.rb:131
+#: src/include/s390/zfcp/dialogs.rb:118 src/include/s390/zfcp/dialogs.rb:127
msgid "WWPN"
msgstr "WWPN"

#. table header
#. table header
-#: src/include/s390/zfcp/dialogs.rb:124 src/include/s390/zfcp/dialogs.rb:133
+#: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129
msgid "LUN"
msgstr "LUN"

#. yes-no popup
#. yes-no popup
-#: src/include/s390/zfcp/dialogs.rb:238 src/include/s390/zfcp/dialogs.rb:391
+#: src/include/s390/zfcp/dialogs.rb:232 src/include/s390/zfcp/dialogs.rb:380
msgid ""
"Really leave the ZFCP device configuration without saving?\n"
"All changes will be lost."
@@ -1200,42 +1200,42 @@
"すべての変更が失われます。"

#. dialog caption
-#: src/include/s390/zfcp/dialogs.rb:259
+#: src/include/s390/zfcp/dialogs.rb:252
msgid "Add New ZFCP Device"
msgstr "新しいZFCPデバイスの追加"

#. push button
-#: src/include/s390/zfcp/dialogs.rb:309
+#: src/include/s390/zfcp/dialogs.rb:300
msgid "Get WWPNs"
msgstr "WWPNの取得"

#. combo box
-#: src/include/s390/zfcp/dialogs.rb:312
+#: src/include/s390/zfcp/dialogs.rb:303
msgid "&WWPN"
msgstr "WWPN(&W)"

#. push button
-#: src/include/s390/zfcp/dialogs.rb:319
+#: src/include/s390/zfcp/dialogs.rb:308
msgid "Get LUNs"
msgstr "LUNの取得"

#. combobox
-#: src/include/s390/zfcp/dialogs.rb:322
+#: src/include/s390/zfcp/dialogs.rb:311
msgid "&LUN"
msgstr "LUN(&L)"

-#: src/include/s390/zfcp/dialogs.rb:325
+#: src/include/s390/zfcp/dialogs.rb:314
msgid "If no WWPN and no LUN have been defined the system is trying to use
allow_lun_scan."
msgstr "WWPNもLUNも定義されていないと、システムはallow_lun_scanを使用しようとします。"

#. error popup
#. error popup
-#: src/include/s390/zfcp/dialogs.rb:376 src/include/s390/zfcp/dialogs.rb:413
+#: src/include/s390/zfcp/dialogs.rb:365 src/include/s390/zfcp/dialogs.rb:402
msgid "The entered WWPN is invalid."
msgstr "入力したWWPNは無効です。"

#. error popup
-#: src/include/s390/zfcp/dialogs.rb:421
+#: src/include/s390/zfcp/dialogs.rb:410
msgid "The entered LUN is invalid."
msgstr "入力したLUNが無効です。"

@@ -1249,7 +1249,7 @@
"</p>\n"

#. Write dialog help 1/2
-#: src/include/s390/zfcp/helps.rb:44
+#: src/include/s390/zfcp/helps.rb:45
msgid ""
"<p><b><big>Saving ZFCP Device Configuration</big></b><br>\n"
"</p>\n"
@@ -1258,7 +1258,7 @@
"</p>\n"

#. Disk selection dialog help 1/3
-#: src/include/s390/zfcp/helps.rb:54
+#: src/include/s390/zfcp/helps.rb:55
msgid ""
"<p><b><big>Configured ZFCP Devices</big></b><br>\n"
"Manage ZFCP devices on your system.</p>\n"
@@ -1267,12 +1267,12 @@
"このダイアログでシステムのZFCPデバイスを管理することができます。</p>\n"

#. Disk selection dialog help 2/3
-#: src/include/s390/zfcp/helps.rb:58
+#: src/include/s390/zfcp/helps.rb:59
msgid "<p>To configure a new ZFCP device, click <b>Add</b>.</p>"
msgstr "<p>新しいZFCPデバイスを設定するには、[<b>追加</b>]をクリックしてください。</p>"

#. Disk selection dialog help 3/3
-#: src/include/s390/zfcp/helps.rb:60
+#: src/include/s390/zfcp/helps.rb:61
msgid ""
"<p>To remove a configured ZFCP device, select it and click\n"
"<b>Delete</b>.</p>"
@@ -1282,11 +1282,11 @@

#. Disk selection dialog Warning
#. Disk selection dialog Warning
-#: src/include/s390/zfcp/helps.rb:64 src/include/s390/zfcp/helps.rb:88
+#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:90
msgid "<h1>Warning</h1>"
msgstr "<h1>警告</h1>"

-#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:89
+#: src/include/s390/zfcp/helps.rb:66 src/include/s390/zfcp/helps.rb:91
msgid ""
"<p>When accessing a ZFCP device\n"
"<b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive.\n"
@@ -1297,7 +1297,7 @@
" そうでない場合は、データ損傷の危険性があります。</p>"

#. Disk add help 1/2
-#: src/include/s390/zfcp/helps.rb:71
+#: src/include/s390/zfcp/helps.rb:72
msgid ""
"<p><b><big>Add New ZFCP Device</big></b><br>\n"
"Enter the identifier of the device to add, the\n"
@@ -1310,7 +1310,7 @@
"(<b>WWPN</b>)、および[<b>LUN</b>]番号を入力してください。</p>\n"

#. Disk add help 2/2, This is HTML, so finally "&lt;devno&gt;" is displayed as
"<devno>"
-#: src/include/s390/zfcp/helps.rb:78
+#: src/include/s390/zfcp/helps.rb:79
msgid ""
"<p>The <b>Channel ID</b> must be entered with lowercase letters in a sysfs
conforming\n"
"format 0.0.&lt;devno&gt;, such as <tt>0.0.5c51</tt>.</p>\n"
@@ -1328,95 +1328,95 @@

#. popup label
#. popup label
-#: src/modules/DASDController.rb:187 src/modules/ZFCPController.rb:163
+#: src/modules/DASDController.rb:178 src/modules/ZFCPController.rb:153
msgid "Running mkinitrd."
msgstr "mkinitrdを実行しています。"

#. Create a textual summary and a list of configured devices
#. @return summary of the current configuration
-#: src/modules/DASDController.rb:333
+#: src/modules/DASDController.rb:311
msgid "Channel ID: %1, Format: %2, DIAG: %3"
msgstr "チャネルID: %1、フォーマット: %2、DIAG: %3"

-#: src/modules/DASDController.rb:346
+#: src/modules/DASDController.rb:324
msgid "Channel ID: %1, Device: %2, DIAG: %3"
msgstr "チャネルID: %1、デバイス: %2、DIAG: %3"

#. popup label
-#: src/modules/DASDController.rb:381
+#: src/modules/DASDController.rb:356
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:472 src/modules/ZFCPController.rb:446
-#: src/modules/ZFCPController.rb:540
+#: src/modules/DASDController.rb:446 src/modules/ZFCPController.rb:422
+#: src/modules/ZFCPController.rb:515
msgid "%1: sysfs not mounted."
msgstr "%1: sysfs がマウントされていません。"

#. error report, %1 is device identification
#. error report, %1 is device identification
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:480 src/modules/ZFCPController.rb:454
-#: src/modules/ZFCPController.rb:548
+#: src/modules/DASDController.rb:454 src/modules/ZFCPController.rb:430
+#: src/modules/ZFCPController.rb:523
msgid "%1: Invalid status for <online>."
msgstr "%1: <オンライン>の無効なステータス。"

#. error report, %1 is device identification
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:488 src/modules/ZFCPController.rb:462
+#: src/modules/DASDController.rb:462 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:496
+#: src/modules/DASDController.rb:470
msgid "%1: Could not change state of the device."
msgstr "%1: デバイスの状態を変更できませんでした。"

#. error report, %1 is device identification
-#: src/modules/DASDController.rb:505
+#: src/modules/DASDController.rb:479
msgid "%1: Device is not a DASD."
msgstr "%1: デバイスはDASDではありません"

#. error report, %1 is device identification
-#: src/modules/DASDController.rb:514
+#: src/modules/DASDController.rb:488
msgid "%1: Could not load module."
msgstr "%1: モジュールをロードできませんでした。"

#. error report, %1 is device identification
-#: src/modules/DASDController.rb:523
+#: src/modules/DASDController.rb:497
msgid "%1: Failed to activate DASD."
msgstr "%1: DASDを有効化できませんでした。"

#. error report, %1 is device identification
-#: src/modules/DASDController.rb:532
+#: src/modules/DASDController.rb:506
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:540 src/modules/ZFCPController.rb:518
-#: src/modules/ZFCPController.rb:596
+#: src/modules/DASDController.rb:514 src/modules/ZFCPController.rb:494
+#: src/modules/ZFCPController.rb:571
msgid "%1: Unknown error %2."
msgstr "%1: 不明なエラー %2。"

#. progress bar
-#: src/modules/DASDController.rb:653
+#: src/modules/DASDController.rb:622
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:682 src/modules/DASDController.rb:779
+#: src/modules/DASDController.rb:651 src/modules/DASDController.rb:747
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:750
+#: src/modules/DASDController.rb:718
msgid "Formatting %1: cylinder %2 of %3 done"
msgstr "「%1」を初期化中 : %3 のうち %2 シリンダ終了"

@@ -1455,9 +1455,9 @@
#. Progress finished
#. Progress finished
#: src/modules/Dump.rb:86 src/modules/Dump.rb:121
-#: src/modules/IUCVTerminal.rb:165 src/modules/IUCVTerminal.rb:246
-#: src/modules/IUCVTerminalServer.rb:334 src/modules/IUCVTerminalServer.rb:478
-#: src/modules/OnPanic.rb:234 src/modules/OnPanic.rb:276
+#: src/modules/IUCVTerminal.rb:165 src/modules/IUCVTerminal.rb:244
+#: src/modules/IUCVTerminalServer.rb:335 src/modules/IUCVTerminalServer.rb:478
+#: src/modules/OnPanic.rb:233 src/modules/OnPanic.rb:275
msgid "Finished"
msgstr "完了"

@@ -1480,37 +1480,37 @@
msgstr "ダンプデバイスを作成しています。このプロセスは数分かかる場合があります。"

#. error description
-#: src/modules/Dump.rb:148
+#: src/modules/Dump.rb:147
msgid "Invalid or unusable disk (fatal)."
msgstr "無効または使用可能でないディスクです(致命的)。"

#. error description
-#: src/modules/Dump.rb:151
+#: src/modules/Dump.rb:150
msgid "Incompatible formatting or partitioning, correct with Force."
msgstr "互換性のないフォーマットまたはパーティションです。強制指定で修正してください。"

#. error description
-#: src/modules/Dump.rb:156
+#: src/modules/Dump.rb:155
msgid "Missing support programs."
msgstr "サポートプログラムがありません。"

#. error description
-#: src/modules/Dump.rb:159
+#: src/modules/Dump.rb:158
msgid "Missing or wrong parameters."
msgstr "パラメータがないか、間違っています。"

#. error description
-#: src/modules/Dump.rb:162
+#: src/modules/Dump.rb:161
msgid "Access problem."
msgstr "アクセスの問題"

#. error description, %1 is error code (integer)
-#: src/modules/Dump.rb:165
+#: src/modules/Dump.rb:164
msgid "Error code from support program: %1."
msgstr "サポートプログラムからのエラーコード: %1."

#. error report, %1 is device name, %2 error description
-#: src/modules/Dump.rb:169
+#: src/modules/Dump.rb:168
msgid ""
"Cannot create dump device %1:\n"
"%2"
@@ -1555,37 +1555,37 @@
msgstr "カーネルパラメータを読み込んでいます..."

#. Inittab write dialog caption
-#: src/modules/IUCVTerminal.rb:223
+#: src/modules/IUCVTerminal.rb:221
msgid "Saving IUCV Terminal Configuration"
msgstr "IUCV端末設定を保存しています"

#. Progress stage 1/4
-#: src/modules/IUCVTerminal.rb:232
+#: src/modules/IUCVTerminal.rb:230
msgid "Write IUCVtty settings"
msgstr "IUCVtty設定を書き込む"

#. Progress stage 2/4
-#: src/modules/IUCVTerminal.rb:234
+#: src/modules/IUCVTerminal.rb:232
msgid "Write HVC settings"
msgstr "HVC設定を書き込む"

#. Progress stage 3/4
-#: src/modules/IUCVTerminal.rb:236
+#: src/modules/IUCVTerminal.rb:234
msgid "Write kernel parameters"
msgstr "カーネルパラメータの書き込み"

#. Progress step 1/4
-#: src/modules/IUCVTerminal.rb:240
+#: src/modules/IUCVTerminal.rb:238
msgid "Writing IUCVtty settings..."
msgstr "IUCVtty設定を書き込み中..."

#. Progress step 2/4
-#: src/modules/IUCVTerminal.rb:242
+#: src/modules/IUCVTerminal.rb:240
msgid "Writing HVC settings..."
msgstr "HVC設定を書込み中..."

#. Progress step 3/4
-#: src/modules/IUCVTerminal.rb:244
+#: src/modules/IUCVTerminal.rb:242
msgid "Writing kernel parameters..."
msgstr "カーネルパラメータを書き込んでいます..."

@@ -1596,27 +1596,27 @@

#. Read all settings
#. @return true on success
-#: src/modules/IUCVTerminalServer.rb:315
+#: src/modules/IUCVTerminalServer.rb:316
msgid "Loading IUCV Terminal Server Configuration"
msgstr "IUCV端末サーバ設定をロードしています"

#. Progress stage 1/2
-#: src/modules/IUCVTerminalServer.rb:324
+#: src/modules/IUCVTerminalServer.rb:325
msgid "Read configuration files"
msgstr "設定ファイルを読み込む"

#. Progress stage 2/2
-#: src/modules/IUCVTerminalServer.rb:326
+#: src/modules/IUCVTerminalServer.rb:327
msgid "Load user/group settings"
msgstr "ユーザ/グループ設定をロードする"

#. Progress step 1/2
-#: src/modules/IUCVTerminalServer.rb:330
+#: src/modules/IUCVTerminalServer.rb:331
msgid "Reading configuration files..."
msgstr "設定ファイルを読み込んでいます..."

#. Progress step 2/2
-#: src/modules/IUCVTerminalServer.rb:332
+#: src/modules/IUCVTerminalServer.rb:333
msgid "Loading user/group settings..."
msgstr "ユーザ/グループ設定を読み込んでいます..."

@@ -1646,67 +1646,67 @@
msgstr "ユーザ設定を更新中..."

#. Dumpconf read dialog caption
-#: src/modules/OnPanic.rb:215
+#: src/modules/OnPanic.rb:214
msgid "Reading Dumpconf Configuration"
msgstr "Dumpconf設定を読み込んでいます"

#. Progress stage 1/2
-#: src/modules/OnPanic.rb:224
+#: src/modules/OnPanic.rb:223
msgid "Checking dump devices"
msgstr "ダンプデバイスをチェックしています"

#. Progress stage 2/2
-#: src/modules/OnPanic.rb:226
+#: src/modules/OnPanic.rb:225
msgid "Reading settings"
msgstr "設定を読み込んでいます"

#. Progress step 1/2
-#: src/modules/OnPanic.rb:230
+#: src/modules/OnPanic.rb:229
msgid "Checking dump devices..."
msgstr "ダンプデバイスをチェック中..."

#. Progress step 2/2
-#: src/modules/OnPanic.rb:232
+#: src/modules/OnPanic.rb:231
msgid "Reading the settings..."
msgstr "設定を読み込み中..."

#. Dumpconf write dialog caption
-#: src/modules/OnPanic.rb:257
+#: src/modules/OnPanic.rb:256
msgid "Saving Dumpconf Configuration"
msgstr "Dumpconf設定を保存しています"

#. Progress stage 1/2
-#: src/modules/OnPanic.rb:266
+#: src/modules/OnPanic.rb:265
msgid "Write the settings"
msgstr "設定を書き込む"

#. Progress stage 2/2
-#: src/modules/OnPanic.rb:268
+#: src/modules/OnPanic.rb:267
msgid "Restart the service"
msgstr "サービスを再起動する"

#. Progress step 1/2
-#: src/modules/OnPanic.rb:272
+#: src/modules/OnPanic.rb:271
msgid "Writing the settings..."
msgstr "設定を書き込み中..."

#. Progress step 2/2
-#: src/modules/OnPanic.rb:274
+#: src/modules/OnPanic.rb:273
msgid "Restarting service..."
msgstr "サービスを再起動しています..."

#. Create a textual summary and a list of configured devices
#. @return summary of the current configuration
-#: src/modules/ZFCPController.rb:304
+#: src/modules/ZFCPController.rb:279
msgid "Channel ID: %1, WWPN: %2, LUN: %3"
msgstr "チャネルID: %1、WWPN: %2、LUN: %3"

-#: src/modules/ZFCPController.rb:313
+#: src/modules/ZFCPController.rb:288
msgid "Channel ID: %1, WWPN: %2, LUN: %3, Device: %4"
msgstr "チャネルID: %1, WWPN: %2、LUN: %3、デバイス: %4"

#. TRANSLATORS: warning message
-#: src/modules/ZFCPController.rb:372
+#: src/modules/ZFCPController.rb:348
msgid ""
"Cannot evaluate ZFCP controllers (e.g. in LPAR).\n"
"You will have to set it manually."
@@ -1715,61 +1715,61 @@
"手動で設定する必要があります。"

#. popup label
-#: src/modules/ZFCPController.rb:391
+#: src/modules/ZFCPController.rb:366
msgid "Reading Configured ZFCP Devices"
msgstr "設定済みのZFCPデバイスを読み込んでいます"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:470
+#: src/modules/ZFCPController.rb:446
msgid "%1: WWPN invalid."
msgstr "%1: WWPNが不正です。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:478
+#: src/modules/ZFCPController.rb:454
msgid "%1: Could not activate WWPN for adapter %1."
msgstr "%1: アダプタ%1用のWWPNをアクティブにできません。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:486
+#: src/modules/ZFCPController.rb:462
msgid "%1: Could not activate ZFCP device."
msgstr "%1:ZFCPデバイスを有効にできません。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:494
+#: src/modules/ZFCPController.rb:470
msgid "%1: SCSI disk could not be deactivated."
msgstr "%1: SCSIディスクを無効にできませんでした。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:502
+#: src/modules/ZFCPController.rb:478
msgid "%1: LUN could not be unregistered."
msgstr "%1: LUNを登録解除できませんでした。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:510
+#: src/modules/ZFCPController.rb:486
msgid "%1: WWPN could not be unregistered."
msgstr "%1: WWPNを登録解除できませんでした。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:556
+#: src/modules/ZFCPController.rb:531
msgid "%1: Device <ccwid> does not exist."
msgstr "%1: デバイス<ccwid>は存在しません。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:564
+#: src/modules/ZFCPController.rb:539
msgid "%1: Module zfcp could not be loaded."
msgstr "%1: モジュールzfcpはロードできませんでした。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:572
+#: src/modules/ZFCPController.rb:547
msgid "%1: Adapter status could not be changed."
msgstr "%1: アダプタのステータスを変更できませんでした。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:580
+#: src/modules/ZFCPController.rb:555
msgid "%1: WWPN ports still active."
msgstr "%1: WWPNポートは依然として有効です。"

#. message, %1 is device identification
-#: src/modules/ZFCPController.rb:588
+#: src/modules/ZFCPController.rb:563
msgid "%1: This host adapter supports allow_lun_scan."
msgstr "%1: このホストアダプタはallow_lun_scanをサポートしています。"

Modified: branches/SLE12-SP3/yast/ja/po/samba-server.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/samba-server.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/samba-server.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: samba-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2017-04-05 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -1701,107 +1701,115 @@

#. translators: progress finished
#. translators: write progress step
-#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:285
+#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:293
msgid "Finished"
msgstr "完了"

+#: src/modules/SambaServer.pm:186
+msgid ""
+"Cups is required by samba for printing to \n"
+"work correctly. Do you wish to disable printing?\n"
+"Note: To reenable printing you will need to \n"
+"manually enable the \"printers\" share and install cups."
+msgstr ""
+
#. Samba-server read dialog caption
-#: src/modules/SambaServer.pm:255
+#: src/modules/SambaServer.pm:263
msgid "Saving Samba Server Configuration"
msgstr "Sambaサーバの設定の保存"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:260
+#: src/modules/SambaServer.pm:268
msgid "Write global settings"
msgstr "グローバル設定の書き込み"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:262
+#: src/modules/SambaServer.pm:270
msgid "Disable Samba services"
msgstr "Sambaサービスを無効にする"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:264
+#: src/modules/SambaServer.pm:272
msgid "Enable Samba services"
msgstr "Sambaサービスを有効にする"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:266
+#: src/modules/SambaServer.pm:274
msgid "Write back-end settings"
msgstr "バックエンドの設定を書き込みます"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:268
+#: src/modules/SambaServer.pm:276
msgid "Write Samba accounts"
msgstr "Sambaのアカウントを書き込みます"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:270
+#: src/modules/SambaServer.pm:278
msgid "Save firewall settings"
msgstr "ファイアウォール設定を保存する"

#. translators: write progress step
-#: src/modules/SambaServer.pm:273
+#: src/modules/SambaServer.pm:281
msgid "Writing global settings..."
msgstr "グローバル設定を書き込んでいます..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:275
+#: src/modules/SambaServer.pm:283
msgid "Disabling Samba services..."
msgstr "Sambaサービスを停止中..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:277
+#: src/modules/SambaServer.pm:285
msgid "Enabling Samba services..."
msgstr "Sambaサービスを起動中..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:279
+#: src/modules/SambaServer.pm:287
msgid "Writing back-end settings..."
msgstr "バックエンドの設定を書き込んでいます..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:281
+#: src/modules/SambaServer.pm:289
msgid "Writing Samba accounts..."
msgstr "Sambaのアカウントを書き込んでいます..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:283
+#: src/modules/SambaServer.pm:291
msgid "Saving firewall settings..."
msgstr "ファイアウォール設定を保存中..."

#. /etc/samba/smb.conf is filename
-#: src/modules/SambaServer.pm:309
+#: src/modules/SambaServer.pm:317
msgid "Cannot write settings to /etc/samba/smb.conf."
msgstr "/etc/samba/smb.confに設定を書き込めません。"

#. summary item: configured workgroup/domain
-#: src/modules/SambaServer.pm:406
+#: src/modules/SambaServer.pm:414
msgid "Global Configuration:"
msgstr "グローバルな設定:"

-#: src/modules/SambaServer.pm:408
+#: src/modules/SambaServer.pm:416
#, perl-format
msgid "Workgroup or Domain: %s"
msgstr "ワークグループまたはドメイン: %s"

#. summary item: selected role for the samba server
-#: src/modules/SambaServer.pm:412
+#: src/modules/SambaServer.pm:420
#, perl-format
msgid "Role: %s"
msgstr "役割: %s"

#. summary item: status of the samba service
-#: src/modules/SambaServer.pm:415
+#: src/modules/SambaServer.pm:423
msgid "Samba server is disabled"
msgstr "Sambaサーバは無効です。"

#. summary heading: configured shares
-#: src/modules/SambaServer.pm:419
+#: src/modules/SambaServer.pm:427
msgid "Share Configuration:"
msgstr "共有設定:"

#. summary item: no configured shares
-#: src/modules/SambaServer.pm:425
+#: src/modules/SambaServer.pm:433
msgid "None"
msgstr "なし"

Modified: branches/SLE12-SP3/yast/ja/po/scanner.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/scanner.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/scanner.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: scanner\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2017-04-04 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -157,7 +157,7 @@
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
#: src/include/scanner/dialogs.rb:438 src/include/scanner/dialogs.rb:971
-#: src/modules/Scanner.rb:2261
+#: src/modules/Scanner.rb:2235
msgid "Failed to deactivate %1."
msgstr "%1の無効化に失敗しました。"

@@ -959,7 +959,7 @@
#. to add a preceding "The error message is:" comment
#. to display an error message where
#. %1 will be replaced by the actual error message:
-#: src/modules/Scanner.rb:355
+#: src/modules/Scanner.rb:353
msgid ""
"The error message is:\n"
"\n"
@@ -971,7 +971,7 @@

#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:377
+#: src/modules/Scanner.rb:375
msgid "Failed to determine the version of package %1."
msgstr "パッケージ %1 のバージョンを判定できませんでした。"

@@ -981,7 +981,7 @@
#. Do not change or translate "Image Scan", it is a driver software name.
#. Do not change or translate "Avasys", it is a manufacturer name.
#. Do not change or translate "Epson", it is a manufacturer name.
-#: src/modules/Scanner.rb:399
+#: src/modules/Scanner.rb:397
msgid ""
"The third-party Image Scan driver software from Epson/Avasys is required.\n"
"The Image Scan driver software is made and provided by Epson (formerly
Avasys)\n"
@@ -1014,12 +1014,12 @@

#. Is the package available to be installed?
#. Package::Available returns nil if no package source is available.
-#: src/modules/Scanner.rb:442
+#: src/modules/Scanner.rb:440
msgid "Required package %1 is not installed and there is no package repository
available."
msgstr "必要なパッケージ %1 がインストールされておらず、利用可能なパッケージリポジトリも見つかりません。"

#. Message of a Popup::Error where %1 will be replaced by the package name:
-#: src/modules/Scanner.rb:457
+#: src/modules/Scanner.rb:455
msgid "Required package %1 is not installed and not available in the
repository."
msgstr "必要なパッケージ %1 がインストールされておらず、このパッケージをインストールできるリポジトリも見つかりません。"

@@ -1027,7 +1027,7 @@
#. Either the user has explicitly rejected to install the package,
#. or this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:476
+#: src/modules/Scanner.rb:474
msgid "Failed to install required package %1."
msgstr "必要なパッケージ %1 のインストールに失敗しました。"

@@ -1035,7 +1035,7 @@
#. Do not change or translate "net", it is a metadriver name.
#. Do not simply use "driver" because net is no normal driver but a metadriver.
#. Do not change or translate "scanimage -L", it is a fixed command.
-#: src/modules/Scanner.rb:497
+#: src/modules/Scanner.rb:495
msgid ""
"Failed to determine the active scanners.\n"
"If the net metadriver is activated while there is a problem\n"
@@ -1055,7 +1055,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no active scanner was
determined.
#. The latter results no error.
-#: src/modules/Scanner.rb:519
+#: src/modules/Scanner.rb:517
msgid "Failed to determine the active scanners."
msgstr "アクティブなスキャナの検出に失敗しました。"

@@ -1067,8 +1067,8 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:533 src/modules/Scanner.rb:591
-#: src/modules/Scanner.rb:650 src/modules/Scanner.rb:2500
+#: src/modules/Scanner.rb:531 src/modules/Scanner.rb:589
+#: src/modules/Scanner.rb:648 src/modules/Scanner.rb:2474
msgid "File %1 does not exist."
msgstr "ファイル %1 が存在しません。"

@@ -1080,8 +1080,8 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:553 src/modules/Scanner.rb:611
-#: src/modules/Scanner.rb:670 src/modules/Scanner.rb:2520
+#: src/modules/Scanner.rb:551 src/modules/Scanner.rb:609
+#: src/modules/Scanner.rb:668 src/modules/Scanner.rb:2494
msgid "Failed to read %1."
msgstr "%1 の読み込みに失敗しました。"

@@ -1089,7 +1089,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no active driver was
determined.
#. The latter results no error.
-#: src/modules/Scanner.rb:577
+#: src/modules/Scanner.rb:575
msgid "Failed to determine the active drivers."
msgstr "アクティブなドライバの検出に失敗しました。"

@@ -1097,7 +1097,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no scanner was autodetected.
#. The latter results no error.
-#: src/modules/Scanner.rb:636
+#: src/modules/Scanner.rb:634
msgid "Failed to detect scanners automatically."
msgstr "スキャナを自動検出できませんでした。"

@@ -1109,53 +1109,53 @@
#. - Determine active backends
#. - Try to autodetect USB and SCSI scanners and HP all-in-one USB and NETWORK
scanners
#. @return true on success
-#: src/modules/Scanner.rb:766
+#: src/modules/Scanner.rb:764
msgid "Initializing Scanner Configuration"
msgstr "スキャナの環境設定の初期化"

-#: src/modules/Scanner.rb:770
+#: src/modules/Scanner.rb:768
msgid "Check installed packages"
msgstr "インストールされているパッケージをチェックします"

#. 2. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:772
+#: src/modules/Scanner.rb:770
msgid "Read or create the scanner database"
msgstr "スキャナデータベースを読み込むか、作成します"

#. 3. progress stage name of a Progress::New:
#. 5. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:774 src/modules/Scanner.rb:1988
+#: src/modules/Scanner.rb:772 src/modules/Scanner.rb:1986
msgid "Determine active scanners"
msgstr "アクティブなスキャナを検出します"

#. 4. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:776
+#: src/modules/Scanner.rb:774
msgid "Determine active drivers"
msgstr "アクティブなスキャナを検出します"

#. 5. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:778
+#: src/modules/Scanner.rb:776
msgid "Detect scanners"
msgstr "スキャナの検出"

#. 1. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:781
+#: src/modules/Scanner.rb:779
msgid "Checking installed packages..."
msgstr "インストールされているパッケージをチェック中..."

#. 2. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:783
+#: src/modules/Scanner.rb:781
msgid "Reading or creating the scanner database..."
msgstr "スキャナデータベースを読み込みまたは作成中..."

#. 3. progress step progress bar title of a Progress::New:
#. 5. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:785 src/modules/Scanner.rb:2001
+#: src/modules/Scanner.rb:783 src/modules/Scanner.rb:1999
msgid "Determining active scanners..."
msgstr "アクティブなスキャナを検出中..."

#. 4. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:787
+#: src/modules/Scanner.rb:785
msgid "Determining active drivers..."
msgstr "アクティブなスキャナを検出中..."

@@ -1164,49 +1164,49 @@
#. Body of a Popup::ShowFeedback:
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/modules/Scanner.rb:789 src/modules/Scanner.rb:1001
-#: src/modules/Scanner.rb:1070
+#: src/modules/Scanner.rb:787 src/modules/Scanner.rb:999
+#: src/modules/Scanner.rb:1068
msgid "Detecting scanners..."
msgstr "スキャナを検出しています..."

#. Last progress step progress bar title of a Progress::New:
#. Last progress step progress bar title of a Progress::New:
#. Last progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:791 src/modules/Scanner.rb:1030
-#: src/modules/Scanner.rb:2003
+#: src/modules/Scanner.rb:789 src/modules/Scanner.rb:1028
+#: src/modules/Scanner.rb:2001
msgid "Finished"
msgstr "完了"

#. Progress 2. stage (Read or create the scanner database):
-#: src/modules/Scanner.rb:859
+#: src/modules/Scanner.rb:857
msgid "Creating scanner database..."
msgstr "スキャナデータベースを作成しています..."

#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:893
+#: src/modules/Scanner.rb:891
msgid "Aborting: Failed to create the scanner database."
msgstr "中止: スキャナデータベースの作成に失敗しました。"

#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:933
+#: src/modules/Scanner.rb:931
msgid "Aborting: Failed to read %1."
msgstr "中止: %1の読み込みに失敗しました。"

#. Write scanner settings:
#. - Save the actual environment
#. @return true on success
-#: src/modules/Scanner.rb:1023
+#: src/modules/Scanner.rb:1021
msgid "Writing Scanner Configuration"
msgstr "スキャナの環境設定の書き込み"

-#: src/modules/Scanner.rb:1026
+#: src/modules/Scanner.rb:1024
msgid "Save the actual environment"
msgstr "実際の環境を保存します"

#. 1. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1028
+#: src/modules/Scanner.rb:1026
msgid "Saving the actual environment..."
msgstr "実際の環境を保存中..."

@@ -1214,7 +1214,7 @@
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "hp-setup", it is a program name.
#. Do not change or translate "HPLIP", it is a subsystem name.
-#: src/modules/Scanner.rb:1088
+#: src/modules/Scanner.rb:1086
msgid ""
"There is at least one printer configuration that uses the ptal service.\n"
"It is possible to proceed but then the running ptal service could prevent\n"
@@ -1232,7 +1232,7 @@

#. Message of a Popup::Error when hp-setup should be run.
#. Do not change or translate "hp-setup", it is a program name:
-#: src/modules/Scanner.rb:1099
+#: src/modules/Scanner.rb:1097
msgid ""
"Cannot run hp-setup because no graphical display can be opened. \n"
"This happens if YaST runs in text-only mode, or the user who runs YaST \n"
@@ -1251,7 +1251,7 @@
#. Message of a Popup::YesNo when hplip should be installed.
#. Do not change or translate "hp-setup", it is a program name.
#. Do not change or translate "hplip", it is a package name:
-#: src/modules/Scanner.rb:1111
+#: src/modules/Scanner.rb:1109
msgid ""
"It seems hplip is not installed, which is required to run hp-setup.\n"
"Should the hplip package be installed?\n"
@@ -1261,7 +1261,7 @@

#. Message of a Popup::Error when hp-setup should be run.
#. Do not change or translate "hp-setup", it is a program name:
-#: src/modules/Scanner.rb:1117
+#: src/modules/Scanner.rb:1115
msgid ""
"Cannot run hp-setup because\n"
"/usr/bin/hp-setup is not executable\n"
@@ -1273,7 +1273,7 @@

#. Body of a Popup::ShowFeedback.
#. Do not change or translate "hp-setup", it is a program name:
-#: src/modules/Scanner.rb:1125
+#: src/modules/Scanner.rb:1123
msgid ""
"Launched hp-setup.\n"
"You must finish hp-setup before you can proceed with the scanner
configuration.\n"
@@ -1283,25 +1283,25 @@

#. where autodetected scanners are listed in the second column
#. to denote those scanners which are not configured yet:
-#: src/modules/Scanner.rb:1296
+#: src/modules/Scanner.rb:1294
msgid "Not Configured:"
msgstr "まだ設定されていません:"

#. Fallback device name if the real device name is missing:
#. Fallback device name if the real device name is missing:
-#: src/modules/Scanner.rb:1326 src/modules/Scanner.rb:2242
+#: src/modules/Scanner.rb:1324 src/modules/Scanner.rb:2216
msgid "Unknown device"
msgstr "不明なデバイス"

#. Fallback manufacturer name if the real manufacturer name is missing:
#. Fallback manufacturer name if the real manufacturer name is missing:
-#: src/modules/Scanner.rb:1332 src/modules/Scanner.rb:2230
+#: src/modules/Scanner.rb:1330 src/modules/Scanner.rb:2204
msgid "Unknown manufacturer"
msgstr "不明なメーカー"

#. Fallback model name if the real model name is missing:
#. Fallback model name if the real model name is missing:
-#: src/modules/Scanner.rb:1335 src/modules/Scanner.rb:2236
+#: src/modules/Scanner.rb:1333 src/modules/Scanner.rb:2210
msgid "Unknown model"
msgstr "不明なモデル"

@@ -1312,14 +1312,14 @@
#. %1 will be replaced by the manufacturer name
#. %2 will be replaced by the model name
#. %3 will be replaced by the device name where the scanner is connected to:
-#: src/modules/Scanner.rb:1360 src/modules/Scanner.rb:2225
+#: src/modules/Scanner.rb:1358 src/modules/Scanner.rb:2199
msgid "%1 %2 at %3"
msgstr "%1 %2 (%3)"

#. A suffix for the second column of a table
#. where active scanner drivers are listed in the first column
#. to denote those drivers for which there is no matching active scanner:
-#: src/modules/Scanner.rb:1402
+#: src/modules/Scanner.rb:1400
msgid "No scanner recognized by this driver"
msgstr "このドライバで認識されるスキャナがありません"

@@ -1327,12 +1327,12 @@
#. when neither a scanner was autodetected
#. nor an active scanner was found
#. nor an active driver was found:
-#: src/modules/Scanner.rb:1426
+#: src/modules/Scanner.rb:1424
msgid "No scanner was detected and no active scanner or driver exists."
msgstr "スキャナを検出できませんでした。有効なスキャナまたはドライバが存在しません。"

#. Scanner model list firmware entry for models which require a firmware
upload:
-#: src/modules/Scanner.rb:1455
+#: src/modules/Scanner.rb:1453
msgid "Firmware upload required."
msgstr "ファームウェアをアップロードする必要があります。"

@@ -1341,79 +1341,79 @@
#. Do not change or translate "Image Scan", it is a driver software name.
#. Do not change or translate "Avasys", it is a manufacturer name.
#. Do not change or translate "Epson", it is a manufacturer name.
-#: src/modules/Scanner.rb:1461
+#: src/modules/Scanner.rb:1459
msgid "Third-party Image Scan driver software from Epson/Avasys required."
msgstr "Epson/Avasysが提供するサードパーティ製のイメージスキャンドライバソフトウェアが必要です。"

#. %1 will be replaced by the RPM package name
#. which provides the driver for the particular model:
-#: src/modules/Scanner.rb:1527
+#: src/modules/Scanner.rb:1525
msgid "Package %1"
msgstr "パッケージ %1"

#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1548
+#: src/modules/Scanner.rb:1546
msgid "Unmaintained driver %1 may provide good functionality."
msgstr "メンテナンスされていないドライバ %1 は、優れた機能を提供している可能性があります。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1554
+#: src/modules/Scanner.rb:1552
msgid "Driver %1 should provide good functionality."
msgstr "ドライバ %1 は、優れた機能を提供しているはずです。"

#. Scanner model list status entry for "good" supported models:
-#: src/modules/Scanner.rb:1561
+#: src/modules/Scanner.rb:1559
msgid "This scanner is not supported."
msgstr "このスキャナはサポートされていません。"

#. which are listed as "unsupported" for a particular driver:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1566
+#: src/modules/Scanner.rb:1564
msgid "This scanner is not supported by the driver %1."
msgstr "このスキャナはドライバ %1 ではサポートされていません。"

#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1576
+#: src/modules/Scanner.rb:1574
msgid "Unmaintained driver %1 may provide complete functionality."
msgstr "メンテナンスされていないドライバ %1 は、完全な機能を提供している可能性があります。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1584
+#: src/modules/Scanner.rb:1582
msgid "Driver %1 should provide complete functionality."
msgstr "ドライバ %1 は完全な機能を提供しているはずです。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1592
+#: src/modules/Scanner.rb:1590
msgid "Driver %1 may work, but was not tested."
msgstr "ドライバ %1 はおそらく動作するものと思われますが、テストは行われていません。"

#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1601
+#: src/modules/Scanner.rb:1599
msgid "Unmaintained driver %1 may provide basic functionality."
msgstr "メンテナンスされていないドライバ %1 は、基本的な機能を提供している可能性があります。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1609
+#: src/modules/Scanner.rb:1607
msgid "Driver %1 should provide basic functionality."
msgstr "ドライバ %1 は基本的な機能を提供しているはずです。"

#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1619
+#: src/modules/Scanner.rb:1617
msgid "Unmaintained driver %1 may provide minimal functionality."
msgstr "メンテナンスされていないドライバ %1 は、最低限の機能を提供している可能性があります。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1627
+#: src/modules/Scanner.rb:1625
msgid "Driver %1 should provide minimal functionality."
msgstr "ドライバ %1 は最低限の機能を提供しているはずです。"

#. which are listed but without a known support status:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1635
+#: src/modules/Scanner.rb:1633
msgid "Driver %1 may work, but the functionality is unknown."
msgstr "ドライバ %1 はおそらく動作するものと思われますが、機能性は不明です。"

@@ -1423,7 +1423,7 @@
#. stored on the manufacturer's CD but often it is buried in a weird
Windows-only
#. driver archive format. The text must indicate this.
#. Do not change or translate "SANE", it is a project name.
-#: src/modules/Scanner.rb:1886
+#: src/modules/Scanner.rb:1884
msgid ""
"A firmware file contains software that must be uploaded to the scanner's
memory.\n"
"Without firmware, the scanner cannot work.\n"
@@ -1456,7 +1456,7 @@
#. Message of a Popup::ContinueCancel for scanners which should be set up with
the hpaio driver.
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "HPLIP", it is a subsystem name.
-#: src/modules/Scanner.rb:1905
+#: src/modules/Scanner.rb:1903
msgid ""
"There is at least one printer configuration that uses the ptal service.\n"
"It is possible to proceed but then the ptal service would be stopped\n"
@@ -1473,7 +1473,7 @@
#. Do not change or translate "PTAL", it is a subsystem name.
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "hplip", it is a service name.
-#: src/modules/Scanner.rb:1917
+#: src/modules/Scanner.rb:1915
msgid ""
"The hpoj driver requires the PTAL system to be set up and running.\n"
"In particular, the ptal service must be up and running.\n"
@@ -1513,7 +1513,7 @@
#. Do not change or translate "hplip", it is a service name.
#. Do not change or translate "hpaio", it is a driver name.
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:1940
+#: src/modules/Scanner.rb:1938
msgid ""
"There is at least one printer configuration that uses the hplip service.\n"
"It is possible to proceed but then the hplip service would be stopped\n"
@@ -1530,51 +1530,51 @@
"または、このまま継続し、ptalサービスを使用するようにプリンタの設定を変更してください。\n"

#. %1 will be replaced by the backend name
-#: src/modules/Scanner.rb:1976
+#: src/modules/Scanner.rb:1974
msgid "Setting Up Driver %1"
msgstr "ドライバ %1 の設定"

-#: src/modules/Scanner.rb:1980
+#: src/modules/Scanner.rb:1978
msgid "Check whether additional packages must be installed"
msgstr "さらにパッケージをインストールする必要があるかどうかのチェック"

#. 2. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1982
+#: src/modules/Scanner.rb:1980
msgid "Check whether firmware upload is required"
msgstr "ファームウェアのアップロードが必要かどうかのチェック"

#. 3. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1984
+#: src/modules/Scanner.rb:1982
msgid "Test and set up special requirements for particular drivers"
msgstr "特定のドライバに対する特別な必要条件のテストと設定"

#. 4. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1986
+#: src/modules/Scanner.rb:1984
msgid "Activate the driver"
msgstr "ドライバを有効にする"

#. 1. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1991
+#: src/modules/Scanner.rb:1989
msgid "Checking whether additional packages must be installed..."
msgstr "さらにパッケージをインストールする必要があるかをチェックしています..."

#. 2. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:1993
+#: src/modules/Scanner.rb:1991
msgid "Checking whether firmware upload is required..."
msgstr "ファームウェアをアップロードする必要があるかをチェックしています..."

#. 3. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:1995
+#: src/modules/Scanner.rb:1993
msgid "Testing and setting up special requirements for particular drivers..."
msgstr "特定のドライバに対する特別な必要条件をテストし、設定しています..."

#. 4. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:1999
+#: src/modules/Scanner.rb:1997
msgid "Activating the driver..."
msgstr "ドライバを有効にしています..."

#. the third-party Image Scan driver software from Epson/Avasys:
-#: src/modules/Scanner.rb:2020
+#: src/modules/Scanner.rb:2018
msgid "Required Package Not Installed"
msgstr "必要なパッケージがインストールされていません"

@@ -1584,7 +1584,7 @@
#. Only a simple message because before there was a dialog
#. which let the user install the package so that this message is shown
#. if the user has explicitly rejected to install it.
-#: src/modules/Scanner.rb:2028
+#: src/modules/Scanner.rb:2026
msgid "The driver %1 requires the package %2."
msgstr "ドライバ%1にはパッケージ%2が必要です。"

@@ -1592,9 +1592,8 @@
#. It may happen that the conflicting service hplip is in use by the printing
system.
#. The hplip service is associated with the hpaoi backend.
#. Activate the backend via bash script:
-#: src/modules/Scanner.rb:2034 src/modules/Scanner.rb:2075
-#: src/modules/Scanner.rb:2119 src/modules/Scanner.rb:2133
-#: src/modules/Scanner.rb:2143
+#: src/modules/Scanner.rb:2032 src/modules/Scanner.rb:2073
+#: src/modules/Scanner.rb:2106 src/modules/Scanner.rb:2117
msgid "Aborted"
msgstr "中止されました"

@@ -1606,7 +1605,7 @@
#. because which scanner requires firmware upload is stored in the database
#. and additionally user confirmation must be requested.
#. Otherwise skip this section.
-#: src/modules/Scanner.rb:2054
+#: src/modules/Scanner.rb:2052
msgid "Firmware Upload Required"
msgstr "ファームウェアをアップロードする必要があります"

@@ -1615,19 +1614,12 @@
#. which asked the user whether he wants to let YaST activate the ptal service
#. so that this message is shown if the user has explicitly rejected to do it.
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:2109
+#: src/modules/Scanner.rb:2096
msgid "If the ptal service is not running, the scanner cannot work."
msgstr "ptalサービスが実行されていない場合、スキャナは動作しません。"

-#. Only a simple message because this error does not happen on a normal system
-#. (i.e. a system which is not totally broken or totally messed up).
-#. Do not change or translate "PTAL", it is a subsystem name.
-#: src/modules/Scanner.rb:2130
-msgid "Failed to set up the PTAL system."
-msgstr "PTALシステムの設定に失敗しました。"
-
#. Header message for a list of scanners which will be deactivated:
-#: src/modules/Scanner.rb:2217
+#: src/modules/Scanner.rb:2191
msgid ""
"The following scanners use the same driver.\n"
"Therefore all those scanners will be deactivated:"
@@ -1642,49 +1634,49 @@
#. Do not change or translate "hpoj", it is a driver name.
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "CUPS", it is a subsystem name.
-#: src/modules/Scanner.rb:2285
+#: src/modules/Scanner.rb:2259
msgid "The driver hpoj is deactivated but the associated service ptal is not
deactivated because it is needed by the CUPS printing system."
msgstr "ドライバhpojは無効になりますが、関連するptalサービスは、CUPS印刷システムで必要なため無効になりません。"

#. (i.e. a system which is not totally broken or totally messed up).
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:2300
+#: src/modules/Scanner.rb:2274
msgid "Failed to stop the ptal service."
msgstr "ptalサービスを停止できませんでした。"

#. (i.e. a system which is not totally broken or totally messed up).
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:2311
+#: src/modules/Scanner.rb:2285
msgid "Failed to disable the ptal service."
msgstr "ptalサービスを無効にすることができませんでした。"

#. If there is no active scanner for the backend
#. then show a message but exit successfully because
#. it is no error when there is no active scanner for the backend:
-#: src/modules/Scanner.rb:2370
+#: src/modules/Scanner.rb:2344
msgid "No Scanner for %1"
msgstr "%1のスキャナがありません"

#. Header of a Popup::AnyMessage where %1 will be replaced by the driver name:
#. Body of a Popup::AnyMessage:
-#: src/modules/Scanner.rb:2372
+#: src/modules/Scanner.rb:2346
msgid "It is not possible to test without a matching active scanner."
msgstr "対応するアクティブなスキャナがなければ、テストできません。"

#. Header of a SelectionBox with a list of scanners:
-#: src/modules/Scanner.rb:2387
+#: src/modules/Scanner.rb:2361
msgid "&Scanner to Test"
msgstr "テストするスキャナ(&S)"

#. Test the device:
-#: src/modules/Scanner.rb:2409
+#: src/modules/Scanner.rb:2383
msgid "Testing %1"
msgstr "%1のテスト中"

#. Header of a Popup::ShowFeedback where %1 will be replaced by the driver
name:
#. Body of a Popup::ShowFeedback where %1 will be replaced by the SANE device
identifier.
#. Do not change or translate "scanimage -d %1 -v", it is a fixed command.
-#: src/modules/Scanner.rb:2412
+#: src/modules/Scanner.rb:2386
msgid "Testing with 'scanimage -d %1 -v'..."
msgstr "「scanimage -d %1 -v」コマンドを使用してテストしています..."

@@ -1692,7 +1684,7 @@
#. %2 will be replaced by the actual test results
#. which are usually only available in English.
#. Do not change or translate "scanimage -d %1 -v", it is a fixed command.
-#: src/modules/Scanner.rb:2424
+#: src/modules/Scanner.rb:2398
msgid ""
"Test with 'scanimage -d %1 -v' failed.\n"
"The results are:\n"
@@ -1706,7 +1698,7 @@

#. Fallback message if the real results are missing:
#. Fallback message if the real results are missing:
-#: src/modules/Scanner.rb:2435 src/modules/Scanner.rb:2467
+#: src/modules/Scanner.rb:2409 src/modules/Scanner.rb:2441
msgid "(no results available)"
msgstr "(使用可能な結果はありません)"

@@ -1716,7 +1708,7 @@
#. the scanner had fallen into coma or the USB or SCSI system had crashed
#. and then the scanner would be no longer an active scanner nor could it be
autodetected.
#. To simulate such an event, simply unplug an USB scanner while it is being
tested.
-#: src/modules/Scanner.rb:2450
+#: src/modules/Scanner.rb:2424
msgid "Successfully Tested %1"
msgstr "%1のテストは成功しました"

@@ -1724,7 +1716,7 @@
#. %2 will be replaced by the actual test results
#. which are usually only available in English.
#. Do not change or translate "scanimage -d %1 -v", it is a fixed command.
-#: src/modules/Scanner.rb:2456
+#: src/modules/Scanner.rb:2430
msgid ""
"Test with 'scanimage -d %1 -v' succeeded.\n"
"The results are:\n"
@@ -1740,7 +1732,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no scanning via network was
configured.
#. The latter results no error.
-#: src/modules/Scanner.rb:2486
+#: src/modules/Scanner.rb:2460
msgid "Failed to determine the configuration for scanning via network."
msgstr "ネットワーク経由でのスキャンの設定の検出に失敗しました。"

@@ -1748,7 +1740,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no scanning via network is to
be set up.
#. The latter results no error.
-#: src/modules/Scanner.rb:2562
+#: src/modules/Scanner.rb:2536
msgid "Failed to set up scanning via network."
msgstr "ネットワーク経由でのスキャナの設定に失敗しました。"

@@ -1763,11 +1755,14 @@
#. If any kind of firewall seems to be active, show a popup message
#. regarding scanning via network and firewall.
#. @return true if any kind of firewall seems to be active
-#: src/modules/Scanner.rb:2590
+#: src/modules/Scanner.rb:2564
msgid "Check that your firewall allows scanning via network."
msgstr "ファイアウォール設定で、ネットワーク経由でのスキャンが許可されていることを確認してください。"

#. Popup::MessageDetails information regarding details:
-#: src/modules/Scanner.rb:2592
+#: src/modules/Scanner.rb:2566
msgid "For details regarding firewall see the help text of this dialog."
msgstr "ファイアウォールの詳細については、このダイアログのヘルプテキストを参照してください。"
+
+#~ msgid "Failed to set up the PTAL system."
+#~ msgstr "PTALシステムの設定に失敗しました。"

Modified: branches/SLE12-SP3/yast/ja/po/smt.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/smt.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/smt.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: smt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-04 17:26+0000\n"
+"POT-Creation-Date: 2017-05-22 12:57+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -646,6 +646,19 @@
msgid "Writing patches..."
msgstr "パッチを書き込んでいます..."

+#. bnc #390085
+#: src/include/smt/dialogs.rb:1129
+#, fuzzy
+#| msgid "Database &Password"
+msgid "Database Password for %1 User"
+msgstr "データベースパスワード(&P)"
+
+#: src/include/smt/dialogs.rb:1137
+#, fuzzy
+#| msgid "P&assword for user (again)"
+msgid "Database Password for %1 User Once Again"
+msgstr "ユーザのパスワード(確認用)(&A)"
+
#. TRANSLATORS: error report
#: src/include/smt/dialogs.rb:1167 src/modules/SMTData.rb:1130
msgid "The first and the second password do not match."

Modified: branches/SLE12-SP3/yast/ja/po/storage.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/storage.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/storage.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: storage\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-03 01:29+0000\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -71,7 +71,7 @@
msgid "List partitions"
msgstr "パーティションのリストを表示します"

-#. Title for dialogue
+#. Title for dialog
#: src/clients/inst_disk_proposal.rb:76
msgid "Suggested Partitioning"
msgstr "推奨されたパーティション分割"
@@ -88,7 +88,7 @@

#. popup text
#: src/clients/inst_disk_proposal.rb:123
-#: src/clients/partitions_proposal.rb:105
+#: src/clients/partitions_proposal.rb:115
msgid ""
"No automatic proposal possible.\n"
"Specify mount points manually in the 'Partitioner' dialog."
@@ -97,16 +97,14 @@
"パーティショナのダイアログで、マウントポイントを手動で指定してください。"

#. TRANSLATORS: button text
-#. this is the resize case
-#.
-#. this is the normal case
-#: src/clients/inst_disk_proposal.rb:135 src/clients/inst_target_part.rb:164
-#: src/clients/inst_target_part.rb:178 src/clients/inst_target_part.rb:185
+#. Return a term for a PushButton("Edit Proposal Settings")
+#. or Empty() if that button is disabled in control.xml.
+#: src/clients/inst_disk_proposal.rb:136 src/clients/inst_target_part.rb:500
msgid "Edit Proposal Settings"
msgstr "推奨設定の編集"

#. help on suggested partitioning
-#: src/clients/inst_disk_proposal.rb:165
+#: src/clients/inst_disk_proposal.rb:166
msgid ""
"<p>\n"
"Your hard disks have been checked. The partition setup\n"
@@ -118,7 +116,7 @@

#. help text continued
#. %1 is replaced by button text
-#: src/clients/inst_disk_proposal.rb:175
+#: src/clients/inst_disk_proposal.rb:176
msgid ""
"<p>\n"
"To make only small adjustments to the proposed\n"
@@ -132,7 +130,7 @@
"ダイアログ内で変更を行なってください。</p>\n"

#. help text continued
-#: src/clients/inst_disk_proposal.rb:188
+#: src/clients/inst_disk_proposal.rb:189
msgid ""
"<p>\n"
"If the suggestion does not fit your needs, create\n"
@@ -152,25 +150,25 @@

#. Attention! besides the testsuite, AutoYaST is using this to turn off
#. the proposal screen too. See inst_autosetup.ycp
-#: src/clients/inst_disk_proposal.rb:232
+#: src/clients/inst_disk_proposal.rb:233
msgid "Impossible to create the requested proposal."
msgstr "要求した提案を作成することができません。"

#. TRANSLATORS: popup error message
-#: src/clients/inst_disk_proposal.rb:238
+#: src/clients/inst_disk_proposal.rb:239
msgid "Not enough space available to propose snapshots for root volume."
msgstr "ルートボリュームのスナップショットを提案するための空き領域が不足しています。"

#. TRANSLATORS: popup error message
-#: src/clients/inst_disk_proposal.rb:244 src/clients/inst_target_part.rb:449
+#: src/clients/inst_disk_proposal.rb:245 src/clients/inst_target_part.rb:449
msgid "Not enough space available to propose separate /home."
msgstr "独立した/homeを作成するための空き領域が不足しています。"

-#: src/clients/inst_disk_proposal.rb:283
+#: src/clients/inst_disk_proposal.rb:284
msgid "Nothing assigned as root filesystem. Cannot continue."
msgstr "ルートファイルシステムの割り当てがありません。続行できません。"

-#: src/clients/inst_disk_proposal.rb:304
+#: src/clients/inst_disk_proposal.rb:305
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -637,12 +635,12 @@
#. loop over targetMap and build radio buttons for selection
#. dont use foreach here since we need a counter (as a shortcut)
#. anyway
-#: src/clients/inst_target_selection.rb:115
+#: src/clients/inst_target_selection.rb:116
msgid "Available &Disks"
msgstr "使用可能なディスク(&D)"

#. label text
-#: src/clients/inst_target_selection.rb:149
+#: src/clients/inst_target_selection.rb:150
msgid "&Custom Partitioning (for experts)"
msgstr "カスタムパーティション(&C) - エキスパート用"

@@ -650,13 +648,13 @@
#. Below this label, all targets are listed that can be used as
#. installation target
#. heading text
-#: src/clients/inst_target_selection.rb:161
+#: src/clients/inst_target_selection.rb:162
msgid "Hard Disk"
msgstr "ハードディスク"

#. normally the target is located on hard disks. Here no hard disks
#. can be found. YaST2 cannot install. Update CD might have newer drivers.
-#: src/clients/inst_target_selection.rb:172
+#: src/clients/inst_target_selection.rb:173
msgid "No disks found. Try using the update CD, if available, for
installation."
msgstr "ディスクが見つかりません。 利用できる場合は、インストール用のアップデートCDを使用してください。"

@@ -665,7 +663,7 @@
#. "Preparing Hard Disk" is the description of the dialog what to
#. do while the following locale is the help description
#. help part 1 of 3
-#: src/clients/inst_target_selection.rb:184
+#: src/clients/inst_target_selection.rb:185
msgid ""
"<p>\n"
"All hard disks automatically detected on your system\n"
@@ -678,7 +676,7 @@
"</p>\n"

#. help part 2 of 3
-#: src/clients/inst_target_selection.rb:193
+#: src/clients/inst_target_selection.rb:194
msgid ""
"<p>\n"
"You may select later which part of the disk is used for &product;.\n"
@@ -689,7 +687,7 @@
"</p>\n"

#. help part 3 of 3
-#: src/clients/inst_target_selection.rb:202
+#: src/clients/inst_target_selection.rb:203
msgid ""
"\n"
"<p>\n"
@@ -708,7 +706,7 @@
#. first step of hd prepare, select a single disk or "expert" partitioning
#. Information what to do, background information
#. Information what to do, background information
-#: src/clients/inst_target_selection.rb:215
+#: src/clients/inst_target_selection.rb:216
#: src/include/partitioning/auto_part_ui.rb:244
#: src/include/partitioning/auto_part_ui.rb:302
msgid "Preparing Hard Disk"
@@ -716,14 +714,24 @@

#. there is a selection from which one option must be
#. chosen - at the moment no option is chosen
-#: src/clients/inst_target_selection.rb:271
+#: src/clients/inst_target_selection.rb:269
msgid "Select one of the options to continue."
msgstr "続行するには、オプションを1つ選択してください。"

-#: src/clients/inst_target_selection.rb:297
+#: src/clients/inst_target_selection.rb:295
msgid "Disk %1 is in use by %2"
msgstr "ディスク %1 は %2 が使用中です"

+#. Warning popup about using the expert partitioner
+#: src/clients/inst_target_selection.rb:352
+msgid ""
+"This is for experts only.\n"
+"You might lose support if you use this!\n"
+"\n"
+"Please refer to the manual to make sure your custom\n"
+"partitioning meets the requirements of this product."
+msgstr ""
+
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -781,19 +789,35 @@
#. See also file proposal-API.txt for details.
#: src/clients/partitions_proposal.rb:93
msgid ""
+"No snapshots possible.\n"
+"Please use larger root partition."
+msgstr ""
+
+#: src/clients/partitions_proposal.rb:105
+msgid ""
"The /home partition will not be formatted. After installation,\n"
"ensure that ownerships of home directories are set properly."
msgstr ""
"/homeパーティションはフォーマットされません。インストール後、\n"
"ホームディレクトリの所有権が正しく設定されているかどうか、ご確認ください。"

+#. A custom configuration
+#: src/clients/partitions_proposal.rb:123
+msgid "Custom"
+msgstr "カスタム設定"
+
+#. A standard configuration
+#: src/clients/partitions_proposal.rb:126
+msgid "Standard"
+msgstr "標準"
+
#. label text
-#: src/clients/partitions_proposal.rb:218
+#: src/clients/partitions_proposal.rb:239
msgid "Partitioning"
msgstr "パーティション分割"

#. label text
-#: src/clients/partitions_proposal.rb:220
+#: src/clients/partitions_proposal.rb:241
msgid "&Partitioning"
msgstr "パーティション分割(&P)"

@@ -959,7 +983,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6272
+#: src/modules/StorageProposal.rb:6295
msgid "Propose Separate &Home Partition"
msgstr "ホームパーティションの分離の提案(&H)"

@@ -977,7 +1001,7 @@
msgstr "提案タイプ"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:244
+#: src/include/partitioning/custom_part_check_generated.rb:248
msgid ""
"You have not assigned a root partition for\n"
"installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -992,7 +1016,7 @@
"本当にこの設定のままでよろしいですか?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:257
+#: src/include/partitioning/custom_part_check_generated.rb:261
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
"points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n"
@@ -1007,7 +1031,7 @@
"本当にこの設定のままでよろしいですか?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:270
+#: src/include/partitioning/custom_part_check_generated.rb:274
msgid ""
"You tried to mount a FAT partition to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1022,7 +1046,7 @@
"本当にこの設定のままでよろしいですか?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:284
+#: src/include/partitioning/custom_part_check_generated.rb:288
msgid ""
"You have mounted a partition with Btrfs to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1038,7 +1062,7 @@

#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
#. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:298
+#: src/include/partitioning/custom_part_check_generated.rb:302
msgid ""
"Warning:\n"
"Your system needs a boot partition, either with type 0x41 PReP/CHRP\n"
@@ -1055,7 +1079,7 @@
"この設定を使用しますか?\n"

#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:314
+#: src/include/partitioning/custom_part_check_generated.rb:318
msgid ""
"Warning:\n"
"Your boot partition ends above cylinder %1.\n"
@@ -1076,13 +1100,20 @@
"本当にこの設定のままでよろしいですか?\n"

#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:334
+#: src/include/partitioning/custom_part_check_generated.rb:338
+#, fuzzy
+#| msgid ""
+#| "Warning:\n"
+#| "Your boot partition is smaller than %1.\n"
+#| "We recommend to increase the size of /boot.\n"
+#| "\n"
+#| "Really keep this size of boot partition?\n"
msgid ""
"Warning:\n"
"Your boot partition is smaller than %1.\n"
"We recommend to increase the size of /boot.\n"
"\n"
-"Really keep this size of boot partition?\n"
+"Really keep this size of the boot partition?\n"
msgstr ""
"警告:\n"
"起動パーティションが %1 未満です。\n"
@@ -1091,7 +1122,7 @@
"このままのサイズ設定でよろしいですか?\n"

#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:351
+#: src/include/partitioning/custom_part_check_generated.rb:355
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1108,7 +1139,7 @@
#. popup text
#. If the user chooses 'no' here, the system will not be able to
#. boot from the hard drive!
-#: src/include/partitioning/custom_part_check_generated.rb:371
+#: src/include/partitioning/custom_part_check_generated.rb:375
msgid ""
"Warning: There is no partition mounted as /boot.\n"
"To boot from your hard disk, a small /boot partition\n"
@@ -1127,7 +1158,7 @@
"/bootパーティションなしの設定を使用しますか?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:391
+#: src/include/partitioning/custom_part_check_generated.rb:395
msgid ""
"Warning: According to your setup, you intend to\n"
"boot your machine from the root partition (/), which, unfortunately,\n"
@@ -1147,7 +1178,7 @@
"\n"
"本当にこの設定のままでよろしいですか?\n"

-#: src/include/partitioning/custom_part_check_generated.rb:417
+#: src/include/partitioning/custom_part_check_generated.rb:421
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
@@ -1160,7 +1191,7 @@
"この設定のまま使用しますか?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:435
+#: src/include/partitioning/custom_part_check_generated.rb:441
msgid ""
"Warning: With your current setup, your %1\n"
"installation might not be directly bootable, because\n"
@@ -1177,7 +1208,7 @@
"本当にこの設定のままでよろしいですか\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:453
+#: src/include/partitioning/custom_part_check_generated.rb:459
msgid ""
"Warning: With your current setup, your %2 installation\n"
"will encounter problems when booting, because you have no\n"
@@ -1202,7 +1233,7 @@
"この設定のままでよろしいですか?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:475
+#: src/include/partitioning/custom_part_check_generated.rb:481
msgid ""
"Warning: With your current setup, your %2 installation will\n"
"encounter problems when booting, because you have no \n"
@@ -1227,12 +1258,12 @@
"この設定のままでよろしいですか?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:498
+#: src/include/partitioning/custom_part_check_generated.rb:504
msgid "Really use this setup?"
msgstr "本当にこの設定のままでよろしいですか"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:506
+#: src/include/partitioning/custom_part_check_generated.rb:512
msgid ""
"\n"
"You have not assigned a swap partition. In most cases, we highly recommend \n"
@@ -1253,7 +1284,7 @@
"スワップパーティションを設定しないままでよろしいですか?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:522
+#: src/include/partitioning/custom_part_check_generated.rb:528
msgid ""
"\n"
"You chose to install onto an existing partition that will not be\n"
@@ -1266,7 +1297,7 @@
"特に以下の場合で失敗する可能性があります:\n"

#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:529
+#: src/include/partitioning/custom_part_check_generated.rb:535
msgid ""
"- if this is an existing ReiserFS partition\n"
"- if this partition already contains a Linux distribution that will be\n"
@@ -1279,7 +1310,7 @@
"- このパーティションに、まだファイルシステムが作成されていない場合\n"

#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:536
+#: src/include/partitioning/custom_part_check_generated.rb:542
msgid ""
"If in doubt, better go back and mark this partition for\n"
"formatting, especially if it is assigned to one of the standard mount
points\n"
@@ -1290,7 +1321,7 @@
"いずれかである場合は、注意してください。\n"

#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:542
+#: src/include/partitioning/custom_part_check_generated.rb:548
msgid ""
"If you decide to format the partition, all data on it will be lost.\n"
"\n"
@@ -1301,7 +1332,7 @@
"フォーマットしないままでよろしいですか?\n"

#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:603
+#: src/include/partitioning/custom_part_check_generated.rb:609
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1310,7 +1341,7 @@
"このデバイスを編集する場合は、先にRAIDから削除してください。\n"

#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:614
+#: src/include/partitioning/custom_part_check_generated.rb:620
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1319,7 +1350,7 @@
"このデバイスを編集する場合は、先にボリュームグループから削除してください。\n"

#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:624
+#: src/include/partitioning/custom_part_check_generated.rb:630
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1328,7 +1359,7 @@
"このデバイスを編集する場合は、先にボリュームから削除してください。\n"

#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:657
+#: src/include/partitioning/custom_part_check_generated.rb:663
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1337,7 +1368,7 @@
"このデバイスを削除する場合は、先にRAIDから削除してください。\n"

#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:668
+#: src/include/partitioning/custom_part_check_generated.rb:674
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1345,12 +1376,12 @@
"デバイス(%2)は %1 で使用されています。\n"
"このデバイスを削除する場合は、先に %1 を削除してください。\n"

-#: src/include/partitioning/custom_part_check_generated.rb:680
+#: src/include/partitioning/custom_part_check_generated.rb:686
msgid "It cannot be deleted while mounted."
msgstr "マウントされている場合は削除することができません。"

#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:716
+#: src/include/partitioning/custom_part_check_generated.rb:722
msgid ""
"The device (%1) cannot be removed since it is a logical partition and \n"
"another logical partition with a higher number is in use.\n"
@@ -1360,7 +1391,7 @@
"使用中であるため、削除できません。\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:792
+#: src/include/partitioning/custom_part_check_generated.rb:798
msgid ""
"The selected extended partition contains partitions which are currently
mounted:\n"
"%1\n"
@@ -1373,7 +1404,7 @@
"何らかの特別な事情がない限り、[キャンセル]を押してください。\n"

#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:810
+#: src/include/partitioning/custom_part_check_generated.rb:816
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1388,7 +1419,7 @@
"削除してください。\n"

#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:821
+#: src/include/partitioning/custom_part_check_generated.rb:827
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1403,7 +1434,7 @@
"拡張パーティションを削除してください。\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:832
+#: src/include/partitioning/custom_part_check_generated.rb:838
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1415,6 +1446,30 @@
"含まれています。 使用されているボリュームを削除してから、\n"
"拡張パーティションを削除してください。\n"

+#. popup text, %1 is a size
+#: src/include/partitioning/custom_part_check_generated.rb:905
+#, fuzzy
+#| msgid ""
+#| "Warning:\n"
+#| "Your boot partition is smaller than %1.\n"
+#| "We recommend to increase the size of /boot.\n"
+#| "\n"
+#| "Really keep this size of boot partition?\n"
+msgid ""
+"Warning:\n"
+"\n"
+"Your root partition is very small for snapshots.\n"
+"We recommend to increase the size of the root partition\n"
+"to %1 or more or to disable snapshots.\n"
+"\n"
+"Really keep the current setup?\n"
+msgstr ""
+"警告:\n"
+"起動パーティションが %1 未満です。\n"
+"/boot のサイズを増やすことをお勧めします。\n"
+"\n"
+"このままのサイズ設定でよろしいですか?\n"
+
#. heading text
#: src/include/partitioning/custom_part_dialogs.rb:70
msgid "Enter your Password for the Encrypted File System."
@@ -1422,13 +1477,13 @@

#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:806
-#: src/modules/StorageProposal.rb:6400
+#: src/include/partitioning/ep-dialogs.rb:805
+#: src/modules/StorageProposal.rb:6423
msgid "Do not forget what you enter here!"
msgstr "ここで入力した内容を忘れないようにしてください。"

#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:809
+#: src/include/partitioning/ep-dialogs.rb:808
msgid "Empty password allowed."
msgstr "パスワードを指定しなくてもかまいません。"

@@ -1457,7 +1512,7 @@
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:834
+#: src/include/partitioning/ep-dialogs.rb:833
msgid "&Enter a Password for your File System:"
msgstr "ファイルシステムのパスワードを入力してください(&E):"

@@ -1468,7 +1523,7 @@
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:147
-#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4007
+#: src/include/partitioning/ep-dialogs.rb:817 src/modules/Storage.rb:4002
msgid "Reenter the Password for &Verification:"
msgstr "確認のため、再度パスワードを入力してください(&V):"

@@ -1491,7 +1546,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3963
+#: src/modules/Storage.rb:3958
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1502,7 +1557,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3971
+#: src/modules/Storage.rb:3966
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1622,47 +1677,54 @@
msgstr "ファイルシステム(&S)"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1053
+#: src/include/partitioning/custom_part_dialogs.rb:1059
msgid "O&ptions..."
msgstr "オプション(&P)..."

+#. Translators: checkbox text
+#. TRANSLATORS: checkbox text
+#: src/include/partitioning/custom_part_dialogs.rb:1069
+#: src/modules/StorageProposal.rb:6276
+msgid "Enable Snapshots"
+msgstr "スナップショットを有効にする"
+
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1069
+#: src/include/partitioning/custom_part_dialogs.rb:1084
msgid "&Encrypt Device"
msgstr "デバイスの暗号化(&E)"

#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1144
+#: src/include/partitioning/custom_part_dialogs.rb:1159
msgid "File system &ID:"
msgstr "ファイルシステムID(&I): "

#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1176
+#: src/include/partitioning/custom_part_dialogs.rb:1191
msgid "Format"
msgstr "フォーマット"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1186
+#: src/include/partitioning/custom_part_dialogs.rb:1201
msgid "Do &not format"
msgstr "フォーマットしない(&N)"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1196
+#: src/include/partitioning/custom_part_dialogs.rb:1211
msgid "&Format"
msgstr "フォーマット(&F)"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1249
+#: src/include/partitioning/custom_part_dialogs.rb:1264
msgid "Fs&tab Options"
msgstr "Fstabオプション(&T)"

#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1256
+#: src/include/partitioning/custom_part_dialogs.rb:1271
msgid "&Mount Point"
msgstr "マウントポイント(&M)"

#. popup text %1 is a partition name, %2 a dirctory
-#: src/include/partitioning/custom_part_dialogs.rb:1268
+#: src/include/partitioning/custom_part_dialogs.rb:1283
msgid ""
"\n"
"The selected partition (%1) is currently mounted on %2.\n"
@@ -1687,7 +1749,7 @@
"続行しますか?\n"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1297
+#: src/include/partitioning/custom_part_dialogs.rb:1312
msgid ""
"\n"
"The file system on the partition cannot be shrunk by YaST2.\n"
@@ -1698,7 +1760,7 @@
"YaST2で縮小できるのはFAT、ext2、ext3、ext4、およびreiserfsの各ファイルシステムだけです。"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1304
+#: src/include/partitioning/custom_part_dialogs.rb:1319
msgid ""
"\n"
"The file system on the logical volume cannot be shrunk by YaST2.\n"
@@ -1709,21 +1771,21 @@
"YaST2で縮小できるのはFAT、ext2、ext3、ext4、およびreiserfsの各ファイルシステムだけです。"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1316
+#: src/include/partitioning/custom_part_dialogs.rb:1331
msgid "You risk losing data if you shrink this partition."
msgstr "このパーティションを縮小するとデータを損失してしまう危険があります。"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1322
+#: src/include/partitioning/custom_part_dialogs.rb:1337
msgid "You risk losing data if you shrink this logical volume."
msgstr "この論理ボリュームを縮小するとデータを損失してしまう危険があります。"

-#: src/include/partitioning/custom_part_dialogs.rb:1326
+#: src/include/partitioning/custom_part_dialogs.rb:1341
msgid "Continue?"
msgstr "続行しますか?"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1342
+#: src/include/partitioning/custom_part_dialogs.rb:1357
msgid ""
"\n"
"The file system on the selected partition cannot be extended by YaST2.\n"
@@ -1734,7 +1796,7 @@
"YaST2で拡張できるのはFAT、ext2、ext3、ext4、xfs、およびreiserfsの各ファイルシステムだけです。"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1349
+#: src/include/partitioning/custom_part_dialogs.rb:1364
msgid ""
"\n"
"The file system on the selected logical volume cannot be extended by YaST2.\n"
@@ -1744,20 +1806,20 @@
"YaST2では選択した論理ボリュームのファイルシステムを拡張できません。\n"
"YaST2で拡張できるのはFAT、ext2、ext3、ext4、xfs、およびreiserfsの各ファイルシステムだけです。"

-#: src/include/partitioning/custom_part_dialogs.rb:1357
+#: src/include/partitioning/custom_part_dialogs.rb:1372
msgid "Continue resizing?"
msgstr "サイズ変更を続行しますか?"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1374
+#: src/include/partitioning/custom_part_dialogs.rb:1389
msgid "You decreased a partition with a reiser file system on it."
msgstr "reiserfs ファイルシステムが利用されているパーティションを縮小しようとしています。"

-#: src/include/partitioning/custom_part_dialogs.rb:1376
+#: src/include/partitioning/custom_part_dialogs.rb:1391
msgid "You decreased a logical volume with a reiser file system on it."
msgstr "reiserfs ファイルシステムが利用されている論理ボリュームを縮小しようとしています。"

-#: src/include/partitioning/custom_part_dialogs.rb:1383
+#: src/include/partitioning/custom_part_dialogs.rb:1398
msgid ""
"\n"
"It is possible to shrink a reiser file system, but this feature is not\n"
@@ -1772,7 +1834,7 @@
"今すぐサイズを縮小しますか?"

#. popup text, %1 is replaced by device name
-#: src/include/partitioning/custom_part_dialogs.rb:1437
+#: src/include/partitioning/custom_part_dialogs.rb:1452
msgid ""
"The selected device contains partitions that are currently mounted:\n"
"%1\n"
@@ -1785,7 +1847,7 @@
"また、特別な事情がない限り、[キャンセル]を押してください。\n"

#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_dialogs.rb:1460
+#: src/include/partitioning/custom_part_dialogs.rb:1475
msgid ""
"\n"
"The selected device contains at least one LVM partition\n"
@@ -1800,7 +1862,7 @@
"取り除いてください。\n"

#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_dialogs.rb:1471
+#: src/include/partitioning/custom_part_dialogs.rb:1486
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -1815,7 +1877,7 @@
"取り除いてください。\n"

#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1482
+#: src/include/partitioning/custom_part_dialogs.rb:1497
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -1828,47 +1890,40 @@
"ボリュームを削除してください。\n"

#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:1543
+#: src/include/partitioning/custom_part_dialogs.rb:1558
msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n"
msgstr "<p>btrfsファイルシステムからサブボリュームを作成および削除します。</p>\n"

-#: src/include/partitioning/custom_part_dialogs.rb:1548
+#: src/include/partitioning/custom_part_dialogs.rb:1563
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:1562
+#: src/include/partitioning/custom_part_dialogs.rb:1577
msgid "Existing Subvolumes:"
msgstr "既存のサブボリューム:"

#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1568
+#: src/include/partitioning/custom_part_dialogs.rb:1583
msgid "New Subvolume"
msgstr "新しいサブボリューム"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1574
+#: src/include/partitioning/custom_part_dialogs.rb:1589
msgid "Add new"
msgstr "新規追加"

#. button text
#. push button text
-#: src/include/partitioning/custom_part_dialogs.rb:1580
+#: src/include/partitioning/custom_part_dialogs.rb:1595
#: src/modules/DualMultiSelectionBox.rb:147
msgid "Remove"
msgstr "削除"

-#. TRANSLATOR: checkbox text
-#. TRANSLATORS: checkbox text
-#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6253
-msgid "Enable Snapshots"
-msgstr "スナップショットを有効にする"
-
#. heading text
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1603
-#: src/include/partitioning/custom_part_lib.rb:409
+#: src/include/partitioning/custom_part_dialogs.rb:1605
+#: src/include/partitioning/custom_part_lib.rb:386
msgid "Subvolume Handling"
msgstr "サブボリュームの処理"

@@ -1888,7 +1943,7 @@
msgid "Subvolume name %1 already exists."
msgstr "サブボリューム名 %1 はすでに存在します。"

-#: src/include/partitioning/custom_part_dialogs.rb:1711
+#: src/include/partitioning/custom_part_dialogs.rb:1702
msgid "Modifications done so far in this dialog will be lost."
msgstr "このダイアログ内での変更点は失われてしまいます。"

@@ -1931,7 +1986,7 @@

#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:746
+#: src/include/partitioning/ep-dialogs.rb:745
msgid ""
"<p>\n"
"This mount point corresponds to a temporary filesystem like /tmp or
/var/tmp.\n"
@@ -1950,7 +2005,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:761
+#: src/include/partitioning/ep-dialogs.rb:760
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file
system.\n"
@@ -1969,7 +2024,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:775
+#: src/include/partitioning/ep-dialogs.rb:774
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have
at\n"
@@ -2000,7 +2055,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:787
+#: src/include/partitioning/ep-dialogs.rb:786
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -2071,17 +2126,17 @@
"このディスク上のすべてのパーティションに削除対象マークを付ける必要があります。\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:51
+#: src/include/partitioning/custom_part_lib.rb:50
msgid "You cannot use the mount point \"%1\" for LVM.\n"
msgstr "LVMにマウントポイント「%1」は使用できません。\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:78
+#: src/include/partitioning/custom_part_lib.rb:77
msgid "You cannot use the mount point %1 for RAID."
msgstr "RAIDにマウントポイント %1 は使用できません。"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:97
+#: src/include/partitioning/custom_part_lib.rb:96
msgid ""
"You have selected to not automatically mount at start-up a file system\n"
"that may contain files that the system needs to work properly.\n"
@@ -2098,21 +2153,8 @@
"この設定を行なってもよろしいですか?\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:120
+#: src/include/partitioning/custom_part_lib.rb:138
msgid ""
-"You have assigned an encrypted file system to a partition\n"
-"with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n"
-"/var\". This is not possible. Change the mount point or use a\n"
-"nonloopbacked file system.\n"
-msgstr ""
-"「/」、「/usr」、「/boot」、「/var」のいずれかのマウントポイントが\n"
-"設定されているパーティションに対して、暗号化ファイルシステムが\n"
-"割り当てられました。この処理は実行できません。マウントポイントを変更するか、\n"
-"ループバックでないファイルシステムを使用してください。\n"
-
-#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:158
-msgid ""
"You have set a file system as mountable by users. The file system\n"
"may contain files that need to be executable.\n"
"\n"
@@ -2131,28 +2173,28 @@
#. @param [Hash{String => map}] targetMap the TargetMap
#. @param mount mount point
#. @return [Boolean]
-#: src/include/partitioning/custom_part_lib.rb:205
+#: src/include/partitioning/custom_part_lib.rb:185
msgid "Mount point must not be empty."
msgstr "マウントポイントを指定する必要があります。"

#. error popup
-#: src/include/partitioning/custom_part_lib.rb:210
+#: src/include/partitioning/custom_part_lib.rb:190
msgid "Swap devices must have swap as mount point."
msgstr "スワップデバイスのマウントポイントはswapでなければなりません。"

#. error popup
-#: src/include/partitioning/custom_part_lib.rb:214
+#: src/include/partitioning/custom_part_lib.rb:194
msgid "Only swap devices may have swap as mount point."
msgstr "スワップデバイスに対してのみマウントポイントをswapに設定することができます。"

#. && mount!="swap" )
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:229
+#: src/include/partitioning/custom_part_lib.rb:209
msgid "This mount point is already in use. Select a different one."
msgstr "このマウントポイントはすでに使用されています。別の値を選択してください。"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:239
+#: src/include/partitioning/custom_part_lib.rb:219
msgid ""
"FAT filesystem used for system mount point (/, /usr, /opt, /var, /home).\n"
"This is not possible."
@@ -2161,12 +2203,12 @@
"この処理は実行できません。"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:248
+#: src/include/partitioning/custom_part_lib.rb:228
msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount
point."
msgstr "マウントポイントに不正な文字を使用しています。マウントポイントには \"`'!\"%#\" を使用しないでください。"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:257
+#: src/include/partitioning/custom_part_lib.rb:237
msgid ""
"You cannot use any of the following mount points:\n"
"/bin, /dev, /etc, /lib, /lib64, /lost+found, /mnt, /proc, /sbin, /sys,\n"
@@ -2177,12 +2219,12 @@
"/var/adm/mnt\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:266
+#: src/include/partitioning/custom_part_lib.rb:246
msgid "Your mount point must start with a \"/\" "
msgstr "マウントポイントは必ず「/」で開始しなければなりません。"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:272
+#: src/include/partitioning/custom_part_lib.rb:252
msgid ""
"It is not allowed to assign the mount point swap\n"
"to a device without a swap file system."
@@ -2191,17 +2233,23 @@
"マウントポイントswapを割り当てることはできません。"

#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#. %2 is prelaced by a size (e.g. 10 MB)
-#: src/include/partitioning/custom_part_lib.rb:299
+#. %2 is replaced by the user entered size (e.g. 20GB)
+#. %3 is replaced by a size (e.g. 10 MB)
+#: src/include/partitioning/custom_part_lib.rb:280
+#, fuzzy
+#| msgid ""
+#| "Your partition is too small to use %1.\n"
+#| "The minimum size for this file system is %2.\n"
msgid ""
"Your partition is too small to use %1.\n"
-"The minimum size for this file system is %2.\n"
+"The size you entered (after rounding up) is %2.\n"
+"The minimum size for this file system is %3.\n"
msgstr ""
"%1 を使用するには、このパーティションは小さすぎます。\n"
"このファイルシステムの最小サイズは %2 です。\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:369
+#: src/include/partitioning/custom_part_lib.rb:346
msgid ""
"It is not allowed to assign a mount point\n"
"to a device with nonexistent or unknown file system."
@@ -2210,7 +2258,7 @@
"のあるデバイスに割り当てることは許されていません。"

#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:482
+#: src/include/partitioning/custom_part_lib.rb:545
msgid ""
"\n"
"WARNING:\n"
@@ -2234,12 +2282,12 @@

#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:924
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:980
+#: src/include/partitioning/custom_part_lib.rb:1007
msgid "The file system is currently mounted on %1."
msgstr "ファイルシステムは現在、%1 にマウントされています。"

-#: src/include/partitioning/custom_part_lib.rb:929
+#: src/include/partitioning/custom_part_lib.rb:985
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2249,12 +2297,12 @@

#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:940
-#: src/include/partitioning/custom_part_lib.rb:965
+#: src/include/partitioning/custom_part_lib.rb:996
+#: src/include/partitioning/custom_part_lib.rb:1021
msgid "Unmount"
msgstr "マウント解除"

-#: src/include/partitioning/custom_part_lib.rb:956
+#: src/include/partitioning/custom_part_lib.rb:1012
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2262,15 +2310,15 @@
"今すぐにアンマウントしようとすることもできますし、キャンセルすることもできます。\n"
"特別な事情がある場合を除き、ここでは[キャンセル]をクリックしてください。"

-#: src/include/partitioning/custom_part_lib.rb:1002
+#: src/include/partitioning/custom_part_lib.rb:1058
msgid "It is not possible to shrink the file system while it is mounted."
msgstr "対象のファイルシステムがマウント中の場合、そのファイルシステムを縮小することはできません。"

-#: src/include/partitioning/custom_part_lib.rb:1015
+#: src/include/partitioning/custom_part_lib.rb:1071
msgid "It is not possible to extend the file system while it is mounted."
msgstr "対象のファイルシステムがマウント中の場合、そのファイルシステムを拡張することはできません。"

-#: src/include/partitioning/custom_part_lib.rb:1026
+#: src/include/partitioning/custom_part_lib.rb:1082
msgid "It is not possible to resize the file system while it is mounted."
msgstr "対象のファイルシステムがマウント中の場合、そのファイルシステムのサイズを変更することはできません。"

@@ -2752,47 +2800,47 @@
"選択してからマウントポイントを入力してください(/、/boot、/home、/varなど)。</p>"

#. set globals
-#: src/include/partitioning/ep-dialogs.rb:337
+#: src/include/partitioning/ep-dialogs.rb:336
msgid "Formatting Options"
msgstr "フォーマットのオプション"

-#: src/include/partitioning/ep-dialogs.rb:345
+#: src/include/partitioning/ep-dialogs.rb:344
msgid "Format partition"
msgstr "パーティションをフォーマットする"

-#: src/include/partitioning/ep-dialogs.rb:356
+#: src/include/partitioning/ep-dialogs.rb:355
msgid "Do not format partition"
msgstr "パーティションをフォーマットしない"

-#: src/include/partitioning/ep-dialogs.rb:372
+#: src/include/partitioning/ep-dialogs.rb:371
msgid "Do not mount partition"
msgstr "パーティションをマウントしない"

-#: src/include/partitioning/ep-dialogs.rb:391
+#: src/include/partitioning/ep-dialogs.rb:390
msgid "Mounting Options"
msgstr "マウントのオプション"

-#: src/include/partitioning/ep-dialogs.rb:399
+#: src/include/partitioning/ep-dialogs.rb:398
msgid "Mount partition"
msgstr "パーティションをマウントする"

#. Column header
-#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:404 src/modules/StorageFields.rb:144
msgid "Mount Point"
msgstr "マウントポイント"

#. button text
-#: src/include/partitioning/ep-dialogs.rb:412
+#: src/include/partitioning/ep-dialogs.rb:411
msgid "Fs&tab Options..."
msgstr "fstabオプション(&T) ..."

#. error popup
-#: src/include/partitioning/ep-dialogs.rb:596
+#: src/include/partitioning/ep-dialogs.rb:595
msgid "Crypt files must be encrypted."
msgstr "暗号ファイルは暗号化しなければなりません。"

#. error popup
-#: src/include/partitioning/ep-dialogs.rb:607
+#: src/include/partitioning/ep-dialogs.rb:606
msgid ""
"You chose to create the crypt file, but did not specify\n"
"that it should be formatted. This does not make sense.\n"
@@ -2805,17 +2853,17 @@
"フォーマットオプションについても確認してください。\n"

#. error popup
-#: src/include/partitioning/ep-dialogs.rb:623
+#: src/include/partitioning/ep-dialogs.rb:622
msgid "Crypt files require a mount point."
msgstr "暗号ファイルにはマウントポイントを設定してください。"

#. error popup
-#: src/include/partitioning/ep-dialogs.rb:637
+#: src/include/partitioning/ep-dialogs.rb:636
msgid "Tmpfs requires a mount point."
msgstr "tmpfsにはマウントポイントが必要です。"

#. helptext
-#: src/include/partitioning/ep-dialogs.rb:721
+#: src/include/partitioning/ep-dialogs.rb:720
msgid ""
"<p>\n"
"Keep in mind that this file system is only protected when it is not\n"
@@ -2830,7 +2878,7 @@
"</p>"

#. helptext
-#: src/include/partitioning/ep-dialogs.rb:734
+#: src/include/partitioning/ep-dialogs.rb:733
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -2844,21 +2892,21 @@
"使用することができなくなります。\n"
"</p>\n"

-#: src/include/partitioning/ep-dialogs.rb:804
+#: src/include/partitioning/ep-dialogs.rb:803
msgid "All data stored on the volume will be lost!"
msgstr "ボリューム上に存在している全てのデータが失われます!"

-#: src/include/partitioning/ep-dialogs.rb:827
+#: src/include/partitioning/ep-dialogs.rb:826
msgid "Password"
msgstr "パスワード"

#. popup text
-#: src/include/partitioning/ep-dialogs.rb:924
+#: src/include/partitioning/ep-dialogs.rb:923
msgid "Resize not supported by underlying device."
msgstr "下層のデバイスでサイズ変更がサポートされていません。"

#. popup text
-#: src/include/partitioning/ep-dialogs.rb:929
+#: src/include/partitioning/ep-dialogs.rb:928
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
@@ -2868,7 +2916,7 @@
"このパーティションのファイルシステムでリサイズをサポートしていないため、\n"
"選択したパーティションをリサイズできません。\n"

-#: src/include/partitioning/ep-dialogs.rb:953
+#: src/include/partitioning/ep-dialogs.rb:952
msgid ""
"It is not possible to check whether a NTFS\n"
"can be resized while it is mounted."
@@ -2877,7 +2925,7 @@
"を判断することはできません。"

#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:972
+#: src/include/partitioning/ep-dialogs.rb:971
msgid ""
"Partition %1 cannot be resized\n"
"because the filesystem seems to be inconsistent.\n"
@@ -2886,21 +2934,21 @@
"パーティション %1 はサイズ変更できません。\n"

#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:999
+#: src/include/partitioning/ep-dialogs.rb:998
msgid "Resize Partition %1"
msgstr "%1 パーティションのサイズ変更"

#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:1020
+#: src/include/partitioning/ep-dialogs.rb:1019
msgid "Resize Logical Volume %1"
msgstr "%1 論理ボリュームのサイズ変更"

#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1052
+#: src/include/partitioning/ep-dialogs.rb:1051
msgid "Current size: %1"
msgstr "現在のサイズ: %1"

-#: src/include/partitioning/ep-dialogs.rb:1064
+#: src/include/partitioning/ep-dialogs.rb:1063
msgid "Currently used: %1"
msgstr "現在使用中: %1"

@@ -2908,8 +2956,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1077
-#: src/include/partitioning/ep-dialogs.rb:1114
+#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1113
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -2921,33 +2969,33 @@

#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1087
+#: src/include/partitioning/ep-dialogs.rb:1086
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
msgid "Maximum Size (%1)"
msgstr "最大サイズ (%1)"

#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1097
+#: src/include/partitioning/ep-dialogs.rb:1096
msgid "Minimum Size (%1)"
msgstr "最小サイズ(%1)"

#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1106
+#: src/include/partitioning/ep-dialogs.rb:1105
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
msgid "Custom Size"
msgstr "カスタムサイズ"

#. help text
-#: src/include/partitioning/ep-dialogs.rb:1140
+#: src/include/partitioning/ep-dialogs.rb:1139
msgid "<p>Choose new size.</p>"
msgstr "<p>新しいサイズを選択してください。</p>"

#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1191
+#: src/include/partitioning/ep-dialogs.rb:1190
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
msgid "The size entered is invalid. Enter a size between %1 and %2."
@@ -2957,7 +3005,7 @@
#. after user tries to do that is stupid - in some cases
#. we can tell beforehand, thus user should never get to this
#. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1234
+#: src/include/partitioning/ep-dialogs.rb:1233
msgid ""
"You are extending a mounted filesystem by %1 Gigabyte. \n"
"This may be quite slow and can take hours. You might possibly want \n"
@@ -2970,12 +3018,12 @@
"ことができるため、そちらをお勧めします。"

#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1310
+#: src/include/partitioning/ep-dialogs.rb:1309
msgid "Output of %1"
msgstr "%1 の出力"

#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1337
+#: src/include/partitioning/ep-dialogs.rb:1336
msgid "Rescanning disks..."
msgstr "ディスクを再検出しています..."

@@ -3236,7 +3284,7 @@

#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5226
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5221
msgid "The disk is in use and cannot be modified."
msgstr "ディスクは現在使用中であるため、変更できません。"

@@ -5265,12 +5313,12 @@
msgstr "パターンファイル"

#. label text
-#: src/modules/FileSystems.rb:278
+#: src/modules/FileSystems.rb:289
msgid "Tmpfs &Size"
msgstr "tmpfsサイズ(&S)"

#. popup text
-#: src/modules/FileSystems.rb:287
+#: src/modules/FileSystems.rb:298
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."
@@ -5278,12 +5326,12 @@
"サイズの指定が正しくありません。数字に続いて K、M、G、% などを指定してください。\n"
"値は 100k 以上、もしくは 1% ~ 200% の間で指定します。もう一度入力してください。"

-#: src/modules/FileSystems.rb:290
+#: src/modules/FileSystems.rb:301
msgid "Value must be between 1% and 200%. Try again."
msgstr "1% から 200% までの値を指定する必要があります。もう一度入力してください。"

#. help text, richtext format
-#: src/modules/FileSystems.rb:297
+#: src/modules/FileSystems.rb:308
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"
@@ -5294,17 +5342,17 @@
"ができます。また、パーセント記号が付いた数字は、メモリの割合を意味します。</p>"

#. label text
-#: src/modules/FileSystems.rb:311
+#: src/modules/FileSystems.rb:322
msgid "Swap &Priority"
msgstr "スワップ優先度(&P)"

#. popup text
-#: src/modules/FileSystems.rb:319
+#: src/modules/FileSystems.rb:330
msgid "Value must be between 0 and 32767. Try again."
msgstr "0~32,767の間で指定してください。もう一度入力してください。"

#. help text, richtext format
-#: src/modules/FileSystems.rb:326
+#: src/modules/FileSystems.rb:337
msgid ""
"<p><b>Swap Priority:</b>\n"
"Enter the swap priority. Higher numbers mean higher priority.</p>\n"
@@ -5313,12 +5361,12 @@
"スワップ優先度を入力します。高い数値が、より高い優先度を意味します。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:481
+#: src/modules/FileSystems.rb:494
msgid "Mount &Read-Only"
msgstr "読み込み専用でマウント(&R)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:485
+#: src/modules/FileSystems.rb:498
msgid ""
"<p><b>Mount Read-Only:</b>\n"
"Writing to the file system is not possible. Default is false. During
installation\n"
@@ -5329,12 +5377,12 @@
"インストールの際は、ファイルシステムは常に読み書き可能な状態でマウントされます。</p>"

#. button text
-#: src/modules/FileSystems.rb:497
+#: src/modules/FileSystems.rb:510
msgid "No &Access Time"
msgstr "アクセスタイムを使用しない(&A)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:501
+#: src/modules/FileSystems.rb:514
msgid ""
"<p><b>No Access Time:</b>\n"
"Access times are not updated when a file is read. Default is false.</p>\n"
@@ -5343,12 +5391,12 @@
"ファイルを読み込むときアクセスタイムを更新しません。既定は 'false' (いいえ) です。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:511
+#: src/modules/FileSystems.rb:524
msgid "Mountable by User"
msgstr "ユーザによるマウント可能"

#. help text, richtext format
-#: src/modules/FileSystems.rb:515
+#: src/modules/FileSystems.rb:528
msgid ""
"<p><b>Mountable by User:</b>\n"
"The file system may be mounted by an ordinary user. Default is false.</p>\n"
@@ -5357,12 +5405,12 @@
"ファイルシステムは、ユーザにより手動でマウントされます。デフォルトはfalseです。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:528
+#: src/modules/FileSystems.rb:541
msgid "Do Not Mount at System &Start-up"
msgstr "システム起動時にマウントしない(&S)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:534
+#: src/modules/FileSystems.rb:547
msgid ""
"<p><b>Do Not Mount at System Start-up:</b>\n"
"The file system is not automatically mounted when the system starts.\n"
@@ -5378,12 +5426,12 @@
"既定は 'false' (いいえ) です。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:551
+#: src/modules/FileSystems.rb:564
msgid "Enable &Quota Support"
msgstr "クォータサポートを有効にする(&Q)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:557
+#: src/modules/FileSystems.rb:570
msgid ""
"<p><b>Enable Quota Support:</b>\n"
"The file system is mounted with user quotas enabled.\n"
@@ -5394,12 +5442,12 @@
"既定ではクォータは無効になっています。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:576
+#: src/modules/FileSystems.rb:589
msgid "Data &Journaling Mode"
msgstr "データジャーナリングモード(&J)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:585
+#: src/modules/FileSystems.rb:598
msgid ""
"<p><b>Data Journaling Mode:</b>\n"
"Specifies the journaling mode for file data.\n"
@@ -5418,12 +5466,12 @@
"<tt>writeback</tt> -- データの順序性を保持しません。パフォーマンスへの影響はありません。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:606
+#: src/modules/FileSystems.rb:619
msgid "&Access Control Lists (ACL)"
msgstr "アクセス制御リスト(ACL)(&A)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:610
+#: src/modules/FileSystems.rb:623
msgid ""
"<p><b>Access Control Lists (ACL):</b>\n"
"Enable access control lists on the file system.</p>\n"
@@ -5432,12 +5480,12 @@
"ファイルシステム上のアクセス制御リストを有効にします。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:621
+#: src/modules/FileSystems.rb:634
msgid "&Extended User Attributes"
msgstr "拡張ユーザ属性(&E)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:625
+#: src/modules/FileSystems.rb:638
msgid ""
"<p><b>Extended User Attributes:</b>\n"
"Allow extended user attributes on the file system.</p>\n"
@@ -5446,16 +5494,16 @@
"ファイルシステム上の拡張ユーザ属性を使用できるようにします。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:642
+#: src/modules/FileSystems.rb:655
msgid "Arbitrary Option &Value"
msgstr "その他のオプション値(&V)"

-#: src/modules/FileSystems.rb:647
+#: src/modules/FileSystems.rb:660
msgid "Invalid characters in arbitrary option value. Do not use spaces or
tabs. Try again."
msgstr "その他のオプション値に、無効な文字が含まれています。スペースやタブを含めないでください。もう一度実行してください。"

#. help text, richtext format
-#: src/modules/FileSystems.rb:651
+#: src/modules/FileSystems.rb:664
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"
@@ -5466,12 +5514,12 @@
"オプションを複数指定するには、コンマで区切ります。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:668
+#: src/modules/FileSystems.rb:681
msgid "Char&set for file names"
msgstr "ファイル名のキャラクタセット(&S)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:689
+#: src/modules/FileSystems.rb:702
msgid ""
"<p><b>Charset for File Names:</b>\n"
"Set the charset used for display of file names in Windows partitions.</p>\n"
@@ -5480,12 +5528,12 @@
"Windowsパーティションでファイル名の表示に使用されるキャラクタセットを指定します。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:700
+#: src/modules/FileSystems.rb:713
msgid "Code&page for short FAT names"
msgstr "FATの短縮ファイル名に使用されるコードページ(&P)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:706
+#: src/modules/FileSystems.rb:719
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"
@@ -5494,12 +5542,12 @@
"このコードページは、FATファイルシステム用の短縮文字に変換する際に使用されるコードページです。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:720
+#: src/modules/FileSystems.rb:733
msgid "Number of &FATs"
msgstr "FATの数(&F)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:726
+#: src/modules/FileSystems.rb:739
msgid ""
"<p><b>Number of FATs:</b>\n"
"Specify the number of file allocation tables in the file system. The default
is 2.</p>"
@@ -5508,12 +5556,12 @@
"ファイルシステムのファイル割り当てテーブルの数を指定します。デフォルトは2です。</p>"

#. label text
-#: src/modules/FileSystems.rb:735
+#: src/modules/FileSystems.rb:748
msgid "FAT &Size"
msgstr "FAT サイズ(&S)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:746
+#: src/modules/FileSystems.rb:759
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"
@@ -5522,17 +5570,17 @@
"使用するファイルアロケーションテーブルの種類 (12、16、または 32 ビット)
を指定します。[自動]を選択すると、そのファイルシステムに最も適した値を YaST が自動的に選択します。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:755
+#: src/modules/FileSystems.rb:768
msgid "Root &Dir Entries"
msgstr "ルートディレクトリの項目数(&D)"

#. popup text
-#: src/modules/FileSystems.rb:763
+#: src/modules/FileSystems.rb:776
msgid "The minimum size for \"Root Dir Entries\" is 112. Try again."
msgstr "[ルートディレクトリの項目数]の最小サイズは 112 です。再度入力してください。"

#. help text, richtext format
-#: src/modules/FileSystems.rb:767
+#: src/modules/FileSystems.rb:780
msgid ""
"<p><b>Root Dir Entries:</b>\n"
"Select the number of entries available in the root directory.</p>\n"
@@ -5541,12 +5589,12 @@
"ルートディレクトリで利用できるように設定する項目数を指定します。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:780
+#: src/modules/FileSystems.rb:793
msgid "Hash &Function"
msgstr "ハッシュ関数(&F)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:787
+#: src/modules/FileSystems.rb:800
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"
@@ -5555,12 +5603,12 @@
"ディレクトリ内のファイル名を並べ替える際に利用するハッシュ関数の名前を指定します。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:796
+#: src/modules/FileSystems.rb:809
msgid "FS &Revision"
msgstr "ファイルシステムリビジョン(&R)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:803
+#: src/modules/FileSystems.rb:816
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"
@@ -5570,12 +5618,12 @@

#. label text
#. label text
-#: src/modules/FileSystems.rb:816 src/modules/FileSystems.rb:980
+#: src/modules/FileSystems.rb:829 src/modules/FileSystems.rb:993
msgid "Block &Size in Bytes"
msgstr "ブロックサイズ (バイト単位)(&S)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:823
+#: src/modules/FileSystems.rb:836
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"
@@ -5585,13 +5633,13 @@

#. label text
#. label text
-#: src/modules/FileSystems.rb:832 src/modules/FileSystems.rb:1062
+#: src/modules/FileSystems.rb:845 src/modules/FileSystems.rb:1075
msgid "&Inode Size"
msgstr "iノードのサイズ(&I)"

#. help text, richtext format
#. help text, richtext format
-#: src/modules/FileSystems.rb:838 src/modules/FileSystems.rb:1068
+#: src/modules/FileSystems.rb:851 src/modules/FileSystems.rb:1081
msgid ""
"<p><b>Inode Size:</b>\n"
"This option specifies the inode size of the file system.</p>\n"
@@ -5600,12 +5648,12 @@
"このオプションは、ファイルシステムのinodeのサイズを指定します。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:847
+#: src/modules/FileSystems.rb:860
msgid "&Percentage of Inode Space"
msgstr "inode 領域の割合(&P)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:875
+#: src/modules/FileSystems.rb:888
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"
@@ -5614,12 +5662,12 @@
"このオプションは、ファイルシステム内で inode に割り当てる最大容量を、パーセント単位で指定します。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:884
+#: src/modules/FileSystems.rb:897
msgid "Inode &Aligned"
msgstr "inode の整列(&A)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:890
+#: src/modules/FileSystems.rb:903
msgid ""
"<p><b>Inode Aligned:</b>\n"
"The option \"Inode Aligned\" is used to specify whether inode allocation is
or\n"
@@ -5632,12 +5680,12 @@
"未整列のものよりもより効果的にアクセスすることができます。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:920
+#: src/modules/FileSystems.rb:933
msgid "&Log Size in Megabytes"
msgstr "ログサイズ (メガバイト単位)(&L)"

#. popup text
-#: src/modules/FileSystems.rb:929
+#: src/modules/FileSystems.rb:942
msgid ""
"The \"Log Size\" value is incorrect.\n"
"Enter a value greater than zero.\n"
@@ -5647,7 +5695,7 @@

#. xgettext: no-c-format
#. help text, richtext format
-#: src/modules/FileSystems.rb:934
+#: src/modules/FileSystems.rb:947
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"
@@ -5656,17 +5704,17 @@
"ログサイズをメガバイト単位で設定します。[自動]に設定している場合、既定値は全体のサイズの 40% です。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:942
+#: src/modules/FileSystems.rb:955
msgid "Invoke Bad Blocks List &Utility"
msgstr "Bad Blockリスト用ユーティリティの起動(&U)"

#. label text
-#: src/modules/FileSystems.rb:956
+#: src/modules/FileSystems.rb:969
msgid "Stride &Length in Blocks"
msgstr "ストライド長 (ブロック単位)(&L)"

#. popup text
-#: src/modules/FileSystems.rb:964
+#: src/modules/FileSystems.rb:977
msgid ""
"The \"Stride Length in Blocks\" value is invalid.\n"
"Select a value greater than 1.\n"
@@ -5675,7 +5723,7 @@
"1 より大きい値を指定してください。\n"

#. help text, richtext format
-#: src/modules/FileSystems.rb:968
+#: src/modules/FileSystems.rb:981
msgid ""
"<p><b>Stride Length in Blocks:</b>\n"
"Set RAID-related options for the file system. Currently, the only supported\n"
@@ -5688,7 +5736,7 @@
"指定します。</p>\n"

#. help text, richtext format
-#: src/modules/FileSystems.rb:987
+#: src/modules/FileSystems.rb:1000
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"
@@ -5697,12 +5745,12 @@
"ブロックの大きさをバイト単位で指定します。選択可能なブロックサイズは 1024、2048、4096
のいずれかです。[自動]を選択すると、ブロックサイズをファイルシステムサイズと想定される用途から決定します。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:996
+#: src/modules/FileSystems.rb:1009
msgid "Bytes per &Inode"
msgstr "inode ごとのバイト数(&B)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:1002
+#: src/modules/FileSystems.rb:1015
msgid ""
"<p><b>Bytes per Inode:</b> \n"
"Specify the bytes to inode ratio. YaST creates an inode for every\n"
@@ -5719,12 +5767,12 @@
"inode の数を増やすことはできません。従って、このパラメータには適切な値を入力してください。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:1018
+#: src/modules/FileSystems.rb:1031
msgid "Percentage of Blocks &Reserved for root"
msgstr "root 用に予約するブロックの割合(&R)"

#. popup text
-#: src/modules/FileSystems.rb:1028
+#: src/modules/FileSystems.rb:1041
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"
@@ -5734,17 +5782,17 @@

#. xgettext: no-c-format
#. help text, richtext format
-#: src/modules/FileSystems.rb:1033
+#: src/modules/FileSystems.rb:1046
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:1042
+#: src/modules/FileSystems.rb:1055
msgid "Disable Regular Checks"
msgstr "通常のチェックを無効にする"

#. help text, richtext format
-#: src/modules/FileSystems.rb:1050
+#: src/modules/FileSystems.rb:1063
msgid ""
"<p><b>Disable Regular Checks:</b>\n"
"Disable regular file system check at booting.</p>\n"
@@ -5753,12 +5801,12 @@
"起動時に通常のファイルシステムチェックを行なわないようにします。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:1077
+#: src/modules/FileSystems.rb:1090
msgid "&Directory Index Feature"
msgstr "ディレクトリインデックス機能(&D)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:1084
+#: src/modules/FileSystems.rb:1097
msgid ""
"<p><b>Directory Index:</b>\n"
"Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
@@ -5767,12 +5815,12 @@
"項目数の多いディレクトリ内で検索速度を上げるため、 B ツリーというハッシュ機能を有効にします。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:1096
+#: src/modules/FileSystems.rb:1109
msgid "&No Journal"
msgstr "ジャーナルなし(&N)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:1103
+#: src/modules/FileSystems.rb:1116
msgid ""
"<p><b>No Journal:</b>\n"
"Suppressed use of journaling on filesystem. Only activate this when you
really\n"
@@ -5884,7 +5932,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:994
+#: src/modules/Storage.rb:989
msgid "Resize Not Possible:"
msgstr "リサイズできません: "

@@ -5897,7 +5945,7 @@
#. mark swap-partitions with pseudo Mountpoint swap in targetMap
#. @param [Hash{String => map}] target Disk map
#. @return [Hash{String => map}] modified target
-#: src/modules/Storage.rb:2697 src/modules/Storage.rb:3920
+#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915
msgid ""
"Could not set encryption.\n"
"System error code is %1.\n"
@@ -5910,7 +5958,7 @@
"入力した暗号化パスワードが正しくない可能性があります。\n"

#. popup text
-#: src/modules/Storage.rb:3951
+#: src/modules/Storage.rb:3946
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -5921,7 +5969,7 @@
"もう一度入力してください。"

#. popup text
-#: src/modules/Storage.rb:3982
+#: src/modules/Storage.rb:3977
msgid ""
"The password may only contain the following characters:\n"
"0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -5933,24 +5981,24 @@

#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4036
+#: src/modules/Storage.rb:4031
msgid "&Enter Encryption Password:"
msgstr "暗号化パスワードの入力(&E):"

#. Clear password fields on every round.
-#: src/modules/Storage.rb:4095
+#: src/modules/Storage.rb:4090
msgid "Provide Password"
msgstr "パスワードの提供"

-#: src/modules/Storage.rb:4114
+#: src/modules/Storage.rb:4109
msgid "The following encrypted volumes are already available."
msgstr "下記の暗号化ボリュームが利用できます。"

-#: src/modules/Storage.rb:4129
+#: src/modules/Storage.rb:4124
msgid "Encrypted Volume Activation"
msgstr "暗号化されたボリュームの有効化"

-#: src/modules/Storage.rb:4133
+#: src/modules/Storage.rb:4128
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -5962,12 +6010,12 @@
"対象のボリュームが更新時に必要なものであったり、暗号化されたLVM物理ボリュームに\n"
"含まれるものである場合は、パスワードを指定する必要があります。"

-#: src/modules/Storage.rb:4145
+#: src/modules/Storage.rb:4140
msgid "Do you want to provide encryption passwords?"
msgstr "暗号化パスワードを指定しますか?"

#. text in help field
-#: src/modules/Storage.rb:4202
+#: src/modules/Storage.rb:4197
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -5977,69 +6025,69 @@
"パスワードはすべてのデバイスで試されます。"

#. header text
-#: src/modules/Storage.rb:4208
+#: src/modules/Storage.rb:4203
msgid "Enter Encryption Password"
msgstr "暗号化パスワードの入力"

-#: src/modules/Storage.rb:4211
+#: src/modules/Storage.rb:4206
msgid "There are no encrypted volume to unlock."
msgstr "ロックを解除する暗号化ボリュームがありません。"

#. label text, multiple device names follow
-#: src/modules/Storage.rb:4224
+#: src/modules/Storage.rb:4219
msgid "Provide password for any of the following devices:"
msgstr "下記のデバイスのいずれかに対するパスワードを入力してください:"

#. label text, one device name follows
-#: src/modules/Storage.rb:4227
+#: src/modules/Storage.rb:4222
msgid "Provide password for the following device:"
msgstr "下記のデバイスに対するパスワードを入力してください:"

-#: src/modules/Storage.rb:4240
+#: src/modules/Storage.rb:4235
msgid "Trying to unlock encrypted volumes..."
msgstr "暗号化ボリュームのロックを解除しようとしています..."

-#: src/modules/Storage.rb:4264
+#: src/modules/Storage.rb:4259
msgid "Password did not unlock any volume."
msgstr "指定されたパスワードでは、どのボリュームのロックも解除できませんでした。"

-#: src/modules/Storage.rb:4350
+#: src/modules/Storage.rb:4345
msgid "IDE Disk"
msgstr "IDE ディスク"

-#: src/modules/Storage.rb:4356
+#: src/modules/Storage.rb:4351
msgid "SCSI Disk"
msgstr "SCSIディスク"

-#: src/modules/Storage.rb:4362
+#: src/modules/Storage.rb:4357
msgid "Disk"
msgstr "ディスク"

-#: src/modules/Storage.rb:4390
+#: src/modules/Storage.rb:4385
msgid "DM RAID"
msgstr "DM RAID"

-#: src/modules/Storage.rb:4403
+#: src/modules/Storage.rb:4398
msgid "MD RAID"
msgstr "MD RAID"

#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4898
+#: src/modules/Storage.rb:4893
msgid "Installing required packages failed."
msgstr "必要なパッケージのインストールに失敗しました。"

-#: src/modules/Storage.rb:4899 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
msgid "Continue despite the error?"
msgstr "エラーを無視して続行しますか?"

#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5238
+#: src/modules/Storage.rb:5233
msgid "Partitions cannot be created since other partitions on the disk are
used."
msgstr "ディスク上の他のパーティションが使用されているため、パーティションを作成できません。"

-#: src/modules/Storage.rb:5264
+#: src/modules/Storage.rb:5259
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
@@ -6049,7 +6097,7 @@
"デバイス %1 にはインストール作業中に必要なスワップが含まれているため、\n"
"設定を変更することができません。\n"

-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5273
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
@@ -6059,7 +6107,7 @@
"デバイス %1 にはインストール作業に必要なインストールデータが含まれているため、\n"
"設定を変更することができません。\n"

-#: src/modules/Storage.rb:5307
+#: src/modules/Storage.rb:5302
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
@@ -6069,7 +6117,7 @@
"デバイス %1 にはインストール作業中に必要なスワップが含まれているため、\n"
"削除することができません。\n"

-#: src/modules/Storage.rb:5316
+#: src/modules/Storage.rb:5311
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
@@ -6079,7 +6127,7 @@
"デバイス %1 にはインストール作業に必要なインストールデータが含まれているため、\n"
"削除することができません。\n"

-#: src/modules/Storage.rb:5345
+#: src/modules/Storage.rb:5340
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6090,7 +6138,7 @@
"デバイス %1 を削除することは、インストール作業に必要な\n"
"スワップが含まれるデバイス %2 を間接的に変更することになります。\n"

-#: src/modules/Storage.rb:5356
+#: src/modules/Storage.rb:5351
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6101,7 +6149,7 @@
"必要なデータが含まれるデバイス %2 を間接的に変更することになります。\n"

#. the check for verbose is needed for calls from StorageProposal (see
bnc#871779)
-#: src/modules/Storage.rb:5378
+#: src/modules/Storage.rb:5373
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -6112,18 +6160,18 @@
"パーティション %1 を削除することができません。\n"

#. FIXME: please, add description of the list that is returned by this
function.
-#: src/modules/Storage.rb:5467
+#: src/modules/Storage.rb:5462
msgid "Nothing assigned as root filesystem!"
msgstr "ルートファイルシステムの割り当てがありません。"

-#: src/modules/Storage.rb:5468
+#: src/modules/Storage.rb:5463
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:6018
+#: src/modules/Storage.rb:6013
msgid "Adding the following resolvables failed: %1"
msgstr "下記の解決方法を追加することができませんでした: %1"

@@ -6775,31 +6823,31 @@

#. bsc#983003
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
+#: src/modules/StorageProposal.rb:4624 src/modules/StorageProposal.rb:5747
msgid "Resize impossible due to inconsistent file system. Try checking file
system under Windows."
msgstr "ファイルシステムの一貫性が損なわれているためサイズ変更できません。Windows で該当のファイルシステムを検査してください。"

#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6239
+#: src/modules/StorageProposal.rb:6262
msgid "File System for Root Partition"
msgstr "ルートパーティションのファイルシステム"

#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6286
+#: src/modules/StorageProposal.rb:6309
msgid "File System for Home Partition"
msgstr "ホームパーティションのファイルシステム"

#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6304
+#: src/modules/StorageProposal.rb:6327
msgid "Enlarge &Swap for Suspend"
msgstr "サスペンド用にスワップを拡大する(&S)"

-#: src/modules/StorageProposal.rb:6314
+#: src/modules/StorageProposal.rb:6337
msgid "Proposal Settings"
msgstr "推奨設定"

#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6329
+#: src/modules/StorageProposal.rb:6352
msgid ""
"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
@@ -6810,7 +6858,7 @@
"[<b>暗号化されたLVMベースの推奨設定</b>]をそれぞれ選択します。</p>"

#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6337
+#: src/modules/StorageProposal.rb:6360
msgid ""
"<p>The filesystem for the root partition can be selected with the\n"
"corresponding combo box. With the filesystem BtrFS the proposal can\n"
@@ -6823,7 +6871,7 @@
"増加します。</p>"

#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6346
+#: src/modules/StorageProposal.rb:6369
msgid ""
"<p>The proposal can create a separate home partition. The filesystem for\n"
"the home partition can be selected with the corresponding combo box.</p>"
@@ -6832,7 +6880,7 @@
"対応するコンボボックスで選択できます。</p>"

#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6353
+#: src/modules/StorageProposal.rb:6376
msgid ""
"<p>The swap partition can be made large enough to be used to suspend\n"
"the system to disk in most cases.</p>"
@@ -6840,32 +6888,32 @@
"<p>たいていの場合、スワップパーティションは、\n"
"システムをディスクにサスペンドできるほどの十分な大きさにできます。</p>"

-#: src/modules/StorageProposal.rb:6378
+#: src/modules/StorageProposal.rb:6401
msgid "Enter your password for the proposal encryption."
msgstr "推奨設定の暗号化のパスワードを入力してください。"

#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6385
+#: src/modules/StorageProposal.rb:6408
msgid "Password:"
msgstr "パスワード:"

#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6396
+#: src/modules/StorageProposal.rb:6419
msgid "Reenter the password for verification:"
msgstr "確認のため、もう一度パスワードを入力してください:"

#. Clear password fields on every round.
-#: src/modules/StorageProposal.rb:6594
+#: src/modules/StorageProposal.rb:6617
msgid "&Partition-based Proposal"
msgstr "パーティションベースの推奨設定(&P)"

-#: src/modules/StorageProposal.rb:6596
+#: src/modules/StorageProposal.rb:6619
msgid "&LVM-based Proposal"
msgstr "LVMベースの推奨設定(&L)"

-#: src/modules/StorageProposal.rb:6598
+#: src/modules/StorageProposal.rb:6621
msgid "&Encrypted LVM-based Proposal"
msgstr "暗号化されたLVMベースの推奨設定(&E)"

@@ -6911,3 +6959,14 @@
#: src/modules/StorageSettings.rb:183
msgid "Visible Information on Storage Devices:"
msgstr "ストレージデバイスの情報表示:"
+
+#~ msgid ""
+#~ "You have assigned an encrypted file system to a partition\n"
+#~ "with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n"
+#~ "/var\". This is not possible. Change the mount point or use a\n"
+#~ "nonloopbacked file system.\n"
+#~ msgstr ""
+#~ "「/」、「/usr」、「/boot」、「/var」のいずれかのマウントポイントが\n"
+#~ "設定されているパーティションに対して、暗号化ファイルシステムが\n"
+#~ "割り当てられました。この処理は実行できません。マウントポイントを変更するか、\n"
+#~ "ループバックでないファイルシステムを使用してください。\n"

Modified: branches/SLE12-SP3/yast/ja/po/update.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/update.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/update.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: update\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 02:31+0000\n"
+"POT-Creation-Date: 2017-04-20 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -167,8 +167,8 @@
#: src/clients/inst_update.rb:69 src/clients/inst_update.rb:74
#: src/include/update/rootpart.rb:100 src/include/update/rootpart.rb:106
#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:157
-#: src/modules/RootPart.rb:1442 src/modules/RootPart.rb:1448
-#: src/modules/RootPart.rb:2006
+#: src/modules/RootPart.rb:1445 src/modules/RootPart.rb:1451
+#: src/modules/RootPart.rb:2009
msgid "Unknown"
msgstr "不明"

@@ -658,19 +658,19 @@
msgstr "マウントを行わずに飛ばす(&S)"

#. yes-no popup
-#: src/modules/RootPart.rb:1066
+#: src/modules/RootPart.rb:1069
msgid "Incorrect password. Try again?"
msgstr "パスワードが正しくありません。再試行しますか?"

#. TRANSLATORS: a popup headline
-#: src/modules/RootPart.rb:1169
+#: src/modules/RootPart.rb:1172
msgid "Warning"
msgstr "警告"

#. TRANSLATORS: error message,
#. %1 is replaced with the current /boot partition size
#. %2 with the recommended size
-#: src/modules/RootPart.rb:1174
+#: src/modules/RootPart.rb:1177
msgid ""
"Your /boot partition is too small (%1 MB).\n"
"We recommend a size of no less than %2 MB or else the new Kernel may not
fit.\n"
@@ -687,7 +687,7 @@
"このままで更新を続行しますか?\n"

#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount'
command
-#: src/modules/RootPart.rb:1266
+#: src/modules/RootPart.rb:1269
msgid ""
"The partition %1 could not be mounted.\n"
"\n"
@@ -708,27 +708,27 @@
"を、アップデートを中止するには[キャンセル]をそれぞれクリックしてください。\n"

#. push button
-#: src/modules/RootPart.rb:1284
+#: src/modules/RootPart.rb:1287
msgid "&Specify Mount Options"
msgstr "マウントオプションの指定(&S)"

#. popup heading
-#: src/modules/RootPart.rb:1300
+#: src/modules/RootPart.rb:1303
msgid "Mount Options"
msgstr "マウントオプション"

#. text entry label
-#: src/modules/RootPart.rb:1303
+#: src/modules/RootPart.rb:1306
msgid "&Mount Point"
msgstr "マウントポイント(&M)"

#. tex entry label
-#: src/modules/RootPart.rb:1306
+#: src/modules/RootPart.rb:1309
msgid "&Device"
msgstr "デバイス(&D)"

#. text entry label
-#: src/modules/RootPart.rb:1311
+#: src/modules/RootPart.rb:1314
msgid ""
"&File System\n"
"(empty for autodetection)"
@@ -737,12 +737,12 @@
"(自動検出の場合は何も指定しない)"

#. error message
-#: src/modules/RootPart.rb:1388
+#: src/modules/RootPart.rb:1391
msgid "The /var partition %1 could not be mounted.\n"
msgstr "/var パーティション %1 をマウントできませんでした。\n"

#. Informational text about selected partition, %x are replaced with values
later
-#: src/modules/RootPart.rb:1429
+#: src/modules/RootPart.rb:1432
msgid ""
"<b>File system:</b> %1, <b>Type:</b> %2,<br>\n"
"<b>Label:</b> %3, <b>Size:</b> %4,<br>\n"
@@ -754,17 +754,17 @@
"<b>udev ID:</b> %5,<br>\n"
"<b>udevパス:</b> %6"

-#: src/modules/RootPart.rb:1443
+#: src/modules/RootPart.rb:1446
msgid "None"
msgstr "なし"

#. a popup caption
-#: src/modules/RootPart.rb:1466
+#: src/modules/RootPart.rb:1469
msgid "Unable to find the /var partition automatically"
msgstr "/var パーティションが自動で見つかりませんでした"

#. a popup message
-#: src/modules/RootPart.rb:1471
+#: src/modules/RootPart.rb:1474
msgid ""
"Your system uses a separate /var partition which is required for the
upgrade\n"
"process to detect the disk-naming changes. Select the /var partition
manually\n"
@@ -774,22 +774,22 @@
"います。/varパーティションを手動で選択しアップグレード処理を続行してください。"

#. a combo-box label
-#: src/modules/RootPart.rb:1484
+#: src/modules/RootPart.rb:1487
msgid "&Select /var Partition Device"
msgstr "/varパーティションデバイスの選択(&S)"

#. an informational rich-text widget label
-#: src/modules/RootPart.rb:1490
+#: src/modules/RootPart.rb:1493
msgid "Device Info"
msgstr "デバイス情報"

#. error message
-#: src/modules/RootPart.rb:1631
+#: src/modules/RootPart.rb:1634
msgid "Unable to mount /var partition with this disk configuration.\n"
msgstr "このディスク構成では/varパーティションをマウントできません。\n"

#. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.rb:1662
+#: src/modules/RootPart.rb:1665
msgid ""
"Partitions could not be mounted.\n"
"\n"
@@ -802,7 +802,7 @@
#. read the keyboard settings now, so that it used when
#. typing passwords for encrypted partitions
#. Calling a script because otherwise this module would depend on yast2-country
-#: src/modules/RootPart.rb:1706
+#: src/modules/RootPart.rb:1709
msgid ""
"Some partitions in the system on %1 are mounted by kernel-device name. This
is\n"
"not reliable for the update since kernel-device names are unfortunately not\n"
@@ -815,37 +815,37 @@
"他のものに変更することを強くお勧めします。"

#. error message
-#: src/modules/RootPart.rb:1724
+#: src/modules/RootPart.rb:1727
msgid "No fstab found."
msgstr "fstabが見つかりません。"

#. message part 1
-#: src/modules/RootPart.rb:1749
+#: src/modules/RootPart.rb:1752
msgid "The root partition in /etc/fstab has an invalid root device.\n"
msgstr "/etc/fstabのルートパーティションに無効なルートデバイスがあります。\n"

#. message part 2
-#: src/modules/RootPart.rb:1754
+#: src/modules/RootPart.rb:1757
msgid "It is currently mounted as %1 but listed as %2.\n"
msgstr "このデバイスは、現在 %1 としてマウントされていますが、%2 と指定されています。\n"

#. TRANSLATORS: label for filesystem snapshot taken before system update
-#: src/modules/RootPart.rb:1810
+#: src/modules/RootPart.rb:1813
msgid "before update"
msgstr "更新前"

#. prepare progress-bar
-#: src/modules/RootPart.rb:2131
+#: src/modules/RootPart.rb:2134
msgid "Evaluating root partition. One moment please..."
msgstr "ルートパーティションを評価しています。しばらくお待ちください..."

#. intermediate popup while mounting partitions
-#: src/modules/RootPart.rb:2214
+#: src/modules/RootPart.rb:2217
msgid "Mounting partitions. One moment please..."
msgstr "パーティションをマウントしています。しばらくお待ちください..."

#. TRANSLATORS: dialog caption
-#: src/modules/RootPart.rb:2229
+#: src/modules/RootPart.rb:2232
msgid "Searching for Available Systems"
msgstr "使用できるシステムを検索しています"


Modified: branches/SLE12-SP3/yast/ja/po/vm.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/vm.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/vm.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: vm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 02:29+0000\n"
+"POT-Creation-Date: 2017-03-31 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -21,7 +21,7 @@
msgstr "ハイパーバイザとツールのインストール"

#. progress step title
-#: src/clients/vm_finish.rb:69
+#: src/clients/vm_finish.rb:70
msgid "Configuring the virtual machine..."
msgstr "仮想マシンを設定しています..."


Modified: branches/SLE12-SP3/yast/ja/po/xpram.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/xpram.ja.po 2017-05-23 07:05:44 UTC (rev
97358)
+++ branches/SLE12-SP3/yast/ja/po/xpram.ja.po 2017-05-23 07:06:46 UTC (rev
97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: xpram\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 17:53+0200\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -55,46 +55,46 @@
msgstr
"<p>現在このツールでは、1つのパーティションにXPRAM全体を割り当てることしかできません。複数のパーティションを利用する場合は、Linux kernel
2.6 - April 2004用の「Device Drivers, Features and Commands November 30,
2004」ストリームを参照してください。</p><p>この場合、このモジュールのXPRAMは無効にしてください。</p>"

#. help text for XPRAM 3/4
-#: src/include/s390/xpram/ui.rb:57
+#: src/include/s390/xpram/ui.rb:60
msgid "<p>Choose the correct mount point for <b>Mount Point</b>.</p>"
msgstr "<p><b>マウントポイント</b>には正しいマウントポイントを選択してください。</p>"

#. help text for XPRAM 4/4
-#: src/include/s390/xpram/ui.rb:59
+#: src/include/s390/xpram/ui.rb:62
msgid "<p>Next, choose the file system to use on the device.</p>"
msgstr "<p>次にデバイスで使用するファイルシステムを選択します。</p>"

#. radio button label for to not start xpram
-#: src/include/s390/xpram/ui.rb:83
+#: src/include/s390/xpram/ui.rb:86
msgid "Do No&t Start XPRAM"
msgstr "XPRAMを開始しない(&T)"

#. radio button label for to start xpram
-#: src/include/s390/xpram/ui.rb:92
+#: src/include/s390/xpram/ui.rb:95
msgid "&Start XPRAM"
msgstr "XPRAMを開始する(&S)"

-#: src/include/s390/xpram/ui.rb:104
+#: src/include/s390/xpram/ui.rb:107
msgid "Install File System or Swap Although &XPRAM Contains Valid Data"
msgstr "XPRAMに有効なデータが含まれていても、ファイルシステムをインストールするか、スワップする(&X)"

#. frame label
-#: src/include/s390/xpram/ui.rb:113
+#: src/include/s390/xpram/ui.rb:116
msgid "Mount Point"
msgstr "マウントポイント"

#. combobox label
-#: src/include/s390/xpram/ui.rb:122
+#: src/include/s390/xpram/ui.rb:125
msgid "&Mount Point"
msgstr "マウントポイント(&M)"

#. frame label
-#: src/include/s390/xpram/ui.rb:137
+#: src/include/s390/xpram/ui.rb:140
msgid "File System Type"
msgstr "ファイルシステムの種類"

#. combobox label
-#: src/include/s390/xpram/ui.rb:146
+#: src/include/s390/xpram/ui.rb:149
msgid "F&ile System to Use:"
msgstr "使用するファイルシステム(&I):"

@@ -104,36 +104,34 @@
msgstr "XPRAMの設定を保存中"

#. Progress stage 1/2
-#: src/modules/Xpram.rb:109
+#: src/modules/Xpram.rb:108
msgid "Write the settings"
msgstr "設定を書き込む"

#. Progress stage 2/2
-#: src/modules/Xpram.rb:111
+#: src/modules/Xpram.rb:110
msgid "Restart the service"
msgstr "サービスを再起動する"

#. Progress step 1/2
-#: src/modules/Xpram.rb:115
+#: src/modules/Xpram.rb:114
msgid "Writing the settings..."
msgstr "設定を書き込み中..."

#. Progress step 2/2
-#: src/modules/Xpram.rb:117
+#: src/modules/Xpram.rb:116
msgid "Restarting service..."
msgstr "サービスを再起動しています..."

#. Progress finished
-#: src/modules/Xpram.rb:119
+#: src/modules/Xpram.rb:118
msgid "Finished"
msgstr "完了"

-#: src/modules/Xpram.rb:136
+#: src/modules/Xpram.rb:135
msgid "Error stopping xpram. Try \"rcxpram stop\" manually."
msgstr "xpramを停止中にエラーが発生しました。手動で「rcxpram stop」を実行してください。"

-#. map out = (map) SCR::Execute(.target.bash_output,"bash -x /etc/init.d/xpram
start", $["TERM":"raw"]);
-#. y2milestone("got %1", out);
-#: src/modules/Xpram.rb:154
+#: src/modules/Xpram.rb:151
msgid "Error starting xpram. Try \"rcxpram start\" manually."
msgstr "xpramを起動中にエラーが発生しました。手動で「rcxpram start」を実行してください。"

Modified: branches/SLE12-SP3/yast/ja/po/yast2-apparmor.ja.po
===================================================================
--- branches/SLE12-SP3/yast/ja/po/yast2-apparmor.ja.po 2017-05-23 07:05:44 UTC
(rev 97358)
+++ branches/SLE12-SP3/yast/ja/po/yast2-apparmor.ja.po 2017-05-23 07:06:46 UTC
(rev 97359)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: yast2-apparmor\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2017-04-05 02:27+0000\n"
"PO-Revision-Date: 2017-04-18 14:01\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -78,7 +78,7 @@

#. AppArmor dialog caption
#. Network dialog caption
-#: src/clients/apparmor.rb:51 src/include/apparmor/aa-config.rb:440
+#: src/clients/apparmor.rb:51 src/include/apparmor/aa-config.rb:60
msgid "AppArmor Configuration"
msgstr "AppArmor環境設定"

@@ -136,119 +136,11 @@
#. you may find current contact information at www.novell.com
#.
#. ***************************************************************************
-#: src/include/apparmor/aa-config.rb:52
-msgid "This operation generated the following error. Check your installation
and AppArmor profile settings."
-msgstr "この操作により次のエラーが発生しました。インストール内容およびAppArmorのプロファイル設定を確認してください。"
+#: src/include/apparmor/aa-config.rb:48
+msgid "Failed to change apparmor service. Please use journal (journalctl -n -u
apparmor) to diagnose"
+msgstr ""

-#: src/include/apparmor/aa-config.rb:91 src/include/apparmor/aa-config.rb:103
-#: src/include/apparmor/aa-config.rb:115
-msgid "Disabled"
-msgstr "無効"
-
-#: src/include/apparmor/aa-config.rb:92 src/include/apparmor/aa-config.rb:104
-#: src/include/apparmor/aa-config.rb:116
-msgid "1 minute"
-msgstr "1分"
-
-#: src/include/apparmor/aa-config.rb:93 src/include/apparmor/aa-config.rb:105
-#: src/include/apparmor/aa-config.rb:117
-msgid "5 minutes"
-msgstr "5分"
-
-#: src/include/apparmor/aa-config.rb:94 src/include/apparmor/aa-config.rb:106
-#: src/include/apparmor/aa-config.rb:118
-msgid "10 minutes"
-msgstr "10分"
-
-#: src/include/apparmor/aa-config.rb:95 src/include/apparmor/aa-config.rb:107
-#: src/include/apparmor/aa-config.rb:119
-msgid "15 minutes"
-msgstr "15分"
-
-#: src/include/apparmor/aa-config.rb:96 src/include/apparmor/aa-config.rb:108
-#: src/include/apparmor/aa-config.rb:120
-msgid "30 minutes"
-msgstr "30分"
-
-#: src/include/apparmor/aa-config.rb:97 src/include/apparmor/aa-config.rb:109
-#: src/include/apparmor/aa-config.rb:121
-msgid "1 hour"
-msgstr "1時間"
-
-#: src/include/apparmor/aa-config.rb:98 src/include/apparmor/aa-config.rb:110
-#: src/include/apparmor/aa-config.rb:122
-msgid "1 day"
-msgstr "1日"
-
-#: src/include/apparmor/aa-config.rb:99 src/include/apparmor/aa-config.rb:111
-#: src/include/apparmor/aa-config.rb:123
-msgid "1 week"
-msgstr "1週間"
-
-#: src/include/apparmor/aa-config.rb:131 src/include/apparmor/aa-config.rb:233
-msgid "Security Event Notification"
-msgstr "セキュリティイベント通知"
-
-#: src/include/apparmor/aa-config.rb:138
-msgid "Terse Notification"
-msgstr "簡潔な通知"
-
-#: src/include/apparmor/aa-config.rb:142 src/include/apparmor/aa-config.rb:171
-#: src/include/apparmor/aa-config.rb:200
-msgid "Frequency"
-msgstr "周波数"
-
-#: src/include/apparmor/aa-config.rb:145 src/include/apparmor/aa-config.rb:174
-#: src/include/apparmor/aa-config.rb:203
-msgid "Email Address"
-msgstr "電子メールアドレス"
-
-#: src/include/apparmor/aa-config.rb:150 src/include/apparmor/aa-config.rb:179
-#: src/include/apparmor/aa-config.rb:208
-msgid "Severity"
-msgstr "重要度"
-
-#: src/include/apparmor/aa-config.rb:159 src/include/apparmor/aa-config.rb:188
-#: src/include/apparmor/aa-config.rb:217
-msgid "Include Unknown Severity Events"
-msgstr "不明重要度イベントを含みます"
-
-#: src/include/apparmor/aa-config.rb:167
-msgid "Summary Notification"
-msgstr "要約の通知"
-
-#: src/include/apparmor/aa-config.rb:196
-msgid "Verbose Notification"
-msgstr "詳細な通知"
-
-#: src/include/apparmor/aa-config.rb:270 src/include/apparmor/aa-config.rb:310
-#: src/include/apparmor/aa-config.rb:350
-msgid "An email address is required for each selected notification method."
-msgstr "選択された通知方法には、電子メールアドレスが必要です。"
-
-#: src/include/apparmor/aa-config.rb:394
-msgid "Configuration failed for the following operations: "
-msgstr "次の操作に対して設定が失敗しました:"
-
-#: src/include/apparmor/aa-config.rb:401 src/include/apparmor/aa-config.rb:434
-msgid "Notification is enabled"
-msgstr "通知は有効です"
-
-#. Notification Status
-#: src/include/apparmor/aa-config.rb:403 src/include/apparmor/aa-config.rb:431
-msgid "Notification is disabled"
-msgstr "通知は無効です"
-
-#. AppArmor Status
-#: src/include/apparmor/aa-config.rb:422
-msgid "AppArmor is disabled"
-msgstr "AppArmorは無効です"
-
-#: src/include/apparmor/aa-config.rb:426
-msgid "AppArmor is enabled"
-msgstr "AppArmorは有効です"
-
-#: src/include/apparmor/aa-config.rb:441
+#: src/include/apparmor/aa-config.rb:61
msgid ""
"<p><b>AppArmor Status</b><br>This reports whether the AppArmor policy
enforcement \n"
"module is loaded and functioning.</p>"
@@ -256,7 +148,7 @@
"<p><b>AppArmorのステータス</b>]<br>このオプションは、AppArmorポリシー強制モジュールが\n"
"ロードされ機能しているかどうかを報告します。</p>"

-#: src/include/apparmor/aa-config.rb:444
+#: src/include/apparmor/aa-config.rb:64
msgid ""
"<p><b>Security Event Notification</b><br>Configure this tool if you want \n"
"to be notified by email when access violations have occurred.</p>"
@@ -264,7 +156,7 @@
"<p><b>セキュリティイベント通知</b><br>アクセス違反が発生したときに\n"
"電子メールで通知する場合、このツールを設定します。</p>"

-#: src/include/apparmor/aa-config.rb:447
+#: src/include/apparmor/aa-config.rb:67
msgid ""
"<p><b>Profile Modes</b><br>Use this tool to change the way that AppArmor \n"
"uses individual profiles.</p>"
@@ -272,38 +164,28 @@
"<p><b>プロファイルモード</b><br>このツールを利用することで、\n"
"AppArmorが個々のプロファイルを使用する方法を変更することができます。</p>"

-#: src/include/apparmor/aa-config.rb:462
+#: src/include/apparmor/aa-config.rb:82
msgid "&Enable AppArmor"
msgstr "AppArmorを有効にする(&E)"

-#: src/include/apparmor/aa-config.rb:469
+#: src/include/apparmor/aa-config.rb:89
msgid "Configure AppArmor"
msgstr "AppArmorの設定"

-#. event notification disabled due to changes in AppArmor
-#. `Frame ( _("Security Event Notification"),
-#. `HBox(
-#. `VSpacing(1), `HSpacing(1),
-#. `HVCenter( `Label( `id(`notifyLabel), evEnStr )),
-#. `PushButton( `id(`ntconf), _("C&onfigure")),
-#. `VSpacing(1), `HSpacing(1)
-#. )
-#. ),
-#. `VSpacing(1), `HSpacing(20),
-#: src/include/apparmor/aa-config.rb:485
+#: src/include/apparmor/aa-config.rb:95
msgid "Configure Profile Modes"
msgstr "プロファイルモードの設定"

-#: src/include/apparmor/aa-config.rb:491
+#: src/include/apparmor/aa-config.rb:101
msgid "Set profile modes"
msgstr "プロファイルモードの設定"

-#: src/include/apparmor/aa-config.rb:494
+#: src/include/apparmor/aa-config.rb:104
msgid "Co&nfigure"
msgstr "設定(&N)"

#. May want to replace Wizard() with UI()
-#: src/include/apparmor/aa-config.rb:518
+#: src/include/apparmor/aa-config.rb:128
#: src/include/apparmor/config_complain.rb:187
#: src/include/apparmor/config_complain.rb:235
#: src/include/apparmor/config_complain.rb:245
@@ -1994,7 +1876,77 @@
msgid "You must select a profile to edit."
msgstr "編集するプロファイルを選択する必要があります。"

-#: perl-lib/Notify.pm:51
-#, perl-format
-msgid "Failed copying %s."
-msgstr "%s のコピーに失敗しました。"
+#~ msgid "This operation generated the following error. Check your
installation and AppArmor profile settings."
+#~ msgstr "この操作により次のエラーが発生しました。インストール内容およびAppArmorのプロファイル設定を確認してください。"
+
+#~ msgid "Disabled"
+#~ msgstr "無効"
+
+#~ msgid "1 minute"
+#~ msgstr "1分"
+
+#~ msgid "5 minutes"
+#~ msgstr "5分"
+
+#~ msgid "10 minutes"
+#~ msgstr "10分"
+
+#~ msgid "15 minutes"
+#~ msgstr "15分"
+
+#~ msgid "30 minutes"
+#~ msgstr "30分"
+
+#~ msgid "1 hour"
+#~ msgstr "1時間"
+
+#~ msgid "1 day"
+#~ msgstr "1日"
+
+#~ msgid "1 week"
+#~ msgstr "1週間"
+
+#~ msgid "Security Event Notification"
+#~ msgstr "セキュリティイベント通知"
+
+#~ msgid "Terse Notification"
+#~ msgstr "簡潔な通知"
+
+#~ msgid "Frequency"
+#~ msgstr "周波数"
+
+#~ msgid "Email Address"
+#~ msgstr "電子メールアドレス"
+
+#~ msgid "Severity"
+#~ msgstr "重要度"
+
+#~ msgid "Include Unknown Severity Events"
+#~ msgstr "不明重要度イベントを含みます"
+
+#~ msgid "Summary Notification"
+#~ msgstr "要約の通知"
+
+#~ msgid "Verbose Notification"
+#~ msgstr "詳細な通知"
+
+#~ msgid "An email address is required for each selected notification method."
+#~ msgstr "選択された通知方法には、電子メールアドレスが必要です。"
+
+#~ msgid "Configuration failed for the following operations: "
+#~ msgstr "次の操作に対して設定が失敗しました:"
+
+#~ msgid "Notification is enabled"
+#~ msgstr "通知は有効です"
+
+#~ msgid "Notification is disabled"
+#~ msgstr "通知は無効です"
+
+#~ msgid "AppArmor is disabled"
+#~ msgstr "AppArmorは無効です"
+
+#~ msgid "AppArmor is enabled"
+#~ msgstr "AppArmorは有効です"
+
+#~ msgid "Failed copying %s."
+#~ msgstr "%s のコピーに失敗しました。"


< Previous Next >
This Thread
  • No further messages