From a45e542ed8171f3f6e8246b1a1574b0a27c836a0 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Wed, 11 Sep 2002 13:22:42 +0000 Subject: merge two more strings --- po/ja.po | 113 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 60 insertions(+), 53 deletions(-) (limited to 'po/ja.po') diff --git a/po/ja.po b/po/ja.po index 06102f22..7be58fa4 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-09 16:17+0200\n" +"POT-Creation-Date: 2002-09-11 15:17+0200\n" "PO-Revision-Date: 2000-09-13 14:44+0200\n" "Last-Translator: YAMAGATA Hiroo \n" "Language-Team: Japanese \n" @@ -104,15 +104,15 @@ msgstr " #: ../edit-urpm-sources.pl_.c:123 ../edit-urpm-sources.pl_.c:182 #: ../edit-urpm-sources.pl_.c:214 ../rpmdrake.pm_.c:85 ../rpmdrake.pm_.c:105 -#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:867 -#: ../rpmdrake_.c:894 +#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:868 +#: ../rpmdrake_.c:899 msgid "Ok" msgstr "Ok" #: ../edit-urpm-sources.pl_.c:126 ../edit-urpm-sources.pl_.c:174 #: ../edit-urpm-sources.pl_.c:182 ../edit-urpm-sources.pl_.c:215 #: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:340 -#: ../rpmdrake_.c:894 +#: ../rpmdrake_.c:899 msgid "Cancel" msgstr "キャンセル" @@ -210,7 +210,7 @@ msgstr " msgid "Quit" msgstr "終了" -#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1005 +#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1014 #, c-format msgid "" "%s\n" @@ -740,25 +740,25 @@ msgstr " msgid "Install" msgstr "インストール" -#: ../rpmdrake_.c:690 +#: ../rpmdrake_.c:691 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:691 data/mandrakeupdate.desktop.in.h:1 +#: ../rpmdrake_.c:692 data/mandrakeupdate.desktop.in.h:1 msgid "Mandrake Update" msgstr "Mandrakeアップデート" -#: ../rpmdrake_.c:691 +#: ../rpmdrake_.c:692 msgid "Software Packages Removal" msgstr "ソフトウェアパッケージ削除" -#: ../rpmdrake_.c:692 +#: ../rpmdrake_.c:693 msgid "Software Packages Installation" msgstr "ソフトパッケージのインストール" -#: ../rpmdrake_.c:725 +#: ../rpmdrake_.c:726 msgid "" "I need to contact the mirror to get latest update packages.\n" "Please check that your network is currently running.\n" @@ -770,23 +770,23 @@ msgstr "" "\n" "続けますか?" -#: ../rpmdrake_.c:729 +#: ../rpmdrake_.c:730 msgid "Please wait, contacting mirror to update packages information." msgstr "少々お待ちを、ミラーにつないでパッケージ情報更新中。" -#: ../rpmdrake_.c:731 +#: ../rpmdrake_.c:732 msgid "Error updating medium" msgstr "メディア更新でエラー" -#: ../rpmdrake_.c:732 +#: ../rpmdrake_.c:733 msgid "There was an unrecoverable error while updating packages information." msgstr "パッケージ情報更新中に回復不能エラー発生。" -#: ../rpmdrake_.c:738 +#: ../rpmdrake_.c:739 msgid "How to choose manually your mirror" msgstr "ミラーをマニュアルで選ぶには" -#: ../rpmdrake_.c:739 +#: ../rpmdrake_.c:740 msgid "" "You may also choose your desired mirror manually: to do so,\n" "launch the Software Sources Manager, and then add a `Security\n" @@ -800,15 +800,15 @@ msgstr "" "\n" "それからMandrakeUpdateを再起動します。" -#: ../rpmdrake_.c:745 +#: ../rpmdrake_.c:746 msgid "Please wait, contacting mirror to initialize updates packages." msgstr "ミラーにつないで更新パッケージを初期化します。少々お待ちを" -#: ../rpmdrake_.c:749 +#: ../rpmdrake_.c:750 msgid "Error adding update medium" msgstr "更新メディア追加でエラー" -#: ../rpmdrake_.c:750 +#: ../rpmdrake_.c:751 #, c-format msgid "" "There was an error while adding the update medium via urpmi.\n" @@ -828,65 +828,65 @@ msgstr "" "\n" "別のミラーを試してみますか?" -#: ../rpmdrake_.c:779 +#: ../rpmdrake_.c:780 msgid "Please wait, finding available packages..." msgstr "提供パッケージを探しています、少々お待ちを" -#: ../rpmdrake_.c:808 +#: ../rpmdrake_.c:809 msgid "Installation finished" msgstr "インストール完了" -#: ../rpmdrake_.c:811 +#: ../rpmdrake_.c:812 #, c-format msgid "Inspecting %s" msgstr "%s 検査中" -#: ../rpmdrake_.c:827 +#: ../rpmdrake_.c:828 #, c-format msgid "Remove .%s" msgstr ".%s を取り除く" -#: ../rpmdrake_.c:829 +#: ../rpmdrake_.c:830 #, c-format msgid "Use .%s as main file" msgstr ".%s をメインファイルとして使う" -#: ../rpmdrake_.c:831 +#: ../rpmdrake_.c:832 msgid "Do nothing" msgstr "なにもしない" -#: ../rpmdrake_.c:834 +#: ../rpmdrake_.c:835 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:851 +#: ../rpmdrake_.c:852 msgid "Inspect..." msgstr "検査..." -#: ../rpmdrake_.c:884 +#: ../rpmdrake_.c:889 msgid "Unable to get source packages." msgstr "ソースパッケージが見つかりません" -#: ../rpmdrake_.c:885 +#: ../rpmdrake_.c:890 msgid "Unable to get source packages, sorry." msgstr "ソースパッケージが得られません、ごめんなさい。" -#: ../rpmdrake_.c:892 +#: ../rpmdrake_.c:897 msgid "Change medium" msgstr "メディア変更" -#: ../rpmdrake_.c:893 +#: ../rpmdrake_.c:898 #, c-format msgid "Please insert the medium named \"%s\" on device [%s]" msgstr "%sというメディアをデバイス[%s]に挿入してください" -#: ../rpmdrake_.c:901 +#: ../rpmdrake_.c:906 msgid "Installation failed" msgstr "インストール失敗" -#: ../rpmdrake_.c:902 +#: ../rpmdrake_.c:907 msgid "" "Installation failed, some files are missing.\n" "You may want to update your sources database." @@ -894,19 +894,19 @@ msgstr "" "インストール失敗、一部ファイルがありません。\n" "ソースデータベースを更新してみてはいかがでしょう。" -#: ../rpmdrake_.c:905 +#: ../rpmdrake_.c:910 msgid "Please wait, removing packages to allow others to be upgraded..." msgstr "他の更新ができるようにパッケージ削除中、少々お待ちを" -#: ../rpmdrake_.c:916 +#: ../rpmdrake_.c:921 msgid "Program missing" msgstr "プログラムがありません" -#: ../rpmdrake_.c:917 +#: ../rpmdrake_.c:922 msgid "A required program is missing (grpmi). Check your installation." msgstr "必要プログラムがありません (grpmi)。インストールを確認しましょう。" -#: ../rpmdrake_.c:927 +#: ../rpmdrake_.c:932 #, c-format msgid "" "The installation is finished; %s.\n" @@ -919,7 +919,7 @@ msgstr "" "`.rpmnew' や `.rpmsave'という設定ファイルが生成されました。\n" "これを検討して追加の設定をすることもできます:" -#: ../rpmdrake_.c:927 +#: ../rpmdrake_.c:932 msgid "" "some packages failed to install\n" "correctly" @@ -927,35 +927,48 @@ msgstr "" "正しくインストールできなかった\n" "パッケージがあります" -#: ../rpmdrake_.c:928 +#: ../rpmdrake_.c:933 msgid "everything was installed correctly" msgstr "すべて正しくインストールされました" -#: ../rpmdrake_.c:930 +#: ../rpmdrake_.c:935 msgid "Everything installed successfully" msgstr "すべてインストールに成功しました" -#: ../rpmdrake_.c:931 +#: ../rpmdrake_.c:936 msgid "All requested packages were installed successfully." msgstr "要求されたパッケージはすべてインストール成功です。" -#: ../rpmdrake_.c:933 +#: ../rpmdrake_.c:938 msgid "Everything already installed." msgstr "すべてインストール済み。" -#: ../rpmdrake_.c:934 +#: ../rpmdrake_.c:939 msgid "Everything already installed (is this supposed to happen at all?)." msgstr "すべてインストール済み(こんなことがあっていいのか?)" -#: ../rpmdrake_.c:944 +#: ../rpmdrake_.c:942 +#, fuzzy +msgid "Problem during installation" +msgstr "インストール中に問題が起こりました" + +#: ../rpmdrake_.c:943 +#, fuzzy, c-format +msgid "" +"There was a problem during the installation:\n" +"\n" +"%s" +msgstr "インストール中に問題発生。" + +#: ../rpmdrake_.c:953 msgid "Please wait, reading packages database..." msgstr "パッケージデータベース読み込み中、少々お待ちを" -#: ../rpmdrake_.c:982 +#: ../rpmdrake_.c:991 msgid "Please wait, removing packages..." msgstr "パッケージ削除中、少々お待ちを" -#: ../rpmdrake_.c:1009 +#: ../rpmdrake_.c:1018 msgid "" "Welcome to the software removal tool!\n" "\n" @@ -966,7 +979,7 @@ msgstr "" "\n" "このツールは、削除したいソフトウェアを選ぶ支援をします。" -#: ../rpmdrake_.c:1014 +#: ../rpmdrake_.c:1023 msgid "" "Welcome to MandrakeUpdate!\n" "\n" @@ -977,7 +990,7 @@ msgstr "" "\n" "このツールは、インストールしたい更新を選ぶお手伝いをします。" -#: ../rpmdrake_.c:1019 +#: ../rpmdrake_.c:1028 msgid "" "Welcome to the software installation tool!\n" "\n" @@ -1057,9 +1070,6 @@ msgstr " #~ "すみません、このパッケージを削除するとシステムが壊れます:\n" #~ "\n" -#~ msgid "There was a problem during installation." -#~ msgstr "インストール中に問題発生。" - #~ msgid "" #~ "Could not find /var/lib/urpmi/compssUsers.flat,\n" #~ "the installer should have generated it for me :-(.\n" @@ -1261,9 +1271,6 @@ msgstr " #~ msgid "Force" #~ msgstr "強制" -#~ msgid "Problems occured during installation" -#~ msgstr "インストール中に問題が起こりました" - #~ msgid "usage: grpmi <[-noupgrade] rpms>\n" #~ msgstr "使い方: grpmi <[-noupgrade] rpms>\n" -- cgit v1.2.1