sync with code

1 files changed, 304 insertions, 307 deletions

diff --git a/po/ja.po b/po/ja.po
index e91c999d..731eea96 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 16:31+0200\n"
+"POT-Creation-Date: 2007-08-10 19:06+0200\n"
 "PO-Revision-Date: 2007-08-07 17:00+0900\n"
 "Last-Translator: BANDO Yukiko <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:687
+#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:689
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -32,7 +32,7 @@ msgstr ""
 "更新リストが無効です。インストールされているパッケージの\n"
 "更新版がないか、既にすべてインストールされています。"
 
-#: ../MandrivaUpdate:105 ../rpmdrake:90 ../rpmdrake:525 ../rpmdrake.pm:189
+#: ../MandrivaUpdate:105 ../rpmdrake:90 ../rpmdrake:539 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Management"
 msgstr "ソフトウェアの管理"
@@ -42,22 +42,22 @@ msgstr "ソフトウェアの管理"
 msgid "Here is the list of software package updates"
 msgstr "RPM アップデートの一覧です"
 
-#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1081 ../rpmdrake:454
+#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1081 ../rpmdrake:468
 #, c-format
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../MandrivaUpdate:148 ../rpmdrake:459 ../rpmdrake.pm:778
+#: ../MandrivaUpdate:148 ../rpmdrake:473 ../rpmdrake.pm:775
 #, c-format
 msgid "Select all"
 msgstr "すべて選択"
 
-#: ../MandrivaUpdate:156 ../rpmdrake.pm:782
+#: ../MandrivaUpdate:156 ../rpmdrake.pm:779
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../MandrivaUpdate:164 ../rpmdrake:469
+#: ../MandrivaUpdate:164 ../rpmdrake:483
 #, c-format
 msgid "Quit"
 msgstr "終了"
@@ -238,9 +238,9 @@ msgstr "メディアの種類:"
 #: ../Rpmdrake/edit_urpm_sources.pm:447 ../Rpmdrake/edit_urpm_sources.pm:474
 #: ../Rpmdrake/edit_urpm_sources.pm:540 ../Rpmdrake/edit_urpm_sources.pm:627
 #: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:726
-#: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:611
-#: ../rpmdrake.pm:301 ../rpmdrake.pm:616 ../rpmdrake.pm:701 ../rpmdrake.pm:774
+#: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:461
+#: ../Rpmdrake/init.pm:133 ../Rpmdrake/pkg.pm:627 ../Rpmdrake/pkg.pm:669
+#: ../rpmdrake.pm:298 ../rpmdrake.pm:613 ../rpmdrake.pm:698 ../rpmdrake.pm:771
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
@@ -250,10 +250,10 @@ msgstr "キャンセル"
 #: ../Rpmdrake/edit_urpm_sources.pm:624 ../Rpmdrake/edit_urpm_sources.pm:667
 #: ../Rpmdrake/edit_urpm_sources.pm:719 ../Rpmdrake/edit_urpm_sources.pm:792
 #: ../Rpmdrake/edit_urpm_sources.pm:922 ../Rpmdrake/edit_urpm_sources.pm:1082
-#: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:475 ../Rpmdrake/gui.pm:480
-#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:807
-#: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:125 ../rpmdrake.pm:239
-#: ../rpmdrake.pm:304 ../rpmdrake.pm:616
+#: ../Rpmdrake/gui.pm:461 ../Rpmdrake/gui.pm:477 ../Rpmdrake/gui.pm:482
+#: ../Rpmdrake/init.pm:133 ../Rpmdrake/pkg.pm:473 ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/rpmnew.pm:179 ../rpmdrake.pm:125 ../rpmdrake.pm:237
+#: ../rpmdrake.pm:301 ../rpmdrake.pm:613
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -471,8 +471,8 @@ msgstr "メディアの制限"
 msgid "Command"
 msgstr "コマンド"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:756 ../Rpmdrake/gui.pm:684
-#: ../Rpmdrake/pkg.pm:97 ../Rpmdrake/pkg.pm:127 ../Rpmdrake/pkg.pm:167
+#: ../Rpmdrake/edit_urpm_sources.pm:756 ../Rpmdrake/gui.pm:686
+#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:128 ../Rpmdrake/pkg.pm:168
 #: ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Configure media"
 msgstr "メディアを設定"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:977
+#: ../Rpmdrake/edit_urpm_sources.pm:977 ../Rpmdrake/pkg.pm:204
 #, c-format
 msgid "Enabled"
 msgstr "有効"
@@ -595,7 +595,7 @@ msgstr "パラレル"
 msgid "Global options..."
 msgstr "共通オプション"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:138
+#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:139
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -690,7 +690,7 @@ msgstr "サイズ: "
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:827
+#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:824
 #, c-format
 msgid "Medium: "
 msgstr "メディア: "
@@ -701,7 +701,7 @@ msgid "Files:"
 msgstr "ファイル: "
 
 #: ../Rpmdrake/gui.pm:118 ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:137
-#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:133
+#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:134
 #, c-format
 msgid "(Not available)"
 msgstr "(なし)"
@@ -736,55 +736,55 @@ msgstr "概要: "
 msgid "Description: "
 msgstr "説明: "
 
-#: ../Rpmdrake/gui.pm:443 ../Rpmdrake/gui.pm:471 ../Rpmdrake/gui.pm:473
+#: ../Rpmdrake/gui.pm:444 ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:475
 #, c-format
 msgid "More information on package..."
 msgstr "パッケージの詳細情報..."
 
-#: ../Rpmdrake/gui.pm:445
+#: ../Rpmdrake/gui.pm:446
 #, c-format
 msgid "Please choose"
 msgstr "選んでください"
 
-#: ../Rpmdrake/gui.pm:446
+#: ../Rpmdrake/gui.pm:447
 #, c-format
 msgid "The following package is needed:"
 msgstr "以下のパッケージのいずれかが必要です:"
 
-#: ../Rpmdrake/gui.pm:446
+#: ../Rpmdrake/gui.pm:447
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "以下のパッケージのいずれかが必要です:"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:464
+#: ../Rpmdrake/gui.pm:461 ../Rpmdrake/gui.pm:466
 #, c-format
 msgid "More info"
 msgstr "詳細情報"
 
-#: ../Rpmdrake/gui.pm:466
+#: ../Rpmdrake/gui.pm:468
 #, c-format
 msgid "Information on packages"
 msgstr "パッケージの情報"
 
-#: ../Rpmdrake/gui.pm:499
+#: ../Rpmdrake/gui.pm:501
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "いくつかのパッケージを削除します"
 
-#: ../Rpmdrake/gui.pm:500
+#: ../Rpmdrake/gui.pm:502
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr "依存関係を満たすために 以下のパッケージを削除します:"
 
-#: ../Rpmdrake/gui.pm:506 ../Rpmdrake/gui.pm:515
+#: ../Rpmdrake/gui.pm:508 ../Rpmdrake/gui.pm:517
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "削除できないパッケージがあります"
 
-#: ../Rpmdrake/gui.pm:507
+#: ../Rpmdrake/gui.pm:509
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -793,7 +793,7 @@ msgstr ""
 "このパッケージを削除するとシステムが壊れます:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:516 ../Rpmdrake/gui.pm:583
+#: ../Rpmdrake/gui.pm:518 ../Rpmdrake/gui.pm:585
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -804,12 +804,12 @@ msgstr ""
 "以下のパッケージの選択を解除します:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:545
+#: ../Rpmdrake/gui.pm:547
 #, c-format
 msgid "Additional packages needed"
 msgstr "追加パッケージが必要です"
 
-#: ../Rpmdrake/gui.pm:546
+#: ../Rpmdrake/gui.pm:548
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -820,22 +820,22 @@ msgstr ""
 "以下のパッケージを追加します:\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:560
+#: ../Rpmdrake/gui.pm:562
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (スキップリストに含まれています)"
 
-#: ../Rpmdrake/gui.pm:564
+#: ../Rpmdrake/gui.pm:566
 #, c-format
 msgid "One package cannot be installed"
 msgstr "インストールできないパッケージがあります"
 
-#: ../Rpmdrake/gui.pm:564
+#: ../Rpmdrake/gui.pm:566
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "インストールできないパッケージがあります"
 
-#: ../Rpmdrake/gui.pm:566
+#: ../Rpmdrake/gui.pm:568
 #, c-format
 msgid ""
 "Sorry, the following package cannot be selected:\n"
@@ -846,7 +846,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:567
+#: ../Rpmdrake/gui.pm:569
 #, c-format
 msgid ""
 "Sorry, the following packages can't be selected:\n"
@@ -857,27 +857,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:526
+#: ../Rpmdrake/gui.pm:584 ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "いくつかのパッケージを削除する必要があります"
 
-#: ../Rpmdrake/gui.pm:613
+#: ../Rpmdrake/gui.pm:615
 #, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr "エラー: %s は読み取り専用でマウントされているようです。"
 
-#: ../Rpmdrake/gui.pm:617
+#: ../Rpmdrake/gui.pm:619
 #, c-format
 msgid "You need to select some packages first."
 msgstr "まずパッケージを選んでください。"
 
-#: ../Rpmdrake/gui.pm:622
+#: ../Rpmdrake/gui.pm:624
 #, c-format
 msgid "Too many packages are selected"
 msgstr "選択されたパッケージが多すぎます"
 
-#: ../Rpmdrake/gui.pm:623
+#: ../Rpmdrake/gui.pm:625
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -893,42 +893,42 @@ msgstr ""
 "\n"
 "選択したパッケージをすべてインストールしますか？"
 
-#: ../Rpmdrake/gui.pm:649 ../Rpmdrake/pkg.pm:230
+#: ../Rpmdrake/gui.pm:651 ../Rpmdrake/pkg.pm:238
 #, c-format
 msgid "Fatal error"
 msgstr "致命的なエラー"
 
-#: ../Rpmdrake/gui.pm:650 ../Rpmdrake/pkg.pm:231
+#: ../Rpmdrake/gui.pm:652 ../Rpmdrake/pkg.pm:239
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "致命的なエラーが発生: %s."
 
-#: ../Rpmdrake/gui.pm:668
+#: ../Rpmdrake/gui.pm:670
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "パッケージのリストを作成しています。お待ちください..."
 
-#: ../Rpmdrake/gui.pm:686
+#: ../Rpmdrake/gui.pm:688
 #, c-format
 msgid "No update"
 msgstr "更新なし"
 
-#: ../Rpmdrake/gui.pm:710 ../rpmdrake:239
+#: ../Rpmdrake/gui.pm:712 ../rpmdrake:239
 #, c-format
 msgid "All"
 msgstr "すべて"
 
-#: ../Rpmdrake/gui.pm:719 ../rpmdrake:144
+#: ../Rpmdrake/gui.pm:721 ../rpmdrake:144
 #, c-format
 msgid "Upgradable"
 msgstr "更新可能"
 
-#: ../Rpmdrake/gui.pm:719 ../rpmdrake:144
+#: ../Rpmdrake/gui.pm:721 ../rpmdrake:144
 #, c-format
 msgid "Addable"
 msgstr "追加可能"
 
-#: ../Rpmdrake/gui.pm:739
+#: ../Rpmdrake/gui.pm:741
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "このパッケージには説明がありません\n"
@@ -961,7 +961,7 @@ msgstr "圧縮/解凍"
 
 #: ../Rpmdrake/icon.pm:40 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:57
 #: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:89 ../Rpmdrake/icon.pm:110
-#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:134 ../Rpmdrake/pkg.pm:74
+#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:134 ../Rpmdrake/pkg.pm:75
 #, c-format
 msgid "Other"
 msgstr "その他"
@@ -1542,6 +1542,11 @@ msgstr "使い方: %s [オプション]..."
 
 #: ../Rpmdrake/init.pm:40
 #, c-format
+msgid "  --auto                 assume default answers to questions"
+msgstr ""
+
+#: ../Rpmdrake/init.pm:41
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
@@ -1549,42 +1554,42 @@ msgstr ""
 "  --changelog-first      詳細情報のチェンジログをファイルリストより先に表示す"
 "る"
 
-#: ../Rpmdrake/init.pm:41
+#: ../Rpmdrake/init.pm:42
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     指定したメディアだけを使う"
 
-#: ../Rpmdrake/init.pm:42
+#: ../Rpmdrake/init.pm:43
 #, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "  --merge-all-rpmnew     .rpmnew や .rpmsave ファイルがあればすべてマージする"
 
-#: ../Rpmdrake/init.pm:43
+#: ../Rpmdrake/init.pm:44
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            モードを指定: install (デフォルト), remove, update"
 
-#: ../Rpmdrake/init.pm:44
+#: ../Rpmdrake/init.pm:45
 #, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      update モードで最初の確認メッセージを表示しない"
 
-#: ../Rpmdrake/init.pm:45
+#: ../Rpmdrake/init.pm:46
 #, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      起動時にメディアを更新しない"
 
-#: ../Rpmdrake/init.pm:46
+#: ../Rpmdrake/init.pm:47
 #, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        パッケージの署名を確認しない"
 
-#: ../Rpmdrake/init.pm:47
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
@@ -1593,37 +1598,37 @@ msgstr ""
 "  --parallel=alias,host  パラレルモードで依存を表示するのに \"alias\" グルー"
 "プまたは \"host\" マシンを使う"
 
-#: ../Rpmdrake/init.pm:48
+#: ../Rpmdrake/init.pm:49
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    指定したパッケージだけを表示する"
 
-#: ../Rpmdrake/init.pm:49
+#: ../Rpmdrake/init.pm:50
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,.       指定したパッケージを事前に選択する"
 
-#: ../Rpmdrake/init.pm:50
+#: ../Rpmdrake/init.pm:51
 #, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 強制的に root で実行する"
 
-#: ../Rpmdrake/init.pm:51
+#: ../Rpmdrake/init.pm:52
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           指定したパッケージを検索し表示する"
 
-#: ../Rpmdrake/init.pm:52
+#: ../Rpmdrake/init.pm:53
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - このツールのバージョンを表示\n"
 
-#: ../Rpmdrake/init.pm:129
+#: ../Rpmdrake/init.pm:130
 #, c-format
 msgid "Running in user mode"
 msgstr "ユーザモードで実行"
 
-#: ../Rpmdrake/init.pm:130
+#: ../Rpmdrake/init.pm:131
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1634,12 +1639,12 @@ msgstr ""
 "現在の権限ではシステムを変更することはできませんが\n"
 "データベースを閲覧することはできます。"
 
-#: ../Rpmdrake/init.pm:137 ../Rpmdrake/init.pm:162
+#: ../Rpmdrake/init.pm:138 ../Rpmdrake/init.pm:163
 #, c-format
 msgid "Welcome"
 msgstr "ようこそ"
 
-#: ../Rpmdrake/init.pm:142
+#: ../Rpmdrake/init.pm:143
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1651,7 +1656,7 @@ msgstr ""
 "\n"
 "このツールはシステムからソフトウェアを削除するお手伝いをします。"
 
-#: ../Rpmdrake/init.pm:147
+#: ../Rpmdrake/init.pm:148
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1663,12 +1668,12 @@ msgstr ""
 "\n"
 "このツールはパッケージを更新するお手伝いをします。"
 
-#: ../Rpmdrake/init.pm:152
+#: ../Rpmdrake/init.pm:153
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "RPM インストールツールへようこそ"
 
-#: ../Rpmdrake/init.pm:153
+#: ../Rpmdrake/init.pm:154
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1682,24 +1687,24 @@ msgstr ""
 "Mandriva Linux の CDROM や DVD には数千ものパッケージが収録されています。\n"
 "このツールはソフトウェアをインストールするお手伝いをします。"
 
-#: ../Rpmdrake/init.pm:164
+#: ../Rpmdrake/init.pm:165
 #, c-format
 msgid "The software installation tool can set up media sources."
 msgstr ""
 "RPM インストールツールを使ってメディアソースをセットアップすることができま"
 "す。"
 
-#: ../Rpmdrake/init.pm:165
+#: ../Rpmdrake/init.pm:166
 #, c-format
 msgid "Do you want to add media sources now?"
 msgstr "メディアソースを今追加しますか？"
 
-#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:526
+#: ../Rpmdrake/pkg.pm:188 ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Confirmation"
 msgstr "確認"
 
-#: ../Rpmdrake/pkg.pm:188
+#: ../Rpmdrake/pkg.pm:189
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1712,12 +1717,12 @@ msgstr ""
 "\n"
 "続けますか？"
 
-#: ../Rpmdrake/pkg.pm:197
+#: ../Rpmdrake/pkg.pm:198
 #, c-format
 msgid "Already existing update media"
 msgstr "更新メディアは既に存在します"
 
-#: ../Rpmdrake/pkg.pm:198
+#: ../Rpmdrake/pkg.pm:199
 #, fuzzy, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1732,12 +1737,12 @@ msgstr ""
 "(有効の欄にチェックを入れてください)\n"
 "その後で %s を再起動してください。"
 
-#: ../Rpmdrake/pkg.pm:209
+#: ../Rpmdrake/pkg.pm:210
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "ミラーを手動で選ぶには"
 
-#: ../Rpmdrake/pkg.pm:210
+#: ../Rpmdrake/pkg.pm:211
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1752,58 +1757,78 @@ msgstr ""
 "\n"
 "その後で %s を再起動してください。"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
-#: ../rpmdrake.pm:329
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576 ../Rpmdrake/pkg.pm:742
+#: ../rpmdrake.pm:326
 #, c-format
 msgid "Please wait"
 msgstr "お待ちください"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576
 #, c-format
 msgid "Package installation..."
 msgstr "パッケージをインストール..."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
+#: ../Rpmdrake/pkg.pm:258 ../Rpmdrake/pkg.pm:576 ../Rpmdrake/pkg.pm:742
 #, c-format
 msgid "Initializing..."
 msgstr "初期化中..."
 
-#: ../Rpmdrake/pkg.pm:261
+#: ../Rpmdrake/pkg.pm:268
 #, c-format
 msgid "Reading updates description"
 msgstr "更新の説明を読み込んでいます"
 
-#: ../Rpmdrake/pkg.pm:287 ../Rpmdrake/pkg.pm:364
+#: ../Rpmdrake/pkg.pm:294 ../Rpmdrake/pkg.pm:371
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "利用可能なパッケージを探しています。お待ちください..."
 
-#: ../Rpmdrake/pkg.pm:293
+#: ../Rpmdrake/pkg.pm:300
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "ベースパッケージのリストを作成しています。お待ちください..."
 
-#: ../Rpmdrake/pkg.pm:330
+#: ../Rpmdrake/pkg.pm:337
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "インストール済みのパッケージを探しています。お待ちください..."
 
-#: ../Rpmdrake/pkg.pm:447
+#: ../Rpmdrake/pkg.pm:453
+#, c-format
+msgid "Upgrade information"
+msgstr "更新情報"
+
+#: ../Rpmdrake/pkg.pm:455
+#, c-format
+msgid "These packages come with upgrade information"
+msgstr "これらのパッケージには更新情報があります"
+
+#: ../Rpmdrake/pkg.pm:463
+#, c-format
+msgid "Upgrade information about this package"
+msgstr "このパッケージの更新情報"
+
+#: ../Rpmdrake/pkg.pm:466
+#, c-format
+msgid "Upgrade information about package %s"
+msgstr "パッケージ %s の更新情報"
+
+#: ../Rpmdrake/pkg.pm:482
 #, c-format
 msgid "Could not create temporary directory '%s'"
 msgstr "一時ディレクトリ '%s' を作成できませんでした"
 
-#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:782
+#: ../Rpmdrake/pkg.pm:490 ../Rpmdrake/pkg.pm:723
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "指定されたパッケージをすべてインストールしました。"
 
-#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:494 ../Rpmdrake/pkg.pm:699
 #, c-format
 msgid "Problem during installation"
 msgstr "インストール中に問題が発生しました"
 
-#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:495 ../Rpmdrake/pkg.pm:514 ../Rpmdrake/pkg.pm:701
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1814,22 +1839,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:478 ../Rpmdrake/pkg.pm:751
+#: ../Rpmdrake/pkg.pm:513 ../Rpmdrake/pkg.pm:689
 #, c-format
 msgid "Installation failed"
 msgstr "インストールに失敗しました"
 
-#: ../Rpmdrake/pkg.pm:507
+#: ../Rpmdrake/pkg.pm:542
 #, c-format
 msgid "Unable to get source packages."
 msgstr "ソースパッケージを取得できません。"
 
-#: ../Rpmdrake/pkg.pm:508
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "パッケージを取得できません。%s"
 
-#: ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:754
+#: ../Rpmdrake/pkg.pm:544 ../Rpmdrake/pkg.pm:692
 #, c-format
 msgid ""
 "\n"
@@ -1842,140 +1867,95 @@ msgstr ""
 "エラーが発生しました:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:523
+#: ../Rpmdrake/pkg.pm:558
 #, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "以下の %d 個のパッケージをインストールします:"
 
-#: ../Rpmdrake/pkg.pm:528
+#: ../Rpmdrake/pkg.pm:563
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%d パッケージを削除しますか？"
 
-#: ../Rpmdrake/pkg.pm:530
+#: ../Rpmdrake/pkg.pm:565
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "更新するために以下のパッケージを削除します:"
 
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:566
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "更新するために以下のパッケージを削除します:"
 
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:566
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "続けますか？"
 
-#: ../Rpmdrake/pkg.pm:561
-#, c-format
-msgid "Change medium"
-msgstr "メディアを変更"
-
-#: ../Rpmdrake/pkg.pm:562
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "メディア %s をデバイス [%s] に挿入してください"
-
-#: ../Rpmdrake/pkg.pm:585
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "パッケージのインストールを準備..."
 
-#: ../Rpmdrake/pkg.pm:585
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Preparing package installation transaction..."
 msgstr "パッケージインストールのトランザクションを準備..."
 
-#: ../Rpmdrake/pkg.pm:588
+#: ../Rpmdrake/pkg.pm:592
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "以下のパッケージをインストール中: %s (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:593
 #, c-format
 msgid "Total: %s/%s"
 msgstr "合計: %s/%s"
 
-#: ../Rpmdrake/pkg.pm:610 ../Rpmdrake/pkg.pm:615
+#: ../Rpmdrake/pkg.pm:621 ../Rpmdrake/pkg.pm:708 ../rpmdrake.pm:741
+#: ../rpmdrake.pm:822 ../rpmdrake.pm:846
+#, c-format
+msgid "Error"
+msgstr "エラー"
+
+#: ../Rpmdrake/pkg.pm:626 ../Rpmdrake/pkg.pm:631
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "パッケージ %s をダウンロード..."
 
-#: ../Rpmdrake/pkg.pm:617
+#: ../Rpmdrake/pkg.pm:633
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% / %s 完了, ETA = %s, 速度 = %s"
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:634
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 完了, 速度 = %s"
 
-#: ../Rpmdrake/pkg.pm:639
-#, c-format
-msgid "Verifying package signatures..."
-msgstr "パッケージの署名を照合.."
-
-#: ../Rpmdrake/pkg.pm:652 ../rpmdrake.pm:757 ../rpmdrake.pm:866
+#: ../Rpmdrake/pkg.pm:667
 #, c-format
-msgid "Warning"
-msgstr "警告"
-
-#: ../Rpmdrake/pkg.pm:653
-#, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
-"\n"
-"Do you want to continue installation?"
-msgstr ""
-"以下のパッケージの署名は間違っています:\n"
-"\n"
-"%s\n"
-"\n"
-"インストールを続けますか？"
-
-#: ../Rpmdrake/pkg.pm:666
-#, c-format
-msgid "installing %s from %s"
-msgstr "%s を %s からインストール"
+msgid "Change medium"
+msgstr "メディアを変更"
 
 #: ../Rpmdrake/pkg.pm:668
 #, c-format
-msgid "installing %s"
-msgstr "%s をインストール"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "メディア %s をデバイス [%s] に挿入してください"
 
 #: ../Rpmdrake/pkg.pm:672
 #, c-format
-msgid "removing %s"
-msgstr "%s を削除"
-
-#: ../Rpmdrake/pkg.pm:698 ../Rpmdrake/pkg.pm:716 ../Rpmdrake/pkg.pm:811
-#: ../rpmdrake.pm:744 ../rpmdrake.pm:825 ../rpmdrake.pm:849
-#, c-format
-msgid "Error"
-msgstr "エラー"
-
-#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:717 ../Rpmdrake/pkg.pm:730
-#, c-format
-msgid "Installation failed:"
-msgstr "インストール失敗:"
-
-#: ../Rpmdrake/pkg.pm:700
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "依存を確認せずにインストールしますか？ (y/N)[デフォルトはN] "
+msgid "Verifying package signatures..."
+msgstr "パッケージの署名を照合.."
 
-#: ../Rpmdrake/pkg.pm:718
+#: ../Rpmdrake/pkg.pm:678 ../rpmdrake.pm:754 ../rpmdrake.pm:863
 #, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "インストールを強行 (--force) してみますか？(y/N)[デフォルトはN]"
+msgid "Warning"
+msgstr "警告"
 
-#: ../Rpmdrake/pkg.pm:752
+#: ../Rpmdrake/pkg.pm:690
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1988,12 +1968,17 @@ msgstr ""
 "\n"
 "メディアのデータベースを更新してください。"
 
-#: ../Rpmdrake/pkg.pm:763
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 件のインストールが失敗しました"
 
-#: ../Rpmdrake/pkg.pm:777
+#: ../Rpmdrake/pkg.pm:709
+#, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "回復不能なエラー: インストールするパッケージが見つかりません。"
+
+#: ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2006,42 +1991,17 @@ msgstr ""
 ".rpmnew または .rpmsave という設定ファイルを生成しました。\n"
 "内容を確認して使用する設定ファイルを選択することができます:"
 
-#: ../Rpmdrake/pkg.pm:787
-#, c-format
-msgid "Upgrade information"
-msgstr "更新情報"
-
-#: ../Rpmdrake/pkg.pm:789
-#, c-format
-msgid "These packages come with upgrade information"
-msgstr "これらのパッケージには更新情報があります"
-
-#: ../Rpmdrake/pkg.pm:797
-#, c-format
-msgid "Upgrade information about this package"
-msgstr "このパッケージの更新情報"
-
-#: ../Rpmdrake/pkg.pm:800
-#, c-format
-msgid "Upgrade information about package %s"
-msgstr "パッケージ %s の更新情報"
-
-#: ../Rpmdrake/pkg.pm:812
-#, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "回復不能なエラー: インストールするパッケージが見つかりません。"
-
-#: ../Rpmdrake/pkg.pm:828 ../Rpmdrake/pkg.pm:845
+#: ../Rpmdrake/pkg.pm:742 ../Rpmdrake/pkg.pm:758
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "パッケージを削除しています。お待ちください..."
 
-#: ../Rpmdrake/pkg.pm:856
+#: ../Rpmdrake/pkg.pm:769
 #, c-format
 msgid "Problem during removal"
 msgstr "削除中に問題が発生しました"
 
-#: ../Rpmdrake/pkg.pm:857
+#: ../Rpmdrake/pkg.pm:770
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2074,27 +2034,27 @@ msgstr ""
 msgid "Remove .%s"
 msgstr ".%s を削除する"
 
-#: ../Rpmdrake/rpmnew.pm:114
+#: ../Rpmdrake/rpmnew.pm:121
 #, c-format
 msgid "Use .%s as main file"
 msgstr ".%s をメインファイルとして使う"
 
-#: ../Rpmdrake/rpmnew.pm:118
+#: ../Rpmdrake/rpmnew.pm:125
 #, c-format
 msgid "Do nothing"
 msgstr "何もしない"
 
-#: ../Rpmdrake/rpmnew.pm:149
+#: ../Rpmdrake/rpmnew.pm:156
 #, c-format
 msgid "Installation finished"
 msgstr "インストールが完了しました"
 
-#: ../Rpmdrake/rpmnew.pm:164
+#: ../Rpmdrake/rpmnew.pm:171
 #, c-format
 msgid "Inspect..."
 msgstr "検査..."
 
-#: ../Rpmdrake/rpmnew.pm:182 ../rpmdrake:68 ../rpmdrake:95
+#: ../Rpmdrake/rpmnew.pm:189 ../rpmdrake:68 ../rpmdrake:95
 #, c-format
 msgid "Please wait, searching..."
 msgstr "検索しています。お待ちください..."
@@ -2261,126 +2221,132 @@ msgstr "説明"
 msgid "in file names"
 msgstr "中のファイル名"
 
-#: ../rpmdrake:345 ../rpmdrake:348 ../rpmdrake:359 ../rpmdrake:372
-#: ../rpmdrake:381
+#: ../rpmdrake:344 ../rpmdrake:386 ../rpmdrake:390 ../rpmdrake:394
+#: ../rpmdrake:433
+#, c-format
+msgid "/_Options"
+msgstr "/オプション(_O)"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "/_Auto solve dependancies"
+msgstr ""
+
+#: ../rpmdrake:347 ../rpmdrake:350 ../rpmdrake:361 ../rpmdrake:374
+#: ../rpmdrake:383
 #, c-format
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: ../rpmdrake:348
+#: ../rpmdrake:350
 #, c-format
 msgid "/_Update media"
 msgstr "/メディアを更新(_U)"
 
-#: ../rpmdrake:359
+#: ../rpmdrake:361
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/選択をリセット(_R)"
 
-#: ../rpmdrake:372
+#: ../rpmdrake:374
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/パッケージリストをリロード(_P)"
 
-#: ../rpmdrake:381
+#: ../rpmdrake:383
 #, c-format
 msgid "/_Quit"
 msgstr "/終了(_Q)"
 
-#: ../rpmdrake:381
+#: ../rpmdrake:383
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:384 ../rpmdrake:385 ../rpmdrake:389 ../rpmdrake:419
-#, c-format
-msgid "/_Options"
-msgstr "/オプション(_O)"
-
-#: ../rpmdrake:385
+#: ../rpmdrake:390
 #, c-format
 msgid "/_Media Manager"
 msgstr "/メディアマネージャ(_M)"
 
-#: ../rpmdrake:389 ../rpmdrake:419
+#: ../rpmdrake:394 ../rpmdrake:433
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/自動選択されたパッケージを表示(_S)"
 
-#: ../rpmdrake:393 ../rpmdrake:394 ../rpmdrake:395 ../rpmdrake:396
+#: ../rpmdrake:398 ../rpmdrake:399 ../rpmdrake:400 ../rpmdrake:401
 #, c-format
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: ../rpmdrake:394
+#: ../rpmdrake:399
 #, c-format
 msgid "/_Report Bug"
 msgstr "/バグを報告(_R)"
 
-#: ../rpmdrake:396
+#: ../rpmdrake:401
 #, c-format
 msgid "/_About..."
 msgstr "/情報(_A)..."
 
-#: ../rpmdrake:399
+#: ../rpmdrake:404
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:401
+#: ../rpmdrake:406
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../rpmdrake:403
+#: ../rpmdrake:408
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake は Mandriva Linux のパッケージ管理ツールです。"
 
-#: ../rpmdrake:405
+#: ../rpmdrake:410
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:410
+#: ../rpmdrake:415
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Yukiko BANDO <ybando@k6.dion.ne.jp>\n"
 "Hirosi UTUMI <utuhiro78@yahoo.co.jp>\n"
 
-#: ../rpmdrake:434
+#: ../rpmdrake:448
 #, c-format
 msgid "Find:"
 msgstr "検索対象:"
 
-#: ../rpmdrake:443
+#: ../rpmdrake:457
 #, c-format
 msgid "Search"
 msgstr "検索"
 
-#: ../rpmdrake:445
+#: ../rpmdrake:459
 #, c-format
 msgid "Clear"
 msgstr "クリア"
 
-#: ../rpmdrake:465
+#: ../rpmdrake:479
 #, c-format
 msgid "Apply"
 msgstr "適用"
 
-#: ../rpmdrake:485
+#: ../rpmdrake:499
 #, c-format
 msgid "Quick Introduction"
 msgstr "使い方"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:500
 #, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "左のカテゴリのツリーを展開してパッケージをブラウズすることができます。"
 
-#: ../rpmdrake:487
+#: ../rpmdrake:501
 #, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
@@ -2388,7 +2354,7 @@ msgstr ""
 "右のリストでパッケージの名前をクリックすると、ここにパッケージの説明が表示さ"
 "れます。"
 
-#: ../rpmdrake:488
+#: ../rpmdrake:502
 #, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
@@ -2415,192 +2381,192 @@ msgstr "プロキシにアクセスするための資格情報を入力してく
 msgid "User name:"
 msgstr "ユーザ名:"
 
-#: ../rpmdrake.pm:184
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "Software Packages Removal"
 msgstr "RPM を削除"
 
-#: ../rpmdrake.pm:185 ../rpmdrake.pm:189
+#: ../rpmdrake.pm:183 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Packages Update"
 msgstr "RPM のアップデート"
 
-#: ../rpmdrake.pm:186
+#: ../rpmdrake.pm:184
 #, c-format
 msgid "Software Packages Installation"
 msgstr "RPM をインストール"
 
-#: ../rpmdrake.pm:230
+#: ../rpmdrake.pm:228
 #, c-format
 msgid "No"
 msgstr "いいえ"
 
-#: ../rpmdrake.pm:234
+#: ../rpmdrake.pm:232
 #, c-format
 msgid "Yes"
 msgstr "はい"
 
-#: ../rpmdrake.pm:285
+#: ../rpmdrake.pm:282
 #, c-format
 msgid "Info..."
 msgstr "情報..."
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:405
 #, c-format
 msgid "Austria"
 msgstr "オーストリア"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:406
 #, c-format
 msgid "Australia"
 msgstr "オーストラリア"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:407
 #, c-format
 msgid "Belgium"
 msgstr "ベルギー"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:408
 #, c-format
 msgid "Brazil"
 msgstr "ブラジル"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:409
 #, c-format
 msgid "Canada"
 msgstr "カナダ"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:410
 #, c-format
 msgid "Switzerland"
 msgstr "スイス"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Costa Rica"
 msgstr "コスタリカ"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:412
 #, c-format
 msgid "Czech Republic"
 msgstr "チェコ"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Germany"
 msgstr "ドイツ"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Danmark"
 msgstr "デンマーク"
 
-#: ../rpmdrake.pm:418 ../rpmdrake.pm:422
+#: ../rpmdrake.pm:415 ../rpmdrake.pm:419
 #, c-format
 msgid "Greece"
 msgstr "ギリシャ"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:416
 #, c-format
 msgid "Spain"
 msgstr "スペイン"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Finland"
 msgstr "フィンランド"
 
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "France"
 msgstr "フランス"
 
-#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Hungary"
 msgstr "ハンガリー"
 
-#: ../rpmdrake.pm:424
+#: ../rpmdrake.pm:421
 #, c-format
 msgid "Israel"
 msgstr "イスラエル"
 
-#: ../rpmdrake.pm:425
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Italy"
 msgstr "イタリア"
 
-#: ../rpmdrake.pm:426
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm:427
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "Korea"
 msgstr "韓国"
 
-#: ../rpmdrake.pm:428
+#: ../rpmdrake.pm:425
 #, c-format
 msgid "Netherlands"
 msgstr "オランダ"
 
-#: ../rpmdrake.pm:429
+#: ../rpmdrake.pm:426
 #, c-format
 msgid "Norway"
 msgstr "ノルウェー"
 
-#: ../rpmdrake.pm:430
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Poland"
 msgstr "ポーランド"
 
-#: ../rpmdrake.pm:431
+#: ../rpmdrake.pm:428
 #, c-format
 msgid "Portugal"
 msgstr "ポルトガル"
 
-#: ../rpmdrake.pm:432
+#: ../rpmdrake.pm:429
 #, c-format
 msgid "Russia"
 msgstr "ロシア"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:430
 #, c-format
 msgid "Sweden"
 msgstr "スウェーデン"
 
-#: ../rpmdrake.pm:434
+#: ../rpmdrake.pm:431
 #, c-format
 msgid "Singapore"
 msgstr "シンガポール"
 
-#: ../rpmdrake.pm:435
+#: ../rpmdrake.pm:432
 #, c-format
 msgid "Slovakia"
 msgstr "スロバキア"
 
-#: ../rpmdrake.pm:436
+#: ../rpmdrake.pm:433
 #, c-format
 msgid "Taiwan"
 msgstr "台湾"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:434
 #, c-format
 msgid "United Kingdom"
 msgstr "イギリス"
 
-#: ../rpmdrake.pm:438
+#: ../rpmdrake.pm:435
 #, c-format
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm:439 ../rpmdrake.pm:440 ../rpmdrake.pm:441 ../rpmdrake.pm:442
+#: ../rpmdrake.pm:436 ../rpmdrake.pm:437 ../rpmdrake.pm:438 ../rpmdrake.pm:439
 #, c-format
 msgid "United States"
 msgstr "アメリカ"
 
-#: ../rpmdrake.pm:540
+#: ../rpmdrake.pm:537
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2613,7 +2579,7 @@ msgstr ""
 "\n"
 "続けますか？"
 
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:541
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -2626,28 +2592,28 @@ msgstr ""
 "\n"
 "続けますか？"
 
-#: ../rpmdrake.pm:550 ../rpmdrake.pm:588
+#: ../rpmdrake.pm:547 ../rpmdrake.pm:585
 #, c-format
 msgid "Mirror choice"
 msgstr "ミラーの選択"
 
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:550
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "ミラーのアドレスを取得しています。お待ちください。"
 
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:551
 #, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Mandriva のウェブサイトからミラーのアドレスを取得しています。お待ちください。"
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:558
 #, c-format
 msgid "Error during download"
 msgstr "ダウンロード中にエラー発生"
 
-#: ../rpmdrake.pm:563
+#: ../rpmdrake.pm:560
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2662,7 +2628,7 @@ msgstr ""
 "ネットワークかウェブサイトが利用不能になっているようです。\n"
 "しばらくたってからやり直してください。"
 
-#: ../rpmdrake.pm:568
+#: ../rpmdrake.pm:565
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2677,17 +2643,17 @@ msgstr ""
 "ネットワークか Mandriva のウェブサイトが利用不能になっているようです。\n"
 "しばらくたってからやり直してください。"
 
-#: ../rpmdrake.pm:578
+#: ../rpmdrake.pm:575
 #, c-format
 msgid "No mirror"
 msgstr "ミラーなし"
 
-#: ../rpmdrake.pm:580
+#: ../rpmdrake.pm:577
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "適切なミラーが見つかりません。"
 
-#: ../rpmdrake.pm:581
+#: ../rpmdrake.pm:578
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2702,68 +2668,68 @@ msgstr ""
 "アーキテクチャが Mandriva Linux の公式アップデートでサポートされて\n"
 "いない場合です。"
 
-#: ../rpmdrake.pm:600
+#: ../rpmdrake.pm:597
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "ミラーを選んでください。"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:650
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "メディア %s 用のファイルをコピー..."
 
-#: ../rpmdrake.pm:656
+#: ../rpmdrake.pm:653
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "メディア %s のファイルを調べています..."
 
-#: ../rpmdrake.pm:659
+#: ../rpmdrake.pm:656
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "メディア %s のリモートファイルを調べています..."
 
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:660
 #, c-format
 msgid " done."
 msgstr "完了しました"
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:664
 #, c-format
 msgid " failed!"
 msgstr "失敗しました"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s (メディア %s)"
 
-#: ../rpmdrake.pm:675
+#: ../rpmdrake.pm:672
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "%s のダウンロードを開始..."
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:676
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "%s をダウンロード。残り時間:%s, 速度:%s"
 
-#: ../rpmdrake.pm:682
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "%s をダウンロード。速度:%s"
 
-#: ../rpmdrake.pm:693
+#: ../rpmdrake.pm:690
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "メディアを更新しています。お待ちください..."
 
-#: ../rpmdrake.pm:720
+#: ../rpmdrake.pm:717
 #, c-format
 msgid "Error retrieving packages"
 msgstr "パッケージ検索中にエラー発生"
 
-#: ../rpmdrake.pm:721
+#: ../rpmdrake.pm:718
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2779,12 +2745,12 @@ msgstr ""
 "削除し、改めて追加してください。後者の場合は、しばらくたってから\n"
 "やり直してください。"
 
-#: ../rpmdrake.pm:752
+#: ../rpmdrake.pm:749
 #, c-format
 msgid "Update media"
 msgstr "メディアを更新"
 
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:754
 #, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
@@ -2792,12 +2758,12 @@ msgstr ""
 "有効なメディアが見つかりません。更新するにはメディアを最低一つ有効にしてくだ"
 "さい。"
 
-#: ../rpmdrake.pm:764
+#: ../rpmdrake.pm:761
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "更新するメディアを選んでください:"
 
-#: ../rpmdrake.pm:803
+#: ../rpmdrake.pm:800
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2810,7 +2776,7 @@ msgstr ""
 "エラー:\n"
 "%s"
 
-#: ../rpmdrake.pm:826 ../rpmdrake.pm:837
+#: ../rpmdrake.pm:823 ../rpmdrake.pm:834
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2821,17 +2787,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:849
+#: ../rpmdrake.pm:846
 #, c-format
 msgid "Unable to create medium."
 msgstr "メディアを作成できません。"
 
-#: ../rpmdrake.pm:854
+#: ../rpmdrake.pm:851
 #, c-format
 msgid "Failure when adding medium"
 msgstr "メディアの追加に失敗しました"
 
-#: ../rpmdrake.pm:855
+#: ../rpmdrake.pm:852
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2842,7 +2808,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:868
+#: ../rpmdrake.pm:865
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2853,7 +2819,7 @@ msgstr ""
 "ていません。\n"
 "無効にします。"
 
-#: ../rpmdrake.pm:871
+#: ../rpmdrake.pm:868
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2864,12 +2830,12 @@ msgstr ""
 "s) と一致していません。\n"
 "無効にします。"
 
-#: ../rpmdrake.pm:888
+#: ../rpmdrake.pm:885
 #, c-format
 msgid "Help launched in background"
 msgstr "ヘルプを裏で起動しました"
 
-#: ../rpmdrake.pm:889
+#: ../rpmdrake.pm:886
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3145,6 +3111,37 @@ msgstr "RPM を削除"
 msgid "Software Media Manager"
 msgstr "RPM メディアマネージャ"
 
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation?"
+#~ msgstr ""
+#~ "以下のパッケージの署名は間違っています:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "インストールを続けますか？"
+
+#~ msgid "installing %s from %s"
+#~ msgstr "%s を %s からインストール"
+
+#~ msgid "installing %s"
+#~ msgstr "%s をインストール"
+
+#~ msgid "removing %s"
+#~ msgstr "%s を削除"
+
+#~ msgid "Installation failed:"
+#~ msgstr "インストール失敗:"
+
+#~ msgid "Try installation without checking dependencies? (y/N) "
+#~ msgstr "依存を確認せずにインストールしますか？ (y/N)[デフォルトはN] "
+
+#~ msgid "Try harder to install (--force)? (y/N) "
+#~ msgstr "インストールを強行 (--force) してみますか？(y/N)[デフォルトはN]"
+
 #~ msgid "Preparing..."
 #~ msgstr "準備中..."