- disable prerendered titles until I have the new banner

- don't update when no source is selected for updates...
- new ugtk without BEGIN so that we can have an OK error message when X is not available
- use parenthesis for as much functions as seen since when requir'ing modules sometimes a function call is considered a bareword

1 files changed, 159 insertions, 137 deletions

diff --git a/po/ja.po b/po/ja.po
index d226baf6..8fb804de 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-09-03 18:58+0200\n"
+"POT-Creation-Date: 2002-09-03 20:08+0200\n"
 "PO-Revision-Date: 2000-09-13 14:44+0200\n"
 "Last-Translator: YAMAGATA Hiroo <hiyori13@alum.mit.edu>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -54,7 +54,7 @@ msgstr "パスまたはマウントポイント："
 msgid "Removable device"
 msgstr "リムーバブルデバイス"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:462
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:464
 msgid "Security updates"
 msgstr "セキュリティ上の更新"
 
@@ -104,15 +104,15 @@ msgstr "ソースの種類:"
 
 #: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
 #: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
-#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:319 ../rpmdrake_.c:805
-#: ../rpmdrake_.c:831
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:319 ../rpmdrake_.c:818
+#: ../rpmdrake_.c:844
 msgid "Ok"
 msgstr "Ok"
 
 #: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
 #: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
 #: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:319
-#: ../rpmdrake_.c:831
+#: ../rpmdrake_.c:844
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -199,7 +199,7 @@ msgstr "有効ですか？"
 msgid "Source"
 msgstr "ソース"
 
-#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:610
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:615
 msgid "Remove"
 msgstr "取り除く"
 
@@ -224,11 +224,11 @@ msgstr "エラー..."
 msgid "Save and quit"
 msgstr "保存して終了"
 
-#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:613
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:618
 msgid "Quit"
 msgstr "終了"
 
-#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:930
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:943
 #, c-format
 msgid ""
 "%s\n"
@@ -434,7 +434,7 @@ msgstr "希望のミラーを選んでください。"
 msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:131 ../rpmdrake_.c:422 ../rpmdrake_.c:423
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:423 ../rpmdrake_.c:424
 msgid "(Not available)"
 msgstr "（一つもありません）"
 
@@ -565,7 +565,7 @@ msgstr ""
 "すみません、以下のパッケージは選択できません:\n"
 "\n"
 
-#: ../rpmdrake_.c:390 ../rpmdrake_.c:572
+#: ../rpmdrake_.c:390 ../rpmdrake_.c:576
 msgid "Some packages need to be removed"
 msgstr "いくつかのパッケージを削除します"
 
@@ -579,132 +579,129 @@ msgstr "選択：%d MB / ディスク空き容量: %d MB"
 msgid "Selected size: %d MB"
 msgstr "選択サイズ: %d MB"
 
-#: ../rpmdrake_.c:420
-#, c-format
-msgid ""
-"%sFiles:\n"
-"%s\n"
-"\n"
-"Changelog:\n"
-"%s"
-msgstr ""
-
-#: ../rpmdrake_.c:421
-#, fuzzy, c-format
-msgid "Source: %s\n"
+#: ../rpmdrake_.c:422
+#, fuzzy
+msgid "Source: "
 msgstr "ソース"
 
-#: ../rpmdrake_.c:426
-#, c-format
-msgid ""
-"Name: %s\n"
-"Version: %s\n"
-"Size: %s KB\n"
-"Importance: %s\n"
-"\n"
-"Summary: %s\n"
-"\n"
-"%s\n"
+#: ../rpmdrake_.c:423
+#, fuzzy
+msgid "Files:\n"
+msgstr "/ファイル(_F)"
+
+#: ../rpmdrake_.c:424
+msgid "Changelog:\n"
+msgstr ""
+
+#: ../rpmdrake_.c:427
+msgid "Reason for update: "
 msgstr ""
-"名称: %s\n"
-"バージョン: %s\n"
-"サイズ: %s KB\n"
-"重要性: %s\n"
-"\n"
-"概要: %s\n"
-"\n"
-"%s\n"
+
+#: ../rpmdrake_.c:429
+#, fuzzy
+msgid "Name: "
+msgstr "名前:"
 
 #: ../rpmdrake_.c:430
-#, c-format
-msgid ""
-"Name: %s\n"
-"Version: %s\n"
-"Size: %s KB\n"
-"\n"
-"Summary: %s\n"
-"\n"
-"%s\n"
+#, fuzzy
+msgid "Version: "
+msgstr "バージョン:"
+
+#: ../rpmdrake_.c:431
+#, fuzzy, c-format
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake_.c:431
+#, fuzzy
+msgid "Size: "
+msgstr "サイズ"
+
+#: ../rpmdrake_.c:432
+msgid "Importance: "
 msgstr ""
-"名称: %s\n"
-"バージョン: %s\n"
-"サイズ: %s KB\n"
-"\n"
-"概要: %s\n"
-"\n"
-"%s\n"
 
-#: ../rpmdrake_.c:441
+#: ../rpmdrake_.c:433
+#, fuzzy
+msgid "Summary: "
+msgstr "まとめ"
+
+#: ../rpmdrake_.c:434
+#, fuzzy
+msgid "Description: "
+msgstr "説明の中"
+
+#: ../rpmdrake_.c:443
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:462
+#: ../rpmdrake_.c:464
 msgid "Bugfixes updates"
 msgstr "バグ修正の更新"
 
-#: ../rpmdrake_.c:462
+#: ../rpmdrake_.c:464
 msgid "Normal updates"
 msgstr "通常の更新"
 
-#: ../rpmdrake_.c:481
+#: ../rpmdrake_.c:483
 msgid "Mandrake choices"
 msgstr "Mandrakeの選択"
 
-#: ../rpmdrake_.c:482
+#: ../rpmdrake_.c:484
 msgid "All packages, alphabetical"
 msgstr "全パッケージ、ABC順"
 
-#: ../rpmdrake_.c:483
+#: ../rpmdrake_.c:485
 msgid "All packages,"
 msgstr "全パッケージ"
 
-#: ../rpmdrake_.c:506
+#: ../rpmdrake_.c:508
 msgid "by group"
 msgstr "グループ別"
 
-#: ../rpmdrake_.c:506
+#: ../rpmdrake_.c:508
 msgid "by size"
 msgstr "サイズ順"
 
-#: ../rpmdrake_.c:507
+#: ../rpmdrake_.c:509
 msgid "by selection state"
 msgstr "選択状態順"
 
-#: ../rpmdrake_.c:508
+#: ../rpmdrake_.c:510
 msgid "by source repository"
 msgstr "ソースrepository順"
 
-#: ../rpmdrake_.c:508
+#: ../rpmdrake_.c:510
 msgid "by update availability"
 msgstr "更新の有無順"
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:531
 msgid "in descriptions"
 msgstr "説明の中"
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:531
 msgid "in names"
 msgstr "名称の中"
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:532
 msgid "in files"
 msgstr "ファイルの中"
 
-#: ../rpmdrake_.c:541
+#: ../rpmdrake_.c:543
 msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake_.c:541
+#: ../rpmdrake_.c:543
 #, fuzzy
 msgid "Normal information"
 msgstr "通常の更新"
 
-#: ../rpmdrake_.c:562
+#: ../rpmdrake_.c:566
 #, fuzzy
 msgid "Too many packages are selected"
 msgstr "インストールできないパッケージがあります"
 
-#: ../rpmdrake_.c:563
+#: ../rpmdrake_.c:567
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -714,7 +711,7 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../rpmdrake_.c:573
+#: ../rpmdrake_.c:577
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -729,37 +726,37 @@ msgstr ""
 "\n"
 "続けていいですか?"
 
-#: ../rpmdrake_.c:594
+#: ../rpmdrake_.c:599
 msgid "Find:"
 msgstr "以下を探す："
 
-#: ../rpmdrake_.c:599
+#: ../rpmdrake_.c:604
 msgid "Search"
 msgstr "検索"
 
-#: ../rpmdrake_.c:611
+#: ../rpmdrake_.c:616
 msgid "Install"
 msgstr "インストール"
 
-#: ../rpmdrake_.c:637
+#: ../rpmdrake_.c:642
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 "-adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*,-misc-fixed-medium-r-normal--"
 "12-*-75-75-c-*-jisx0208.1983-0,*"
 
-#: ../rpmdrake_.c:638
+#: ../rpmdrake_.c:643
 msgid "Mandrake Update"
 msgstr "Mandrakeアップデート"
 
-#: ../rpmdrake_.c:638
+#: ../rpmdrake_.c:643
 msgid "Software Packages Removal"
 msgstr "ソフトウェアパッケージ削除"
 
-#: ../rpmdrake_.c:639
+#: ../rpmdrake_.c:644
 msgid "Software Packages Installation"
 msgstr "ソフトパッケージのインストール"
 
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:677
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -771,23 +768,23 @@ msgstr ""
 "\n"
 "続けますか?"
 
-#: ../rpmdrake_.c:676
+#: ../rpmdrake_.c:681
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "少々お待ちを、ミラーにつないでパッケージ情報更新中。"
 
-#: ../rpmdrake_.c:678
+#: ../rpmdrake_.c:683
 msgid "Error updating medium"
 msgstr "メディア更新でエラー"
 
-#: ../rpmdrake_.c:679
+#: ../rpmdrake_.c:684
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "パッケージ情報更新中に回復不能エラー発生。"
 
-#: ../rpmdrake_.c:685
+#: ../rpmdrake_.c:690
 msgid "How to choose manually your mirror"
 msgstr "ミラーをマニュアルで選ぶには"
 
-#: ../rpmdrake_.c:686
+#: ../rpmdrake_.c:691
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -801,15 +798,15 @@ msgstr ""
 "\n"
 "それからMandrakeUpdateを再起動します。"
 
-#: ../rpmdrake_.c:692
+#: ../rpmdrake_.c:697
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "ミラーにつないで更新パッケージを初期化します。少々お待ちを"
 
-#: ../rpmdrake_.c:696
+#: ../rpmdrake_.c:701
 msgid "Error adding update medium"
 msgstr "更新メディア追加でエラー"
 
-#: ../rpmdrake_.c:697
+#: ../rpmdrake_.c:702
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -829,54 +826,54 @@ msgstr ""
 "\n"
 "別のミラーを試してみますか?"
 
-#: ../rpmdrake_.c:726
+#: ../rpmdrake_.c:731
 msgid "Please wait, finding available packages..."
 msgstr "提供パッケージを探しています、少々お待ちを"
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:754
 msgid "All requested packages were installed successfully."
 msgstr ""
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:754
 msgid "Everything installed successfully"
 msgstr ""
 
-#: ../rpmdrake_.c:752
+#: ../rpmdrake_.c:757
 #, fuzzy
 msgid "Installation finished"
 msgstr "インストール失敗"
 
-#: ../rpmdrake_.c:755
+#: ../rpmdrake_.c:760
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake_.c:771
+#: ../rpmdrake_.c:776
 #, fuzzy, c-format
 msgid "Remove .%s"
 msgstr "取り除く"
 
-#: ../rpmdrake_.c:773
+#: ../rpmdrake_.c:778
 #, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake_.c:775
+#: ../rpmdrake_.c:780
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake_.c:778
+#: ../rpmdrake_.c:783
 #, fuzzy
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr ""
 "-adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*,-misc-fixed-medium-r-normal--"
 "12-*-75-75-c-*-jisx0208.1983-0,*"
 
-#: ../rpmdrake_.c:787
+#: ../rpmdrake_.c:800
 msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake_.c:800
+#: ../rpmdrake_.c:813
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -885,40 +882,40 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake_.c:801
+#: ../rpmdrake_.c:814
 #, fuzzy
 msgid ""
 "some packages failed to install\n"
 "correctly"
 msgstr "インストールできないパッケージがあります"
 
-#: ../rpmdrake_.c:802
+#: ../rpmdrake_.c:815
 #, fuzzy
 msgid "everything was installed correctly"
 msgstr "すべてインストール済み。"
 
-#: ../rpmdrake_.c:821
+#: ../rpmdrake_.c:834
 msgid "Unable to get source packages."
 msgstr "ソースパッケージが見つかりません"
 
-#: ../rpmdrake_.c:822
+#: ../rpmdrake_.c:835
 msgid "Unable to get source packages, sorry."
 msgstr "ソースパッケージが得られません、ごめんなさい。"
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:842
 msgid "Change medium"
 msgstr "メディア変更"
 
-#: ../rpmdrake_.c:830
+#: ../rpmdrake_.c:843
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "%sというメディアをデバイス[%s]に挿入してください"
 
-#: ../rpmdrake_.c:838
+#: ../rpmdrake_.c:851
 msgid "Installation failed"
 msgstr "インストール失敗"
 
-#: ../rpmdrake_.c:839
+#: ../rpmdrake_.c:852
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -926,35 +923,35 @@ msgstr ""
 "インストール失敗、一部ファイルがありません。\n"
 "ソースデータベースを更新してみてはいかがでしょう。"
 
-#: ../rpmdrake_.c:842
+#: ../rpmdrake_.c:855
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "他の更新ができるようにパッケージ削除中、少々お待ちを"
 
-#: ../rpmdrake_.c:851
+#: ../rpmdrake_.c:864
 msgid "Program missing"
 msgstr "プログラムがありません"
 
-#: ../rpmdrake_.c:852
+#: ../rpmdrake_.c:865
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "必要プログラムがありません (grpmi)。インストールを確認しましょう。"
 
-#: ../rpmdrake_.c:870
+#: ../rpmdrake_.c:883
 msgid "Everything already installed."
 msgstr "すべてインストール済み。"
 
-#: ../rpmdrake_.c:871
+#: ../rpmdrake_.c:884
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "すべてインストール済み（こんなことがあっていいのか？）"
 
-#: ../rpmdrake_.c:881
+#: ../rpmdrake_.c:894
 msgid "Please wait, reading packages database..."
 msgstr "パッケージデータベース読み込み中、少々お待ちを"
 
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:932
 msgid "Please wait, removing packages..."
 msgstr "パッケージ削除中、少々お待ちを"
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:947
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -965,7 +962,7 @@ msgstr ""
 "\n"
 "このツールは、削除したいソフトウェアを選ぶ支援をします。"
 
-#: ../rpmdrake_.c:939
+#: ../rpmdrake_.c:952
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -976,7 +973,7 @@ msgstr ""
 "\n"
 "このツールは、インストールしたい更新を選ぶお手伝いをします。"
 
-#: ../rpmdrake_.c:944
+#: ../rpmdrake_.c:957
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1006,6 +1003,46 @@ msgid "Install Software"
 msgstr "ソフトをインストール"
 
 #, fuzzy
+#~ msgid "Source: %s\n"
+#~ msgstr "ソース"
+
+#~ msgid ""
+#~ "Name: %s\n"
+#~ "Version: %s\n"
+#~ "Size: %s KB\n"
+#~ "Importance: %s\n"
+#~ "\n"
+#~ "Summary: %s\n"
+#~ "\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "名称: %s\n"
+#~ "バージョン: %s\n"
+#~ "サイズ: %s KB\n"
+#~ "重要性: %s\n"
+#~ "\n"
+#~ "概要: %s\n"
+#~ "\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "Name: %s\n"
+#~ "Version: %s\n"
+#~ "Size: %s KB\n"
+#~ "\n"
+#~ "Summary: %s\n"
+#~ "\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "名称: %s\n"
+#~ "バージョン: %s\n"
+#~ "サイズ: %s KB\n"
+#~ "\n"
+#~ "概要: %s\n"
+#~ "\n"
+#~ "%s\n"
+
+#, fuzzy
 #~ msgid "Remove .rpmnew"
 #~ msgstr "ソフトウェア削除"
 
@@ -1272,9 +1309,6 @@ msgstr "ソフトをインストール"
 #~ "少々お待ちを\n"
 #~ "ミラー一覧を取得しています"
 
-#~ msgid "%.1f KB"
-#~ msgstr "%.1f KB"
-
 #~ msgid "%.1f MB"
 #~ msgstr "%.1f MB"
 
@@ -1382,9 +1416,6 @@ msgstr "ソフトをインストール"
 #~ msgid "0 selected packages: 0.0 MB"
 #~ msgstr "選択したパッケージ数は 0個: 0.0 MB"
 
-#~ msgid "/_File"
-#~ msgstr "/ファイル(_F)"
-
 #~ msgid "/File/_Preferences"
 #~ msgstr "/ファイル(F)/プレファレンス(_P)"
 
@@ -1406,15 +1437,9 @@ msgstr "ソフトをインストール"
 #~ msgid "Installed"
 #~ msgstr "インストール済み"
 
-#~ msgid "Size"
-#~ msgstr "サイズ"
-
 #~ msgid "Type"
 #~ msgstr "種類"
 
-#~ msgid "Summary"
-#~ msgstr "まとめ"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, version 7.2\n"
 
@@ -1546,9 +1571,6 @@ msgstr "ソフトをインストール"
 #~ msgid "Network settings:"
 #~ msgstr "ネットワークの設定:"
 
-#~ msgid "Version:"
-#~ msgstr "バージョン:"
-
 #~ msgid "Show security updates"
 #~ msgstr "セキュリティ上の更新を表示"