merge new tool mdkonline_tui

1 files changed, 239 insertions, 57 deletions

diff --git a/po/ja.po b/po/ja.po
index 7067044f..3202ae89 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mdkonline-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-09-21 14:29+0200\n"
+"POT-Creation-Date: 2004-09-26 07:20+0200\n"
 "PO-Revision-Date: 2004-09-20 10:56+0900\n"
 "Last-Translator: BANDO Yukiko\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,10 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 
 #: ../mdkapplet:61
+#, c-format
 msgid "Your system is up-to-date"
 msgstr "新しい更新はありません"
 
 #: ../mdkapplet:67
+#, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
 "support@mandrakeonline.net"
@@ -30,152 +32,189 @@ msgstr ""
 "メールしてください。"
 
 #: ../mdkapplet:73
+#, c-format
 msgid "System is busy. Please wait ..."
 msgstr "システムがビジー状態です。お待ち下さい..."
 
 #: ../mdkapplet:79
+#, c-format
 msgid "New updates are available for your system"
 msgstr "新しい更新があります"
 
 #: ../mdkapplet:85
+#, c-format
 msgid "Service is not configured. Please click on \"Configure the service\""
 msgstr "サービスが設定されていません。「サービスの設定」を選択して下さい。"
 
 #: ../mdkapplet:91
+#, c-format
 msgid "Network is down. Please configure your network"
 msgstr "ネットワークが未接続です。ネットワークを設定して下さい。"
 
 #: ../mdkapplet:97
+#, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "サービスが有効になっていません。「Onlineウェブサイト」を選択して下さい。"
 
 #: ../mdkapplet:103
+#, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
 
 #: ../mdkapplet:108 ../mdkapplet:157
+#, c-format
 msgid "Install updates"
 msgstr "システムを更新"
 
 #: ../mdkapplet:109
+#, c-format
 msgid "Configure the service"
 msgstr "サービスの設定"
 
 #: ../mdkapplet:110
+#, c-format
 msgid "Check Updates"
 msgstr "更新をチェック"
 
 #: ../mdkapplet:111
+#, c-format
 msgid "Online WebSite"
 msgstr "Onlineウェブサイト"
 
 #: ../mdkapplet:112
+#, c-format
 msgid "Configure Network"
 msgstr "ネットワークの設定"
 
 #: ../mdkapplet:113
+#, c-format
 msgid "Configure Now!"
 msgstr "設定して下さい"
 
 #: ../mdkapplet:145
+#, c-format
 msgid "Mandrakelinux Updates Applet"
 msgstr "Mandrakelinux 更新アプレット"
 
 #: ../mdkapplet:155
+#, c-format
 msgid "Actions"
 msgstr "動作"
 
 #: ../mdkapplet:158
+#, c-format
 msgid "Configure"
 msgstr "設定"
 
 #: ../mdkapplet:159
+#, c-format
 msgid "Check updates"
 msgstr "更新をチェック"
 
 #: ../mdkapplet:160
+#, c-format
 msgid "See logs"
 msgstr "ログを見る"
 
 #: ../mdkapplet:163
+#, c-format
 msgid "Status"
 msgstr "状態"
 
 #: ../mdkapplet:167 ../mdkapplet:422
+#, c-format
 msgid "Close"
 msgstr "閉じる"
 
 #: ../mdkapplet:202
-msgid "Down"
-msgstr "未接続"
-
-#: ../mdkapplet:202
+#, c-format
 msgid "Network Connection: "
 msgstr "ネットワーク接続: "
 
 #: ../mdkapplet:202
+#, c-format
 msgid "Up"
 msgstr "接続"
 
+#: ../mdkapplet:202
+#, c-format
+msgid "Down"
+msgstr "未接続"
+
 #: ../mdkapplet:203
+#, c-format
 msgid "Last check: "
 msgstr "前回チェック: "
 
 #: ../mdkapplet:204
+#, c-format
 msgid "Updates: "
 msgstr "更新: "
 
 #: ../mdkapplet:208
+#, c-format
 msgid "Launching drakconnect\n"
 msgstr "Drakconnectを起動\n"
 
 #: ../mdkapplet:212
+#, c-format
 msgid "Launching mdkupdate --applet\n"
 msgstr "更新アプレットを起動\n"
 
 #: ../mdkapplet:216
+#, c-format
 msgid "Mandrakeonline seems to be reinstalled, reloading applet ...."
 msgstr "Mandrakeonline が再インストールされたようです。アプレットを更新中 ..."
 
 #: ../mdkapplet:224
+#, c-format
 msgid "Computing new updates...\n"
 msgstr "新しい更新を計算中...\n"
 
 #: ../mdkapplet:226
+#, c-format
 msgid "Connecting to"
 msgstr "接続しています"
 
 #: ../mdkapplet:249
+#, c-format
 msgid "Checking... Updates are available\n"
 msgstr "チェック中... 新しい更新があります\n"
 
 #: ../mdkapplet:253
+#, c-format
 msgid "Development release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:254
+#, c-format
 msgid "Too old release not supported by service"
 msgstr ""
 
 #: ../mdkapplet:255
+#, c-format
 msgid "Unknown state"
 msgstr "不明な状態"
 
 #: ../mdkapplet:256
+#, c-format
 msgid "Online services disabled. Contact Mandrakeonline site\n"
 msgstr ""
 "Onlineサービスが無効になっています。Mandrakeonline に連絡して下さい。\n"
 
 #: ../mdkapplet:257
+#, c-format
 msgid "Wrong Password.\n"
 msgstr "パスワード誤り\n"
 
 #: ../mdkapplet:258
+#, c-format
 msgid "Wrong Action or host or login.\n"
 msgstr "動作、ホスト、ログイン名のいずれかが誤り\n"
 
 #: ../mdkapplet:259
+#, c-format
 msgid ""
 "Something is wrong with your network settings (check your route, firewall or "
 "proxy settings)\n"
@@ -184,58 +223,72 @@ msgstr ""
 "確認して下さい。\n"
 
 #: ../mdkapplet:263
+#, c-format
 msgid "System is up-to-date\n"
 msgstr "新しい更新はありません\n"
 
 #: ../mdkapplet:348
+#, c-format
 msgid "No check"
 msgstr "チェックなし"
 
 #: ../mdkapplet:361
+#, c-format
 msgid "Checking Network: seems disabled\n"
 msgstr "ネットワーク確認: 無効化されているようです\n"
 
 #: ../mdkapplet:364
+#, c-format
 msgid "Checking config file: Not present\n"
 msgstr "設定ファイル確認: ファイルがありません\n"
 
 #: ../mdkapplet:412
+#, c-format
 msgid "Logs"
 msgstr "ログ"
 
 #: ../mdkapplet:428
+#, c-format
 msgid "Clear"
 msgstr "クリア"
 
 #: ../mdkapplet:455
+#, c-format
 msgid "About..."
 msgstr "情報.."
 
 #: ../mdkapplet:456
+#, c-format
 msgid "Always launch on startup"
 msgstr "起動時に常に開始する"
 
 #: ../mdkapplet:458
+#, c-format
 msgid "Quit"
 msgstr "終了"
 
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Next"
 msgstr "次へ"
 
-#: ../mdkonline:88
-msgid "Previous"
-msgstr "戻る"
-
-#: ../mdkonline:88
+#: ../mdkonline:90
+#, c-format
 msgid "Skip Wizard"
 msgstr "ウィザードを省略"
 
-#: ../mdkonline:102
+#: ../mdkonline:90
+#, c-format
+msgid "Previous"
+msgstr "戻る"
+
+#: ../mdkonline:104
+#, c-format
 msgid "Welcome to Mandrakeonline"
 msgstr "Mandrakeonline へようこそ"
 
-#: ../mdkonline:103
+#: ../mdkonline:105 ../mdkonline_tui:93
+#, c-format
 msgid ""
 "This assistant will help you to upload your configuration\n"
 "(packages, hardware configuration) to a centralized database in\n"
@@ -245,55 +298,68 @@ msgstr ""
 "個別にお知らせするために、あなたのシステムに関する情報\n"
 "(パッケージやハードウェアの設定)を集中データベースに送信します。\n"
 
-#: ../mdkonline:104
+#: ../mdkonline:106 ../mdkonline_tui:133
+#, c-format
 msgid "Create a Mandrakeonline Account"
 msgstr "Mandrakeonline のアカウント作成"
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "I don't have a Mandrakeonline account and I want to "
 msgstr "Mandrakeonline にアカウントを持っていないので... "
 
-#: ../mdkonline:106
+#: ../mdkonline:108
+#, c-format
 msgid "Subscribe"
 msgstr "入会する"
 
-#: ../mdkonline:110 ../mdkonline:130
+#: ../mdkonline:112 ../mdkonline:132 ../mdkonline_tui:109 ../mdkonline_tui:136
+#, c-format
 msgid "Login:"
 msgstr "ログイン:"
 
-#: ../mdkonline:111 ../mdkonline:131
+#: ../mdkonline:113 ../mdkonline:133 ../mdkonline_tui:110 ../mdkonline_tui:137
+#, c-format
 msgid "Password:"
 msgstr "パスワード:"
 
-#: ../mdkonline:112
+#: ../mdkonline:114 ../mdkonline_tui:138
+#, c-format
 msgid "Confirm Password:"
 msgstr "パスワード確認:"
 
-#: ../mdkonline:113
+#: ../mdkonline:115 ../mdkonline_tui:139
+#, c-format
 msgid "Mail contact:"
 msgstr "メールアドレス:"
 
-#: ../mdkonline:120
+#: ../mdkonline:122
+#, c-format
 msgid "Mandrakelinux Privacy Policy"
 msgstr "Mandrakelinux プライバシー方針"
 
-#: ../mdkonline:126
+#: ../mdkonline:128
+#, c-format
 msgid "Authentification"
 msgstr "認証"
 
-#: ../mdkonline:127
+#: ../mdkonline:129 ../mdkonline_tui:103
+#, c-format
 msgid "Enter your Mandrakeonline login, password and machine name:"
 msgstr "Mandrakeonline のログイン名・パスワード・マシン名を入力して下さい:"
 
-#: ../mdkonline:132
+#: ../mdkonline:134 ../mdkonline_tui:111
+#, c-format
 msgid "Machine name:"
 msgstr "マシン名:"
 
-#: ../mdkonline:137
+#: ../mdkonline:139
+#, c-format
 msgid "Send Configuration"
 msgstr "設定を送信"
 
-#: ../mdkonline:138
+#: ../mdkonline:140 ../mdkonline_tui:124
+#, c-format
 msgid ""
 "In order to benefit from Mandrakeonline services,\n"
 "we are about to upload your configuration.\n"
@@ -329,11 +395,18 @@ msgstr ""
 "適用されます。\n"
 "手続完了後、あなたの username@mandrakeonline.net をメールでお送りします。"
 
-#: ../mdkonline:143 ../mdkonline:212 ../mdkonline:238
+#: ../mdkonline:145 ../mdkonline:212 ../mdkonline:235
+#, c-format
 msgid "Finish"
 msgstr "終る"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
+msgid "Your upload was successful!"
+msgstr "送信成功"
+
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "From now you will receive on security and updates \n"
 "announcements thanks to Mandrakeonline."
@@ -341,7 +414,8 @@ msgstr ""
 "これからはセキュリティその他の更新情報を Mandrakeonline \n"
 "がお知らせします。"
 
-#: ../mdkonline:144
+#: ../mdkonline:146 ../mdkonline_tui:152
+#, c-format
 msgid ""
 "Mandrakeonline offers you the ability to automate the updates.\n"
 "A program will run regulary in your system waiting for new updates\n"
@@ -349,27 +423,28 @@ msgstr ""
 "Mandrakeonline をご利用頂くとシステムの更新を自動化できます。\n"
 "チェックプログラムが新しい更新情報を定期的に調べに行きます。\n"
 
-#: ../mdkonline:144
-msgid "Your upload was successful!"
-msgstr "送信成功"
-
-#: ../mdkonline:145
+#: ../mdkonline:147
+#, c-format
 msgid "automated Upgrades"
 msgstr "自動アップグレード"
 
-#: ../mdkonline:150
+#: ../mdkonline:151
+#, c-format
 msgid "Country:"
 msgstr "国名:"
 
 #: ../mdkonline:179 ../mdkonline:184 ../mdkonline:186 ../mdkonline:188
+#, c-format
 msgid "Error"
 msgstr "エラー"
 
 #: ../mdkonline:184
+#, c-format
 msgid "Please provide a login"
 msgstr "ログイン名を入力してください"
 
 #: ../mdkonline:186
+#, c-format
 msgid ""
 "The passwords do not match\n"
 " Please try again\n"
@@ -378,39 +453,49 @@ msgstr ""
 "やり直してください\n"
 
 #: ../mdkonline:188
+#, c-format
 msgid "Not a valid mail address!\n"
 msgstr "メールアドレスが無効です\n"
 
-#: ../mdkonline:200
+#: ../mdkonline:200 ../mdkonline_tui:78 ../mdkonline_tui:82
+#, c-format
 msgid "Reading configuration\n"
 msgstr "設定読み込み中\n"
 
 #: ../mdkonline:205
+#, c-format
 msgid "Sending configuration..."
 msgstr "設定を送信中..."
 
-#: ../mdkonline:214 ../mdkonline:279
+#: ../mdkonline:214 ../mdkonline:274 ../mdkonline_tui:126 ../mdkonline_tui:154
+#: ../mdkupdate:124 ../mdkupdate:195
+#, c-format
 msgid "Connection problem"
 msgstr "接続トラブル"
 
-#: ../mdkonline:214
+#: ../mdkonline:214 ../mdkonline_tui:154
+#, c-format
 msgid "Problem occurs when uploading files, please try again"
 msgstr "ファイル送信中に問題が発生しました。やり直して下さい。"
 
-#: ../mdkonline:255
+#: ../mdkonline:252
+#, c-format
 msgid "Quitting Wizard\n"
 msgstr "Wizard を出る\n"
 
-#: ../mdkonline:279
+#: ../mdkonline:274
+#, c-format
 msgid "Mandrakeonline could not be contacted, please try again at a later time"
 msgstr ""
 "Mandrakeonline に接続できませんでした。しばらくたってからやり直して下さい。"
 
-#: ../mdkonline:291
+#: ../mdkonline:286
+#, c-format
 msgid "Wrong password"
 msgstr "パスワード誤り"
 
-#: ../mdkonline:291
+#: ../mdkonline:286 ../mdkonline_tui:126
+#, c-format
 msgid ""
 "Your login or password was wrong.\n"
 " Either you'll have to type it again, or you'll need to create an account on "
@@ -428,8 +513,83 @@ msgstr ""
 "注意：マシン名も必要です。\n"
 " (アルファベットのみ可)"
 
-#: ../mdkupdate:51
-#, perl-format
+#: ../mdkonline.pm:36
+#, c-format
+msgid "Login and password should be less than 12 characters\n"
+msgstr ""
+
+#: ../mdkonline.pm:37
+#, c-format
+msgid "Special characters are not allowed\n"
+msgstr ""
+
+#: ../mdkonline.pm:38
+#, c-format
+msgid "Please fill in all fields\n"
+msgstr ""
+
+#: ../mdkonline.pm:39
+#, c-format
+msgid "Email not valid\n"
+msgstr ""
+
+#: ../mdkonline.pm:40
+#, c-format
+msgid "Account already exist\n"
+msgstr ""
+
+#: ../mdkonline.pm:46
+#, c-format
+msgid "Problem connecting to server \n"
+msgstr "サーバ接続中にエラーが発生\n"
+
+#: ../mdkonline_tui:45 ../mdkonline_tui:90
+#, fuzzy, c-format
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline へようこそ"
+
+#: ../mdkonline_tui:48
+#, c-format
+msgid "I already have an account"
+msgstr ""
+
+#: ../mdkonline_tui:49
+#, c-format
+msgid "I want to subscribe"
+msgstr ""
+
+#: ../mdkonline_tui:78 ../mdkonline_tui:82 ../mdkonline_tui:119
+#, c-format
+msgid "Please wait"
+msgstr ""
+
+#: ../mdkonline_tui:98
+#, c-format
+msgid "Account creation or authentication"
+msgstr ""
+
+#: ../mdkonline_tui:119
+#, fuzzy, c-format
+msgid "Connecting to Mandrakeonline website..."
+msgstr "Mandrakeonline へようこそ"
+
+#: ../mdkonline_tui:126
+#, c-format
+msgid "or"
+msgstr ""
+
+#: ../mdkonline_tui:126
+#, fuzzy, c-format
+msgid "wrong password:"
+msgstr "パスワード誤り"
+
+#: ../mdkonline_tui:160
+#, fuzzy, c-format
+msgid "Country"
+msgstr "国名:"
+
+#: ../mdkupdate:50
+#, c-format
 msgid ""
 "mdkupdate version %s\n"
 "Copyright (C) %s Mandrakesoft.\n"
@@ -444,22 +604,53 @@ msgstr ""
 "\n"
 "使用方法 :\n"
 
-#: ../mdkupdate:56
+#: ../mdkupdate:55
+#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - このヘルプメッセージを出力する。\n"
 
-#: ../mdkupdate:57
+#: ../mdkupdate:56
+#, c-format
 msgid "  --auto         - Mandrakeupdate launched automatically.\n"
 msgstr "  --auto       - Mandrakeupdateを自動的に起動する。\n"
 
-#: ../mdkupdate:58
+#: ../mdkupdate:57
+#, c-format
 msgid "  --applet       - launch Mandrakeupdate.\n"
 msgstr "  --applet       - Mandrakeupdateを起動する\n"
 
-#: ../mdkupdate:59
+#: ../mdkupdate:58
+#, c-format
 msgid "  --update       - Update keys\n"
 msgstr "  --update       - キー更新\n"
 
+#: ../mdkupdate:66
+#, c-format
+msgid "No %s file found. Run mdkonline wizard first"
+msgstr ""
+
+#: ../mdkupdate:124
+#, c-format
+msgid "Mandrakeupdate could not contact the site, we will try again."
+msgstr "Mandrakeupdateはこのサイトに接続できません。再試行します。"
+
+#: ../mdkupdate:173
+#, c-format
+msgid "Unable to update packages from mdkupdate medium.\n"
+msgstr "mdkupdateメディアからのパッケージ更新ができません。\n"
+
+#: ../mdkupdate:187
+#, c-format
+msgid "No diff found"
+msgstr ""
+
+#: ../mdkupdate:195
+#, c-format
+msgid ""
+"Mandrakeupdate could not upload the diff files. Send a mail to support [at] "
+"mandrakeonline [dot] net"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Configuration"
 #~ msgstr "設定読み込み中\n"
@@ -468,12 +659,6 @@ msgstr "  --update       - キー更新\n"
 #~ msgid "Checking ..."
 #~ msgstr "接続トラブル"
 
-#~ msgid "Problem connecting to server \n"
-#~ msgstr "サーバ接続中にエラーが発生\n"
-
-#~ msgid "Unable to update packages from mdkupdate medium.\n"
-#~ msgstr "mdkupdateメディアからのパッケージ更新ができません。\n"
-
 #, fuzzy
 #~ msgid "Response from Mandrakeonline server\n"
 #~ msgstr "Mandrakeonline へようこそ"
@@ -485,9 +670,6 @@ msgstr "  --update       - キー更新\n"
 #~ msgid "Yes I want automated updates"
 #~ msgstr "はい、自動アップデートしたい"
 
-#~ msgid "Mandrakeupdate could not contact the site, we will try again."
-#~ msgstr "Mandrakeupdateはこのサイトに接続できません。再試行します。"
-
 #, fuzzy
 #~ msgid "Mandrakelinux Online Team"
 #~ msgstr "Mandrakeonline へようこそ"